neo4apis 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89023a93271f59dea6fa05a98b70f459bf4d6b26
-  data.tar.gz: 82c4afb82a045d86f231d2330591c512fc11afb5
+  metadata.gz: fedf11c93ff329de09c8c6e529ffd4612fb743d6
+  data.tar.gz: 786710564e9b2a4c21807e9492d73b5cd7933156
 SHA512:
-  metadata.gz: 135b1f1188780828302371977b930b40778460d29d6d6b66f188d3c61d10bbb92d8fbf7bdcf047282d2e7ae38ee242c23de5b5fb186b07ba2f78f24b31c60bfb
-  data.tar.gz: 4cb5e535fe4c08e479b92cd2a9c300ec3909a59a59fce3ae1cdc63228eb782461fa8af07df3d1fe4037ecd33f78fe2d6766c8413cc63868f66f7477cf5e9140b
+  metadata.gz: b36a2e013ecf99bc50334181ffc03dc22ede8c2a8abcacf47b4f05398ab533dc261e3be1e5aff9566afdc930ef3c6668fb088a800965ce13b18fa0e5385b9c92
+  data.tar.gz: c1876201d6fe0291f3d1236eca33fbb60bbbdce74d9b61f14696e01d0f37911a013521b907dde3ae794fe6485eb60a84c5af55ef7615ee124668f0d33776bdc3

data/lib/neo4apis/base.rb

@@ -154,7 +154,7 @@ QUERY
 
     def set_attributes(var, properties)
       properties.map do |property|
-        "#{var}.#{property} = {props}.#{property}"
+        "#{var}.`#{property}` = {props}.`#{property}`"
       end.join(', ')
     end
 

data/lib/neo4apis/cli/base.rb

@@ -2,6 +2,12 @@ module Neo4Apis
   module CLI
     class Base < ::Thor
       class_option :neo4j_url, type: :string,  default: 'http://localhost:7474'
+      class_option :neo4j_username, type: :string
+      class_option :neo4j_password, type: :string
+
+      def neo4j_session
+        Neo4j::Session.open(:server_db, options[:neo4j_url], basic_auth: {username: options[:neo4j_username], password: options[:neo4j_password]})
+      end
     end
   end
 end

data/lib/neo4apis/query_buffer.rb

@@ -5,12 +5,7 @@ module Neo4Apis
       @neo4j_session = neo4j_session
       @flush_size = flush_size
 
-      uri = URI.parse(@neo4j_session.resource_url)
-
-      @faraday_connection = Faraday.new(:url => "#{uri.scheme}://#{uri.host}:#{uri.port}") do |faraday|
-        faraday.request  :url_encoded             # form-encode POST params
-        faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
-      end
+      @faraday_connection = @neo4j_session.connection
 
       super()
     end
@@ -46,9 +41,8 @@ module Neo4Apis
         if response.status != 200
           fail "ERROR: response status #{response.status}:\n#{response.body}"
         else
-          response_data = JSON.parse(response.body)
-          if response_data['errors'].size > 0
-            error_string = response_data['errors'].map do |error|
+          if response.body[:errors].size > 0
+            error_string = response.body[:errors].map do |error|
               [error['code'], error['message']].join("\n")
             end.join("\n\n")
 

data/neo4apis.gemspec

@@ -3,7 +3,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name     = "neo4apis"
-  s.version  = '0.7.1'
+  s.version  = '0.8.0'
   s.required_ruby_version = ">= 1.9.1"
 
   s.authors  = "Brian Underwood"
@@ -22,7 +22,7 @@ A core library for importing data from APIs into neo4j.  Designed to be used wit
   s.executables << 'neo4apis'
 
   s.add_dependency('faraday', "~> 0.9.0")
-  s.add_dependency("neo4j-core", ">= 3.0")
+  s.add_dependency("neo4j-core", ">= 4.0.5")
   s.add_dependency('thor', '~> 0.19.1')
   s.add_dependency('colorize', '~> 0.7.3')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4apis
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Brian Underwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.5
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement