neography 1.2.0 → 1.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7f2234bb146cd1e3f2a8982a50ed7a40cc55cf7e
+  data.tar.gz: 27d36db4460e5c928e22714c22e6d198a4af8178
+SHA512:
+  metadata.gz: 7b0fe9807a4ce69b2befcebe432f214bc4db21aa86ebd8c900f80062946ed44732c2a5b887b4666ad35c989beab923079d713ed2813d44431301b6fb529b865c
+  data.tar.gz: 5753e7142a9e9d19598faec7ea62cc27613a45b386e184c2a004fddb9e85ff558abec6fb4c85e6b853a1ecd16d3cd0dc7689998424cbca4d2ef4886d392a5e00

data/.travis.yml

@@ -1,4 +1,4 @@
-script: "bundle exec rake neo4j:install['enterprise','2.0.0-M04'] neo4j:start spec --trace"
+script: "bundle exec rake neo4j:install['enterprise','2.0.0-M06'] neo4j:start spec --trace"
 language: ruby
 rvm:
   - 1.9.3

data/lib/neography/rest/transactions.rb

@@ -60,24 +60,43 @@ module Neography
         query = nil
         parameters = nil
         Array(statements).each do |statement|
-          if query && parameters
-            array << {:statement => query, :parameters => {:props => parameters}}
-            query = statement
-            parameters = nil            
-          elsif query && statement.is_a?(String)
-            array << {:statement => query}
-            query = statement
-            parameters = nil 
-          elsif query && statement.is_a?(Hash)
-            array << {:statement => query, :parameters => {:props => parameters}}
-            query = nil
-            parameters = nil            
+          case 
+            when query && parameters && statement.is_a?(Array)
+              then
+                array << {:statement => query, :parameters => parameters, :resultDataContents => statement }
+                query = nil
+                parameters = nil        
+            when query && parameters && statement.is_a?(String)
+              then
+                array << {:statement => query, :parameters => parameters}
+                query = statement
+                parameters = nil                 
+            when query && statement.is_a?(Hash)
+              then
+                parameters = statement            
+            when query && statement.is_a?(Array)
+              then
+                array << {:statement => query, :resultDataContents => statement }
+                query = nil
+                parameters = nil                       
+            else
+              query = statement
           end
-          query = statement
+
+        end
+        
+        if query && parameters
+          array << {:statement => query, :parameters => parameters}
+          query = nil
         end
-        array << {:statement => query} if query
+        
+        if query
+          array << {:statement => query}
+        end
+        
         { :statements => array }
       end
+
     end
   end
 end

data/lib/neography/tasks.rb

@@ -7,7 +7,7 @@ require 'net/http'
 namespace :neo4j do
   desc "Install Neo4j"
   task :install, :edition, :version do |t, args|
-    args.with_defaults(:edition => "community", :version => "1.9.3")
+    args.with_defaults(:edition => "community", :version => "1.9.4")
     puts "Installing Neo4j-#{args[:edition]}-#{args[:version]}"
     
     if OS::Underlying.windows?

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/integration/rest_transaction_spec.rb

@@ -18,6 +18,19 @@ describe Neography::Rest do
       tx.should have_key("results")
       tx["results"].should_not be_empty
     end
+
+    it "can start a transaction with statements and represent them as a graph" do
+      tx = @neo.begin_transaction(["CREATE ( bike:Bike { weight: 10 } ) CREATE ( frontWheel:Wheel { spokes: 3 } ) CREATE ( backWheel:Wheel { spokes: 32 } ) CREATE p1 = bike -[:HAS { position: 1 } ]-> frontWheel CREATE p2 = bike -[:HAS { position: 2 } ]-> backWheel RETURN bike, p1, p2", 
+                                 ["row", "graph", "rest"]])
+      tx.should have_key("transaction")
+      tx.should have_key("results")
+      tx["results"].should_not be_empty
+      tx["results"].first["data"].first["row"].should_not be_empty
+      tx["results"].first["data"].first["graph"].should_not be_empty
+      tx["results"].first["data"].first["rest"].should_not be_empty
+    end
+
+
   end
 
   describe "keep a transaction" do
@@ -43,6 +56,37 @@ describe Neography::Rest do
       existing_tx.should have_key("results")
       existing_tx["results"].should_not be_empty
     end
+
+    it "can add to a transaction with parameters" do
+      tx = @neo.begin_transaction
+      tx.should have_key("transaction")
+      tx["results"].should be_empty
+      existing_tx = @neo.in_transaction(tx, ["start n=node({id}) return n", {:id => 0}])
+      existing_tx.should have_key("transaction")
+      existing_tx.should have_key("results")
+      existing_tx["results"].should_not be_empty
+    end    
+
+    it "can add to a transaction with representation" do
+      tx = @neo.begin_transaction
+      tx.should have_key("transaction")
+      tx["results"].should be_empty
+      existing_tx = @neo.in_transaction(tx, ["start n=node(0) return n", [:row,:rest]])
+      existing_tx.should have_key("transaction")
+      existing_tx.should have_key("results")
+      existing_tx["results"].should_not be_empty
+    end    
+
+    it "can add to a transaction with parameters and representation" do
+      tx = @neo.begin_transaction
+      tx.should have_key("transaction")
+      tx["results"].should be_empty
+      existing_tx = @neo.in_transaction(tx, ["start n=node({id}) return n", {:id => 0}, [:row,:rest]])
+      existing_tx.should have_key("transaction")
+      existing_tx.should have_key("results")
+      existing_tx["results"].should_not be_empty
+    end    
+    
   end
 
   describe "commit a transaction" do

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors:
 - Max De Marzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: net-http-spy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -46,103 +41,90 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,17 +139,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
 description: A Ruby wrapper to the Neo4j Rest API see http://docs.neo4j.org/chunked/stable/rest-api.html
@@ -299,27 +278,26 @@ files:
 - spec/unit/rest/transactions_spec.rb
 homepage: http://rubygems.org/gems/neography
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: neography
-rubygems_version: 1.8.24
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ruby wrapper to Neo4j Rest API
 test_files:
 - spec/integration/authorization_spec.rb
@@ -378,3 +356,4 @@ test_files:
 - spec/unit/rest/relationships_spec.rb
 - spec/unit/rest/schema_index_spec.rb
 - spec/unit/rest/transactions_spec.rb
+has_rdoc: