active_node 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2401f4a711f45da3c03f5d9950e39e50e7a2dfaf
-  data.tar.gz: eec605cd8b1bdb9a0f930aaf238569780eac6946
+  metadata.gz: 6fba7d60bad2e08d7dc4e0750638d7307e04fc17
+  data.tar.gz: 65347e49175fad7daae68761797e7c195bcfb287
 SHA512:
-  metadata.gz: 84f8abfac7991f1917389f32833d90eaa35043738ed16c4ff8695e8f631866f7ca42e9cf8efeb2ca55f32e4b54c445fd1518fcc28e01283d7d4e22c77bcd2bde
-  data.tar.gz: 6ac1809212df8a9211148c10a11d60e09efac009b1d1ceeb41af72f29f143f45ee01c9e96f32894800cbe0b63043ff566e4d34dc65dda4cc5708d91f21ca897d
+  metadata.gz: 35794dbe68d4e3345b8860fce9597a095d7888090b2da7336a175a4492e8c11577a339b0a2832242f03cbd7e23c11aa61ed6c723c1d62aa965500856a45fca96
+  data.tar.gz: 9cf27db0e024749342e86a971a8156a4e5efa99e91e327899fb0797ebacbf7817012f7d2867f2ccada1eb1256e799cb7b4a67bff469ca4c8b0e6815f346b1c39

data/.travis.yml

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

data/README.md

@@ -2,3 +2,72 @@ active_node
 ===========
 
 ActiveRecord style Object Graph Mapping for neo4j
+
+
+gem install active_node
+
+
+```ruby
+require 'rubygems'
+require 'active_node'
+require 'neography'
+
+Neography.configure do |config|
+  config.protocol           = "http://"
+  config.server             = "localhost"
+  config.port               = 7474
+  config.directory          = ""  # prefix this path with '/'
+  config.cypher_path        = "/cypher"
+  config.gremlin_path       = "/ext/GremlinPlugin/graphdb/execute_script"
+  config.log_file           = "neography.log"
+  config.log_enabled        = false
+  config.slow_log_threshold = 0    # time in ms for query logging
+  config.max_threads        = 20
+  config.authentication     = nil  # 'basic' or 'digest'
+  config.username           = nil
+  config.password           = nil
+  config.parser             = MultiJsonParser
+  end
+
+class NeoUser < ActiveNode::Base
+  attribute :name, type: String
+  has_many :clients
+  validates :name, presence: true
+
+  def self.label
+    'User'
+  end
+end
+
+class Client < ActiveNode::Base
+  attribute :name, type: String
+
+  has_many :users, direction: :incoming, class_name: 'NeoUser'
+  has_one :address
+
+  validates :name, presence: true
+end
+
+class Address < ActiveNode::Base
+end
+
+class Person < ActiveNode::Base
+  attribute :name, type: String
+  attribute :multi
+  timestamps
+
+  has_many :people
+  has_many :children, class_name: "Person"
+  #has_many :sons, class_name: "Person"
+  has_one :father, type: :child, direction: :incoming, class_name: "Person"
+  has_one :address
+
+  validates :name, uniqueness: true
+end
+
+
+user = NeoUser.new(name: 'Heinrich')
+user.save
+client = Client.new(name: 'a', users: [user])
+client.save
+```

data/lib/active_node/persistence.rb

@@ -81,11 +81,11 @@ module ActiveNode
     end
 
     def to_param
-      id
+      id.to_s if persisted?
     end
 
     def persisted?
-      id
+      id.present?
     end
 
     def initialize hash={}, split_by=:respond_to_writer?
@@ -222,4 +222,4 @@ module ActiveNode
     end
 
   end
-end
+end

data/lib/active_node/validations/uniqueness_validator.rb

@@ -2,10 +2,19 @@ module ActiveNode
   module Validations
     class UniquenessValidator < ActiveModel::EachValidator # :nodoc:
       def validate_each(record, attribute, value)
-        if value && !record.class.find_by_cypher("Match (n:#{record.class.label}) where n.#{attribute} = {value} return n", value: value).empty?
+        if value && other_matching_records(record, attribute, value).any?
           record.errors.add(attribute, :taken, value: value)
         end
       end
