neography 1.1.1 → 1.1.2

data/README.md

@@ -13,7 +13,7 @@ Neography is a thin Ruby wrapper to the Neo4j Rest API, for more information:
 * [Getting Started with Neo4j Server](http://neo4j.org/community/)
 * [Neo4j Rest API Reference](http://docs.neo4j.org/chunked/milestone/rest-api.html)
 
-If you want to the full power of Neo4j, you will want to use JRuby and the excellent Neo4j.rb gem at https://github.com/andreasronge/neo4j by Andreas Ronge
+If you want to utilize the full power of Neo4j, you will want to use JRuby and the excellent Neo4j.rb gem at https://github.com/andreasronge/neo4j by Andreas Ronge
 
 
 ## Installation

data/lib/neography/connection.rb

@@ -110,7 +110,7 @@ module Neography
         code, body, parsed = handle_batch(response)
       else
         code = response.code
-        body = response.body
+        body = response.body.force_encoding("UTF-8")
         parsed = false
       end
       return_result(code, body, parsed)
@@ -118,7 +118,7 @@ module Neography
 
     def handle_batch(response)
       code = 200
-      body = @parser.json(response.body)
+      body = @parser.json(response.body.force_encoding("UTF-8"))
       body.each do |result|
         if result["status"] >= 400
           code = result["status"] 

data/lib/neography/railtie.rb

@@ -7,7 +7,7 @@ module Neography
     # See: http://api.rubyonrails.org/classes/Rails/Railtie.html
     initializer 'neography.configure' do
       # Provides a hook so people implementing the gem can do this in a railtie of their own:
-      #   initializer "my_thing.neography_initialization", before: 'neography_railtie.configure_rails_initialization' do
+      #   initializer "my_thing.neography_initialization", before: 'neography.configure' do
       #     require 'my_thing/neography'
       #   end
     end

data/lib/neography/rest/cypher.rb

@@ -13,7 +13,7 @@ module Neography
             :query => query,
             :params => parameters
           }.to_json,
-          :headers => json_content_type.merge({'Accept' => 'application/json;stream=true'})
+          :headers => json_content_type.merge({'Accept' => 'application/json;stream=true;charset=UTF-8'})
         }
         
         @connection.post(optioned_path(cypher_options), options)

data/lib/neography/rest/node_labels.rb

@@ -17,11 +17,11 @@ module Neography
       def list
         @connection.get(base_path)
       end
-      
+
       def get(id)
-        @connection.get(node_path(:id => id))
+        @connection.get(node_path(:id => get_id(id)))
       end
-      
+
       def get_nodes(label)
         @connection.get(nodes_path(:label => label))
       end
@@ -37,9 +37,9 @@ module Neography
           ).to_json,
           :headers => json_content_type
         }
-        @connection.post(node_path(:id => id), options)
+        @connection.post(node_path(:id => get_id(id)), options)
       end
-      
+
       def set(id, label)
         options = {
           :body => (
@@ -47,11 +47,11 @@ module Neography
           ).to_json,
           :headers => json_content_type
         }
-        @connection.put(node_path(:id => id), options)
-      end      
+        @connection.put(node_path(:id => get_id(id)), options)
+      end
 
       def delete(id, label)
-        @connection.delete(delete_path(:id => id, :label => label))
+        @connection.delete(delete_path(:id => get_id(id), :label => label))
       end
 
 

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/integration/node_encoding_spec.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Neography::Node do
+
+  describe "create and new" do
+
+    it "can create a node with UTF-8 encoded properties" do
+      new_node = Neography::Node.create("name" => "美都池水")
+      new_node.name.should == "美都池水"
+    end
+
+    it "can create a node with more than one UTF-8 encoded properties" do
+      new_node = Neography::Node.create("first_name" => "美都", "last_name" => "池水")
+      new_node.first_name.should == "美都"
+      new_node.last_name.should == "池水"
+    end
+
+  end
+
+  describe "load" do
+    it "can get a node with UTF-8 encoded properties that exists" do
+      new_node = Neography::Node.create("first_name" => "美都", "last_name" => "池水")
+      existing_node = Neography::Node.load(new_node)
+      existing_node.should_not be_nil
+      existing_node.neo_id.should_not be_nil
+      existing_node.neo_id.should == new_node.neo_id
+      existing_node.first_name.should == "美都"
+      existing_node.last_name.should == "池水"
+    end
+
+    it "can get a node with UTF-8 encoded properties from an index" do
+      @neo = Neography::Rest.new
+      new_node = Neography::Node.create("first_name" => "美都", "last_name" => "池水")
+      key = generate_text(6)
+      value = generate_text
+      @neo.add_node_to_index("test_node_index", key, value, new_node)
+      node_from_index = @neo.get_node_index("test_node_index", key, value)
+      existing_node = Neography::Node.load(node_from_index)
+      existing_node.should_not be_nil
+      existing_node.neo_id.should_not be_nil
+      existing_node.neo_id.should == new_node.neo_id
+      existing_node.first_name.should == "美都"
+      existing_node.last_name.should == "池水"
+    end
+
+    it "can get a node with UTF-8 encoded properties that exists via cypher" do
+      new_node = Neography::Node.create("first_name" => "美都", "last_name" => "池水")
+      cypher = "START n = node({id}) return n"
+      @neo = Neography::Rest.new
+      results = @neo.execute_query(cypher, {:id => new_node.neo_id.to_i})
+      existing_node = Neography::Node.load(results)
+      existing_node.should_not be_nil
+      existing_node.neo_id.should_not be_nil
+      existing_node.neo_id.should == new_node.neo_id
+      existing_node.first_name.should == "美都"
+      existing_node.last_name.should == "池水"
+    end
+
+    it "can get columns of data from a node with UTF-8 encoded properties that exists via cypher" do
+      new_node = Neography::Node.create("first_name" => "美都", "last_name" => "池水")
+      cypher = "START me = node({id})
+                    RETURN me.first_name, me.last_name"
+      @neo = Neography::Rest.new
+      results = @neo.execute_query(cypher, {:id => new_node.neo_id.to_i})
+      results['data'][0].should == ["美都","池水"]
+    end
+
+  end
+
+end

data/spec/integration/rest_labels_spec.rb

@@ -16,9 +16,8 @@ describe Neography::Rest do
   describe "add_label" do
     it "can add a label to a node" do
       new_node = @neo.create_node
-      new_node_id = new_node["self"].split('/').last
-      @neo.add_label(new_node_id, "Person")
-      labels = @neo.get_node_labels(new_node_id)
+      @neo.add_label(new_node, "Person")
+      labels = @neo.get_node_labels(new_node)
       labels.should == ["Person"]
     end
 
@@ -39,7 +38,7 @@ describe Neography::Rest do
       labels.should == ["Actor", "Director"]
     end
   end
-  
+
   describe "set_label" do
     it "can set a label to a node" do
       new_node = @neo.create_node
@@ -47,17 +46,16 @@ describe Neography::Rest do
       @neo.set_label(new_node_id, "Person")
       labels = @neo.get_node_labels(new_node_id)
       labels.should == ["Person"]
-    end  
+    end
 
     it "can set a label to a node that already had a label" do
       new_node = @neo.create_node
-      new_node_id = new_node["self"].split('/').last
-      @neo.add_label(new_node_id, "Actor")
-      @neo.set_label(new_node_id, "Director")
-      labels = @neo.get_node_labels(new_node_id)
+      @neo.add_label(new_node, "Actor")
+      @neo.set_label(new_node, "Director")
+      labels = @neo.get_node_labels(new_node)
       labels.should == ["Director"]
-    end  
-    
+    end
+
     it "can set multiple labels to a node" do
       new_node = @neo.create_node
       new_node_id = new_node["self"].split('/').last
@@ -70,12 +68,11 @@ describe Neography::Rest do
   describe "delete_label" do
     it "can delete a label from a node" do
       new_node = @neo.create_node
-      new_node_id = new_node["self"].split('/').last
-      @neo.set_label(new_node_id, ["Actor", "Director"])
-      @neo.delete_label(new_node_id, "Actor")
-      labels = @neo.get_node_labels(new_node_id)
+      @neo.set_label(new_node, ["Actor", "Director"])
+      @neo.delete_label(new_node, "Actor")
+      labels = @neo.get_node_labels(new_node)
       labels.should == ["Director"]
-    end  
+    end
 
     it "can delete a label from a node that doesn't have one" do
       new_node = @neo.create_node
@@ -83,15 +80,15 @@ describe Neography::Rest do
       @neo.delete_label(new_node_id, "Actor")
       labels = @neo.get_node_labels(new_node_id)
       labels.should == []
-    end  
+    end
 
     it "cannot delete a label from a node that doesn't exist" do
       new_node = @neo.create_node
       new_node_id = new_node["self"].split('/').last
-      expect {      
+      expect {
         @neo.delete_label(new_node_id.to_i + 1, "Actor")
       }.to raise_error Neography::NodeNotFoundException
-    end  
+    end
   end
 
   describe "get_nodes_labeled" do
@@ -101,14 +98,14 @@ describe Neography::Rest do
       @neo.set_label(new_node_id, ["Actor", "Director"])
       nodes = @neo.get_nodes_labeled("Actor")
       nodes.last["self"].split('/').last.should == new_node_id
-    end  
+    end
 
     it "returns an empty array on non-existing label" do
       nodes = @neo.get_nodes_labeled("do_not_exist")
       nodes.should == []
-    end  
+    end
   end
-  
+
   describe "find_nodes_labeled" do
     it "can find a node with a label and a property" do
       new_node = @neo.create_node(:name => "max")
@@ -116,7 +113,7 @@ describe Neography::Rest do
       @neo.set_label(new_node_id, "clown")
       nodes = @neo.find_nodes_labeled("clown", { :name => "max" })
       nodes.last["self"].split('/').last.should == new_node_id
-    end  
+    end
 
     it "returns an empty array on non-existing label property" do
       new_node = @neo.create_node(:name => "max")
@@ -124,8 +121,8 @@ describe Neography::Rest do
       @neo.set_label(new_node_id, "clown")
       nodes = @neo.find_nodes_labeled("clown", { :name => "does_not_exist" })
       nodes.should == []
-    end  
+    end
+
+  end
 
-  end  
-  
-end
+end

data/spec/integration/rest_node_spec.rb

@@ -1,3 +1,5 @@
+# Encoding: utf-8
+
 require 'spec_helper'
 
 describe Neography::Rest do
@@ -71,6 +73,16 @@ describe Neography::Rest do
         @neo.get_node(fake_node)
       }.to raise_error Neography::NodeNotFoundException
     end
+    
+    it "can get a node with a tilde" do
+      new_node = @neo.create_node("name" => "Ateísmo Sureño")
+      new_node[:id] = new_node["self"].split('/').last
+      existing_node = @neo.get_node(new_node)
+      existing_node.should_not be_nil
+      existing_node.should have_key("self")
+      existing_node["self"].split('/').last.should == new_node[:id]
+      existing_node["data"]["name"].should == "Ateísmo Sureño"
+    end
   end
 
   describe "set_node_properties" do

data/spec/integration/rest_plugin_spec.rb

@@ -1,3 +1,5 @@
+# Encoding: utf-8
+
 require 'spec_helper'
 
 describe Neography::Rest do
@@ -51,6 +53,54 @@ describe Neography::Rest do
       existing_node["data"][0][0]["self"].split('/').last.should == id
     end
 
+    it "can perform a range query" do
+      name = generate_text(6)
+      new_node = @neo.create_node({:number => 3})
+      id = new_node["self"].split('/').last
+      @neo.create_node_index(name, "fulltext","lucene")
+      @neo.add_node_to_index(name, "number", 3, new_node) 
+      existing_node = @neo.find_node_index(name, "number:[1 TO 5]")
+      existing_node.first["self"].should == new_node["self"]
+      existing_node.first.should_not be_nil
+      existing_node.first["data"]["number"].should == 3
+      existing_node = @neo.execute_query("start n=node:#{name}(\"number:[1 TO 5]\") return n")
+      existing_node.should have_key("data")
+      existing_node.should have_key("columns")
+      existing_node["data"][0][0].should have_key("self")
+      existing_node["data"][0][0]["self"].split('/').last.should == id
+    end
+
+    it "can perform a range query with a term" do
+      name = generate_text(6)
+      new_node = @neo.create_node({:number => 3, :name => "Max"})
+      id = new_node["self"].split('/').last
+      @neo.create_node_index(name, "fulltext","lucene")
+      @neo.add_node_to_index(name, "number", 3, new_node) 
+      @neo.add_node_to_index(name, "name", "max", new_node) 
+      existing_node = @neo.find_node_index(name, "name:max AND number:[1 TO 5]")
+      existing_node.first["self"].should == new_node["self"]
+      existing_node.first.should_not be_nil
+      existing_node.first["data"]["number"].should == 3
+      existing_node.first["data"]["name"].should == "Max"
+      existing_node = @neo.execute_query("start n=node:#{name}(\"name:max AND number:[1 TO 5]\") return n")
+      existing_node.should have_key("data")
+      existing_node.should have_key("columns")
+      existing_node["data"][0][0].should have_key("self")
+      existing_node["data"][0][0]["self"].split('/').last.should == id
+    end
+
+
+    it "can get a node with a tilde" do
+      new_node = @neo.create_node("name" => "Ateísmo Sureño")
+      id = new_node["self"].split('/').last
+      existing_node = @neo.execute_query("start n=node(#{id}) return n")
+      existing_node.should_not be_nil
+      existing_node.should have_key("data")
+      existing_node.should have_key("columns")
+      existing_node["data"][0][0]["self"].split('/').last.should == id
+      existing_node["data"][0][0]["data"]["name"].should == "Ateísmo Sureño"
+    end
+
     it "can get the a node with a variable" do
       new_node = @neo.create_node
       id = new_node["self"].split('/').last

data/spec/unit/rest/cypher_spec.rb

@@ -10,7 +10,7 @@ module Neography
       it "executes a cypher query" do
         options = {
           :body=>"{\"query\":\"SOME QUERY\",\"params\":{\"foo\":\"bar\",\"baz\":\"qux\"}}",
-          :headers=>{"Content-Type"=>"application/json", "Accept"=>"application/json;stream=true"}
+          :headers=>{"Content-Type"=>"application/json", "Accept"=>"application/json;stream=true;charset=UTF-8"}
         }
         connection.should_receive(:post).with("/cypher", options)
         subject.query("SOME QUERY", { :foo => "bar", :baz => "qux" })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -244,6 +244,7 @@ files:
 - spec/integration/authorization_spec.rb
 - spec/integration/index_spec.rb
 - spec/integration/neography_spec.rb
+- spec/integration/node_encoding_spec.rb
 - spec/integration/node_path_spec.rb
 - spec/integration/node_relationship_spec.rb
 - spec/integration/node_spec.rb
@@ -324,6 +325,7 @@ test_files:
 - spec/integration/authorization_spec.rb
 - spec/integration/index_spec.rb
 - spec/integration/neography_spec.rb
+- spec/integration/node_encoding_spec.rb
 - spec/integration/node_path_spec.rb
 - spec/integration/node_relationship_spec.rb
 - spec/integration/node_spec.rb