Use Universe#create to create FileOptions

andreyvit · andreyvit · commit 622816ca3257 · 2012-11-27T11:32:53.000+07:00
diff --git a/lib/projects/fileopts.iced b/lib/projects/fileopts.iced
@@ -18,8 +18,15 @@ encodeExternalRelativeDir = (dir) ->
 class FileOptions extends R.Model
 
   schema:
+    project:                  { type: Object }
+    path:                     { type: String }
+    compiler:                 { type: Object }
+    memento:                  { type: Object }
+
     compilable:               { type: Boolean }
     compiled:                 { type: Boolean }
+    initialized:              { type: Boolean }
+    enabled:                  { type: Boolean }
 
 
   # **/*.coffee -> **/*.js
@@ -36,13 +43,12 @@ class FileOptions extends R.Model
 
   # [x] Minify and concatenate
 
-  constructor: (@project, @path, memento={}) ->
-    @initialized = no
-    @enabled = memento.enabled ? yes
-    @compiler = null
+  initialize: (options) ->
+    @memento = options.memento or {}
 
-    @setMemento memento
+    @enabled = @memento.enabled ? yes
 
+    @setMemento @memento
 
     Object.defineProperty this, 'outputName', get: => @outputNameForMask(@outputNameMask)
 
diff --git a/lib/projects/project.iced b/lib/projects/project.iced
@@ -162,9 +162,10 @@ class Project extends R.Model
       if compiler = @session.findCompilerById(compilerId)
         @compilerOptionsById[compilerId] = new CompilerOptions(compiler, compilerOptionsMemento)
         for own filePath, fileOptionsMemento of compilerOptionsMemento.files || {}
-          @fileOptionsByPath[filePath] = new FileOptions(this, filePath, fileOptionsMemento)
+          @fileAt(filePath, yes).setMemento fileOptionsMemento
 
     for fileMemento in @memento?.files or []
+      debug "fileMemento: %j", fileMemento
       @fileAt(fileMemento.src, yes).setMemento fileMemento
 
     debug "@compilerOptionsById = " + JSON.stringify(([i, o.options] for i, o of @compilerOptionsById), null, 2)
@@ -201,7 +202,7 @@ class Project extends R.Model
 
   fileAt: (relpath, create=no) ->
     if create
-      @fileOptionsByPath[relpath] or= new FileOptions(this, relpath)
+      @fileOptionsByPath[relpath] or= @universe.create(FileOptions, project: this, path: relpath)
     else
       @fileOptionsByPath[relpath]
 
