active_node 0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 009873db2285d63fc20017f441525c2356dec8b9
-  data.tar.gz: 59aab9d43e21d1fb9376ddde89feecfdfe9c82f9
+  metadata.gz: 2d31741bd5a8017c8fbc4a49a3494d5d4622e6b0
+  data.tar.gz: 4fe415aecee9215b53ab04a5e5f031c94fcca1b8
 SHA512:
-  metadata.gz: 506c0696d7db079e83d2e36ddf00be5dc3e0e1088c037755f6d3ad0205faf50a89a6def731093dbf66df5dc3ddfa13b853eb5e4bfe748c2f99550465e445942b
-  data.tar.gz: 5594c6ce98652b3549369628bd6fb33e3f7eab56199e69e7a4c23d6b0bab9f7a421db842c1fe313593f97352653c7cab8ea08298fc2db1be63c83d6ba3f255b8
+  metadata.gz: 740435b0a5eceb85a52c8c98a0a2068b26c1e17cfb5dde3341bb6075c9f6717478a811e564c48cf1ae2460f7131bea2ef34c8bf2713b3e5a9eb04fbe28255304
+  data.tar.gz: ec10984057ef8c34ccfd19e4a1b83359db40b121e02e5d5b400618c78ff565c6f198b67ce8329c1f9f9a2f673dc6969bbedd82f373f3a69cf7a452cf73c44f1d

data/.travis.yml

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

data/lib/active_node.rb

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

data/lib/active_node/associations/association.rb

@@ -58,13 +58,14 @@ module ActiveNode
       def save
         return unless @dirty
         #delete all relations missing in new target
-        owner.node.rels(reflection.type).send(reflection.direction).each do |rel|
-          rel.del unless ids_reader.include? rel.other_node(owner.node).neo_id.to_i
+        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
         end
-        original_target = owner.node.send(reflection.direction, reflection.type)
+        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.node unless original_target_ids.include? n.id }
+        target_each { |n| original_target << n.id unless original_target_ids.include? n.id }
       end
     end
   end

data/lib/active_node/associations/singular_association.rb

@@ -6,7 +6,7 @@ module ActiveNode
       end
 
       def target_each
-        yield target
+        yield target if target.present?
       end
 
       def ids_reader
@@ -18,7 +18,7 @@ module ActiveNode
       end
 
       def id_writer(id)
-        writer(klass.find(id.to_i))
+        writer(id.blank? ? nil : klass.find(id.to_i))
       end
     end
   end

data/lib/active_node/base.rb

@@ -10,5 +10,9 @@ module ActiveNode
     include Associations
     include Reflection
     include Core
+
+    def self.subclass(klass_name)
+      Class.new(super_class=self) { define_singleton_method(:label) { klass_name } }
+    end
   end
 end

data/lib/active_node/core.rb

@@ -2,9 +2,9 @@ module ActiveNode
   module Core
     extend ActiveSupport::Concern
 
-    def initialize(attributes = nil)
+    def initialize(attributes = nil, split_by=:respond_to_writer?)
       @association_cache = {}
-      super attributes
+      super attributes, split_by
     end
   end
 end

data/lib/active_node/neo.rb

@@ -0,0 +1,7 @@
+module ActiveNode
+  class Neo
+    def self.db
+      @db ||= Neography::Rest.new
+    end
+  end
+end

data/lib/active_node/persistence.rb

@@ -1,8 +1,12 @@
+require 'active_support/core_ext/hash/indifferent_access'
+
 module ActiveNode
   module Persistence
     extend ActiveSupport::Concern
+    include Neography::Rest::Helpers
 
     included do
+      extend Neography::Rest::Helpers
       attribute :id
     end
 
@@ -13,22 +17,24 @@ module ActiveNode
       end
 
       def find ids
-        ids.is_a?(Enumerable) ? ids.map { |id| find(id) } : new_instance(Neography::Node.load(ids))
+        array = new_instances(Neo.db.get_nodes([ids].flatten))
+        ids.is_a?(Array) ? array : array.first
+      end
+
+      def find_by_cypher query, params={}, klass=nil
+        wrap(Neo.db.execute_query(query, params)['data'].map(&:first), klass)
       end
 
       def all
-        result = Neography::Node.find(:node_auto_index, :type, type)
-        (result.is_a?(Enumerable) ? result : [result]).map { |node| new_instance(node) }.compact
+        new_instances(Neo.db.get_nodes_labeled(label), self)
       end
 
-      def type
-        name.underscore
+      def label
+        name
       end
 
       def wrap node, klass=nil
-        node.is_a?(Enumerable) ?
-            node.map { |n| wrap(n, klass) } :
-            node.is_a?(Neography::Node) && (active_node_class(node.type.camelize, klass)).try(:new, node) || node
+        node.is_a?(Array) ? new_instances(node, klass) : new_instance(node, klass)
       end
 
       def active_node_class(class_name, default_klass=nil)
@@ -36,32 +42,51 @@ module ActiveNode
         klass && klass < ActiveNode::Base && klass || default_klass
       end
 
-      def filterClass(nodes, klass)
-        wrap(nodes, klass).select { |model| klass.nil? || model.instance_of?(klass) }
+      private
+      def new_instance node, klass=nil
+        (klass || find_suitable_class(Neo.db.get_node_labels(node))).try(:new, data(node), :declared?)
       end
 
-      private
-      def new_instance node
-        new(node) if node.try(:type) == type
+      def data hash
+        hash['data'].merge(id: get_id(hash).to_i)
+      end
+
+      def new_instances nodes, klass=nil
+        nodes.map { |node| new_instance(node, klass) }.compact
       end
+
+      def find_suitable_class labels
+        labels.include?(label) ? self : labels.map { |l| active_node_class(l) }.compact.first
+      end
+    end
+
+    def [](attr)
+      declared?(attr) ? send(attr) : @hash[attr]
     end
 
-    attr_reader :node
-    delegate :neo_id, to: :node, allow_nil: true
+    def []=(attr, value)
+      if declared? attr
+        send "#{attr}=", value
+      else
+        @hash[attr]=value
+      end
+    end
 
-    alias :[] :send
+    def neo_id
+      id
+    end
 
-    def id
-      neo_id && neo_id.to_i
+    def to_param
+      id
     end
 
-    alias :to_param :id
-    alias :persisted? :id
+    def persisted?
+      id
+    end
 
-    def initialize object={}
-      hash=object
-      @node, hash = object, declared_attributes_only(object.send(:table)) if object.is_a? Neography::Node
-      super hash
+    def initialize hash={}, split_by=:respond_to_writer?
+      super(split_hash hash, :select, split_by)
+      @hash=(split_hash(hash, :reject, split_by) || {}).with_indifferent_access
     end
 
     def new_record?
@@ -76,7 +101,7 @@ module ActiveNode
 
     def destroy include_relationships=false
       destroyable = destroy_associations include_relationships
-      node.del if destroyable
+      Neo.db.delete_node(id) if destroyable
       @destroyed = destroyable
     end
 
@@ -84,32 +109,38 @@ module ActiveNode
       destroy true
     end
 
-    def incoming(types=nil, klass=nil)
-      related(:incoming, types, klass)
+    def incoming(type=nil, klass=nil)
+      related(:incoming, type, klass)
     end
 
-    def outgoing(types=nil, klass=nil)
-      related(:outgoing, types, klass)
+    def outgoing(type=nil, klass=nil)
+      related(:outgoing, type, klass)
     end
 
     private
-    def declared_attributes_only hash
-      hash.try(:select) { |k, _| self.class.attribute_names.include? k.to_s }
+    def split_hash hash, method, split_by
+      hash.try(method) { |k, _| send split_by, k }
     end
 
-    def related(direction, types, klass)
-      node && self.class.filterClass(node.send(direction, types), klass)
+    def declared? attr
+      self.class.attribute_names.include? attr.to_s
     end
 
-    def destroy_associations include_associations
-      rels = node.rels
-      return false unless rels.empty? || include_associations
-      rels.each { |rel| rel.del }
-      true
+    def respond_to_writer? attr
+      respond_to? "#{attr}="
     end
 
-    def nullify_blanks! attrs
-      attrs.each { |k, v| attrs[k]=nil if v.blank? }
+    def related(direction, type, klass)
+      id ?
+          self.class.find_by_cypher(
+              "start n=node({id}) match (n)#{'<' if direction == :incoming}-[:#{type}]-#{'>' if direction == :outgoing}(m#{":#{klass.label}" if klass}) return m",
+              {id: id}, klass) :
+          []
+    end
+
+    def destroy_associations include_associations
+      rels=Neo.db.get_node_relationships(id)
+      rels.nil? || rels.empty? || include_associations && rels.each { |rel| Neo.db.delete_relationship(rel) }
     end
 
     def create_or_update
@@ -120,12 +151,25 @@ module ActiveNode
     def write
       now = Time.now.utc.iso8601(3)
       try :updated_at=, now
-      if @node
-        nullify_blanks!(self.attributes).each { |k, v| @node[k]=v }
+      if persisted?
+        write_properties
       else
         try :created_at=, now
-        @node = Neography::Node.create nullify_blanks!(self.attributes).merge!(type: self.class.type)
+        create_node_with_label
       end
     end
+
+    def create_node_with_label
+      self.id = get_id(Neo.db.create_node(all_attributes)).to_i
+      Neo.db.set_label(id, self.class.label)
+    end
+
+    def write_properties
+      Neo.db.reset_node_properties(id, all_attributes.select { |_, v| v.present? })
+    end
+
+    def all_attributes
+      attributes.merge(@hash)
+    end
   end
 end

data/lib/active_node/version.rb

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

data/spec/functional/associations_spec.rb

@@ -104,6 +104,26 @@ describe ActiveNode::Associations do
       father.children.should == [child]
     end
 
+    it 'can set has_one relationship by id at creation time' do
+      father = Person.create!
+      child = Person.create! father_id: father.id
+      father.children.should == [child]
+    end
+
+    it 'does not set has_one relationship by id if id is blank' do
+      father = Person.create!
+      child = Person.create! father_id: nil
+      father.children.should be_empty
+    end
+
+    it 'can remove has_one relationship' do
+      father = Person.create!
+      child = Person.create! father: father
+      child.father = nil
+      child.save
+      Person.find(child.id).father.should be_nil
+    end
+
     it 'can read has_one relation by id' do
       father = Person.create!
       child = Person.create!

data/spec/functional/base_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe ActiveNode::Base do
+  describe ".subclass" do
+    it "should be ActiveNode::Base" do
+      ActiveNode::Base.subclass('Abc').should <= ActiveNode::Base
+    end
+
+    it "should have the right label" do
+      ActiveNode::Base.subclass('Abc').label.should == 'Abc'
+    end
+
+    it "should find object via subclass" do
+      p = Person.create! name: 'Heinrich'
+      ActiveNode::Base.subclass('Person').find(p.id)[:name].should == p.name
+    end
+  end
+end

data/spec/functional/persistence_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 describe ActiveNode::Persistence do
   describe "#save" do
+    it "should save an object" do
+      a=Address.create!
+      Address.find(a.id).should == a
+    end
+
     it "should save not conventionally named object" do
       NeoUser.new(name: 'Heinrich').save.should be_true
       NeoUser.all.map(&:name).should == ['Heinrich']
@@ -10,10 +15,10 @@ describe ActiveNode::Persistence do
     it "should save object with non attribute properties with a name of a relationship" do
       child = Person.create!
       person = Person.create! children: [child]
-      person.node[:children] = "Bob"
-      person = Person.find person.id
+      person[:children] = "Bob"
       person.save
-      person.node[:children].should == "Bob"
+      person = Person.find person.id
+      person[:children].should == "Bob"
       person.children.should == [child]
     end
 
@@ -64,8 +69,8 @@ describe ActiveNode::Persistence do
       Person.find(person.id).multi.should == [1, 2, 3]
     end
 
-    it 'should not find an object with id of a different model' do
-      Client.find(Person.create!.id).should be_nil
+    it 'should find an object with id of a different model' do
+      Client.find(Person.create!.id).class.should == Person
     end
   end
 

data/spec/models/neo_user.rb

@@ -3,7 +3,7 @@ class NeoUser < ActiveNode::Base
   has_many :clients
   validates :name, presence: true
 
-  def self.type
-    'user'
+  def self.label
+    'User'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_node
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 2.0.0
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -152,11 +152,13 @@ files:
 - lib/active_node/callbacks.rb
 - lib/active_node/core.rb
 - lib/active_node/errors.rb
+- lib/active_node/neo.rb
 - lib/active_node/persistence.rb
 - lib/active_node/reflection.rb
 - lib/active_node/validations.rb
 - lib/active_node/version.rb
 - spec/functional/associations_spec.rb
+- spec/functional/base_spec.rb
 - spec/functional/persistence_spec.rb
 - spec/functional/validations_spec.rb
 - spec/models/address.rb
@@ -189,6 +191,7 @@ specification_version: 4
 summary: ActiveRecord style Object Graph Mapping for neo4j
 test_files:
 - spec/functional/associations_spec.rb
+- spec/functional/base_spec.rb
 - spec/functional/persistence_spec.rb
 - spec/functional/validations_spec.rb
 - spec/models/address.rb