neography 0.0.28 → 0.0.29

data/.gitignore

@@ -1,3 +1,5 @@
+.idea
+*.iml
 neo4j
 pkg/*
 *.gem

data/Gemfile.lock

@@ -4,7 +4,7 @@ PATH
     neography (0.0.28)
       httparty (>= 0.8.1)
       json
-      oj
+      multi_json
       os
       rake (>= 0.8.7)
       rubyzip
@@ -20,7 +20,6 @@ GEM
     multi_json (1.3.6)
     multi_xml (0.5.1)
     net-http-spy (0.2.1)
-    oj (1.2.9)
     os (0.9.6)
     rake (0.8.7)
     rspec (2.10.0)

data/lib/neography.rb

@@ -18,13 +18,13 @@ DIRECTIONS = ["incoming", "in", "outgoing", "out", "all", "both"]
 require 'cgi'
 require 'httparty'
 require 'json'
-require 'oj'
+require 'multi_json'
 require 'logger'
 require 'ostruct'
 require 'os'
 require 'zip/zipfilesystem'
 
-require 'neography/oj_parser'
+require 'neography/multi_json_parser'
 
 require 'neography/config'
 require 'neography/rest'

data/lib/neography/config.rb

@@ -15,6 +15,6 @@ module Neography
     @authentication = {}
     @username       = nil
     @password       = nil
-    @parser         = {:parser => OjParser}
+    @parser         = {:parser => MultiJsonParser}
   end
-end
+end

data/lib/neography/multi_json_parser.rb

@@ -0,0 +1,29 @@
+class MultiJsonParser < HTTParty::Parser
+
+  protected
+
+    # I know this looks pretty ugly, but we have issues with Neo4j returning true, false,
+    # plain numbers and plain strings, which is considered by some JSON libraries to be
+    # invalid JSON, but some consider it perfectly fine.
+    # This ugly hack deals with the problem.  Send me a Pull Request if you
+    # come up with a nicer solution... please!
+    #
+    def json
+      begin
+        MultiJson.load(body)
+      rescue MultiJson::DecodeError, ArgumentError
+        case
+          when body == "true"
+            true
+          when body == "false"
+            false
+           when body.match(/\A[+-]?\d+?(\.\d+)?\Z/) == nil ? false : true
+            Float(body)
+          else
+            body[1..-2]
+        end
+
+      end
+    end
+
+end

data/lib/neography/rest.rb

@@ -509,6 +509,8 @@ module Neography
             {:method => "POST", :to => (args[2].is_a?(String) && args[2].start_with?("{") ? "" : "/node/") + "#{get_id(args[2])}/relationships", :body => {:to => (args[3].is_a?(String) && args[3].start_with?("{") ? "" : "/node/") + "#{get_id(args[3])}", :type => args[1], :data => args[4] } }
           when :create_unique_relationship
             {:method => "POST", :to => "/index/relationship/#{args[1]}?unique", :body => {:key => args[2], :value => args[3], :type => args[4], :start => (args[5].is_a?(String) && args[5].start_with?("{") ? "" : "/node/") + "#{get_id(args[5])}", :end=> (args[6].is_a?(String) && args[6].start_with?("{") ? "" : "/node/") + "#{get_id(args[6])}"} }
+          when :delete_relationship
+            {:method => "DELETE", :to => "/relationship/#{get_id(args[1])}"}
           when :set_relationship_property
             {:method => "PUT", :to => "/relationship/#{get_id(args[1])}/properties/#{args[2].keys.first}", :body => args[2].values.first}
           when :reset_relationship_properties

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "0.0.28"
+  VERSION = "0.0.29"
 end

data/neography.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
   s.add_dependency "json"
   s.add_dependency "os"
   s.add_dependency "rubyzip"
-  s.add_dependency "oj"
+  s.add_dependency "multi_json"
 end

data/spec/integration/rest_batch_spec.rb

@@ -144,6 +144,18 @@ describe Neography::Rest do
       batch_result.first["body"]["end"].split('/').last.should == node2["self"].split('/').last
     end
 
+    it "can delete a single relationship" do
+      node1 = @neo.create_node
+      node2 = @neo.create_node
+      batch_result = @neo.batch [:create_relationship, "friends", node1, node2, {:since => "time immemorial"}]
+      batch_result.should_not be_nil
+      batch_result[0]["status"].should == 201
+      id = batch_result.first["body"]["self"].split("/").last
+      batch_result = @neo.batch [:delete_relationship, id]
+      batch_result[0]["status"].should == 204
+      batch_result[0]["from"].should == "/relationship/#{id}"
+    end
+
     it "can create a unique relationship" do
       index_name = generate_text(6)
       key = generate_text(6)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8820440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8820440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-http-spy
-  requirement: &8819700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :development
   prerelease: false
-  version_requirements: *8819700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8832280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *8832280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &8831800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *8831800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8831340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *8831340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &8830960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8830960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: os
-  requirement: &8830500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8830500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &8830080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8830080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: oj
-  requirement: &8829640 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8829640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby wrapper to the Neo4j Rest API see http://components.neo4j.org/neo4j-rest/
   for more details.
 email: maxdemarzi@gmail.com
@@ -137,12 +182,12 @@ files:
 - lib/neography/config.rb
 - lib/neography/equal.rb
 - lib/neography/index.rb
+- lib/neography/multi_json_parser.rb
 - lib/neography/neography.rb
 - lib/neography/node.rb
 - lib/neography/node_path.rb
 - lib/neography/node_relationship.rb
 - lib/neography/node_traverser.rb
-- lib/neography/oj_parser.rb
 - lib/neography/path_traverser.rb
 - lib/neography/property.rb
 - lib/neography/property_container.rb
@@ -192,8 +237,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neography
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ruby wrapper to Neo4j Rest API
-test_files: []
+test_files:
+- spec/integration/authorization_spec.rb
+- spec/integration/index_spec.rb
+- spec/integration/neography_spec.rb
+- spec/integration/node_path_spec.rb
+- spec/integration/node_relationship_spec.rb
+- spec/integration/node_spec.rb
+- spec/integration/parsing_spec.rb
+- spec/integration/relationship_spec.rb
+- spec/integration/rest_batch_spec.rb
+- spec/integration/rest_bulk_spec.rb
+- spec/integration/rest_experimental_spec.rb
+- spec/integration/rest_gremlin_fail_spec.rb
+- spec/integration/rest_index_spec.rb
+- spec/integration/rest_node_spec.rb
+- spec/integration/rest_path_spec.rb
+- spec/integration/rest_plugin_spec.rb
+- spec/integration/rest_relationship_spec.rb
+- spec/integration/rest_traverse_spec.rb
+- spec/spec_helper.rb

data/lib/neography/oj_parser.rb

@@ -1,8 +0,0 @@
-class OjParser < HTTParty::Parser
-  Oj.default_options = { :mode => :strict }
-  
-  protected 
-    def json
-      Oj.load(body)
-    end
-end