neo4j-core 7.0.6 → 7.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 012959b6a5ad5db3f1fc8197b65ca216e3b54f26
-  data.tar.gz: f96ec3337ee5fa9eb103966e497552c1c3f56e89
+  metadata.gz: df59e523326d0f32d5c85d5148cc1c2029013789
+  data.tar.gz: 45e9e52b039ccc859dbb0ca5dc5c0f72e0205eff
 SHA512:
-  metadata.gz: 744b6920e214b0abbd55385a41c5eb28f3e1754793e01180754f9dba9e8f5b2183596c94779d152b97be4f80d60435a6807c3a1b457c7f383dd462c5652a5af9
-  data.tar.gz: bf9de1588905f3b62064004ce66ddec878faf0c02862391383561b5833ed12c59f5989effa37bce6a7c92a07c5baa86de534cc95b2c077b3ef5e0ac77c88725e
+  metadata.gz: a1263e57c3f4c8a0adf910a9f937b3bf6adecd98e2855ca9dcc46a0086e69779b96706bf306ee666c87ae4c04e5070e94eeb4b732ef21e1149f3d1a0c8ee27bc
+  data.tar.gz: a615b1178d22709928932acb07a9bb2b330de3ecd2f9ce1189b0dac152cddf5ed23831c2f6e5eed7a5b2fe09b7491d7ff377067da9f19dd7e264c255ee31ad9f

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = '7.0.6'
+    VERSION = '7.0.7'
   end
 end

data/lib/neo4j-embedded/property.rb

@@ -20,7 +20,7 @@ module Neo4j
 
       # Sets the property of this node.
       # Property keys are always strings. Valid property value types are the primitives:
-      # (<tt>String</tt>, <tt>Fixnum</tt>, <tt>Float</tt>, <tt>FalseClass</tt>, <tt>TrueClass</tt>)
+      # (<tt>String</tt>, <tt>Integer</tt>, <tt>Float</tt>, <tt>FalseClass</tt>, <tt>TrueClass</tt>)
       # or an array of those primitives.
       #
       # ==== Gotchas
@@ -28,7 +28,7 @@ module Neo4j
       # * You can *not* delete or add one item in the array (e.g. person.phones.delete('123')) but instead you must create a new array instead.
       #
       # @param [String, Symbol] k of the property to set
-      # @param [String,Fixnum,Float,true,false, Array] v to set
+      # @param [String,Integer,Float,true,false, Array] v to set
       def []=(k, v)
         to_java_property(k, v)
       end
@@ -95,7 +95,7 @@ module Neo4j
           :double
         when FalseClass, TrueClass
           :boolean
-        when Fixnum
+        when Integer
           :long
         else
           fail "Not allowed to store array with value #{value.inspect} type #{value.class}"

data/lib/neo4j/core/cypher_session/adaptors/http.rb

@@ -16,7 +16,7 @@ module Neo4j
           end
 
           def connect
-            @requestor = Requestor.new(@url, USER_AGENT_STRING, self.class.method(:instrument_request))
+            @requestor = Requestor.new(@url, USER_AGENT_STRING, self.class.method(:instrument_request), @options.fetch(:faraday_options, {}))
           end
 
           ROW_REST = %w(row REST)
@@ -101,13 +101,12 @@ module Neo4j
             include Adaptors::HasUri
             default_url('http://neo4:neo4j@localhost:7474')
             validate_uri { |uri| uri.is_a?(URI::HTTP) }
-
-            def initialize(url, user_agent_string, instrument_proc)
+            def initialize(url, user_agent_string, instrument_proc, faraday_options = {})
               self.url = url
               @user = user
               @password = password
               @user_agent_string = user_agent_string
-              @faraday = wrap_connection_failed! { faraday_connection }
+              @faraday = wrap_connection_failed! { faraday_connection(faraday_options) }
               @instrument_proc = instrument_proc
             end
 
@@ -144,12 +143,12 @@ module Neo4j
 
             private
 
-            def faraday_connection
+            def faraday_connection(options = {})
               require 'faraday'
               require 'faraday_middleware/multi_json'
 
-              Faraday.new(url) do |c|
-                c.request :basic_auth, user, password
+              Faraday.new(url, options) do |c|
+                c.request :basic_auth, username_config(options), password_config(options)
                 c.request :multi_json
 
                 c.response :multi_json, symbolize_keys: true, content_type: 'application/json'
@@ -162,6 +161,14 @@ module Neo4j
               end
             end
 
+            def password_config(options)
+              options.fetch(:basic_auth, {}).fetch(:password, @password)
+            end
+
+            def username_config(options)
+              options.fetch(:basic_auth, {}).fetch(:username, @user)
+            end
+
             def request_body(body)
               return body if body.is_a?(String)
 

data/lib/neo4j/property_validator.rb

@@ -5,12 +5,12 @@ module Neo4j
     end
 
     # the valid values on a property, and arrays of those.
-    VALID_PROPERTY_VALUE_CLASSES = Set.new([Array, NilClass, String, Float, TrueClass, FalseClass, Fixnum])
+    VALID_PROPERTY_VALUE_CLASSES = Set.new([Array, NilClass, String, Float, TrueClass, FalseClass, Integer])
 
     # @param [Object] value the value we want to check if it's a valid neo4j property value
     # @return [True, False] A false means it can't be persisted.
     def valid_property?(value)
-      VALID_PROPERTY_VALUE_CLASSES.include?(value.class)
+      VALID_PROPERTY_VALUE_CLASSES.any? { |c| value.is_a?(c) }
     end
 
     def validate_property!(value)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 7.0.6
+  version: 7.0.7
 platform: ruby
 authors:
 - Andreas Ronge, Chris Grigg, Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday