neography 0.0.17 → 0.0.18

data/.gitignore

@@ -1,4 +1,5 @@
+neo4j
 pkg/*
 *.gem
 .bundle
-log/*
+log/*

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    neography (0.0.16)
-      httparty (~> 0.7.3)
+    neography (0.0.17)
+      httparty (= 0.7.8)
       json
       os
       rubyzip
@@ -11,24 +11,23 @@ GEM
   remote: http://rubygems.org/
   specs:
     crack (0.1.8)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     httparty (0.7.8)
       crack (= 0.1.8)
-    json (1.6.1)
+    json (1.6.4)
+    json (1.6.4-java)
     net-http-spy (0.2.1)
-    os (0.9.4)
+    os (0.9.5)
     rake (0.8.7)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    rubyzip (0.9.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+    rubyzip (0.9.5)
 
 PLATFORMS
   java
@@ -38,4 +37,4 @@ DEPENDENCIES
   neography!
   net-http-spy (= 0.2.1)
   rake (~> 0.8.7)
-  rspec (~> 2.0.0.beta.22)
+  rspec

data/README.rdoc

@@ -44,7 +44,7 @@ Just add gem 'neography' to your Gemfile and run bundle install.
 The following tasks will be available to you:
   
   rake neo4j:install                           # Install Neo4j to the neo4j directory under your project
-  rake neo4j:install[community,1.6.M01]        # Install Neo4j Community edition, version 1.6.M01
+  rake neo4j:install[community,1.6.M02]        # Install Neo4j Community edition, version 1.6.M02
   rake neo4j:install[advanced,1.5]             # Install Neo4j Advanced edition, version 1.5 
   rake neo4j:install[enterprise,1.5]           # Install Neo4j Enterprise edition, version 1.5
   rake neo4j:start                             # Start Neo4j
@@ -284,11 +284,23 @@ Phase 2 way of doing these:
 
 === To Do
 
+* Batch functions
 * Phase 2 Index functionality
 * More Tests
 * More Examples
 * Mixins ?
 
+=== Contributing
+
+{<img src="https://secure.travis-ci.org/maxdemarzi/neography.png" />}[http://travis-ci.org/maxdemarzi/neography]
+
+Please create a {new issue}[https://github.com/maxdemarzi/neography/issues] if you run into any bugs.
+Contribute patches via pull requests.
+
+=== Help
+
+If you are just starting out, or need help send me an e-mail at maxdemazi@gmail.com.
+
 === Licenses
 
 * Neography - MIT, see the LICENSE file http://github.com/maxdemarzi/neography/tree/master/LICENSE.

data/lib/neography/node_traverser.rb

@@ -116,7 +116,7 @@ module Neography
       options["return filter"] = @filter unless @filter.nil?
       options["depth"] = @depth unless @depth.nil?
 
-      if @relationships[0]["type"].blank?
+      if @relationships[0]["type"].empty?
         rels = @from.neo_server.get_node_relationships(@from, @relationships[0]["direction"])
         case @relationships[0]["direction"]
           when "in"

data/lib/neography/property.rb

@@ -12,10 +12,8 @@ module Neography
       if value.nil?
         if self.is_a? Neography::Node
           neo_server.remove_node_properties(self.neo_id, [key])
-          @table[key] = nil
         else
           neo_server.remove_relationship_properties(self.neo_id, [key])
-          @table[key] = nil
         end
       else
         if self.is_a? Neography::Node
@@ -23,10 +21,9 @@ module Neography
         else
           neo_server.set_relationship_properties(self.neo_id, {k => value})
         end
-       
         new_ostruct_member(k) unless self.respond_to?(key)
-
       end
+      @table[key] = value
     end
 
 
@@ -40,6 +37,7 @@ module Neography
         self[name.to_sym] = x        
       end
     end
+   name
   end
 
 

data/lib/neography/relationship.rb

@@ -25,8 +25,8 @@ module Neography
         rel = db.get_relationship(rel)
         unless rel.nil?
           rel = Neography::Relationship.new(rel) 
-          rel.start_node = Neography::Node.load(rel.start_node) 
-          rel.end_node = Neography::Node.load(rel.end_node) 
+          rel.start_node = Neography::Node.load(rel.start_node, db) 
+          rel.end_node = Neography::Node.load(rel.end_node, db) 
         end
         rel
       end

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.6.M01")
+    args.with_defaults(:edition => "community", :version => "1.6.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.17"
+  VERSION = "0.0.18"
 end

data/neography.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec", "~> 2.0.0.beta.22"
+  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 "httparty", "~> 0.7.3"
+  s.add_dependency "httparty", "0.7.8"
   s.add_dependency "json"
   s.add_dependency "os"
   s.add_dependency "rubyzip"

data/spec/integration/node_spec.rb

@@ -148,6 +148,23 @@ describe Neography::Node do
       existing_node.eyes.should == "brown"
       existing_node.hair.should == "black"
     end
+
+    it "can pass issue 18" do
+      n = Neography::Node.create("name" => "Test")
+      n.prop = 1
+      n.prop.should == 1           
+      n.prop = 1                   
+      n.prop.should == 1           
+      n[:prop].should == 1         
+      n[:prop2] = 2                  
+      n[:prop2].should == 2          
+      n[:prop2] = 2                  
+      n[:prop2].should == 2          
+      n.name                         
+      n.name = "New Name"            
+      n.name.should == "New Name"
+    end
+
   end
 
   describe "get node properties" do

data/spec/integration/rest_batch_spec.rb

@@ -0,0 +1,80 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+describe Neography::Rest do
+  before(:each) do
+    @neo = Neography::Rest.new
+  end
+
+  describe "simple batch" do
+    it "can get a single node" do
+      pending
+    end
+    
+    it "can get multiple nodes" do
+      pending
+    end
+
+    it "can create a single node" do
+      pending
+    end
+
+    it "can create multiple nodes" do
+      pending
+    end
+
+    it "can update a single node" do
+      pending
+    end
+
+    it "can update multiple nodes" do
+      pending
+    end
+
+    it "can get a single relationship" do
+      pending
+    end
+    
+    it "can get multiple relationships" do
+      pending
+    end
+
+    it "can create a single relationship" do
+      pending
+    end
+
+    it "can create multiple relationships" do
+      pending
+    end
+
+    it "can update a single relationship" do
+      pending
+    end
+
+    it "can update multiple relationships" do
+      pending
+    end
+
+    it "can add a node to an index" do
+      pending
+    end
+  end
+
+  describe "referenced batch" do
+    it "can create a relationship from two newly created nodes" do
+      pending
+    end
+
+    it "can create a relationship from an existing node and a newly created node" do
+      pending
+    end
+
+    it "can add a newly created node to an index" do
+      pending
+    end
+
+    it "can add a newly created relationship to an index" do
+      pending
+    end
+  end
+  
+end

data/spec/integration/rest_gremlin_fail_spec.rb

@@ -25,7 +25,7 @@ describe Neography::Rest do
 
 
   describe "break gremlin" do
-    it "can can't handle node and relationship indexes with the same name" do
+    it "can can't handle node and relationship indexes with the same name", :break_gremlin => true do
       new_node1 = @neo.create_node
       new_node2 = @neo.create_node
       new_relationship = @neo.create_relationship("friends", new_node1, new_node2)

data/spec/spec_helper.rb

@@ -14,5 +14,5 @@ def generate_text(length=8)
 end
 
 RSpec.configure do |c|
-  c.filter_run_excluding :slow => true
+  c.filter_run_excluding :slow => true, :break_gremlin => true
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: neography
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Max De Marzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-30 00:00:00 Z
+date: 2012-01-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -23,16 +23,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196431
+        hash: 3
         segments: 
-        - 2
-        - 0
         - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -73,14 +69,14 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 19
         segments: 
         - 0
         - 7
-        - 3
-        version: 0.7.3
+        - 8
+        version: 0.7.8
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -175,6 +171,7 @@ files:
 - spec/integration/node_relationship_spec.rb
 - spec/integration/node_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