neoid 0.0.1 → 0.0.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.0.2
+
+* create node immediately after active record create
+* logging
+* bug fixes
+
 ## v0.0.1
 
 * initial release

data/README.md

@@ -1,5 +1,3 @@
-# DRAFT ONLY - GEM IS NOT HOSTED YET.
-
 # Neoid
 
 Make your ActiveRecords stored and searchable on Neo4j graph database, in order to make fast graph queries that MySQL would crawl while doing them.
@@ -261,11 +259,11 @@ Please create a [new issue](https://github.com/elado/neoid/issues) if you run in
 
 ## To Do
 
-* Auto create node when creating an AR, instead of lazily-creating it
 * `after_update` to update a node/relationship.
 * Allow to disable sub reference nodes through options
 * Execute queries/scripts from model and not Neography (e.g. `Movie.neo_gremlin(gremlin_query)` with query that outputs IDs, returns a list of `Movie`s)
+* Rake task to index all nodes and relatiohsips in Neo4j
 
 ---
 
-developed by [@elado](http://twitter.com/elado) | named by [@ekampf](http://twitter.com/ekampf)
+Developed by [@elado](http://twitter.com/elado)

data/lib/neoid.rb

@@ -3,18 +3,22 @@ require "neoid/model_config"
 require "neoid/model_additions"
 require "neoid/node"
 require "neoid/relationship"
-require "neoid/railtie" if defined? Rails
 
 module Neoid
   class << self
     attr_accessor :db
+    attr_accessor :logger
     attr_accessor :ref_node
     
     def db
-      raise "Neoid.db wasn't supplied" unless @db
+      raise "Must set Neoid.db with a Neography::Rest instance" unless @db
       @db
     end
     
+    def logger
+      @logger ||= Logger.new(ENV['NEOID_LOG'] ? $stdout : '/dev/null')
+    end
+    
     def ref_node
       @ref_node ||= Neography::Node.load(Neoid.db.get_root['self'])
     end

data/lib/neoid/model_additions.rb

@@ -10,21 +10,21 @@ module Neoid
       def neoidable_options
         @neoidable_options
       end
+    
+      def neo_index_name
+        @index_name ||= "#{self.name.tableize}_index"
+      end
     end
   
     module InstanceMethods
       def to_neo
         {}
       end
-    
-      def neo_index_name
-        @index_name ||= "#{self.class.name.tableize}_index"
-      end
 
       protected
       def neo_properties_to_hash(*property_list)
         property_list.flatten.inject({}) { |all, property|
-          all[property] = self.send(property)
+          all[property] = self.attributes[property]
           all
         }
       end

data/lib/neoid/node.rb

@@ -10,6 +10,8 @@ module Neoid
       
       def neo_subref_node
         @_neo_subref_node ||= begin
+          Neoid::logger.info "Node#neo_subref_node #{neo_subref_rel_type}"
+          
           subref_node_query = Neoid.ref_node.outgoing(neo_subref_rel_type)
 
           if subref_node_query.to_a.blank?
@@ -30,7 +32,8 @@ module Neoid
     
     module InstanceMethods
       def neo_find_by_id
-        Neoid.db.get_node_index(neo_index_name, :ar_id, self.id)
+        Neoid::logger.info "Node#neo_find_by_id #{self.class.neo_index_name} #{self.id}"
+        Neoid.db.get_node_index(self.class.neo_index_name, :ar_id, self.id)
       end
       
       def neo_create
@@ -39,18 +42,16 @@ module Neoid
         
         node = Neography::Node.create(data)
         
-        begin
-          Neography::Relationship.create(
-            self.class.neo_subref_node_rel_type,
-            self.class.neo_subref_node,
-            node
-          )
-        rescue Exception => e
-          puts [$!.message] + $!.backtrace
-          raise e
-        end
+        Neography::Relationship.create(
+          self.class.neo_subref_node_rel_type,
+          self.class.neo_subref_node,
+          node
+        )
         
-        Neoid.db.add_node_to_index(neo_index_name, :ar_id, self.id, node)
+        Neoid.db.add_node_to_index(self.class.neo_index_name, :ar_id, self.id, node)
+
+        Neoid::logger.info "Node#neo_create #{self.class.name} #{self.id}, index = #{self.class.neo_index_name}"
+
         node
       end
       
@@ -64,14 +65,12 @@ module Neoid
     
       def neo_destroy
         return unless neo_node
-        Neoid.db.remove_node_from_index(neo_index_name, neo_node)
+        Neoid.db.remove_node_from_index(self.class.neo_index_name, neo_node)
         neo_node.del
       end
     end
       
     def self.included(receiver)
-      Neoid.db.create_node_index(receiver.name.tableize)
-      
       receiver.extend         Neoid::ModelAdditions::ClassMethods
       receiver.send :include, Neoid::ModelAdditions::InstanceMethods
       receiver.extend         ClassMethods
@@ -79,6 +78,7 @@ module Neoid
       
       receiver.neo_subref_node # ensure
       
+      receiver.after_create :neo_create
       receiver.after_destroy :neo_destroy
     end
   end

data/lib/neoid/relationship.rb

@@ -2,7 +2,7 @@ module Neoid
   module Relationship
     module InstanceMethods
       def neo_find_by_id
-        Neoid.db.get_relationship_index(neo_index_name, :ar_id, self.id)
+        Neoid.db.get_relationship_index(self.class.neo_index_name, :ar_id, self.id)
       end
       
       def neo_create
@@ -19,7 +19,9 @@ module Neoid
           end_node.neo_node
         )
         
-        Neoid.db.add_relationship_to_index(neo_index_name, :ar_id, self.id, relationship)
+        Neoid.db.add_relationship_to_index(self.class.neo_index_name, :ar_id, self.id, relationship)
+
+        Neoid::logger.info "Relationship#neo_create #{self.class.name} #{self.id}, index = #{self.class.neo_index_name}"
         
         relationship
       end
@@ -30,8 +32,8 @@ module Neoid
       
       def neo_destroy
         return unless neo_relationship
-        Neoid.db.remove_relationship_from_index(neo_index_name, neo_relationship)
-        puts neo_relationship.del
+        Neoid.db.remove_relationship_from_index(self.class.neo_index_name, neo_relationship)
+        neo_relationship.del
       end
       
       def neo_relationship
@@ -40,8 +42,6 @@ module Neoid
     end
 
     def self.included(receiver)
-      Neoid.db.create_relationship_index(receiver.name.tableize)
-
       receiver.extend         Neoid::ModelAdditions::ClassMethods
       receiver.send :include, Neoid::ModelAdditions::InstanceMethods
       receiver.send :include, InstanceMethods

data/lib/neoid/version.rb

@@ -1,3 +1,3 @@
 module Neoid
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/neoid.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rest-client"
+  s.add_development_dependency "supermodel"
   s.add_runtime_dependency "neography"
-  s.add_runtime_dependency "supermodel"
 end

data/spec/neoid/model_additions_spec.rb

@@ -77,12 +77,9 @@ describe Neoid::ModelAdditions do
   context "nodes" do
     context "create graph nodes" do
       it "should call neo_create on a neo_node for user" do
-        user = User.create(name: "Elad Ossadon")
-  
-        user.neo_find_by_id.should be_nil
-      
-        user.should_receive(:neo_create)
-        user.neo_node
+        User.any_instance.should_receive(:neo_create)
+
+        User.create(name: "Elad Ossadon")
       end
   
       it "should create a neo_node for user" do
@@ -110,7 +107,6 @@ describe Neoid::ModelAdditions do
       it "should find a neo_node for user" do
         user = User.create(name: "Elad Ossadon", slug: "elado")
       
-        user.neo_find_by_id.should be_nil
         user.neo_node.should_not be_nil
         user.neo_find_by_id.should_not be_nil
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neoid
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000 Z
+date: 2012-01-21 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70163085349120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70163085349120
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70350248004300 !ruby/object:Gem::Requirement
+  requirement: &70163085342100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350248004300
+  version_requirements: *70163085342100
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70350248003700 !ruby/object:Gem::Requirement
+  requirement: &70163085341480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70350248003700
+  version_requirements: *70163085341480
 - !ruby/object:Gem::Dependency
-  name: neography
-  requirement: &70350248003040 !ruby/object:Gem::Requirement
+  name: supermodel
+  requirement: &70163085341000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *70350248003040
+  version_requirements: *70163085341000
 - !ruby/object:Gem::Dependency
-  name: supermodel
-  requirement: &70350248002080 !ruby/object:Gem::Requirement
+  name: neography
+  requirement: &70163085340500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70350248002080
+  version_requirements: *70163085340500
 description: Extend Ruby on Rails ActiveRecord with Neo4j nodes. Keep RDBMS and utilize
   the power of Neo4j queries
 email:
@@ -94,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1013384318664591928
+      hash: -1739317772889618819
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1013384318664591928
+      hash: -1739317772889618819
 requirements: []
 rubyforge_project: neoid
 rubygems_version: 1.8.10