neo4j 5.0.15 → 5.1.0.rc.1

data/lib/neo4j/shared/type_converters.rb

@@ -9,6 +9,10 @@ module Neo4j::Shared
           Date
         end
 
+        def db_type
+          Integer
+        end
+
         def to_db(value)
           Time.utc(value.year, value.month, value.day).to_i
         end
@@ -26,6 +30,10 @@ module Neo4j::Shared
           DateTime
         end
 
+        def db_type
+          Integer
+        end
+
         # Converts the given DateTime (UTC) value to an Integer.
         # DateTime values are automatically converted to UTC.
         def to_db(value)
@@ -59,9 +67,16 @@ module Neo4j::Shared
           Time
         end
 
+        # ActiveAttr, which assists with property management, does not recognize Time as a valid type. We tell it to interpret it as
+        # Integer, as it will be when saved to the database.
         def primitive_type
           Integer
         end
+
+        def db_type
+          Integer
+        end
+
         # Converts the given DateTime (UTC) value to an Integer.
         # Only utc times are supported !
         def to_db(value)
@@ -86,6 +101,10 @@ module Neo4j::Shared
           Hash
         end
 
+        def db_type
+          String
+        end
+
         def to_db(value)
           Psych.dump(value)
         end
@@ -103,6 +122,10 @@ module Neo4j::Shared
           JSON
         end
 
+        def db_type
+          String
+        end
+
         def to_db(value)
           value.to_json
         end
@@ -113,14 +136,26 @@ module Neo4j::Shared
       end
     end
 
+    # Modifies a hash's values to be of types acceptable to Neo4j or matching what the user defined using `type` in property definitions.
+    # @param [Neo4j::Shared::Property] obj A node or rel that mixes in the Property module
+    # @param [Symbol] medium Indicates the type of conversion to perform.
+    # @param [Hash] properties A hash of symbol-keyed properties for conversion.
     def convert_properties_to(obj, medium, properties)
-      converter = medium == :ruby ? :to_ruby : :to_db
-      properties.each_pair do |attr, value|
-        next if skip_conversion?(obj, attr, value)
-        properties[attr] = converted_property(primitive_type(attr.to_sym), value, converter)
+      direction = medium == :ruby ? :to_ruby : :to_db
+      properties.each_pair do |key, value|
+        next if skip_conversion?(obj, key, value)
+        properties[key] = convert_property(key, value, direction)
       end
     end
 
+    # Converts a single property from its current format to its db- or Ruby-expected output type.
+    # @param [Symbol] key A property declared on the model
+    # @param value The value intended for conversion
+    # @param [Symbol] direction Either :to_ruby or :to_db, indicates the type of conversion to perform
+    def convert_property(key, value, direction)
+      converted_property(primitive_type(key.to_sym), value, direction)
+    end
+
     private
 
     def converted_property(type, value, converter)
@@ -156,7 +191,6 @@ module Neo4j::Shared
         end
       end
 
-
       def typecaster_for(primitive_type)
         return nil if primitive_type.nil?
         converters.key?(primitive_type) ? converters[primitive_type] : nil
@@ -166,7 +200,16 @@ module Neo4j::Shared
       def to_other(direction, value, type)
         fail "Unknown direction given: #{direction}" unless direction == :to_ruby || direction == :to_db
         found_converter = converters[type]
-        found_converter ? found_converter.send(direction, value) : value
+        return value unless found_converter
+        return value if direction == :to_db && formatted_for_db?(found_converter, value)
+        found_converter.send(direction, value)
+      end
+
+      # Attempts to determine whether conversion should be skipped because the object is already of the anticipated output type.
+      # @param [#convert_type] found_converter An object that responds to #convert_type, hinting that it is a type converter.
+      # @param value The value for conversion.
+      def formatted_for_db?(found_converter, value)
+        found_converter.respond_to?(:db_type) && value.is_a?(found_converter.db_type)
       end
 
       def register_converter(converter)

data/lib/neo4j/shared/typecaster.rb

@@ -1,30 +1,34 @@
 module Neo4j
   module Shared
     # This module provides a convenient way of registering a custom Typecasting class. Custom Typecasters all follow a simple pattern.
+    #
     # EXAMPLE:
