related 0.6.4 → 0.6.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 70a2db50fca75efa1347b6ba41ea376cd98837dc
+  data.tar.gz: a714af9f8116c1792c81748d7d3b250e548d36df
+SHA512:
+  metadata.gz: b28c5d6cba03e88a78017c1aa0de067e6fd033acd441db56bf4b222e1a4e484d9af773ee5309fe9ac199bf06927aa26fbe77532382eb8f8813c24345e4da218b
+  data.tar.gz: 29a74e4b10cec1e3ca460eb7de6a5ee943b9410c8003986a13cbf44258e24a4cd57c720946978cf8a1ff66dc8f7311d666bc0929940a709a13da28e989e65182

data/lib/related/entity.rb

@@ -17,8 +17,13 @@ module Related
     attr_reader :id
     attr_reader :attributes
 
+    validates_with CheckRedisUniqueness, on: :create
+
     def initialize(attributes = {})
       @attributes = {}
+
+      @_internal_id = attributes.delete(:id) || Related.generate_id
+
       attributes.each do |key,value|
         serializer = self.class.property_serializer(key)
         @attributes[key.to_s] = serializer ?
@@ -156,9 +161,8 @@ module Related
 
     def create
       run_callbacks :create do
-        raise Related::ValidationsFailed, self unless valid?
-        @id = Related.generate_id
-        @attributes ||= {}
+        raise Related::ValidationsFailed, self unless valid?(:create)
+        @id = @_internal_id
         @attributes.merge!('created_at' => Time.now.utc.iso8601)
         Related.redis.hmset(@id, *@attributes.to_a.flatten)
       end
@@ -167,8 +171,7 @@ module Related
 
     def update
       run_callbacks :update do
-        raise Related::ValidationsFailed, self unless valid?
-        @attributes ||= {}
+        raise Related::ValidationsFailed, self unless valid?(:update)
         @attributes.merge!('updated_at' => Time.now.utc.iso8601)
         Related.redis.hmset(@id, *@attributes.to_a.flatten)
       end

data/lib/related/relationship.rb

@@ -4,9 +4,7 @@ module Related
     validates_presence_of :label, :start_node_id, :end_node_id
 
     def initialize(*attributes)
-      if attributes.first.is_a?(String)
-        @id = attributes.first
-      end
+      @_internal_id = attributes.first.is_a?(String) ? attributes.first : Related.generate_id
       @attributes = attributes.last
     end
 

data/lib/related/validations/check_redis_uniqueness.rb

@@ -0,0 +1,11 @@
+module Related
+  class CheckRedisUniqueness < ActiveModel::Validator
+    def validate(entity)
+      internal_id = entity.instance_variable_get(:@_internal_id)
+
+      if Related.redis.exists(internal_id)
+        entity.errors[:id] << "#{internal_id.inspect} already exists."
+      end
+    end
+  end
+end

data/lib/related/version.rb

@@ -1,3 +1,3 @@
 module Related
-  Version = VERSION = '0.6.4'
+  Version = VERSION = '0.6.5'
 end

data/lib/related.rb

@@ -5,6 +5,7 @@ require 'active_model'
 require 'related/version'
 require 'related/helpers'
 require 'related/exceptions'
+require 'related/validations/check_redis_uniqueness'
 require 'related/entity'
 require 'related/node'
 require 'related/relationship'

data/test/custom_id_attribute_test.rb

@@ -0,0 +1,35 @@
+require File.expand_path('test/test_helper')
+
+class CustomIdAttribute < ActiveModel::TestCase
+
+  class FakeThing < Related::Node
+    property :id, Integer
+    property :name, String
+  end
+
+  def setup
+    Related.redis.flushall
+  end
+
+  def test_manually_set_id
+    FakeThing.create(id: 42, name: "Bond, James Bond")
+
+    found = FakeThing.find(42)
+
+    assert_equal 42, found.id
+    assert_equal "Bond, James Bond", found.name
+  end
+
+  def test_unique_ids
+    FakeThing.create(id: 42, name: "Bond, James Bond")
+
+    assert_raise Related::ValidationsFailed do
+      FakeThing.create(id: 42, name: "Black Bears")
+    end
+
+    found = FakeThing.find(42)
+
+    assert_equal 42, found.id
+    assert_equal "Bond, James Bond", found.name
+  end
+end

data/test/test_helper.rb

@@ -2,9 +2,9 @@
 dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift dir + '/../lib'
 
-gem 'minitest'
 require 'rubygems'
-require 'minitest/unit'
+require 'bundler/setup'
+require 'test/unit'
 require 'related'
 require 'redis/distributed'
 

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: related
 version: !ruby/object:Gem::Version
-  version: 0.6.4
-  prerelease: 
+  version: 0.6.5
 platform: ruby
 authors:
 - Niklas Holmgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70134047954640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70134047954640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70134047954040 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70134047954040
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70134047953660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70134047953660
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Related is a Redis-backed high performance distributed graph database.
 email: niklas@sutajio.se
 executables: []
@@ -64,15 +72,13 @@ files:
 - lib/related/node.rb
 - lib/related/relationship.rb
 - lib/related/root.rb
+- lib/related/validations/check_redis_uniqueness.rb
 - lib/related/version.rb
 - lib/related.rb
 - test/active_model_test.rb
+- test/custom_id_attribute_test.rb
 - test/custom_node_test.rb
 - test/data_flow_test.rb
-- test/dump-1.rdb
-- test/dump-2.rdb
-- test/dump-3.rdb
-- test/dump-4.rdb
 - test/follower_test.rb
 - test/model_test.rb
 - test/performance_test.rb
@@ -84,27 +90,26 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/sutajio/related/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Related is a Redis-backed high performance distributed graph database.
 test_files: []

data/test/dump-1.rdb

@@ -1 +0,0 @@
-REDIS0006�ܳC�Z��V

data/test/dump-2.rdb

@@ -1 +0,0 @@
-REDIS0006�ܳC�Z��V

data/test/dump-3.rdb

@@ -1 +0,0 @@
-REDIS0006�ܳC�Z��V

data/test/dump-4.rdb

@@ -1 +0,0 @@
-REDIS0006�ܳC�Z��V