Move Project.deserialize to instance method

So we can instantiate atom.project during Atom environment construction.

Signed-off-by: Max Brunsfeld <maxbrunsfeld@github.com>

spec/git-spec.coffee

@@ -277,7 +277,8 @@ describe "GitRepository", ->
         atom.workspace.open('file.txt')
 
       runs ->
-        project2 = Project.deserialize(atom.project.serialize())
+        project2 = new Project()
+        project2.deserialize(atom.project.serialize(), atom.deserializers)
         buffer = project2.getBuffers()[0]
 
       waitsFor ->

spec/project-spec.coffee

@@ -66,7 +66,9 @@ describe "Project", ->
 
       runs ->
         expect(atom.project.getBuffers().length).toBe 1
-        deserializedProject = Project.deserialize(atom.project.serialize())
+
+        deserializedProject = new Project()
+        deserializedProject.deserialize(atom.project.serialize(), atom.deserializers)
         expect(deserializedProject.getBuffers().length).toBe 0
 
     it "listens for destroyed events on deserialized buffers and removes them when they are destroyed", ->
@@ -75,7 +77,8 @@ describe "Project", ->
 
       runs ->
         expect(atom.project.getBuffers().length).toBe 1
-        deserializedProject = Project.deserialize(atom.project.serialize())
+        deserializedProject = new Project
+        deserializedProject.deserialize(atom.project.serialize(), atom.deserializers)
 
         expect(deserializedProject.getBuffers().length).toBe 1
         deserializedProject.getBuffers()[0].destroy()
@@ -91,7 +94,8 @@ describe "Project", ->
       runs ->
         expect(atom.project.getBuffers().length).toBe 1
         fs.mkdirSync(pathToOpen)
-        deserializedProject = Project.deserialize(atom.project.serialize())
+        deserializedProject = new Project
+        deserializedProject.deserialize(atom.project.serialize(), atom.deserializers)
         expect(deserializedProject.getBuffers().length).toBe 0
 
     it "does not deserialize buffers when their path is inaccessible", ->
@@ -104,7 +108,8 @@ describe "Project", ->
       runs ->
         expect(atom.project.getBuffers().length).toBe 1
         fs.chmodSync(pathToOpen, '000')
-        deserializedProject = Project.deserialize(atom.project.serialize())
+        deserializedProject = new Project()
+        deserializedProject.deserialize(atom.project.serialize(), atom.deserializers)
         expect(deserializedProject.getBuffers().length).toBe 0
 
   describe "when an editor is saved and the project has no path", ->

spec/spec-helper.coffee

@@ -85,7 +85,8 @@ beforeEach ->
   documentTitle = null
   projectPath = specProjectPath ? path.join(@specDirectory, 'fixtures')
   atom.packages.serviceHub = new ServiceHub
-  atom.project = new Project(paths: [projectPath])
+  atom.project = new Project
+  atom.project.setPaths([projectPath])
   atom.workspace = new Workspace()
   atom.themes.workspace = atom.workspace
   atom.keymaps.keyBindings = _.clone(keyBindingsToRestore)

spec/workspace-spec.coffee

@@ -1,6 +1,7 @@
 path = require 'path'
 temp = require 'temp'
 Workspace = require '../src/workspace'
+Project = require '../src/project'
 Pane = require '../src/pane'
 platform = require './spec-helper-platform'
 _ = require 'underscore-plus'
@@ -21,7 +22,8 @@ describe "Workspace", ->
       projectState = atom.project.serialize()
       atom.workspace.destroy()
       atom.project.destroy()
-      atom.project = atom.deserializers.deserialize(projectState)
+      atom.project = new Project()
+      atom.project.deserialize(projectState, atom.deserializers)
       atom.workspace = Workspace.deserialize(workspaceState)
 
     describe "when the workspace contains text editors", ->

src/atom.coffee

@@ -652,9 +652,9 @@ class Atom extends Model
 
   deserializeProject: ->
     Project = require './project'
-
     startTime = Date.now()
-    @project ?= @deserializers.deserialize(@state.project) ? new Project()
+    @project = new Project()
+    @project.deserialize(@state.project, @deserializers) if @state.project?
     @deserializeTimings.project = Date.now() - startTime
 
   deserializeWorkspace: ->

src/project.coffee

@@ -21,23 +21,10 @@ class Project extends Model
   Section: Construction and Destruction
   ###
 
-  @deserialize: (state) ->
-    state.buffers = _.compact state.buffers.map (bufferState) ->
-      # Check that buffer's file path is accessible
-      return if fs.isDirectorySync(bufferState.filePath)
-      if bufferState.filePath
-        try
-          fs.closeSync(fs.openSync(bufferState.filePath, 'r'))
-        catch error
-          return unless error.code is 'ENOENT'
-
-      atom.deserializers.deserialize(bufferState)
-
-    new this(state)
-
-  constructor: ({path, paths, @buffers}={}) ->
+  constructor: ->
     @emitter = new Emitter
-    @buffers ?= []
+    @buffers = []
+    @paths = []
     @rootDirectories = []
     @repositories = []
 
@@ -68,11 +55,6 @@ class Project extends Model
           @setPaths(@getPaths())
       )
 
-    @subscribeToBuffer(buffer) for buffer in @buffers
-
-    paths ?= _.compact([path])
-    @setPaths(paths)
-
   destroyed: ->
     buffer.destroy() for buffer in @getBuffers()
     @setPaths([])
@@ -85,6 +67,22 @@ class Project extends Model
   Section: Serialization
   ###
 
+  deserialize: (state, deserializerManager) ->
+    states.paths = [state.path] if state.path? # backward compatibility
+
+    @buffers = _.compact state.buffers.map (bufferState) ->
+      # Check that buffer's file path is accessible
+      return if fs.isDirectorySync(bufferState.filePath)
+      if bufferState.filePath
+        try
+          fs.closeSync(fs.openSync(bufferState.filePath, 'r'))
+        catch error
+          return unless error.code is 'ENOENT'
+      deserializerManager.deserialize(bufferState)
+
+    @subscribeToBuffer(buffer) for buffer in @buffers
+    @setPaths(state.paths)
+
   serialize: ->
     deserializer: 'Project'
     paths: @getPaths()