neography 1.0.2 → 1.0.3

data/.travis.yml

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

data/lib/neography.rb

@@ -1,18 +1,3 @@
-def find_and_require_user_defined_code
-  extensions_path = ENV['neography_extensions'] || "~/.neography"
-  extensions_path = File.expand_path(extensions_path)
-  if File.exists?(extensions_path)
-    Dir.open extensions_path do |dir|
-      dir.entries.each do |file|
-        if file.split('.').size > 1 && file.split('.').last == 'rb'
-          extension = File.join(File.expand_path(extensions_path), file) 
-          require(extension) && puts("Loaded Extension: #{extension}")
-        end
-      end
-    end
-  end
-end
-
 require 'cgi'
 require 'httparty'
 require 'json'
@@ -47,8 +32,6 @@ require 'neography/relationship'
 
 require 'neography/railtie' if defined? Rails::Railtie
 
-find_and_require_user_defined_code
-
 module Neography
 
   def self.configure

data/lib/neography/property.rb

@@ -11,10 +11,12 @@ module Neography
       key = key.to_sym
       k_str = key.to_s
       if value.nil?
-        if self.is_a? Neography::Node
-          neo_server.remove_node_properties(self.neo_id, [k_str])
-        else
-          neo_server.remove_relationship_properties(self.neo_id, [k_str])
+        unless @table[key].nil?
+          if self.is_a? Neography::Node
+            neo_server.remove_node_properties(self.neo_id, [k_str])
+          else
+            neo_server.remove_relationship_properties(self.neo_id, [k_str])
+          end
         end
       else
         if self.is_a? Neography::Node
@@ -33,7 +35,6 @@ module Neography
         meta = class << self; self; end
         meta.send(:define_method, name) { @table[name] }
         meta.send(:define_method, "#{name}=") do |value|
-          @table[name] = value
           self[name.to_sym] = value
         end
       end

data/lib/neography/relationship.rb

@@ -21,7 +21,7 @@ module Neography
 
         rel = db.get_relationship(rel)
         if rel
-          rel = Neography::Relationship.new(rel)
+          rel = Neography::Relationship.new(rel, db)
           rel.start_node = Neography::Node.load(rel.start_node, db)
           rel.end_node = Neography::Node.load(rel.end_node, db)
         end
@@ -34,7 +34,7 @@ module Neography
       @start_node = hash["start"].split('/').last
       @end_node = hash["end"].split('/').last
       @rel_type = hash["type"]
-      neo_server = server
+      self.neo_server = server
     end
 
     def neo_server

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.8")
+    args.with_defaults(:edition => "community", :version => "1.8.1")
     puts "Installing Neo4j-#{args[:edition]}-#{args[:version]}"
     
     if OS::Underlying.windows?

data/lib/neography/version.rb

@@ -1,3 +1,3 @@
 module Neography
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/neography.gemspec

@@ -19,7 +19,7 @@ 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"
+  s.add_development_dependency "rspec", ">= 2.11"
   s.add_development_dependency "net-http-spy", "0.2.1"
   s.add_development_dependency "rake", ">= 0.8.7"
   s.add_dependency "httparty", ">= 0.8.1"

data/spec/unit/config_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Neography
   describe Config do
 
-    subject(:config)
+    subject(:config) { Config.new }
 
     context "defaults" do
 

data/spec/unit/connection_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Neography
   describe Connection do
 
-    subject(:connection)
+    subject(:connection) { Connection.new }
 
     context "defaults" do
 

data/spec/unit/properties_spec.rb

@@ -40,11 +40,13 @@ module Neography
 
       it "resets properties as accessor" do
         @db.should_receive(:"remove_node_properties").with(42, ["key"])
+        node.key = "value"
         node.key = nil
       end
 
       it "resets properties as array entry" do
         @db.should_receive(:"remove_node_properties").with(42, ["key"])
+        node["key"] = "value"
         node["key"] = nil
       end
 
@@ -104,11 +106,13 @@ module Neography
 
       it "resets properties as accessor" do
         @db.should_receive(:"remove_relationship_properties").with(42, ["key"])
+        relationship.key = "value"
         relationship.key = nil
       end
 
       it "resets properties as array entry" do
         @db.should_receive(:"remove_relationship_properties").with(42, ["key"])
+        relationship["key"] = "value"
         relationship["key"] = nil
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neography
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: net-http-spy
   requirement: !ruby/object:Gem::Requirement