neo4j 1.1.0-java → 1.1.1-java

data/CHANGELOG

@@ -1,4 +1,9 @@
-== 1.1.0 / 2011-05-13
+== 1.1.1 / 2011-06-26
+* Made neo4j compatible with rails 3.1.0.rc1 [#170]
+* Fix for neo4j-devise [#171]
+* BUG: Neo4j::GraphAlgo shortest path does raise exception if two nodes are not connected [#172]
+
+ == 1.1.0 / 2011-05-13
 * Support for embedding neo4j.rb by providing an already running db instance (#168)
 * Neo4j::Rails::Relationships should be ActiveModel compliant (#156)
 * Support for incoming relationships in Neo4j::Rails::Model (#157)

data/README.rdoc

@@ -92,6 +92,7 @@ Example of using Neo4j with Rails 3 (ActiveModel)
 ==== Generate a Rails Application
 
 Example of creating an Neo4j Application from scratch:
+(make sure you have installed JRuby version >= 1.6.2)
 
  gem install rails
  rails new myapp -m http://andreasronge.github.com/rails3.rb
@@ -108,7 +109,7 @@ To run it with Tomcat instead of WEBrick
 
 
 === Presentation Materials and other URLs
-* {Intoduction to Neo4j.rb}[http://www.slideshare.net/andreasronge/neo4jrb]
+* {Presentation: RailsConf 2011}[http://andreasronge.github.com/neo4j-railsconf.pdf]
 * {Nordic Ruby 2010 May 21-23}[http://nordicruby.org/speakers#user_29]
 * {Neo4j wiki, check the guidelines and domain modeling gallery pages}[http://wiki.neo4j.org/content/Main_Page]
 

data/lib/neo4j.rb

@@ -6,11 +6,18 @@ require 'tmpdir'
 
 # Rails
 require 'rails/railtie'
+require 'active_support/core_ext/class/inheritable_attributes'
+require 'active_support/core_ext/hash/indifferent_access'
 require 'active_model'
 
 require 'will_paginate/collection'
 require 'will_paginate/finders/base'
 
+# core extensions
+require 'neo4j/core_ext/class/inheritable_attributes'
+
+# Jars
+
 require 'neo4j/jars/core/geronimo-jta_1.1_spec-1.1.1.jar'
 require 'neo4j/jars/core/lucene-core-3.0.3.jar'
 require 'neo4j/jars/core/neo4j-lucene-index-1.3.jar'

data/lib/neo4j/algo/algo.rb

@@ -187,7 +187,8 @@ module Neo4j
       if @single && @path_finder_method
         execute_algo.send(@path_finder_method).each &block
       else
-        execute_algo.each &block
+        traversal = execute_algo
+        traversal.each &block if traversal
       end
     end
 

data/lib/neo4j/config.rb

@@ -145,7 +145,7 @@ module Neo4j
       # The a new configuration using default values as a hash.
       #
       def setup()
-        @configuration = ActiveSupport::HashWithIndifferentAccess.new(defaults)
+        @configuration = defaults.with_indifferent_access #nested_under_indifferent_access
         @configuration.merge!(defaults)
         @configuration
       end

data/lib/neo4j/core_ext/class/inheritable_attributes.rb

@@ -0,0 +1,37 @@
+# This is copied from Rails Active Support since it has been depricated and I still need it
+class Class # :nodoc:
+  def class_inheritable_reader(*syms)
+    options = syms.extract_options!
+    syms.each do |sym|
+      next if sym.is_a?(Hash)
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}                                # def self.after_add
+          read_inheritable_attribute(:#{sym})          #   read_inheritable_attribute(:after_add)
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}                                     # def after_add
+          self.class.#{sym}                            #   self.class.after_add
+        end                                            # end
+        " unless options[:instance_reader] == false }  # # the reader above is generated unless options[:instance_reader] == false
+      EOS
+    end
+  end
+
+  def class_inheritable_writer(*syms)
+    options = syms.extract_options!
+    syms.each do |sym|
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}=(obj)                          # def self.color=(obj)
+          write_inheritable_attribute(:#{sym}, obj)    #   write_inheritable_attribute(:color, obj)
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}=(obj)                               # def color=(obj)
+          self.class.#{sym} = obj                      #   self.class.color = obj
+        end                                            # end
+        " unless options[:instance_writer] == false }  # # the writer above is generated unless options[:instance_writer] == false
+      EOS
+    end
+  end
+end

data/lib/neo4j/node_mixin/node_mixin.rb

@@ -107,10 +107,10 @@ module Neo4j
         end
       end unless c.respond_to?(:orig_new)
 
-      c.class_inheritable_hash :_decl_props
+      c.class_inheritable_accessor :_decl_props
       c._decl_props ||= {}
 
-      c.class_inheritable_hash :_decl_rels
+      c.class_inheritable_accessor :_decl_rels
       c._decl_rels ||= {}
 
       c.extend ClassMethods

data/lib/neo4j/rails/attributes.rb

@@ -15,7 +15,7 @@ module Neo4j
         include ActiveModel::Dirty # track changes to attributes
         include ActiveModel::MassAssignmentSecurity # handle attribute hash assignment
 
-        class_inheritable_hash :attribute_defaults
+        class_inheritable_accessor :attribute_defaults
         self.attribute_defaults ||= {}
 
         # save the original [] and []= to use as read/write to Neo4j
@@ -36,7 +36,7 @@ module Neo4j
       # and callbacks are run to ensure correctness
       def write_local_property(key, value)
         key_s = key.to_s
-        if @properties[key_s] != value
+        if !@properties.has_key?(key_s) || @properties[key_s] != value
           attribute_will_change!(key_s)
           @properties[key_s] = value
         end

data/lib/neo4j/rails/callbacks.rb

@@ -4,13 +4,17 @@ module Neo4j
 			extend ActiveSupport::Concern
 			
 			included do
-				[:create_or_update, :create, :update, :destroy].each do |method|
+				[:valid?, :create_or_update, :create, :update, :destroy].each do |method|
 					alias_method_chain method, :callbacks
 				end
 				
 				extend ActiveModel::Callbacks
 				
-				define_model_callbacks :create, :save, :update, :destroy, :validation
+				define_model_callbacks :validation, :create, :save, :update, :destroy
+			end
+			
+			def valid_with_callbacks?(*) #:nodoc:
+			  _run_validation_callbacks { valid_without_callbacks? }
 			end
 			
 			def destroy_with_callbacks #:nodoc:

data/lib/neo4j/relationship_mixin/relationship_mixin.rb

@@ -123,7 +123,7 @@ module Neo4j
           end
         end
         
-        c.class_inheritable_hash :_decl_props
+        c.class_inheritable_accessor :_decl_props
         c._decl_props ||= {}
 
         c.extend ClassMethods

data/lib/neo4j/type_converters/type_converters.rb

@@ -135,7 +135,11 @@ module Neo4j
         # Only utc times are supported !
         def to_java(value)
           return nil if value.nil?
-          Time.utc(value.year, value.month, value.day, value.hour, value.min, value.sec).to_i
+          if value.class == Date
+            Time.utc(value.year, value.month, value.day, 0, 0, 0).to_i
+          else
+            Time.utc(value.year, value.month, value.day, value.hour, value.min, value.sec).to_i
+          end
         end
 
         def to_ruby(value)
@@ -157,7 +161,11 @@ module Neo4j
         # Only utc times are supported !
         def to_java(value)
           return nil if value.nil?
-          value.utc.to_i
+          if value.class == Date
+            Time.utc(value.year, value.month, value.day, 0, 0, 0).to_i
+          else
+            value.utc.to_i
+          end
         end
 
         def to_ruby(value)

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: neo4j
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 +02:00
+date: 2011-05-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -107,6 +107,7 @@ files:
   - lib/neo4j/relationship_mixin/relationship_mixin.rb
   - lib/neo4j/relationship_mixin/class_methods.rb
   - lib/neo4j/type_converters/type_converters.rb
+  - lib/neo4j/core_ext/class/inheritable_attributes.rb
   - lib/neo4j/migrations/migrations.rb
   - lib/neo4j/migrations/lazy_node_mixin.rb
   - lib/neo4j/migrations/extensions.rb