active_node 0.0.2.alpha → 0.0.3

data/.travis.yml

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

data/README.md

@@ -0,0 +1,4 @@
+active_node
+===========
+
+ActiveRecord style Object Graph Mapping for neo4j

data/active_node.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "activemodel"
   s.add_development_dependency "rspec", ">= 2.11"
   s.add_development_dependency "net-http-spy", "0.2.1"
-  #s.add_development_dependency "rake", ">= 0.8.7"
+  s.add_development_dependency "rake", ">= 0.8.7"
   s.add_development_dependency "coveralls"
 
 end

data/lib/active_node/associations.rb

@@ -8,13 +8,17 @@ module ActiveNode
     extend ActiveSupport::Concern
 
     autoload :Association,           'active_node/associations/association'
+    autoload :SingularAssociation, 'active_node/associations/singular_association'
     autoload :CollectionAssociation, 'active_node/associations/collection_association'
+    autoload :HasOneAssociation,              'active_node/associations/has_one_association'
     autoload :HasManyAssociation,              'active_node/associations/has_many_association'
 
     module Builder #:nodoc:
       autoload :Association,           'active_node/associations/builder/association'
+      autoload :SingularAssociation, 'active_node/associations/builder/singular_association'
       autoload :CollectionAssociation, 'active_node/associations/builder/collection_association'
 
+      autoload :HasOne,             'active_node/associations/builder/has_one'
       autoload :HasMany,             'active_node/associations/builder/has_many'
     end
 
@@ -55,6 +59,10 @@ module ActiveNode
       def has_many(name, options = {})
         Builder::HasMany.build(self, name, options)
       end
+
+      def has_one(name, options = {})
+        Builder::HasOne.build(self, name, options)
+      end
     end
   end
 end

data/lib/active_node/associations/association.rb

@@ -39,6 +39,33 @@ module ActiveNode
       def klass
         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
+      end
+
+      # Implements the writer method, e.g. foo.items= for Foo.has_many :items
+      def writer(records)
+        @dirty = true
+        @target = records
+      end
+
+      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
+        end
+        original_target = owner.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 }
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module ActiveNode::Associations::Builder
       attr_accessor :valid_options
     end
 
-    self.valid_options = [:class_name]
+    self.valid_options = [:direction, :type, :class_name]
 
     attr_reader :model, :name, :options, :reflection
 

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

@@ -3,9 +3,5 @@ module ActiveNode::Associations::Builder
     def macro
       :has_many
     end
-
-    def valid_options
-      super + [:direction, :type]
-    end
   end
 end

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

@@ -0,0 +1,7 @@
+module ActiveNode::Associations::Builder
+  class HasOne < SingularAssociation #:nodoc:
+    def macro
+      :has_one
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module ActiveNode::Associations::Builder
+  class SingularAssociation < Association #:nodoc:
+    def define_constructors
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def build_#{name}(*args, &block)
+          association(:#{name}).build(*args, &block)
+        end
+
+        def create_#{name}(*args, &block)
+          association(:#{name}).create(*args, &block)
+        end
+
+        def create_#{name}!(*args, &block)
+          association(:#{name}).create!(*args, &block)
+        end
+      CODE
+    end
+  end
+end

data/lib/active_node/associations/collection_association.rb

@@ -26,17 +26,6 @@ module ActiveNode
     # +load_target+ and the +loaded+ flag are your friends.
     class CollectionAssociation < Association #:nodoc:
 
-      # Implements the reader method, e.g. foo.items for Foo.has_many :items
-      def reader(force_reload = false)
-        @target ||= load_target
-      end
-
-      # Implements the writer method, e.g. foo.items= for Foo.has_many :items
-      def writer(records)
-        @dirty = true
-        @target = records
-      end
-
       # Implements the ids reader method, e.g. foo.item_ids for Foo.has_many :items
       def ids_reader
         reader.map(&:id)
@@ -47,20 +36,8 @@ module ActiveNode
         writer klass.find(ids.reject(&:blank?).map!(&:to_i))
       end
 
-      def load_target
-        owner.send(reflection.direction, reflection.type, reflection.klass)
-      end
-
-      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
-        end
-        original_target = owner.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 }
+      def target_each
+        target.each {|n| yield n}
       end
 
       def reset

data/lib/active_node/associations/has_one_association.rb

@@ -0,0 +1,7 @@
+module ActiveNode
+  # = Active Record Belongs To Has One Association
+  module Associations
+    class HasOneAssociation < SingularAssociation #:nodoc:
+    end
+  end
+end

data/lib/active_node/associations/singular_association.rb

@@ -0,0 +1,17 @@
+module ActiveNode
+  module Associations
+    class SingularAssociation < Association #:nodoc:
+      def load_target
+        super.first
+      end
+
+      def target_each
+        yield target
+      end
+
+      def ids_reader
+        [target.try(:id)].compact
+      end
+    end
+  end
+end

data/lib/active_node/version.rb

@@ -1,3 +1,3 @@
 module ActiveNode
-  VERSION = "0.0.2.alpha"
-end
+  VERSION = "0.0.3"
+end

data/spec/functional/associations_spec.rb

@@ -73,5 +73,18 @@ describe ActiveNode::Associations do
       id = Person.create!(children: [Person.create!, Person.create!]).id
       Person.find(id).children.size.should == 2
     end
+
+    it 'can set has_one relation' do
+      father = Person.create!
+      child = Person.create!
+      child.father = father
+      child.save
+      father.children.should == [child]
+    end
+
+    it 'can handle has_one reverse relationship' do
+      father = Person.create!(children: [Person.create!])
+      father.children.first.father.should == father
+    end
   end
 end

data/spec/models/client.rb

@@ -1,7 +1,6 @@
 class Client < ActiveNode::Base
   attribute :name, type: String
 
-  #has_many :phases
   has_many :users, type: :client, direction: :incoming, class_name: 'NeoUser'
 
   validates :name, presence: true

data/spec/models/person.rb

@@ -1,5 +1,5 @@
 class Person < ActiveNode::Base
   has_many :people
   has_many :children, class_name: "Person"
-  #has_one :father, type: :child, direction: :incoming, class_name: "Person"
+  has_one :father, type: :child, direction: :incoming, class_name: "Person"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_node
 version: !ruby/object:Gem::Version
-  version: 0.0.2.alpha
-  prerelease: 6
+  version: 0.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -107,6 +107,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +150,7 @@ files:
 - .travis.yml
 - Gemfile
 - LICENSE
+- README.md
 - Rakefile
 - active_node.gemspec
 - lib/active_node.rb
@@ -142,8 +159,12 @@ files:
 - lib/active_node/associations/builder/association.rb
 - lib/active_node/associations/builder/collection_association.rb
 - lib/active_node/associations/builder/has_many.rb
+- lib/active_node/associations/builder/has_one.rb
+- lib/active_node/associations/builder/singular_association.rb
 - lib/active_node/associations/collection_association.rb
 - lib/active_node/associations/has_many_association.rb
+- lib/active_node/associations/has_one_association.rb
+- lib/active_node/associations/singular_association.rb
 - lib/active_node/base.rb
 - lib/active_node/callbacks.rb
 - lib/active_node/core.rb
@@ -174,9 +195,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: active_node
 rubygems_version: 1.8.25