related 0.6.3 → 0.6.4

data/README.md

@@ -188,6 +188,13 @@ node.outgoing(:attending).options(
 )
 ```
 
+You can also specify a simple model class if you don't need to dynamically
+instantiate different model classes based on an attribute.
+
+````ruby
+Related::Node.find(..., :model => Event)
+```
+
 Weight
 ------
 

data/lib/related/entity.rb

@@ -203,7 +203,7 @@ module Related
           raise Related::NotFound, id
         end
       end
-      klass = options[:model] ? options[:model].call(attributes) : self
+      klass = get_model(options[:model], attributes)
       klass.new.send(:load_attributes, id, attributes)
     end
 
@@ -216,23 +216,30 @@ module Related
         end
       end
       objects = []
+
       ids.each_with_index do |id,i|
         if options[:fields]
           attributes = {}
           res[i].each_with_index do |value, i|
             attributes[options[:fields][i]] = value
           end
-          klass = options[:model] ? options[:model].call(attributes) : self
+          klass = get_model(options[:model], attributes)
           objects << klass.new.send(:load_attributes, id, attributes)
         else
           attributes = res[i].is_a?(Array) ? Hash[*res[i]] : res[i]
-          klass = options[:model] ? options[:model].call(attributes) : self
+          klass = get_model(options[:model], attributes)
           objects << klass.new.send(:load_attributes, id, attributes)
         end
       end
       objects
     end
 
+    def self.get_model(model, attributes)
+      return self unless model
+
+      model.is_a?(Proc) ? model.call(attributes) : model
+    end
+
     def self.pipelined_fetch(ids, &block)
       Related.redis.pipelined do
         ids.each do |id|

data/lib/related/version.rb

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

data/test/dump-1.rdb

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

data/test/dump-2.rdb

@@ -1 +1 @@
-REDIS0002�
+REDIS0006�ܳC�Z��V

data/test/dump-3.rdb

@@ -1 +1 @@
-REDIS0002�
+REDIS0006�ܳC�Z��V

data/test/dump-4.rdb

@@ -1 +1 @@
-REDIS0002�
+REDIS0006�ܳC�Z��V

data/test/follower_test.rb

@@ -5,7 +5,7 @@ class User < Related::Node
   include Related::Follower
 end
 
-class FollowerTest < Test::Unit::TestCase
+class FollowerTest < MiniTest::Unit::TestCase
 
   def setup
     Related.redis.flushall

data/test/model_test.rb

@@ -50,6 +50,9 @@ class ModelTest < ActiveModel::TestCase
     nodes = e1.outgoing(:test).nodes.options(:model =>
       lambda {|attributes| attributes['popularity'].to_f > 0.5 ? Event : Related::Node }).to_a
     assert_equal Event, nodes.first.class
+
+    nodes = Related::Node.find(e1.id, e2.id, model: Event)
+    assert_equal [Event, Event], nodes.map(&:class)
   end
 
   def test_custom_weight

data/test/performance_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('test/test_helper')
 require 'benchmark'
 
-class PerformanceTest < Test::Unit::TestCase
+class PerformanceTest < MiniTest::Unit::TestCase
 
   def setup
     Related.redis.flushall

data/test/redis-test-1.conf

@@ -105,11 +105,4 @@ databases 16
 # to upgrade. With maxmemory after the limit is reached you'll start to get
 # errors for write operations, and this may even lead to DB inconsistency.
 
-# maxmemory <bytes>
-
-############################### ADVANCED CONFIG ###############################
-
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
+# maxmemory <bytes>

data/test/redis-test-2.conf

@@ -105,11 +105,4 @@ databases 16
 # to upgrade. With maxmemory after the limit is reached you'll start to get
 # errors for write operations, and this may even lead to DB inconsistency.
 
-# maxmemory <bytes>
-
-############################### ADVANCED CONFIG ###############################
-
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
+# maxmemory <bytes>

data/test/redis-test-3.conf

@@ -105,11 +105,4 @@ databases 16
 # to upgrade. With maxmemory after the limit is reached you'll start to get
 # errors for write operations, and this may even lead to DB inconsistency.
 
-# maxmemory <bytes>
-
-############################### ADVANCED CONFIG ###############################
-
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
+# maxmemory <bytes>

data/test/redis-test-4.conf

@@ -105,11 +105,4 @@ databases 16
 # to upgrade. With maxmemory after the limit is reached you'll start to get
 # errors for write operations, and this may even lead to DB inconsistency.
 
-# maxmemory <bytes>
-
-############################### ADVANCED CONFIG ###############################
-
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
+# maxmemory <bytes>

data/test/related_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('test/test_helper')
 
-class RelatedTest < Test::Unit::TestCase
+class RelatedTest < MiniTest::Unit::TestCase
 
   def setup
     Related.redis.flushall

data/test/test_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: related
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70248787222180 !ruby/object:Gem::Requirement
+  requirement: &70134047954640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70248787222180
+  version_requirements: *70134047954640
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70248787220860 !ruby/object:Gem::Requirement
+  requirement: &70134047954040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70248787220860
+  version_requirements: *70134047954040
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70248787219920 !ruby/object:Gem::Requirement
+  requirement: &70134047953660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70248787219920
+  version_requirements: *70134047953660
 description: Related is a Redis-backed high performance distributed graph database.
 email: niklas@sutajio.se
 executables: []
@@ -69,6 +69,7 @@ files:
 - test/active_model_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