+
+      private
+
+      def other_matching_records(record, attribute, value)
+        record.class.find_by_cypher(
+            "Match (n:#{record.class.label}) where n.#{attribute} = {value}#{' and id(n) <> {id}' if record.persisted?} return n",
+            value: value, id: record.id
+        )
+      end
     end
   end
 end

data/lib/active_node/version.rb

@@ -1,3 +1,3 @@
 module ActiveNode
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/spec/functional/base_spec.rb

@@ -15,4 +15,6 @@ describe ActiveNode::Base do
       ActiveNode::Base.subclass('Person').find(p.id)[:name].should == p.name
     end
   end
+
+  it_behaves_like "ActiveModel"
 end

data/spec/functional/persistence_spec.rb

@@ -80,6 +80,18 @@ describe ActiveNode::Persistence do
     end
   end
 
+  describe "#to_param" do
+    it "should return a string version of the id" do
+      person = Person.create!
+      person.to_param.should == person.id.to_s
+    end
+
+    it "should return nil if the id is nil" do
+      person = Person.new
+      person.to_param.should be_nil
+    end
+  end
+
   describe "#incoming" do
     it "can retrieve heterogenous models" do
       a = Address.create!
@@ -88,4 +100,4 @@ describe ActiveNode::Persistence do
       a.incoming(:address).should include(p, c)
     end
   end
-end
+end

data/spec/functional/validations_spec.rb

@@ -11,9 +11,16 @@ describe ActiveNode::Validations do
       Client.all.first.name.should == 'abc7'
     end
 
-    it "should validate uniqueness" do
-      Person.create! name: 'abc'
-      Person.new(name: 'abc').should_not be_valid
+    describe "with uniqueness constraint" do
+      it "should validate uniqueness" do
+        Person.create! name: 'abc'
+        Person.new(name: 'abc').should_not be_valid
+      end
+
+      it "should still be valid after save" do
+        person = Person.create! name: "abc"
+        person.should be_valid
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -22,6 +22,10 @@ Coveralls.wear!
 
 Dir[File.dirname(__FILE__) + '/models/*.rb'].each {|file| require file }
 
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }
+
 def generate_text(length=8)
   chars = 'abcdefghjkmnpqrstuvwxyz'
   key = ''
@@ -50,10 +54,10 @@ end
 def error_response(attributes)
   request_uri = double()
   request_uri.stub(:request_uri).and_return("")
-  
+
   http_header = double()
   http_header.stub(:request_uri).and_return(request_uri)
-  
+
   stub(
     http_header: http_header,
     code: attributes[:code],

data/spec/support/shared/active_model_specs.rb

@@ -0,0 +1,23 @@
+# Adapated from http://pivotallabs.com/making-sure-you-implement-the-activemodel-interface-fully/
+#
+# Originally adapted from rspec-rails http://github.com/rspec/rspec-rails/blob/master/spec/rspec/rails/mocks/mock_model_spec.rb
+# put this in a file in your spec/support directory
+# USAGE:
+#
+#    let(:model) { ModelUnderTest.new(params) }
+#    it_behaves_like "ActiveModel"
+
+shared_examples_for "ActiveModel" do
+  require 'test/unit/assertions'
+  require 'active_model/lint'
+  include Test::Unit::Assertions
+  include ActiveModel::Lint::Tests
+
+  ActiveModel::Lint::Tests.public_instance_methods.map { |method| method.to_s }.grep(/^test/).each do |method|
+    example(method.gsub('_', ' ')) { send method }
+  end
+
+  def model
+    subject
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_node
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -168,6 +168,7 @@ files:
 - spec/models/neo_user.rb
 - spec/models/person.rb
 - spec/spec_helper.rb
+- spec/support/shared/active_model_specs.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -201,3 +202,4 @@ test_files:
 - spec/models/neo_user.rb
 - spec/models/person.rb
 - spec/spec_helper.rb
+- spec/support/shared/active_model_specs.rb