todos

ahoward · Jan 26, 2014 · 68ef898 · 68ef898
1 parent 9acca88
commit 68ef898
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/TODO.md b/TODO.md
@@ -1,5 +1,9 @@
 todo:
 
+  Model[id]
+  Model.select
+  Model.where
+
   - reconsider using active_model...
 
   - with ro, do we/should we need to expand assets?

diff --git a/lib/ro/model.rb b/lib/ro/model.rb
@@ -47,7 +47,7 @@ def Model.paginate(*args, &block)
     def Model.models_for(result)
       case result
         when Array
-          Array(result).flatten.compact.map{|attributes| new(attributes)}
+          Array(result).flatten.compact.map{|element| new(element)}
         else
           new(result)
       end
@@ -60,6 +60,12 @@ def initialize(*args, &block)
       attributes = Map.options_for!(args)
 
       node = args.detect{|arg| arg.is_a?(Node)}
+      model = args.detect{|arg| arg.is_a?(Model)}
+
+      if node.nil? and not model.nil?
+        node = model.node
+      end
+
       if node
         @node = node
       else