-    # class RangeConverter
-    #   class << self
-    #     def primitive_type
-    #       String
-    #     end
     #
-    #     def convert_type
-    #       Range
-    #     end
+    # .. code-block:: ruby
     #
-    #     def to_db(value)
-    #       value.to_s
-    #     end
+    #   class RangeConverter
+    #     class << self
+    #       def primitive_type
+    #         String
+    #       end
     #
-    #     def to_ruby(value)
-    #       ends = value.to_s.split('..').map { |d| Integer(d) }
-    #       ends[0]..ends[1]
+    #       def convert_type
+    #         Range
+    #       end
+    #
+    #       def to_db(value)
+    #         value.to_s
+    #       end
+    #
+    #       def to_ruby(value)
+    #         ends = value.to_s.split('..').map { |d| Integer(d) }
+    #         ends[0]..ends[1]
+    #       end
+    #       alias_method :call, :to_ruby
     #     end
-    #     alias_method :call, :to_ruby
-    #   end
     #
-    #   include Neo4j::Shared::Typecaster
-    # end
+    #     include Neo4j::Shared::Typecaster
+    #   end
     #
     # This would allow you to use `property :my_prop, type: Range` in a model.
     # Each method and the `alias_method` call is required. Make sure the module inclusion happens at the end of the file.

data/lib/neo4j/shared/validations.rb

@@ -24,7 +24,7 @@ module Neo4j
 
       # @return [Boolean] true if valid
       def valid?(context = nil)
-        context     ||= (new_record? ? :create : :update)
+        context ||= (new_record? ? :create : :update)
         super(context)
         errors.empty?
       end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '5.0.15'
+  VERSION = '5.1.0.rc.1'
 end

data/neo4j.gemspec

@@ -30,7 +30,7 @@ A Neo4j OGM (Object-Graph-Mapper) for use in Ruby on Rails and Rack frameworks h
   s.add_dependency('activemodel', '~> 4')
   s.add_dependency('activesupport', '~> 4')
   s.add_dependency('active_attr', '~> 0.8')
-  s.add_dependency('neo4j-core', '~> 5.0.1')
+  s.add_dependency('neo4j-core', '~> 5.1.0.rc.1')
   s.add_dependency('neo4j-community', '~> 2.0') if RUBY_PLATFORM =~ /java/
   s.add_development_dependency('railties', '~> 4')
   s.add_development_dependency('pry')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 5.0.15
+  version: 5.1.0.rc.1
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.1.0.rc.1
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,9 @@ files:
 - lib/neo4j/active_node/dependent/query_proxy_methods.rb
 - lib/neo4j/active_node/has_n.rb
 - lib/neo4j/active_node/has_n/association.rb
+- lib/neo4j/active_node/has_n/association_cypher_methods.rb
 - lib/neo4j/active_node/id_property.rb
+- lib/neo4j/active_node/id_property/accessor.rb
 - lib/neo4j/active_node/initialize.rb
 - lib/neo4j/active_node/labels.rb
 - lib/neo4j/active_node/node_wrapper.rb
@@ -245,10 +247,12 @@ files:
 - lib/neo4j/active_node/query/query_proxy_find_in_batches.rb
 - lib/neo4j/active_node/query/query_proxy_link.rb
 - lib/neo4j/active_node/query/query_proxy_methods.rb
+- lib/neo4j/active_node/query/query_proxy_unpersisted.rb
 - lib/neo4j/active_node/query_methods.rb
 - lib/neo4j/active_node/reflection.rb
 - lib/neo4j/active_node/rels.rb
 - lib/neo4j/active_node/scope.rb
+- lib/neo4j/active_node/unpersisted.rb
 - lib/neo4j/active_node/validations.rb
 - lib/neo4j/active_rel.rb
 - lib/neo4j/active_rel/callbacks.rb
@@ -274,6 +278,7 @@ files:
 - lib/neo4j/shared/initialize.rb
 - lib/neo4j/shared/persistence.rb
 - lib/neo4j/shared/property.rb
+- lib/neo4j/shared/property/default_property.rb
 - lib/neo4j/shared/rel_type_converters.rb
 - lib/neo4j/shared/serialized_properties.rb
 - lib/neo4j/shared/type_converters.rb
@@ -309,12 +314,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby