update model

demo.coffee.md

@@ -26,5 +26,5 @@ A demo application displaying the filetree.
     document.body.appendChild template(filetree)
 
     textarea = document.createElement "textarea"
-    
+
     document.body.appendChild textarea

file.coffee.md

@@ -4,10 +4,10 @@ File Model
 The `File` model represents a file in a file system. It is populated by data
 returned from the Github API.
 
-    Composition = require "composition"
-    Observable = require "observable"
     {defaults} = require "util"
 
+    Model = require "model"
+    Observable = Model.Observable
     {SHA1} = require "sha1"
     utf8 = require "./lib/utf8"
 
@@ -35,7 +35,7 @@ Attributes
 
       I.initialSha ?= I.sha
 
-      self = Composition(I)
+      self=Model(I)
 
       self.attrObservable Object.keys(I)...
 

filetree.coffee.md

@@ -1,18 +1,13 @@
 Filetree Model
 ==============
-
+
+    Model = require "model"
     File = require("./file")
 
-    Composition = require "composition"
-    {defaults} = require "util"
-
 The `Filetree` model represents a tree of files.
 
-    Filetree = (I={}) ->
-      defaults I,
-        files: []
-
-      self = Composition(I)
+    Filetree = (I={}, self=Model(I)) ->
+      I.files ?= []
 
       self.attrModels "files", File
 

main.coffee.md

@@ -11,6 +11,4 @@ requests.
 
     # Check if package is root package and then run demo
     if PACKAGE.name is "ROOT"
-      global.Observable = require "observable" # TODO: Hack for templating
-
       require "./demo"

pixie.cson

@@ -1,6 +1,5 @@
-version: "0.3.2"
+version: "0.4.0-pre.2"
 dependencies:
-  composition: "distri/model:v0.1.3"
-  observable: "distri/observable:v0.3.1"
+  model: "distri/model:v0.2.0-pre.2"
   sha1: "distri/sha1:v0.1.0"
   util: "distri/util:v0.1.0"

templates/filetree.haml.md

@@ -3,7 +3,7 @@ Render a list of files as a filetree.
     %ul.filetree
       - selectedFile = @selectedFile
       - files = @files
-      - each files, (file) ->
+      - files.forEach (file) ->
         - select = (e) -> selectedFile(file) if e.target.nodeName is 'LI'
         %li(click=select)= file.displayName
           - remove = -> files.remove(file) if confirm("Delete #{file.path()}?")