active_node 2.2.10 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8b5cdce49bea8a43202dd604742e923524d112e
-  data.tar.gz: 3528cb5ae3bc24ba06ac5ed67144da5f3f20c02e
+  metadata.gz: 23634528e561c3566ceadee3c51e59b9b1a3f168
+  data.tar.gz: a2f28a259c39e95dacbf8ae3c407aa81dea03454
 SHA512:
-  metadata.gz: e161898cfc4cc82d71a98dc3009430124ecf259df99858bf66fa12afad2f667d0f2adb236efd1a4eacadcc9726c151f3059197e65e93db0115eede6bf7f43dec
-  data.tar.gz: 5d6c3b17d28b112e6a6fe4247b9c8aacac0b8566782b87f72458ddea7a82297c5f1230943a943f3ccfe7326995fae4ebe7a93ba95663b655bdda86af0d332c93
+  metadata.gz: 620475b5a57080c67baf074098d4db30672a75877fca13a52211f308c6a5a2fe26d97d87f7727ae58be24f15383270bb432b3b8f43274928c48830f55f463837
+  data.tar.gz: 1b46d6c1b24082e8bde6a912fccec63d4239ba30c87051834f70c385b6d89c3ba4468e0574ba3c0ec1824144d5d5a016c32cf8085f1fe9c3cbfb8b85111ce7f4

data/.travis.yml

@@ -1,4 +1,4 @@
-script: "bundle exec rake neo4j:install['enterprise','2.1.3'] neo4j:start spec --trace"
+script: "bundle exec rake neo4j:install['enterprise','2.1.6'] neo4j:start spec --trace"
 language: ruby
 rvm:
   - 2.1.2

data/lib/active_node/associations/association.rb

@@ -41,6 +41,7 @@ module ActiveNode
       end
 
       def rel(*associations)
+        @loaded = true
         owner.includes!(reflection.name => associations)
       end
 
@@ -53,7 +54,7 @@ module ActiveNode
       end
 
       def validate_type(records)
-        unless records.all? {|r| r.is_a?(reflection.klass)}
+        unless records.all? { |r| r.is_a?(reflection.klass) }
           raise ArgumentError, "#{reflection.name} can only accept object(s) of class #{reflection.klass}"
         end
       end
@@ -78,14 +79,19 @@ module ActiveNode
 
 
       def rels_reader(*args)
-        rel(*args) unless @rel_target
+        rel(*args) unless @loaded
         @rel_target ||= []
       end
 
       def rels_writer(rels)
-        @target = nil
         @dirty = true
+        rels_loader(rels)
+      end
+
+      def rels_loader(rels)
+        @target = nil
         @rel_target = rels
+        @loaded = true
       end
 
       def save(fresh=false)

data/lib/active_node/graph.rb

@@ -166,25 +166,47 @@ module ActiveNode
 
     def parse_results data
       @records = data.reduce(Set.new) { |set, record| set << wrap(record.first, @klass) }.to_a
-      alternate_cells(data, 2) { |node, reflection| wrap node, reflection.klass }
-      alternate_cells(data, 1) { |rel, reflection| wrap_rel [rel].flatten.last, reflection }
+      parse_nodes(data)
+      parse_relationships(data)
       @loaded = true
     end
 
-    def alternate_cells data, shift
-      data.each do |row|
-        @reflections.each_with_index do |reflection, index|
-          cell = row[2*index + shift]
-          yield cell, reflection if cell
+    def parse_nodes(data)
+      each_row_reflection_with_index(data) do |row, reflection, index|
+        node = row[index+2]
+        wrap node, reflection.klass if node.present?
+      end
+    end
+
+    def parse_relationships(data)
+      each_row_reflection_with_index(data) do |row, reflection, index|
+        rel = row[index+1]
+        if rel.nil?
+          node = row[index]
+          add_empty_assoc(node, reflection) if node
+        elsif rel.present?
+          wrap_rel [rel].flatten.last, reflection
         end
       end
     end
 
