neography 0.0.24 → 0.0.25

data/.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>com.aptana.ruby.core.rubynature</nature>

data/CONTRIBUTORS

@@ -9,4 +9,8 @@ Contributors:
 * Stephen Becker IV
 * Thomas Baum
 * Maximilian Schulz
-* Hesham Amiri
+* Hesham Amiri
+* Pablo Fernandez
+* Nick Reavill
+* Marcel Sherf
+* David Pitman

data/Gemfile.lock

@@ -1,10 +1,12 @@
 PATH
   remote: .
   specs:
-    neography (0.0.19)
-      httparty (= 0.7.8)
+    neography (0.0.20)
+      crack (= 0.1.8)
+      httparty (= 0.8.1)
       json
       os
+      rake (>= 0.8.7)
       rubyzip
 
 GEM
@@ -12,9 +14,12 @@ GEM
   specs:
     crack (0.1.8)
     diff-lcs (1.1.3)
-    httparty (0.7.8)
-      crack (= 0.1.8)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
     json (1.6.4)
+    multi_json (1.0.4)
+    multi_xml (0.4.1)
     net-http-spy (0.2.1)
     os (0.9.5)
     rake (0.8.7)

data/README.rdoc

@@ -7,8 +7,10 @@ Neography is a thin Ruby wrapper to the Neo4j Rest API, for more information:
 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
 
 Complement to Neography are the:
-Neology Gem at https://github.com/lordkada/neology by Carlo Alberto Degli Atti
-Neoid Gem at https://github.com/elado/neoid by Elad Ossadon
+
+* {Neo4j Active Record Adapter}[https://github.com/yournextleap/activerecord-neo4j-adapter] by Nikhil Lanjewar 
+* {Neology}[https://github.com/lordkada/neology] by Carlo Alberto Degli Atti
+* {Neoid}[https://github.com/elado/neoid] by Elad Ossadon
 
 An alternative is the Architect4r Gem at https://github.com/namxam/architect4r by Maximilian Schulz 
 
@@ -72,7 +74,9 @@ If you are not using Rails, then add:
 
   require 'neography/tasks'
 
-to your Rakefile to have access to these tasks.
+to your Rakefile to have access to these tasks.  
+
+rake neo4j:install requires wget to be installed.  It will download and install Neo4j into a neo4j directory in your project regardless of what version you choose.
 
 
 === Documentation
@@ -189,6 +193,8 @@ To Use:
              [:set_node_property, node2, {"name" => "Jerry"}]              # Sets the property of two nodes
   @neo.batch [:create_unique_node, index_name, key, value, 
                {"age" => 33, "name" => "Max"}]                             # Creates a unique node
+  @neo.batch [:get_node_relationships, node1, "out",  
+             [:get_node_relationships, node2, "out"]                       # Get node relationships in a batch
   @neo.batch [:get_relationship, rel1],
              [:get_relationship, rel2]                                     # Gets two relationships in a batch
   @neo.batch [:create_relationship, "friends",
@@ -272,6 +278,7 @@ The Neo4j ID is available by using node.neo_id .
   new_rel.start_node                                                   # Get the start/from node of a relationship
   new_rel.end_node                                                     # Get the end/to node of a relationship
   new_rel.other_node(n2)                                               # Get the other node of a relationship
+  new_rel.attributes                                                   # Get the attributes of the relationship as an array
 
   existing_rel = Neography::Relationship.load(12)                      # Get an existing relationship by id
   existing_rel.del                                                     # Delete a relationship
@@ -341,6 +348,26 @@ Phase 2 way of doing these:
 *  {Facebook}[https://github.com/maxdemarzi/neography/blob/master/examples/facebook_v2.rb]
 *  {Linked In}[https://github.com/maxdemarzi/neography/blob/master/examples/linkedin_v2.rb]
 
+=== Testing
+
+To run testing locally you will need to have two instances of the server running. There is some 
+good advice on how to set up the a second instance on the 
+{neo4j site}[http://docs.neo4j.org/chunked/stable/server-installation.html#_multiple_server_instances_on_one_machine]. 
+Connect to the second instance in your testing environment, for example:
+
+  if Rails.env.development?
+    @neo  = Neography::Rest.new({:port => 7474})
+  elsif Rails.env.test?
+    @neo  = Neography::Rest.new({:port => 7475})
+  end
+
+Install the test-delete-db-extension plugin, as mentioned in the neo4j.org docs, if you want to use 
+the Rest clean_database method to empty your database between tests. In Rspec, for example, 
+put this in your spec_helper.rb:
+
+  config.before(:each) do
+    @neo.clean_database("yes_i_really_want_to_clean_the_database")
+  end
 
 === To Do
 

data/lib/neography.rb

@@ -16,6 +16,7 @@ end
 DIRECTIONS = ["incoming", "in", "outgoing", "out", "all", "both"]
 
 require 'cgi'
+require 'crack'
 require 'httparty'
 require 'json'
 require 'logger'
@@ -23,6 +24,7 @@ require 'ostruct'
 require 'os'
 require 'zip/zipfilesystem'
 
+require 'neography/crack_parser'
 require 'neography/config'
 require 'neography/rest'
 require 'neography/neography'

data/lib/neography/config.rb

@@ -1,6 +1,6 @@
 module Neography
   class Config 
-    class << self; attr_accessor :protocol, :server, :port, :directory, :cypher_path, :gremlin_path, :log_file, :log_enabled, :logger, :max_threads, :authentication, :username, :password end
+    class << self; attr_accessor :protocol, :server, :port, :directory, :cypher_path, :gremlin_path, :log_file, :log_enabled, :logger, :max_threads, :authentication, :username, :password, :parser end
 
     @protocol       = 'http://'
     @server         = 'localhost'
@@ -15,5 +15,6 @@ module Neography
     @authentication = {}
     @username       = nil
     @password       = nil
+    @parser         = {:parser => CrackParser}
   end
 end

data/lib/neography/crack_parser.rb

@@ -0,0 +1,7 @@
+class CrackParser < HTTParty::Parser
+ 
+  protected 
+    def json
+      Crack::JSON.parse(body)
+    end
+end

data/lib/neography/relationship.rb

@@ -55,6 +55,11 @@ module Neography
     def exist?
       !self.start_node.neo_server.get_relationship(self.neo_id).nil?
     end
+    
+    def attributes
+      attrs = self.methods - OpenStruct.instance_methods - Neography::Relationship.instance_methods
+      attrs.values_at(*attrs.each_index.select {|i| i.even?})
+    end
 
     def other_node(node)
       if node == @start_node
@@ -65,4 +70,4 @@ module Neography
     end
 
   end
-end
+end

data/lib/neography/rest.rb

@@ -1,8 +1,9 @@
 module Neography
+  
   class Rest
     include HTTParty
-
-    attr_accessor :protocol, :server, :port, :directory, :cypher_path, :gremlin_path, :log_file, :log_enabled, :logger, :max_threads, :authentication, :username, :password
+    
+    attr_accessor :protocol, :server, :port, :directory, :cypher_path, :gremlin_path, :log_file, :log_enabled, :logger, :max_threads, :authentication, :username, :password, :parser
 
       def initialize(options=ENV['NEO4J_URL'] || {})
         init = {:protocol       => Neography::Config.protocol, 
@@ -16,7 +17,9 @@ module Neography
                 :max_threads    => Neography::Config.max_threads,
                 :authentication => Neography::Config.authentication,
                 :username       => Neography::Config.username,
-                :password       => Neography::Config.password}
+                :password       => Neography::Config.password,
+                :parser         => Neography::Config.parser
+                }
 
         unless options.respond_to?(:each_pair)
           url = URI.parse(options)
@@ -44,6 +47,7 @@ module Neography
         @max_threads    = init[:max_threads]
         @authentication = Hash.new
         @authentication = {"#{init[:authentication]}_auth".to_sym => {:username => init[:username], :password => init[:password]}} unless init[:authentication].empty?
+        @parser         = init[:parser]
       end
 
       def configure(protocol, server, port, directory)
@@ -382,6 +386,17 @@ module Neography
          options = { :body => batch.to_json, :headers => {'Content-Type' => 'application/json'} } 
          post("/batch", options)
       end
+      
+      # For testing (use a separate neo4j instance)
+      # call this before each test or spec
+      def clean_database(sanity_check = "not_really")
+        if sanity_check == "yes_i_really_want_to_clean_the_database"
+          delete("/cleandb/secret-key")
+          true
+        else
+          false
+        end
+      end
             
       private
 
@@ -415,6 +430,10 @@ module Neography
             {:method => "GET", :to => "/index/node/#{args[1]}/#{args[2]}/#{args[3]}"}
           when :get_relationship_index
             {:method => "GET", :to => "/index/relationship/#{args[1]}/#{args[2]}/#{args[3]}"}
+          when :get_node_relationships
+            {:method => "GET", :to => "/node/#{get_id(args[1])}/relationships/#{args[2] || 'all'}"}
+          else
+            raise "Unknown option #{args[0]}"
         end
      end
 
@@ -435,7 +454,7 @@ module Neography
             @logger.error "Invalid data sent #{body}"  if @log_enabled
             nil
           when 404
-            @logger.error "#{body}" if @log_enabled
+            @logger.error "Not Found #{body}" if @log_enabled
             nil
           when 409
             @logger.error "Node could not be deleted (still has relationships?)" if @log_enabled
@@ -444,19 +463,19 @@ module Neography
       end
 
        def get(path,options={})
-          evaluate_response(HTTParty.get(configuration + URI.encode(path), options.merge!(@authentication)))
+          evaluate_response(HTTParty.get(configuration + URI.encode(path), options.merge!(@authentication).merge!(@parser)))
        end
 
        def post(path,options={})
-          evaluate_response(HTTParty.post(configuration + URI.encode(path), options.merge!(@authentication)))
+          evaluate_response(HTTParty.post(configuration + URI.encode(path), options.merge!(@authentication).merge!(@parser)))
        end
 
        def put(path,options={})
-          evaluate_response(HTTParty.put(configuration + URI.encode(path), options.merge!(@authentication)))
+          evaluate_response(HTTParty.put(configuration + URI.encode(path), options.merge!(@authentication).merge!(@parser)))
        end
 
        def delete(path,options={})
-          evaluate_response(HTTParty.delete(configuration + URI.encode(path), options.merge!(@authentication)))
+          evaluate_response(HTTParty.delete(configuration + URI.encode(path), options.merge!(@authentication).merge!(@parser)))
        end
 
       def get_id(id)

data/lib/neography/tasks.rb

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

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/neography.gemspec

@@ -21,8 +21,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "net-http-spy", "0.2.1"
+  s.add_development_dependency "rake", "~> 0.8.7"
+  s.add_dependency "crack", "0.1.8"
+  s.add_dependency "httparty", "0.8.1"
   s.add_dependency "rake", ">= 0.8.7"
-  s.add_dependency "httparty", "~> 0.7.8"
   s.add_dependency "json"
   s.add_dependency "os"
   s.add_dependency "rubyzip"

data/spec/integration/rest_batch_spec.rb

@@ -311,6 +311,24 @@ describe Neography::Rest do
                                 [:add_relationship_to_index, "test_relationship_index", key, value, "{4}"] 
       batch_result.should_not be_nil
     end
+
+    it "can get multiple relationships" do
+      node1 = @neo.create_node
+      node2 = @neo.create_node
+      node3 = @neo.create_node
+      new_relationship1 = @neo.create_relationship("friends", node1, node2)
+      new_relationship2 = @neo.create_relationship("brothers", node1, node3)
+      batch_result = @neo.batch [:get_node_relationships, node1]
+      batch_result.first["body"][0]["type"].should == "friends"
+      batch_result.first["body"][0]["start"].split('/').last.should == node1["self"].split('/').last
+      batch_result.first["body"][0]["end"].split('/').last.should == node2["self"].split('/').last
+      batch_result.first["body"][0]["self"].should == new_relationship1["self"]
+      batch_result.first["body"][1]["type"].should == "brothers"
+      batch_result.first["body"][1]["start"].split('/').last.should == node1["self"].split('/').last
+      batch_result.first["body"][1]["end"].split('/').last.should == node3["self"].split('/').last
+      batch_result.first["body"][1]["self"].should == new_relationship2["self"]
+    end
+
   end
   
 end

metadata

@@ -1,100 +1,167 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: neography
-version: !ruby/object:Gem::Version
-  version: 0.0.24
+version: !ruby/object:Gem::Version 
+  hash: 45
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 25
+  version: 0.0.25
 platform: ruby
-authors:
+authors: 
 - Max De Marzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-04-04 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &81537140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *81537140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: net-http-spy
-  requirement: &81536810 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
         version: 0.2.1
   type: :development
-  prerelease: false
-  version_requirements: *81536810
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &81536470 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-  type: :runtime
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: crack
   prerelease: false
-  version_requirements: *81536470
-- !ruby/object:Gem::Dependency
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 1
+        - 8
+        version: 0.1.8
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: httparty
-  requirement: &81535920 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.8
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 61
+        segments: 
+        - 0
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *81535920
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &81535730 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
   type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: *81535730
-- !ruby/object:Gem::Dependency
-  name: os
-  requirement: &81518230 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: os
   prerelease: false
-  version_requirements: *81518230
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: &81517920 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rubyzip
   prerelease: false
-  version_requirements: *81517920
-description: A Ruby wrapper to the Neo4j Rest API see http://components.neo4j.org/neo4j-rest/
-  for more details.
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
+description: A Ruby wrapper to the Neo4j Rest API see http://components.neo4j.org/neo4j-rest/ for more details.
 email: maxdemarzi@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .project
 - .travis.yml
@@ -113,6 +180,7 @@ files:
 - examples/traversal_example2.rb
 - lib/neography.rb
 - lib/neography/config.rb
+- lib/neography/crack_parser.rb
 - lib/neography/equal.rb
 - lib/neography/index.rb
 - lib/neography/neography.rb
@@ -150,26 +218,36 @@ files:
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/neography
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: neography
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: ruby wrapper to Neo4j Rest API
 test_files: []
+