neo4j 7.0.16 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c519c8df13d5f5cbb5a82596b394ae421ab36eb4
-  data.tar.gz: 4646b6989dc25cdb11fb0372b0513ebe96cef302
+  metadata.gz: ba15fc0f5d37d234071965eed2d43f554b975d97
+  data.tar.gz: 6ec523603c6fb4fe1866cd12534c537694978b74
 SHA512:
-  metadata.gz: 77819a19c9a8fc298769758769a818983f92ba3d0560d1fdb3ab8c1f2d7bbcfab4b2fe1bd2d6c937851659648fcced3e3bd0fc9b64fb1abbe2992ac277ec7047
-  data.tar.gz: 2bb1ce43554404df1e49680586fd70b43580a919eb7930f91e5288ab25b90b549ed3d482b146d5ae90d593d95804ba24baee1cc4e8f9c71853205dae8cf0636f
+  metadata.gz: ebc52066120144041f6e288c558e13fed5e25849182dfb39641a97531064e28b31866610859500943c1c74e352f80c3a661c6780b44bd241765184db7789f4f1
+  data.tar.gz: 29700cde539799c8ce950275c1de1bf9eedaa8c85f5d4fb57aee460653b6390709d28e1ec19dd5d0246ab74da04f59b5f172eb8617c0a69dcab189500d778193

data/CHANGELOG.md

@@ -3,17 +3,12 @@ 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/).
 
-## [7.0.16] - 09-20-2016
-
-### Fixed
-
-- `where` clause with question mark parameter and array values only using the first element (see #1247 #1290)
-
-## [7.0.15] - 08-18-2016
+## [7.1.0] - 07-14-2016
 
 ### Changed
 
-- Default value for `enum` is `nil` instead of the first value.  This is a **BREAKING** change but is being released as a patch because the original behavior was considered a bug.  See [this pull request](https://github.com/neo4jrb/neo4j/pull/1270) (thanks to ProGM and andyweiss1982)
+- Gemspec dependency requirements were modified where ActiveModel, ActiveSupport, and Railties are concerned. The gem now requires >= 4.0, < 5.1.
+- `ActiveModel::Serializers::Xml` is only included if supported if available.
 
 ## [7.0.14] - 07-10-2016
 

data/Gemfile

@@ -2,31 +2,31 @@ source 'http://rubygems.org'
 
 gemspec
 
-# if ENV['CI']
-#   gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: 'master'
-#   gem 'neo4j-rake_tasks', github: 'neo4jrb/neo4j-rake_tasks', branch: 'master'
-# end
+if ENV['CI']
+  gem 'neo4j-core', github: 'neo4jrb/neo4j-core', branch: 'master'
+  gem 'neo4j-rake_tasks', github: 'neo4jrb/neo4j-rake_tasks', branch: 'master'
+end
 
 # gem 'active_attr', github: 'neo4jrb/active_attr', branch: 'performance'
 # gem 'active_attr', path: '../active_attr'
 
 gem 'listen', '< 3.1'
 
+if RUBY_VERSION.to_f < 2.2
+  gem 'activemodel', '~> 4'
+  gem 'activesupport', '~> 4'
+  gem 'railties', '~> 4'
+end
+
 group 'test' do
   gem 'coveralls', require: false
-  if RUBY_VERSION.to_f < 2.0
-    gem 'tins', '< 1.7'
-    gem 'overcommit', '< 0.35.0'
-  else
-    gem 'overcommit'
-    gem 'activesupport', '>= 4.2'
-  end
   gem 'codecov', require: false
   gem 'simplecov', require: false
   gem 'simplecov-html', require: false
   gem 'rspec', '~> 3.4'
   gem 'its'
   gem 'test-unit'
+  gem 'overcommit'
   gem 'colored'
   gem 'dotenv'
   gem 'timecop'

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

@@ -12,11 +12,7 @@ module Neo4j
           end
 
           def args(var, rel_var)
-            if @arg.respond_to?(:call)
-              @arg.call(var, rel_var)
-            else
-              [@arg] + @args
-            end
+            @arg.respond_to?(:call) ? @arg.call(var, rel_var) : [@arg, @args].flatten
           end
 
           class << self

data/lib/neo4j/railtie.rb

@@ -7,7 +7,11 @@ module Neo4j
   class Railtie < ::Rails::Railtie
     config.neo4j = ActiveSupport::OrderedOptions.new
 
-    if const_defined?(:ActionDispatch)
+    if defined?(ActiveSupport::Reloader)
+      ActiveSupport::Reloader.to_prepare do
+        Neo4j::ActiveNode::Labels::Reloading.reload_models!
+      end
+    elsif const_defined?(:ActionDispatch)
       ActionDispatch::Reloader.to_prepare do
         Neo4j::ActiveNode::Labels::Reloading.reload_models!
       end

data/lib/neo4j/shared.rb

@@ -4,7 +4,9 @@ module Neo4j
     extend ActiveModel::Naming
 
     include ActiveModel::Conversion
+    begin
     include ActiveModel::Serializers::Xml
+    rescue NameError; end # rubocop:disable Lint/HandleExceptions
     include ActiveModel::Serializers::JSON
 
     module ClassMethods

data/lib/neo4j/shared/enum.rb

@@ -67,7 +67,7 @@ module Neo4j::Shared
         end
       end
 
-      VALID_OPTIONS_FOR_ENUMS = [:_index, :_prefix, :_suffix, :_default]
+      VALID_OPTIONS_FOR_ENUMS = [:_index, :_prefix, :_suffix]
       DEFAULT_OPTIONS_FOR_ENUMS = {
         _index: true
       }
@@ -88,12 +88,12 @@ module Neo4j::Shared
       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)
+        serialize property_name, Neo4j::Shared::TypeConverters::EnumConverter.new(enum_keys)
       end
 
-      def build_property_options(_enum_keys, options = {})
+      def build_property_options(enum_keys, _options = {})
         {
-          default: options[:_default]
+          default: enum_keys.keys.first
         }
       end
 

data/lib/neo4j/shared/type_converters.rb

@@ -264,9 +264,8 @@ module Neo4j::Shared
     end
 
     class EnumConverter
-      def initialize(enum_keys, options)
+      def initialize(enum_keys)
         @enum_keys = enum_keys
-        @options = options
       end
 
       def converted?(value)

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = '7.0.16'
+  VERSION = '7.1.0'
 end

data/neo4j.gemspec

@@ -27,11 +27,11 @@ A Neo4j OGM (Object-Graph-Mapper) for use in Ruby on Rails and Rack frameworks h
   s.rdoc_options = ['--quiet', '--title', 'Neo4j.rb', '--line-numbers', '--main', 'README.rdoc', '--inline-source']
 
   s.add_dependency('orm_adapter', '~> 0.5.0')
-  s.add_dependency('activemodel', '~> 4')
-  s.add_dependency('activesupport', '~> 4')
-  s.add_dependency('neo4j-core', '>= 6.0.0', '< 7.0.0')
+  s.add_dependency('activemodel', '>= 4.0', '< 5.1')
+  s.add_dependency('activesupport', '>= 4.0', '< 5.1')
+  s.add_dependency('neo4j-core', '>= 6.0.0')
   s.add_dependency('neo4j-community', '~> 2.0') if RUBY_PLATFORM =~ /java/
-  s.add_development_dependency('railties', '~> 4')
+  s.add_development_dependency('railties', '>= 4.0', '< 5.1')
   s.add_development_dependency('pry')
   s.add_development_dependency('os')
   s.add_development_dependency('rake')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 7.0.16
+  version: 7.1.0
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -28,30 +28,42 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: neo4j-core
   requirement: !ruby/object:Gem::Requirement
@@ -59,9 +71,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,23 +78,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -198,10 +210,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.34.0
-description: 'A Neo4j OGM (Object-Graph-Mapper) for use in Ruby on Rails and Rack
-  frameworks heavily inspired by ActiveRecord.
-
-'
+description: |
+  A Neo4j OGM (Object-Graph-Mapper) for use in Ruby on Rails and Rack frameworks heavily inspired by ActiveRecord.
 email: andreas.ronge@gmail.com, brian@brian-underwood.codes, chris@subvertallmedia.com
 executables:
 - neo4j-jars
@@ -214,7 +224,6 @@ files:
 - Gemfile
 - README.md
 - bin/neo4j-jars
-- bin/rake
 - config/locales/en.yml
 - config/neo4j/add_classnames.yml
 - config/neo4j/config.yml
@@ -333,8 +342,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby
 test_files: []
+has_rdoc: true

data/bin/rake

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
-                                           Pathname.new(__FILE__).realpath)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')