neo4j 8.3.4 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cfd5a1f6cea64cb3a8b231afff48bf1329a87ba
-  data.tar.gz: 42fda6bc83fd3dfa0074395ea71f54af16e99a38
+  metadata.gz: c78f6fb58c6a6a78a3fb7e270ffd739ae12e308b
+  data.tar.gz: 7594112b8478cca3a2a8be8c8466a3857e1f26d3
 SHA512:
-  metadata.gz: 672186434970764c8d1b58ce6a6e97697ca6fbdbfa003f1f9d733975fca77e8493804c6af4c36a0363efb5f7158a2a498ea3c939f821f9b6673ed25e6802eb91
-  data.tar.gz: 4fdd315602b202e5f1d29a2300dc218c76ac4d40c6d5b7401611aac8dbe457b72ee4a42557c61e6e68224b2e95ad474d6f34b0cfa2dc15e226b8b69618427c0e
+  metadata.gz: 41a2702fbfba425b8f56a68ad6cf3eb6c2caafa65b7b59274df602b0db61c75ea2d66ba6be7d08a68464f7f5b69685fc803445a6720c12559cab71e386050d49
+  data.tar.gz: ccd313d1f0c9ded6b4ed0512e5f7c6aeefca38450f9b69500d9551440f7aebab9e13cc9c861e872538a18243ba2fe796a617802f47066ebf4265adbd77a9ef96

data/CHANGELOG.md

@@ -3,27 +3,15 @@ All notable changes to this project will be documented in this file.
 This file should follow the standards specified on [http://keepachangelog.com/]
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [8.3.4] 2017-10-16
+## [9.0.0] 2017-09-26
 
-## Fixes
-
-- Ensure `branch` and `with_association` methods propagate `distinct` (thanks @klobuczek / see #1438)
-
-## [8.3.3] 2017-10-15
-
-## Fixes
-
-- Change YAML.safe_load call in `neo4j:schema:load` rake task to allow Symbols (thanks @evanob / see #1439)
-
-## [8.3.2] 2017-10-12
-
-## Fixes
+### Changed
 
-- Ensure branch method propagates with_association_tree context (thanks @klobuczek / see #1437)
+- `enum` values are now case-insensitive when being set by default (with a `_case_sensitive` option) (thanks @thefliik / see #1419)
 
-## [8.3.1] 2017-10-08
+### Fixed
 
-- Accidental release
+- Properties defined on a superclass after the subclass has been defined will now take effect on the subclass (thanks @thefliik / see #1428)
 
 ## [8.3.0] 2017-09-25
 

data/lib/neo4j/active_node/query/query_proxy.rb

@@ -187,9 +187,7 @@ module Neo4j
           # `as(identity)` is here to make sure we get the right variable
           # There might be a deeper problem of the variable changing when we
           # traverse an association
-          as(identity).instance_eval(&block).query.proxy_as(self.model, identity).tap do |new_query_proxy|
-            propagate_context(new_query_proxy)
-          end
+          as(identity).instance_eval(&block).query.proxy_as(self.model, identity)
         end
 
         def [](index)

data/lib/neo4j/active_node/query/query_proxy_eager_loading.rb

@@ -73,11 +73,6 @@ module Neo4j
           end
         end
 
-        def propagate_context(query_proxy)
-          super
-          query_proxy.instance_variable_set('@with_associations_tree', @with_associations_tree)
-        end
-
         def with_associations_tree
           @with_associations_tree ||= AssociationTree.new(model)
         end
@@ -143,7 +138,7 @@ module Neo4j
 
         def query_from_association_tree
           previous_with_variables = []
-          with_associations_tree.paths.inject(query_as(identity).with(ensure_distinct(identity))) do |query, path|
+          with_associations_tree.paths.inject(query_as(identity).with(identity)) do |query, path|
             with_association_query_part(query, path, previous_with_variables).tap do
               previous_with_variables << path_name(path)
             end

data/lib/neo4j/active_node/query/query_proxy_methods.rb

@@ -47,10 +47,6 @@ module Neo4j
           end
         end
 
-        def propagate_context(query_proxy)
-          query_proxy.instance_variable_set(:@distinct, @distinct)
-        end
-
         # @return [Integer] number of nodes of this class
         def count(distinct = nil, target = nil)
           return 0 if unpersisted_start_object?

data/lib/neo4j/config.rb

@@ -122,6 +122,10 @@ module Neo4j
         return nil if namespace.nil?
         "::#{namespace}"
       end
+
+      def enums_case_sensitive
+        Neo4j::Config[:enums_case_sensitive] || false
+      end
     end
   end
 end

data/lib/neo4j/shared/enum.rb

@@ -3,6 +3,7 @@ module Neo4j::Shared
     extend ActiveSupport::Concern
 
     class ConflictingEnumMethodError < Neo4j::Error; end
+    class InvalidEnumValueError < Neo4j::InvalidParameterError; end
 
     module ClassMethods
       attr_reader :neo4j_enum_data
@@ -43,7 +44,7 @@ module Neo4j::Shared
       def enum(parameters = {})
         options, parameters = *split_options_and_parameters(parameters)
         parameters.each do |property_name, enum_keys|
-          enum_keys = normalize_key_list enum_keys
+          enum_keys = normalize_key_list enum_keys, options
           @neo4j_enum_data ||= {}
           @neo4j_enum_data[property_name] = enum_keys
           define_property(property_name, enum_keys, options)
@@ -53,18 +54,28 @@ module Neo4j::Shared
 
       protected
 
-      def normalize_key_list(enum_keys)
+      def normalize_key_list(enum_keys, options)
+        case_sensitive = options.fetch(:_case_sensitive, Neo4j::Config.enums_case_sensitive)
+
         case enum_keys
         when Hash
           enum_keys
         when Array
-          Hash[enum_keys.each_with_index.to_a]
+          enum_keys = Hash[enum_keys.each_with_index.to_a]
         else
           fail ArgumentError, 'Invalid parameter for enum. Please provide an Array or an Hash.'
         end
+
+        unless case_sensitive
+          enum_keys.keys.each do |key|
+            fail ArgumentError, 'Enum keys must be lowercase unless _case_sensitive = true' unless key.downcase == key
+          end
+        end
+
+        enum_keys
       end
 
-      VALID_OPTIONS_FOR_ENUMS = [:_index, :_prefix, :_suffix, :_default]
+      VALID_OPTIONS_FOR_ENUMS = [:_index, :_prefix, :_suffix, :_default, :_case_sensitive]
 
       def split_options_and_parameters(parameters)
         options = {}
@@ -80,9 +91,8 @@ module Neo4j::Shared
       end
 
       def define_property(property_name, enum_keys, options)
-        property_options = build_property_options(enum_keys, options)
-        property property_name, property_options
-        serialize property_name, Neo4j::Shared::TypeConverters::EnumConverter.new(enum_keys, property_options)
+        property property_name, build_property_options(enum_keys, options)
+        serialize property_name, Neo4j::Shared::TypeConverters::EnumConverter.new(enum_keys, build_enum_options(enum_keys, options))
       end
 
       def build_property_options(_enum_keys, options = {})
@@ -91,6 +101,16 @@ module Neo4j::Shared
         }
       end
 
+      def build_enum_options(enum_keys, options = {})
+        if options[:_default] && not(enum_keys.include?(options[:_default]))
+          fail ArgumentError, 'Enum default value must match an enum key'
+        end
+
+        build_property_options(enum_keys, options).tap do |enum_options|
+          enum_options[:case_sensitive] = options[:_case_sensitive]
+        end
+      end
+
       def define_enum_methods(property_name, enum_keys, options)
         define_enum_methods_?(property_name, enum_keys, options)
         define_enum_methods_!(property_name, enum_keys, options)

data/lib/neo4j/shared/type_converters.rb

@@ -271,6 +271,10 @@ module Neo4j::Shared
       def initialize(enum_keys, options)
         @enum_keys = enum_keys
         @options = options
+
+        return unless @options[:case_sensitive].nil?
+
+        @options[:case_sensitive] = Neo4j::Config.enums_case_sensitive
       end
 
       def converted?(value)
@@ -298,8 +302,12 @@ module Neo4j::Shared
       def to_db(value)
         if value.is_a?(Array)
           value.map(&method(:to_db))
+        elsif @options[:case_sensitive]
+          @enum_keys[value.to_s.to_sym] ||
+            fail(Neo4j::Shared::Enum::InvalidEnumValueError, 'Value passed to an enum property must match one of the enum keys')
         else
-          @enum_keys[value.to_s.to_sym] || 0
+          @enum_keys[value.to_s.downcase.to_sym] ||
+            fail(Neo4j::Shared::Enum::InvalidEnumValueError, 'Case-insensitive (downcased) value passed to an enum property must match one of the enum keys')
         end
       end
     end

data/lib/neo4j/tasks/migration.rake

@@ -95,7 +95,7 @@ COMMENT
 
         args.with_defaults(remove_missing: false)
 
-        schema_data = YAML.safe_load(File.read(SCHEMA_YAML_PATH), [Symbol])
+        schema_data = YAML.safe_load(File.read(SCHEMA_YAML_PATH))
 
         Neo4j::Core::CypherSession::Adaptors::Base.subscribe_to_query(&method(:puts))
 

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '8.3.4'
+  VERSION = '9.0.0'
 end

data/neo4j.gemspec

@@ -41,5 +41,4 @@ A Neo4j OGM (Object-Graph-Mapper) for Ruby heavily inspired by ActiveRecord.
   s.add_development_dependency('guard-rubocop')
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('rubocop', '~> 0.49.1')
-  s.add_development_dependency('neo4j-rake_tasks', '>= 0.3.0')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 8.3.4
+  version: 9.0.0
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -192,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.49.1
-- !ruby/object:Gem::Dependency
-  name: neo4j-rake_tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 description: 'A Neo4j OGM (Object-Graph-Mapper) for Ruby heavily inspired by ActiveRecord.
 
 '