n4j 0.0.1.4 → 0.0.1.5

data/lib/n4j/entity.rb

@@ -12,11 +12,11 @@ module N4j
       include N4j::Field
 
       extend ActiveModel::Callbacks
-      define_model_callbacks :initialize
+      define_model_callbacks :initialize, :save
 
       include Representation
 
-      attr_accessor :from_neo4j
+      attr_writer :from_neo4j
       attr_accessor :destroyed
       attribute :data
     end
@@ -33,6 +33,10 @@ module N4j
       end
     end
 
+    def from_neo4j
+      @from_neo4j ||= HashWithIndifferentAccess.new
+    end
+
     def note_update!
       changed_attributes.clear
     end
@@ -72,12 +76,18 @@ module N4j
     end
 
     def save
-      updateable_bundle = create_bundle.select(&:persist_hash)
-      commands = updateable_bundle.collect {|entity| entity.persist_hash(:id => entity.place_in_batch) }
-      results = N4j.batch(commands)
-      updateable_bundle.zip(results).each do |entity,result|
-        entity.load_neo4j_data(result['body'])
-        entity.post_save
+      run_callbacks :save do
+        updateable_bundle = create_bundle.select(&:persist_hash)
+        commands = updateable_bundle.collect {|entity| entity.persist_hash(:id => entity.place_in_batch) }
+        index_commands = create_bundle.select do |entity|
+          entity.class.ancestors.
+          include?(N4j::Node)
+        end.collect(&:index_hashes).compact.flatten
+        results = N4j.batch(commands + index_commands)
+        updateable_bundle.zip(results).each do |entity,result|
+          entity.load_neo4j_data(result['body'])
+          entity.post_save
+        end
       end
     end
 

data/lib/n4j/field.rb

@@ -7,20 +7,20 @@ module N4j::Field
       define_method name do
         data_access(name.to_s)
       end
-      
+
       define_method "#{name}=" do |value|
         data_set(name, value)
       end
     end
   end
-  
+
   def data_access(key)
-    data[key]
+    data && data[key.to_s]
   end
 
   def data_set(key, new_value)
     new_data = data.merge({key.to_s => new_value})
     self.data = new_data
   end
-    
+
 end

data/lib/n4j/index.rb

@@ -0,0 +1,62 @@
+module N4j::Node::Index
+  extend ActiveSupport::Concern
+  included do
+    N4j.batch([{:to => "#{N4j.neo4j_url_prefix}/index/node/", :method => "POST", :body => {:name => index_name}}])
+    class_attribute :indexes
+  end
+  module ClassMethods
+    def find_by_index(key, value)
+      search_url = "#{N4j.neo4j_url_prefix}
+                      /index/node
+                      /#{index_name}
+                      /#{CGI.escape(key.to_s)}
+                      /#{CGI.escape(value)}".gsub(/\s+/,'')
+      result = N4j.batch([{:to => search_url,:method => 'GET'}]).first['body'].first
+      new(result) if result
+    end
+
+    def index_name
+      model_name.i18n_key
+    end
+
+    def index(key)
+      self.indexes ||= []
+      self.indexes << key
+
+      define_singleton_method "find_by_#{key}" do |value|
+        find_by_index(key, value)
+      end
+
+    end
+  end
+
+  def add_to_index(key)
+    index = {
+      "value" => send(key),
+      "uri"   => url,
+      "key"   => key
+    }
+
+    N4j.batch([{:to => "#{index_path}",:method => 'POST',:body => index }])
+  end
+
+  def index_path
+    "#{N4j.neo4j_url_prefix}/index/node/#{self.class.index_name}"
+  end
+
+  def index_hashes # (opts ={}) <- the normal argument pattern doesn't really work here.
+    if (indexes = self.class.indexes)
+      indexes.collect do |index|
+        if (value = send(index))
+          index = {
+            "value" => send(index),
+            "uri"   => url,
+            "key"   => index
+          }
+          {:to => "#{index_path}",:method => 'POST',:body => index }
+        end
+      end.compact
+    end
+  end
+
+end

data/lib/n4j/node.rb

@@ -1,27 +1,29 @@
 module N4j::Node
-  
+
   autoload :AutoRelate, 'n4j/auto_relate'
-  
+  autoload :Index,      'n4j/index'
+
   extend ActiveSupport::Concern
   included do
     include AutoRelate
+    include Index
     # include N4j::Entity
   end
   module ClassMethods
     def find(n)
       find_by_node_id(n)
     end
-    
+
     def find_by_node_id(n)
       find_by_path("/node/#{n}")
     end
-    
+
     def find_by_path(path)
       path.sub!(N4j.neo4j_url_prefix,'')
       result = N4j.batch([{:to => path, :method => 'GET'}])
-      new(result.first['body'])      
+      new(result.first['body'])
     end
-    
+
     def service_root
       find_by_node_id(0)
     end
@@ -30,7 +32,7 @@ module N4j::Node
   def initialize(hsh)
     super(hsh)
     unless N4j.neo4j_hash?(hsh)
-      self.data = hsh.dup
+      self.data = HashWithIndifferentAccess.new.merge(hsh)
     end
   end
 

data/lib/n4j/representation.rb

@@ -19,11 +19,14 @@ module N4j::Entity::Representation
   end
 
   def url
-    from_neo4j['self']
+    from_neo4j['self'] || place_in_batch_path
   end
 
   def path
-    from_neo4j_relative['self'] ||
+    from_neo4j_relative['self'] || place_in_batch_path
+  end
+
+  def place_in_batch_path
     (place_in_batch ? "{#{place_in_batch}}" : nil)
   end
 

data/lib/n4j/request.rb

@@ -10,7 +10,7 @@ module N4j::Request
     end
 
     def port
-      config = YAML.load_file("#{Rails.root}/config/n4j.yml")
+      config = YAML.load_file("config/n4j.yml")
       config[Rails.env]['port']
     end
 
@@ -20,8 +20,12 @@ module N4j::Request
 
     def batch(commands) # [{'to'=> '', 'method' => '', 'body' => '', 'id' => 0},...]
       commands.flatten!
-      commands.each_with_index {|command, index| command[:id] ||= index }
-      # puts "Batch job: #{commands.inspect}"
+      # commands.each_with_index {|command, index| command[:id] ||= index }
+      commands.inject(0) do |index, command|
+        command[:id] = command[:id] || (index + 1)
+      end
+      puts "Batch job: "
+      commands.each {|c| puts "  #{c}"}
       begin
         result = RestClient.post("#{neo4j_url_prefix}/batch",
                                   commands.to_json,

data/lib/n4j/version.rb

@@ -1,3 +1,3 @@
 module N4j
-  VERSION = "0.0.1.4"
+  VERSION = "0.0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: n4j
 version: !ruby/object:Gem::Version
-  version: 0.0.1.4
+  version: 0.0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 -05:00
-default_executable: 
+date: 2012-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153204100 !ruby/object:Gem::Requirement
+  requirement: &70305424386120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153204100
+  version_requirements: *70305424386120
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153203680 !ruby/object:Gem::Requirement
+  requirement: &70305424385700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153203680
+  version_requirements: *70305424385700
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2153203260 !ruby/object:Gem::Requirement
+  requirement: &70305424385280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153203260
+  version_requirements: *70305424385280
 description: A little spiked out thing.
 email:
 - samsm@samsm.com
@@ -64,6 +63,7 @@ files:
 - lib/n4j/cypher.rb
 - lib/n4j/entity.rb
 - lib/n4j/field.rb
+- lib/n4j/index.rb
 - lib/n4j/node.rb
 - lib/n4j/populate.rb
 - lib/n4j/railtie.rb
@@ -87,7 +87,6 @@ files:
 - test/field_test.rb
 - test/test_helper.rb
 - tmp/pids/.gitkeep
-has_rdoc: true
 homepage: ''
 licenses: []
 post_install_message: 
@@ -100,15 +99,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2230038907754236757
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2230038907754236757
 requirements: []
 rubyforge_project: n4j
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Help using Neo4j Rest server.