+    def each_row_reflection_with_index(data)
+      data.each { |row| @reflections.each_with_index { |reflection, index| yield row, reflection, 2*index } }
+    end
+
     def previously_loaded?(assoc)
       @loaded_assoc_cache[assoc] = assoc.rel_target unless @loaded_assoc_cache.key? assoc
       @loaded_assoc_cache[assoc]
     end
 
+    def add_empty_assoc(record, reflection)
+      association(extract_id(record), reflection).rels_loader []
+    end
+
+    def association(node_id, reflection)
+      @object_cache[node_id].association(reflection.name)
+    end
+
     def wrap(record, klass)
       @object_cache[extract_id record] ||= ActiveNode::Base.wrap(record, klass)
     end
@@ -195,8 +217,8 @@ module ActiveNode
 
     def create_rel(rel, reflection)
       ActiveNode::Relationship.new(@object_cache[node_id rel, reflection, :other], data(rel)).tap do |relationship|
-        assoc = @object_cache[node_id rel, reflection, :owner].association(reflection.name)
-        assoc.rels_writer((assoc.rel_target || []) << relationship) unless previously_loaded?(assoc)
+        assoc = association(node_id(rel, reflection, :owner), reflection)
+        assoc.rels_loader((assoc.rel_target || []) << relationship) unless previously_loaded?(assoc)
       end
     end
 

data/lib/active_node/version.rb

@@ -1,3 +1,3 @@
 module ActiveNode
-  VERSION = "2.2.10"
+  VERSION = "2.3.0"
 end

data/spec/functional/associations_spec.rb

@@ -186,5 +186,22 @@ describe ActiveNode::Associations do
       father.update_attributes(name: "John")
       expect(Person.find(father.id).children).to be_empty?
     end
+
+    it 'should respect object identity on retrieval with includes' do
+      child1 = Person.create!
+      father = Person.create! children: [child1]
+      father = Person.includes(children: :father).find(father.id)
+      father.update_attributes(name: "John")
+      expect(father.children.first.father.name).to eq "John"
+    end
+
+    it 'should respect object identity on retrieval on demand' do
+      pending
+      child1 = Person.create!
+      father = Person.create! children: [child1]
+      father = Person.find(father.id)
+      father.children.first.father.update_attributes(name: "John")
+      expect(father.name).to eq "John"
+    end
   end
 end

data/spec/functional/graph_spec.rb

@@ -22,8 +22,21 @@ describe ActiveNode::Graph do
       expect(g_person.children).to eq([c1, c2])
     end
 
-    it "should not query db twice" do
-      pending
+    it "should not query db twice non empty associations" do
+      person = Person.create!(children: [Person.create!])
+      person = Person.includes(:children).find(person.id)
+      expect(ActiveNode::Neo).not_to receive(:db)
+      person.children
+    end
+
+    it "should not query db twice empty associations" do
+      person = Person.create!
+      person.children
+      expect(ActiveNode::Neo).not_to receive(:db)
+      person.children
+    end
+
+    it "should not query db twice empty associations after load with includes" do
       person = Person.create!
       person.includes! :children
       expect(ActiveNode::Neo).not_to receive(:db)
@@ -51,10 +64,15 @@ describe ActiveNode::Graph do
 
     it "should return correct associated objects" do
       child1 = Person.create! children: [Person.create!, Person.create!]
-      person = Person.create! children: [child1]
+      address = Address.create!
+      person = Person.create! children: [child1], address: address
       expect(Person.includes(children: :children).find(person.id).children).to eq([child1])
       expect(Person.includes(children: 2).find(person.id).children).to eq([child1])
       expect(Person.includes(children: '*').find(person.id).children).to eq([child1])
+      expect(Person.includes(children: '*0..').find(person.id).children).to eq([child1])
+      person = Person.includes({children: '*0..'} => :address).find(person.id)
+      expect(ActiveNode::Neo).not_to receive(:db)
+      expect(person.address).to eq(address)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_node
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.3.0
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr