neoid 0.1.1 → 0.1.2

data/README.md

@@ -15,7 +15,7 @@ Neoid offers querying Neo4j for IDs of objects and then fetch them from your RDB
 
 ## Changelog
 
-[See Changelog](https://github.com/elado/neoid/blob/master/CHANGELOG.md)
+[See Changelog](https://github.com/elado/neoid/blob/master/CHANGELOG.md). Including some breaking changes (and solutions) from previos versions.
 
 
 ## Installation
@@ -23,7 +23,7 @@ Neoid offers querying Neo4j for IDs of objects and then fetch them from your RDB
 Add to your Gemfile and run the `bundle` command to install it.
 
 ```ruby
-gem 'neoid', '~> 0.1'
+gem 'neoid', '~> 0.1.1'
 ```
 
 **Requires Ruby 1.9.2 or later.**
@@ -217,7 +217,7 @@ Neoid::Node.from_hash(Neoid.db.get_node_auto_index(Neoid::UNIQUE_ID_KEY, user.ne
 If Subreferences are enabled, you can get the subref node and then get all attached nodes:
 
 ```ruby
-Neoid.ref_node.outgoing('users_subref').first.outgoing('users_subref').to_a
+Neoid.ref_node.outgoing('users_subref').first.outgoing('users').to_a
 # => this, according to Neography, returns an array of Neography::Node so no conversion is needed
 ```
 

data/lib/neoid/node.rb

@@ -106,7 +106,7 @@ module Neoid
             }
           } else {
             node = g.addVertex(node_data);
-            if (enable_subrefs) g.addEdge(g.v(subref_id), node, neo_subref_rel_type);
+            if (enable_subrefs) g.addEdge(g.v(subref_id), node, neo_subref_node_rel_type);
 
             if (enable_model_index) g.idx(neo_model_index_name).put('ar_id', node.ar_id, node);
           }
@@ -125,7 +125,7 @@ module Neoid
         if Neoid.config.enable_subrefs
           script_vars.update(
             subref_id: self.class.neo_subref_node.neo_id,
-            neo_subref_rel_type: self.class.neo_subref_rel_type
+            neo_subref_node_rel_type: self.class.neo_subref_node_rel_type
           )
         end
 

data/lib/neoid/version.rb

@@ -1,3 +1,3 @@
 module Neoid
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/neoid/node_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+
+describe Neoid::Node do
+  context "create graph nodes" do
+    it "should call neo_save after model creation" do
+      user = User.new(name: "Elad Ossadon")
+      user.should_receive(:neo_save)
+      user.save!
+    end
+
+    it "should create a node for user" do
+      user = User.create!(name: "Elad Ossadon", slug: "elado")
+
+      user.neo_node.should_not be_nil
+      
+      user.neo_node.ar_id.should == user.id
+      user.neo_node.name.should == user.name
+      user.neo_node.slug.should == user.slug
+    end
+
+    it "should create a neo_node for movie" do
+      movie = Movie.create!(name: "Memento", slug: "memento-1999", year: 1999)
+
+      movie.neo_node.should_not be_nil
+      
+      movie.neo_node.ar_id.should == movie.id
+      movie.neo_node.name.should == movie.name
+      movie.neo_node.year.should == movie.year
+    end
+  end
+
+  context "update graph nodes" do
+    it "should call neo_save after model update" do
+      user = User.create!(name: "Elad Ossadon")
+      user.should_receive(:neo_save)
+      user.name = "John Doe"
+      user.save!
+    end
+
+    it "should update a node after model update" do
+      user = User.create!(name: "Elad Ossadon")
+      user.neo_node.name.should == "Elad Ossadon"
+
+      user.name = "John Doe"
+      user.save!
+
+      user.neo_node.name.should == "John Doe"
+    end
+  end
+
+  context "find by id" do
+    it "should find a neo_node for user" do
+      user = User.create!(name: "Elad Ossadon", slug: "elado")
+      
+      user.neo_node.should_not be_nil
+      user.neo_find_by_id.should_not be_nil
+    end
+  end
+
+  context "no auto_index" do
+    it "should not index a node if option :auto_index is set to false" do
+      model = NoAutoIndexNode.new(name: "Hello")
+      model.should_not_receive(:neo_save)
+      model.save!
+    end
+  end
+
+  context "subrefs" do
+    it "should connect subrefs to reference node" do
+      old, Neoid.config.enable_subrefs = Neoid.config.enable_subrefs, true
+
+      Neoid.send(:initialize_subrefs)
+      
+      begin
+        Neoid.ref_node.rel(:outgoing, :users_subref).should_not be_nil
+      ensure
+        Neoid.config.enable_subrefs = old
+      end
+    end
+
+    it "should create a relationship with a subref node" do
+      old, Neoid.config.enable_subrefs = Neoid.config.enable_subrefs, true
+
+      Neoid.send(:initialize_subrefs)
+      
+      begin
+        user = User.create!(name: "Elad")
+        user.neo_node.rel(:incoming, :users).should_not be_nil
+      ensure
+        Neoid.config.enable_subrefs = old
+      end
+    end
+
+    it "should not create a relationship with a subref node if disabled" do
+      old, Neoid.config.enable_subrefs = Neoid.config.enable_subrefs, false
+
+      begin
+        user = User.create!(name: "Elad")
+        user.neo_node.rel(:incoming, :users_subref).should be_nil
+      ensure
+        Neoid.config.enable_subrefs = old
+      end
+    end
+  end
+
+  context "per_model_indexes" do
+    it "should create a relationship with a subref node" do
+      old, Neoid.config.enable_per_model_indexes = Neoid.config.enable_per_model_indexes, true
+
+      Neoid.send(:initialize_per_model_indexes)
+
+      begin
+        user = User.create!(name: "Elad")
+        Neoid.db.get_node_index(User.neo_model_index_name, 'ar_id', user.id).should_not be_nil
+      ensure
+        Neoid.config.enable_per_model_indexes = old
+      end
+    end
+
+    it "should not create a relationship with a subref node if disabled" do
+      old, Neoid.config.enable_per_model_indexes = Neoid.config.enable_per_model_indexes, false
+
+      begin
+        user = User.create!(name: "Elad")
+        expect { Neoid.db.get_node_index(User.neo_model_index_name, 'ar_id', user.id) }.to raise_error(Neography::NotFoundException)
+      ensure
+        Neoid.config.enable_per_model_indexes = old
+      end
+    end
+  end
+end

data/spec/neoid/relationship_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+describe Neoid::Relationship do
+  let(:user) { User.create!(name: "Elad Ossadon", slug: "elado") }
+  let(:movie) { Movie.create!(name: "Memento", slug: "memento-1999", year: 1999) }
+  
+  it "should call neo_save after relationship model creation" do
+    Like.any_instance.should_receive(:neo_save)
+    user.like! movie
+  end
+
+  it "should create a neo_relationship for like" do
+    like = user.like! movie
+    like = user.likes.last
+
+    like.neo_find_by_id.should_not be_nil
+
+    like.neo_relationship.should_not be_nil
+    
+    like.neo_relationship.start_node.should == user.neo_node
+    like.neo_relationship.end_node.should == movie.neo_node
+    like.neo_relationship.rel_type.should == 'likes'
+  end
+  
+  it "should delete a relationship on deleting a record" do
+    user.like! movie
+    like = user.likes.last
+    
+    relationship_neo_id = like.neo_relationship.neo_id
+
+    Neography::Relationship.load(relationship_neo_id).should_not be_nil
+    
+    user.unlike! movie
+    
+    expect { Neography::Relationship.load(relationship_neo_id) }.to raise_error(Neography::RelationshipNotFoundException)
+  end
+
+  it "should update neo4j on manual set of a collection" do
+    movies = [
+      Movie.create(name: "Memento"),
+      Movie.create(name: "The Prestige"),
+      Movie.create(name: "The Dark Knight"),
+      Movie.create(name: "Spiderman")
+    ]
+
+    user.neo_node.outgoing(:likes).length.should == 0
+
+    expect {
+      user.movies = movies
+    }.to change{ user.neo_node.outgoing(:likes).length }.to(movies.length)
+
+    expect { expect {
+      user.movies -= movies[0..1]
+    }.to change{ user.movies.count }.by(-2)
+    }.to change{ user.neo_node.outgoing(:likes).length }.by(-2)
+
+    expect {
+      user.movies = []
+    }.to change{ user.neo_node.outgoing(:likes).length }.to(0)
+
+    expect {
+      user.movie_ids = movies[0...2].collect(&:id)
+    }.to change{ user.neo_node.outgoing(:likes).length }.to(2)
+  end
+
+  it "should update a relationship after relationship model update" do
+    like = user.like! movie
+
+    like.neo_relationship.rate.should be_nil
+
+    like.rate = 10
+    like.save!
+
+    like.neo_relationship.rate.should == 10
+  end
+
+  context "polymorphic relationship" do
+    let(:user) { User.create(name: "Elad Ossadon", slug: "elado") }
+
+    it "should create relationships with polymorphic items" do
+      followed = [
+        User.create(name: "Some One", slug: "someone"),
+        Movie.create(name: "The Prestige"),
+        Movie.create(name: "The Dark Knight")
+      ]
+
+      expect {
+        followed.each do |item|
+          user.user_follows.create!(item: item)
+        end
+      }.to change{ user.neo_node.outgoing(:follows).length }.to(followed.length)
+
+      expect {
+        user.user_follows = user.user_follows[0...1]
+      }.to change{ user.neo_node.outgoing(:follows).length }.to(1)
+
+      expect {
+        user.user_follows = []
+      }.to change{ user.neo_node.outgoing(:follows).length }.to(0)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neoid
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -139,8 +139,9 @@ files:
 - neoid.gemspec
 - spec/neoid/batch_spec.rb
 - spec/neoid/config_spec.rb
-- spec/neoid/model_additions_spec.rb
 - spec/neoid/model_config_spec.rb
+- spec/neoid/node_spec.rb
+- spec/neoid/relationship_spec.rb
 - spec/neoid/search_spec.rb
 - spec/neoid_spec.rb
 - spec/spec_helper.rb
@@ -174,8 +175,9 @@ summary: Neo4j for ActiveRecord
 test_files:
 - spec/neoid/batch_spec.rb
 - spec/neoid/config_spec.rb
-- spec/neoid/model_additions_spec.rb
 - spec/neoid/model_config_spec.rb
+- spec/neoid/node_spec.rb
+- spec/neoid/relationship_spec.rb
 - spec/neoid/search_spec.rb
 - spec/neoid_spec.rb
 - spec/spec_helper.rb

data/spec/neoid/model_additions_spec.rb

@@ -1,222 +0,0 @@
-require 'spec_helper'
-
-describe Neoid::ModelAdditions do
-  context "nodes" do
-    context "create graph nodes" do
-      it "should call neo_save after model creation" do
-        user = User.new(name: "Elad Ossadon")
-        user.should_receive(:neo_save)
-        user.save!
-      end
-  
-      it "should create a node for user" do
-        user = User.create!(name: "Elad Ossadon", slug: "elado")
-
-        user.neo_node.should_not be_nil
-        
-        user.neo_node.ar_id.should == user.id
-        user.neo_node.name.should == user.name
-        user.neo_node.slug.should == user.slug
-      end
-
-      it "should create a neo_node for movie" do
-        movie = Movie.create!(name: "Memento", slug: "memento-1999", year: 1999)
-
-        movie.neo_node.should_not be_nil
-        
-        movie.neo_node.ar_id.should == movie.id
-        movie.neo_node.name.should == movie.name
-        movie.neo_node.year.should == movie.year
-      end
-    end
-  
-    context "update graph nodes" do
-      it "should call neo_save after model update" do
-        user = User.create!(name: "Elad Ossadon")
-        user.should_receive(:neo_save)
-        user.name = "John Doe"
-        user.save!
-      end
-
-      it "should update a node after model update" do
-        user = User.create!(name: "Elad Ossadon")
-        user.neo_node.name.should == "Elad Ossadon"
-
-        user.name = "John Doe"
-        user.save!
-
-        user.neo_node.name.should == "John Doe"
-      end
-    end
-
-    context "find by id" do
-      it "should find a neo_node for user" do
-        user = User.create!(name: "Elad Ossadon", slug: "elado")
-        
-        user.neo_node.should_not be_nil
-        user.neo_find_by_id.should_not be_nil
-      end
-    end
-
-    context "no auto_index" do
-      it "should not index a node if option :auto_index is set to false" do
-        model = NoAutoIndexNode.new(name: "Hello")
-        model.should_not_receive(:neo_save)
-        model.save!
-      end
-    end
-
-    context "subrefs" do
-      it "should create a relationship with a subref node" do
-        old, Neoid.config.enable_subrefs = Neoid.config.enable_subrefs, true
-
-        Neoid.send(:initialize_subrefs)
-        
-        begin
-          user = User.create!(name: "Elad")
-          user.neo_node.rel(:incoming, :users_subref).should_not be_nil
-        ensure
-          Neoid.config.enable_subrefs = old
-        end
-      end
-
-      it "should not create a relationship with a subref node if disabled" do
-        old, Neoid.config.enable_subrefs = Neoid.config.enable_subrefs, false
-
-        begin
-          user = User.create!(name: "Elad")
-          user.neo_node.rel(:incoming, :users_subref).should be_nil
-        ensure
-          Neoid.config.enable_subrefs = old
-        end
-      end
-    end
-
-    context "per_model_indexes" do
-      it "should create a relationship with a subref node" do
-        old, Neoid.config.enable_per_model_indexes = Neoid.config.enable_per_model_indexes, true
-
-        Neoid.send(:initialize_per_model_indexes)
-
-        begin
-          user = User.create!(name: "Elad")
-          Neoid.db.get_node_index(User.neo_model_index_name, 'ar_id', user.id).should_not be_nil
-        ensure
-          Neoid.config.enable_per_model_indexes = old
-        end
-      end
-
-      it "should not create a relationship with a subref node if disabled" do
-        old, Neoid.config.enable_per_model_indexes = Neoid.config.enable_per_model_indexes, false
-
-        begin
-          user = User.create!(name: "Elad")
-          expect { Neoid.db.get_node_index(User.neo_model_index_name, 'ar_id', user.id) }.to raise_error(Neography::NotFoundException)
-        ensure
-          Neoid.config.enable_per_model_indexes = old
-        end
-      end
-    end
-  end
-  
-  context "relationships" do
-    let(:user) { User.create!(name: "Elad Ossadon", slug: "elado") }
-    let(:movie) { Movie.create!(name: "Memento", slug: "memento-1999", year: 1999) }
-    
-    it "should call neo_save after relationship model creation" do
-      Like.any_instance.should_receive(:neo_save)
-      user.like! movie
-    end
-
-    it "should create a neo_relationship for like" do
-      like = user.like! movie
-      like = user.likes.last
-
-      like.neo_find_by_id.should_not be_nil
-
-      like.neo_relationship.should_not be_nil
-      
-      like.neo_relationship.start_node.should == user.neo_node
-      like.neo_relationship.end_node.should == movie.neo_node
-      like.neo_relationship.rel_type.should == 'likes'
-    end
-    
-    it "should delete a relationship on deleting a record" do
-      user.like! movie
-      like = user.likes.last
-      
-      relationship_neo_id = like.neo_relationship.neo_id
-
-      Neography::Relationship.load(relationship_neo_id).should_not be_nil
-      
-      user.unlike! movie
-      
-      expect { Neography::Relationship.load(relationship_neo_id) }.to raise_error(Neography::RelationshipNotFoundException)
-    end
-
-    it "should update neo4j on manual set of a collection" do
-      movies = [
-        Movie.create(name: "Memento"),
-        Movie.create(name: "The Prestige"),
-        Movie.create(name: "The Dark Knight"),
-        Movie.create(name: "Spiderman")
-      ]
-
-      user.neo_node.outgoing(:likes).length.should == 0
-
-      expect {
-        user.movies = movies
-      }.to change{ user.neo_node.outgoing(:likes).length }.to(movies.length)
-
-      expect { expect {
-        user.movies -= movies[0..1]
-      }.to change{ user.movies.count }.by(-2)
-      }.to change{ user.neo_node.outgoing(:likes).length }.by(-2)
-
-      expect {
-        user.movies = []
-      }.to change{ user.neo_node.outgoing(:likes).length }.to(0)
-
-      expect {
-        user.movie_ids = movies[0...2].collect(&:id)
-      }.to change{ user.neo_node.outgoing(:likes).length }.to(2)
-    end
-
-    it "should update a relationship after relationship model update" do
-      like = user.like! movie
-
-      like.neo_relationship.rate.should be_nil
-
-      like.rate = 10
-      like.save!
-
-      like.neo_relationship.rate.should == 10
-    end
-  end
-
-  context "polymorphic relationship" do
-    let(:user) { User.create(name: "Elad Ossadon", slug: "elado") }
-
-    it "should create relationships with polymorphic items" do
-      followed = [
-        User.create(name: "Some One", slug: "someone"),
-        Movie.create(name: "The Prestige"),
-        Movie.create(name: "The Dark Knight")
-      ]
-
-      expect {
-        followed.each do |item|
-          user.user_follows.create!(item: item)
-        end
-      }.to change{ user.neo_node.outgoing(:follows).length }.to(followed.length)
-
-      expect {
-        user.user_follows = user.user_follows[0...1]
-      }.to change{ user.neo_node.outgoing(:follows).length }.to(1)
-
-      expect {
-        user.user_follows = []
-      }.to change{ user.neo_node.outgoing(:follows).length }.to(0)
-    end
-  end
-end