architect4r 0.4.2 → 0.4.3

data/ReleaseNotes.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## v0.4.3
+
+* Allow retrieving multiple nodes with a single call to ```Node#find(id, id2, id3)```
+
 ## v0.4.2
 
 * Unify the finder interface and use ```Node#find(id)``` in favor of ```Node#find_by_id(id)```

data/lib/architect4r/model/queries.rb

@@ -16,15 +16,33 @@ module Architect4r
         
         # Fetch a record of the specified model based on its id
         #
-        def find(id)
-          data = connection.execute_cypher("start s=node(#{self.model_root.id}), d=node(#{id.to_i}) match s<-[r:model_type]-d return d")
-          data &&= data['data'] && data['data'].flatten.first
-          self.build_from_database(data)
+        def find(*ids)
+          # This code is taken from / inspired by activerecord:
+          #   activerecord/lib/active_record/base.rb, line 1589
+          expects_array = ids.first.kind_of?(Array)
+          return ids.first if expects_array && ids.first.empty?
+          
+          ids = ids.flatten.compact.uniq
+          
+          case ids.size
+          when 0
+            raise(Architect4r::RecordNotFound.new("Could not find the #{self.name} without an id!"))
+          when 1
+            id = ids.first.to_i
+            data = connection.execute_cypher("start s=node(#{self.model_root.id}), d=node(#{id}) match s<-[r:model_type]-d return d")
+            data &&= data['data'] && data['data'].flatten.first
+            result = self.build_from_database(data)
+            
+            expects_array ? [ result ] : result
+          else
+            ids = ids.map { |i| i.to_i }.uniq.join(',')
+            find_by_cypher("start s=node(#{self.model_root.id}), d=node(#{ids}) match s<-[r:model_type]-d return d", 'd')
+          end
         end
         alias :find_by_id :find
         
         def find!(id)
-          self.find_by_id(id) || raise(Architect4r::RecordNotFound.new("Could not find the #{self.name} with id #{id}!"))
+          self.find(id) || raise(Architect4r::RecordNotFound.new("Could not find the #{self.name} with id #{id}!"))
         end
         alias :find_by_id! :find!
         

data/lib/architect4r/version.rb

@@ -1,3 +1,3 @@
 module Architect4r
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/model/queries_spec.rb

@@ -36,6 +36,21 @@ describe "Node Queries" do
       lambda { Person.find_by_id!(person.id) }.should_not raise_error(Architect4r::RecordNotFound)
     end
     
+    it "should allow fetching multiple nodes by id" do
+      person1 = Person.create(:name => 'Agent 1', :human => false)
+      person2 = Person.create(:name => 'Agent 2', :human => false)
+      
+      result = Person.find(person1.id, person2.id)
+      result.should have(2).persons
+    end
+    
+    it "should return an array if the input was one" do
+      person = Person.create(:name => 'Agent X', :human => false)
+      
+      result = Person.find([person.id])
+      result.should have(1).persons
+    end
+    
   end
   
   describe "counting records" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: architect4r
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Maximilian Schulz