active_node 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d31741bd5a8017c8fbc4a49a3494d5d4622e6b0
-  data.tar.gz: 4fe415aecee9215b53ab04a5e5f031c94fcca1b8
+  metadata.gz: 05485943a60e029748218ef9bb075ac6a601e863
+  data.tar.gz: 025ea77b6cfd4e68a839f0712d48fdb5c8de0a02
 SHA512:
-  metadata.gz: 740435b0a5eceb85a52c8c98a0a2068b26c1e17cfb5dde3341bb6075c9f6717478a811e564c48cf1ae2460f7131bea2ef34c8bf2713b3e5a9eb04fbe28255304
-  data.tar.gz: ec10984057ef8c34ccfd19e4a1b83359db40b121e02e5d5b400618c78ff565c6f198b67ce8329c1f9f9a2f673dc6969bbedd82f373f3a69cf7a452cf73c44f1d
+  metadata.gz: a0f21defc7f1b9477c886879b2fbca7aaf3e2a79ec7f39b2304084faf6cd84efc9dc3e231cf2f15fce724c23be89bff6b733ccedbcce0fbd6975aea90217aeeb
+  data.tar.gz: 8ab33c466677513cc63a9be1009a7c10b06cd82796dc6d6a2a499cdc3bfdee1612b7e8ad5db0b0675dcc0baaf01d97170b7d92e77bac3ba5137c1f33fb54a0fd

data/lib/active_node.rb

@@ -10,6 +10,7 @@ module ActiveNode
   autoload :Reflection
   autoload :VERSION
   autoload :Neo
+  autoload :Relationship
 
   eager_autoload do
     autoload :ActiveNodeError, 'active_node/errors'

data/lib/active_node/associations/association.rb

@@ -40,32 +40,68 @@ module ActiveNode
         reflection.klass
       end
 
-      def load_target
-        owner.send(reflection.direction, reflection.type, reflection.klass)
-      end
 
-      # Implements the reader method, e.g. foo.items for Foo.has_many :items
-      def reader(force_reload = false)
-        @target ||= load_target
+      def rel(*associations)
+        owner.relationships(reflection, *associations)
       end
 
       # Implements the writer method, e.g. foo.items= for Foo.has_many :items
       def writer(records)
         @dirty = true
+        @rel_target = nil
         @target = records
       end
+      alias :super_writer :writer
+
+      # Implements the ids writer method, e.g. foo.item_ids= for Foo.has_many :items
+      def ids_writer(ids)
+        @rel_target = nil
+        super_writer klass.find(ids.reject(&:blank?).map!(&:to_i))
+      end
+
+      def reader(*args)
+        @target ||= rels_reader(*args).map &:other
+      end
+
+      # Implements the ids reader method, e.g. foo.item_ids for Foo.has_many :items
+      def ids_reader
+        reader
+        @target.map(&:id)
+      end
+
+
+      def rels_reader(*args)
+        @rel_target ||= rel(*args)
+      end
+
+      def rels_writer(rels)
+        @target = nil
+        @dirty = true
+        @rel_target = rels
+      end
 
-      def save
-        return unless @dirty
+      def save(fresh=false)
+        #return unless @dirty
         #delete all relations missing in new target
-        node = Neography::Node.load(owner.id)
-        node.rels(reflection.type).send(reflection.direction).each do |rel|
-          rel.del unless ids_reader.include? rel.other_node(node).neo_id.to_i
+        original_rels = fresh ? [] : rel
+        original_rels.each do |r|
+          unless ids_reader.include? r.other.id
+            Neo.db.delete_relationship(r.id)
+            original_rels.delete(r)
+          end
         end
-        original_target = node.send(reflection.direction, reflection.type)
-        original_target_ids = original_target.map(&:neo_id).map(&:to_i)
+
         #add relations missing in old target
-        target_each { |n| original_target << n.id unless original_target_ids.include? n.id }
+        #if no rel_target proceed as before + set rel_target from db
+        #if rel_target exists update persisted records and insert new records
+        if @rel_target
+          @rel_target.each { |r| r.save(self) }
+        else
+          @target.map do |n|
+            original_rels.detect { |r| r.other.id == n.id }.tap { |o_r| o_r.try :other=, n } ||
+                ActiveNode::Relationship.create!(n, self)
+          end
+        end
       end
     end
   end

data/lib/active_node/associations/builder/collection_association.rb

@@ -9,6 +9,10 @@ module ActiveNode::Associations::Builder
         def #{name.to_s.singularize}_ids
           association(:#{name}).ids_reader
         end
+
+        def #{name.to_s.singularize}_rels
+          association(:#{name}).rels_reader
+        end
       CODE
     end
 
@@ -19,6 +23,10 @@ module ActiveNode::Associations::Builder
         def #{name.to_s.singularize}_ids=(ids)
           association(:#{name}).ids_writer(ids)
         end
+
+        def #{name.to_s.singularize}_rels=(ids)
+          association(:#{name}).rels_writer(ids)
+        end
       CODE
     end
   end

data/lib/active_node/associations/builder/singular_association.rb

@@ -23,6 +23,10 @@ module ActiveNode::Associations::Builder
         def #{name}_id
           association(:#{name}).id_reader
         end
+
+        def #{name}_rel
+          association(:#{name}).rel_reader
+        end
       CODE
     end
 
@@ -33,6 +37,10 @@ module ActiveNode::Associations::Builder
         def #{name}_id=(value)
           association(:#{name}).id_writer(value)
         end
+
+        def #{name}_rel=(value)
+          association(:#{name}).rel_writer(value)
+        end
       CODE
     end
   end

data/lib/active_node/associations/collection_association.rb

@@ -26,20 +26,6 @@ module ActiveNode
     # +load_target+ and the +loaded+ flag are your friends.
     class CollectionAssociation < Association #:nodoc:
 
-      # Implements the ids reader method, e.g. foo.item_ids for Foo.has_many :items
-      def ids_reader
-        reader.map(&:id)
-      end
-
-      # Implements the ids writer method, e.g. foo.item_ids= for Foo.has_many :items
-      def ids_writer(ids)
-        writer klass.find(ids.reject(&:blank?).map!(&:to_i))
-      end
-
-      def target_each
-        target.each {|n| yield n}
-      end
-
       def reset
         super
         @target = owner.new_record? ? [] : nil

data/lib/active_node/associations/singular_association.rb

@@ -1,24 +1,28 @@
 module ActiveNode
   module Associations
     class SingularAssociation < Association #:nodoc:
-      def load_target
+      def reader
         super.try :first
       end
 
-      def target_each
-        yield target if target.present?
+      def id_reader
+        ids_reader.try :first
       end
 
-      def ids_reader
-        [id_reader].compact
+      def id_writer(id)
+        ids_writer([id].compact)
       end
 
-      def id_reader
-        target.try :id
+      def rel_reader
+        rels_reader.try :first
       end
 
-      def id_writer(id)
-        writer(id.blank? ? nil : klass.find(id.to_i))
+      def rel_writer(rel)
+        rels_writer([rel].compact)
+      end
+
+      def writer(record)
+        super([record].compact)
       end
     end
   end

data/lib/active_node/persistence.rb

@@ -37,6 +37,10 @@ module ActiveNode
         node.is_a?(Array) ? new_instances(node, klass) : new_instance(node, klass)
       end
 
+      def wrap_rel rel, node, klass
+        ActiveNode::Relationship.new wrap(node, klass), rel['data'].merge(id: get_id(rel).to_i)
+      end
+
       def active_node_class(class_name, default_klass=nil)
         klass = Module.const_get(class_name) rescue nil
         klass && klass < ActiveNode::Base && klass || default_klass
@@ -117,7 +121,51 @@ module ActiveNode
       related(:outgoing, type, klass)
     end
 
+    def relationships(reflection, *associations)
+      id ?
+          Neo.db.execute_query(
+              "start n=node({id}) match #{match reflection}#{optional_match reflection, associations} return #{list_with_rel reflection.name, *associations} order by #{created_at_list reflection.name, *associations}",
+              {id: id})['data'].map { |rel_node| self.class.wrap_rel rel_node[0], rel_node[1], reflection.klass } :
+          []
+    end
+
     private
+    def parse_result klass, result, associations
+      node_map = {}
+      result.each do |record|
+        (node_map[extract_id(record[1])] ||= wrap_rel(record[0], record[1], klass))
+      end
+    end
+
+    def extract_id(id)
+      get_id(id).to_i
+    end
+
+    def match(reflection, start_var='n')
+      "(#{start_var})#{'<' if reflection.direction == :incoming}-[#{reflection.name}_rel:#{reflection.type}]-#{'>' if reflection.direction == :outgoing}(#{reflection.name}#{label reflection.klass})"
+    end
+
+    def optional_match reflection, associations
+      return if associations.empty?
+      " optional match " + comma_sep_list(associations.map { |association| match(reflection.klass.reflect_on_association(association), association) })
+    end
+
+    def label klass
+      ":#{klass.label}" if klass
+    end
+
+    def list_with_rel *names
+      comma_sep_list names.map { |name| ["#{name}_rel", name] }.flatten
+    end
+
+    def comma_sep_list *items
+      items.join(', ')
+    end
+
+    def created_at_list *names
+      comma_sep_list names.map { |name| "#{name}.created_at" }
+    end
+
     def split_hash hash, method, split_by
       hash.try(method) { |k, _| send split_by, k }
     end
@@ -144,8 +192,9 @@ module ActiveNode
     end
 
     def create_or_update
+      fresh = new_record?
       write; true
-      association_cache.values.each &:save
+      association_cache.values.each { |assoc| assoc.save(fresh) }
     end
 
     def write
@@ -171,5 +220,6 @@ module ActiveNode
     def all_attributes
       attributes.merge(@hash)
     end
+
   end
 end

data/lib/active_node/relationship.rb

@@ -0,0 +1,38 @@
+module ActiveNode
+  class Relationship
+    include Neography::Rest::Helpers
+
+    attr_accessor :other
+    attr_reader :id
+
+    def initialize other, props={}
+      self.other = other
+      @hash = props.with_indifferent_access
+      @id = @hash.delete(:id).try(&:to_i)
+    end
+
+    delegate :[], to: :@hash
+    delegate :[]=, to: :@hash
+
+    def new_record?
+      !id
+    end
+
+    def save(association)
+      if new_record?
+        from=association.owner
+        to=other
+        if association.reflection.direction == :incoming
+          from, to = to, from
+        end
+        @id = get_id(Neo.db.create_relationship(association.reflection.type, from.id, to.id, @hash)).to_i
+      else
+        Neo.db.reset_relationship_properties(id, @hash)
+      end
+    end
+
+    def self.create!(n, association)
+      new(n).save(association)
+    end
+  end
+end

data/lib/active_node/version.rb

@@ -1,3 +1,3 @@
 module ActiveNode
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/functional/associations_spec.rb

@@ -143,5 +143,40 @@ describe ActiveNode::Associations do
       father = Person.create!(children: [Person.create!])
       father.children.first.father.should == father
     end
+
+    it 'returns relationships to related nodes' do
+      child1 = Person.create!
+      child2 = Person.create!
+      person = Person.create! child_ids: [child1.id, child2.id]
+      person.save
+      person = Person.find(person.id)
+      person.child_rels.map(&:other).should == person.children
+    end
+
+    it 'relationship should include property' do
+      client = Client.create! name: 'Heinrich'
+      client.address_rel=ActiveNode::Relationship.new(Address.create!, address_type: 'home')
+      client.save
+      client = Client.find(client.id)
+      client.address_rel[:address_type].should == 'home'
+    end
+
+    it 'should save updated property on relationship' do
+      client = Client.create! name: 'Heinrich'
+      client.address_rel=ActiveNode::Relationship.new(Address.create!, address_type: 'home')
+      client.save
+      client = Client.find(client.id)
+      client.address_rel[:address_type]='office'
+      client.save
+      client=Client.find(client.id)
+      ar=client.address_rel
+      ar[:address_type].should == 'office'
+    end
+
+    it 'should retrieve multiple relationships at once' do
+      address = Address.create!
+      person = Person.create! children: [Person.create!(address: address)]
+      Person.find(person.id).children(:address).first.address.should == address
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_node
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -155,6 +155,7 @@ files:
 - lib/active_node/neo.rb
 - lib/active_node/persistence.rb
 - lib/active_node/reflection.rb
+- lib/active_node/relationship.rb
 - lib/active_node/validations.rb
 - lib/active_node/version.rb
 - spec/functional/associations_spec.rb