rhoconnect 3.4.5 → 4.0.0.beta.10

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ require 'webmock/rspec'
 require 'rspec/autorun' # Required for Rcov to run with rspec '~> 2.8.0'
 if RUBY_VERSION =~ /1.9/ || defined?(JRUBY_VERSION)
   require 'simplecov'
+  require 'simplecov-rcov'
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
   SimpleCov.start do
     add_filter '/spec/'
   end
@@ -45,6 +47,7 @@ end
 
 require 'rhoconnect'
 include Rhoconnect
+require 'rhoconnect/server'
 
 # require RSpec shared examples
 SPEC_PATH = File.expand_path(File.dirname(__FILE__))
@@ -140,9 +143,19 @@ module TestHelpers
     end
   end
 
-  def set_zstate(state,assoc_key,append=false)
+  def set_source_queue_state(source, state,assoc_key,append=false)
     state.each do |dockey,data|
-      Store.put_zdata(dockey,assoc_key,data,append)
+      source.push_queue(dockey,assoc_key,data,append)
+    end
+  end
+
+  def set_doc_state(docobj, state,append=false)
+    state.each do |dockey,data|
+      if data.is_a?(Hash) or data.is_a?(Array)
+        docobj.put_data(dockey,data,append)
+      else
+        docobj.put_value(dockey,data)
+      end
     end
   end
 
@@ -173,11 +186,29 @@ module TestHelpers
     end
   end
 
-  def verify_zresult(result)
+  def verify_doc_result(docobj, result)
+    result.keys.sort.each do |dockey|
+      expected = result[dockey]
+      begin
+        if expected.is_a?(Hash)
+          docobj.get_data(dockey).should == expected
+        elsif expected.is_a?(Array)
+          docobj.get_data(dockey,Array).should == expected
+        else
+          docobj.get_value(dockey).should == expected
+        end
+      rescue RSpec::Expectations::ExpectationNotMetError => e
+        message = "\nVerifying `#{dockey}`\n\n" + e.to_s
+        Kernel::raise(RSpec::Expectations::ExpectationNotMetError.new(message))
+      end
+    end
+  end
+
+  def verify_source_queue_data(source, result)
     result.keys.sort.each do |dockey|
       expected = result[dockey]
       begin
-        data,assoc_keys = Store.get_zdata(dockey)
+        data,assoc_keys = source.get_queue(dockey)
         data.should == expected
       rescue RSpec::Expectations::ExpectationNotMetError => e
         message = "\nVerifying `#{dockey}`\n\n" + e.to_s

data/spec/stats/record_spec.rb

@@ -10,20 +10,20 @@ describe "Record" do
   
   before(:each) do
     @now = 9
-    Store.db.flushdb
+    Store.flush_all
     Store.stub!(:lock).and_yield
   end
   
   it "should add metric to the record and trim record size" do
     Time.stub!(:now).and_return { @now }
     10.times { @now += 1; Rhoconnect::Stats::Record.add('foo') }
-    Store.db.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
+    Store.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
   end
   
   it "should add single record" do
     Time.stub!(:now).and_return { @now += 1; @now }
     Rhoconnect::Stats::Record.add('foo')
-    Store.db.zrange('stat:foo', 0, -1).should == ["1:10"]
+    Store.zrange('stat:foo', 0, -1).should == ["1:10"]
   end
   
   it "should return type of metric" do
@@ -33,11 +33,11 @@ describe "Record" do
   
   it "should set string metric" do
     Rhoconnect::Stats::Record.set_value('foo', 'bar')
-    Store.db.get('stat:foo').should == 'bar'
+    Store.get_value('stat:foo').should == 'bar'
   end
   
   it "should get string metric" do
-    Store.db.set('stat:foo', 'bar')
+    Store.put_value('stat:foo', 'bar')
     Rhoconnect::Stats::Record.get_value('foo').should == 'bar'
   end
   
@@ -55,7 +55,7 @@ describe "Record" do
       Rhoconnect::Stats::Record.save_average('foo',time)
       time += 1
     end
-    Store.db.zrange('stat:foo', 0, -1).should == ["2.0,1.0:10", "2.0,5.0:12"]
+    Store.zrange('stat:foo', 0, -1).should == ["2.0,1.0:10", "2.0,5.0:12"]
   end
   
   it "should update metric" do
@@ -74,7 +74,7 @@ describe "Record" do
         @incr = 2
       end
     end
-    Store.db.zrange('stat:foo', 0, -1).should == ["1,1.0:14", "1,1.0:18", "1,1.0:20"]
+    Store.zrange('stat:foo', 0, -1).should == ["1,1.0:14", "1,1.0:18", "1,1.0:20"]
     Rhoconnect.stats = false
   end
   
@@ -87,15 +87,15 @@ describe "Record" do
   it "should reset metric" do
     Time.stub!(:now).and_return { @now }
     10.times { @now += 1; Rhoconnect::Stats::Record.add('foo') }
-    Store.db.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
+    Store.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
     Rhoconnect::Stats::Record.reset('foo')
-    Store.db.zrange('stat:foo', 0, -1).should == []
+    Store.zrange('stat:foo', 0, -1).should == []
   end
   
   it "should reset all metrics" do
     Rhoconnect::Stats::Record.add('foo')
     Rhoconnect::Stats::Record.add('bar')
     Rhoconnect::Stats::Record.reset_all
-    Store.db.keys('stat:*').should == []
+    Store.keys('stat:*').should == []
   end
 end

data/spec/{model_spec.rb → store_orm_spec.rb}

@@ -1,10 +1,10 @@
 # Taken from http://github.com/voloko/redis-model
 require File.join(File.dirname(__FILE__),'spec_helper')
 
-describe Rhoconnect::Model do
+describe Rhoconnect::StoreOrm do
   
   context "DSL" do
-    class TestDSL < Rhoconnect::Model
+    class TestDSL < Rhoconnect::StoreOrm
       field :foo
       list  :bar
       set   :sloppy
@@ -29,7 +29,7 @@ describe Rhoconnect::Model do
   
     it "should raise error on invalid type" do
       lambda do
-        class TestInvalidType < Rhoconnect::Model
+        class TestInvalidType < Rhoconnect::StoreOrm
           field :invalid, :invalid_type
         end
       end.should raise_error(ArgumentError, 'Unknown type invalid_type for field invalid')
@@ -37,7 +37,7 @@ describe Rhoconnect::Model do
   end
   
   context "field type cast" do
-    class TestType < Rhoconnect::Model
+    class TestType < Rhoconnect::StoreOrm
       field :foo_string, :string
       field :foo_json,   :json
       field :foo_date,   :datetime
@@ -48,23 +48,29 @@ describe Rhoconnect::Model do
       set   :set_date,   :datetime      
     end
     
-    class TestValidateType < Rhoconnect::Model
+    class TestValidateType < Rhoconnect::StoreOrm
       field :v_field, :string
       validates_presence_of :v_field
     end
     
-    class TestLoadType < Rhoconnect::Model
+    class TestLoadType < Rhoconnect::StoreOrm
       field :something, :string
       attr_accessor :foo
     end
   
     before(:each) do
+      Store.create
+      Store.flush_all
       @xRedisMock = RSpec::Mocks::Mock.new
       @yRedisMock = RSpec::Mocks::Mock.new
+      @xRedisDbMock = RSpec::Mocks::Mock.new
+      @yRedisDbMock = RSpec::Mocks::Mock.new
       @x = TestType.with_key(1)
       @y = TestType.with_key(1)
-      @x.stub!(:redis).and_return(@xRedisMock)
-      @y.stub!(:redis).and_return(@yRedisMock)
+      @x.stub!(:store).and_return(@xRedisMock)
+      @y.stub!(:store).and_return(@yRedisMock)
+      @xRedisMock.stub!(:db).and_return(@xRedisDbMock)
+      @yRedisMock.stub!(:db).and_return(@yRedisDbMock)
     end
     
     it "should create with string id" do
@@ -96,23 +102,23 @@ describe Rhoconnect::Model do
     end
   
     it "should save string as is" do
-      @xRedisMock.should_receive(:[]=).with('test_type:1:foo_string', 'xxx')
-      @yRedisMock.should_receive(:[]).with('test_type:1:foo_string').and_return('xxx')
+      @xRedisMock.should_receive(:put_value).with('test_type:1:foo_string', 'xxx')
+      @yRedisMock.should_receive(:get_value).with('test_type:1:foo_string').and_return('xxx')
       @x.foo_string = 'xxx'
       @y.foo_string.should be_instance_of(String)
     end
   
     it "should marshal integer fields" do
-      @xRedisMock.should_receive(:[]=).with('test_type:1:foo_int', '12')
-      @yRedisMock.should_receive(:[]).with('test_type:1:foo_int').and_return('12')
+      @xRedisMock.should_receive(:put_value).with('test_type:1:foo_int', '12')
+      @yRedisMock.should_receive(:get_value).with('test_type:1:foo_int').and_return('12')
       @x.foo_int = 12
       @y.foo_int.should be_kind_of(Integer)
       @y.foo_int.should == 12
     end
   
     it "should marshal float fields" do
-      @xRedisMock.should_receive(:[]=).with('test_type:1:foo_float', '12.1')
-      @yRedisMock.should_receive(:[]).with('test_type:1:foo_float').and_return('12.1')
+      @xRedisMock.should_receive(:put_value).with('test_type:1:foo_float', '12.1')
+      @yRedisMock.should_receive(:get_value).with('test_type:1:foo_float').and_return('12.1')
       @x.foo_float = 12.1
       @y.foo_float.should be_kind_of(Float)
       @y.foo_float.should == 12.1
@@ -121,8 +127,8 @@ describe Rhoconnect::Model do
     it "should marshal datetime fields" do
       time = DateTime.now
       str  = time.strftime('%FT%T%z')
-      @xRedisMock.should_receive(:[]=).with('test_type:1:foo_date', str)
-      @yRedisMock.should_receive(:[]).with('test_type:1:foo_date').and_return(str)
+      @xRedisMock.should_receive(:put_value).with('test_type:1:foo_date', str)
+      @yRedisMock.should_receive(:get_value).with('test_type:1:foo_date').and_return(str)
       @x.foo_date = time
       @y.foo_date.should be_kind_of(DateTime)
       @y.foo_date.should.to_s == time.to_s
@@ -131,15 +137,15 @@ describe Rhoconnect::Model do
     it "should marshal json structs" do
       data = {'foo' => 'bar', 'x' => 2}
       str  = JSON.dump(data)
-      @xRedisMock.should_receive(:[]=).with('test_type:1:foo_json', str)
-      @yRedisMock.should_receive(:[]).with('test_type:1:foo_json').and_return(str)
+      @xRedisMock.should_receive(:put_value).with('test_type:1:foo_json', str)
+      @yRedisMock.should_receive(:get_value).with('test_type:1:foo_json').and_return(str)
       @x.foo_json = data
       @y.foo_json.should be_kind_of(Hash)
       @y.foo_json.should.inspect == data.inspect
     end
     
     it "should return nil for empty fields" do
-      @xRedisMock.should_receive(:[]).with('test_type:1:foo_date').and_return(nil)
+      @xRedisMock.should_receive(:get_value).with('test_type:1:foo_date').and_return(nil)
       @x.foo_date.should be_nil
     end
     
@@ -147,15 +153,15 @@ describe Rhoconnect::Model do
       data = DateTime.now
       str  = data.strftime('%FT%T%z')
       
-      @xRedisMock.should_receive('rpush').with('test_type:1:list_date', str)
-      @xRedisMock.should_receive('lset').with('test_type:1:list_date', 1, str)
-      @xRedisMock.should_receive('exists').with('test_type:1:list_date', str)
-      @xRedisMock.should_receive('lrem').with('test_type:1:list_date', 0, str)
-      @xRedisMock.should_receive('lpush').with('test_type:1:list_date', str)
-      @xRedisMock.should_receive('lrange').with('test_type:1:list_date', 0, 1).and_return([str])
-      @xRedisMock.should_receive('rpop').with('test_type:1:list_date').and_return(str)
-      @xRedisMock.should_receive('lpop').with('test_type:1:list_date').and_return(str)
-      @xRedisMock.should_receive('lindex').with('test_type:1:list_date', 0).and_return(str)
+      @xRedisDbMock.should_receive('rpush').with('test_type:1:list_date', str)
+      @xRedisDbMock.should_receive('lset').with('test_type:1:list_date', 1, str)
+      @xRedisDbMock.should_receive('exists').with('test_type:1:list_date', str)
+      @xRedisDbMock.should_receive('lrem').with('test_type:1:list_date', 0, str)
+      @xRedisDbMock.should_receive('lpush').with('test_type:1:list_date', str)
+      @xRedisDbMock.should_receive('lrange').with('test_type:1:list_date', 0, 1).and_return([str])
+      @xRedisDbMock.should_receive('rpop').with('test_type:1:list_date').and_return(str)
+      @xRedisDbMock.should_receive('lpop').with('test_type:1:list_date').and_return(str)
+      @xRedisDbMock.should_receive('lindex').with('test_type:1:list_date', 0).and_return(str)
       @x.list_date << data
       @x.list_date[1] = data
       @x.list_date.include?(data)
@@ -171,30 +177,24 @@ describe Rhoconnect::Model do
       data = DateTime.now
       str  = data.strftime('%FT%T%z')
 
-      @xRedisMock.should_receive('sadd').with('test_type:1:set_date', str)
-      @xRedisMock.should_receive('srem').with('test_type:1:set_date', str)
-      @xRedisMock.should_receive('sismember').with('test_type:1:set_date', str)
-      @xRedisMock.should_receive('smembers').with('test_type:1:set_date').and_return([str])
-      @xRedisMock.should_receive('sinter').with('test_type:1:set_date', 'x').and_return([str])
-      @xRedisMock.should_receive('sunion').with('test_type:1:set_date', 'x').and_return([str])
-      @xRedisMock.should_receive('sdiff').with('test_type:1:set_date', 'x', 'y').and_return([str])
+      @xRedisDbMock.should_receive('sadd').with('test_type:1:set_date', str)
+      @xRedisDbMock.should_receive('srem').with('test_type:1:set_date', str)
+      @xRedisDbMock.should_receive('sismember').with('test_type:1:set_date', str)
+      @xRedisDbMock.should_receive('smembers').with('test_type:1:set_date').and_return([str])
       @x.set_date << data
       @x.set_date.delete(data)
       @x.set_date.include?(data)
       @x.set_date.members[0].should be_kind_of(DateTime)
-      @x.set_date.intersect('x')[0].should be_kind_of(DateTime)
-      @x.set_date.union('x')[0].should be_kind_of(DateTime)
-      @x.set_date.diff('x', 'y')[0].should be_kind_of(DateTime)
     end
 
     it "should handle empty members" do
-      @xRedisMock.stub!(:smembers).and_return(nil)
+      @xRedisDbMock.stub!(:smembers).and_return(nil)
       @x.set_date.members.should == []
     end
   end
   
   context "increment/decrement" do
-    class TestIncrements < Rhoconnect::Model
+    class TestIncrements < Rhoconnect::StoreOrm
       field :foo, :integer
       field :bar, :string
       field :baz, :float
@@ -203,16 +203,16 @@ describe Rhoconnect::Model do
     before do
       @redisMock = RSpec::Mocks::Mock.new
       @x = TestIncrements.with_key(1)
-      @x.stub!(:redis).and_return(@redisMock)
+      @x.stub!(:store).and_return(@redisMock)
     end
     
     it "should send INCR when #increment! is called on an integer" do
-      @redisMock.should_receive(:incrby).with("test_increments:1:foo", 1)
+      @redisMock.should_receive(:update_count).with("test_increments:1:foo", 1)
       @x.increment!(:foo)
     end
     
     it "should send DECR when #decrement! is called on an integer" do
-      @redisMock.should_receive(:decrby).with("test_increments:1:foo", 1)
+      @redisMock.should_receive(:update_count).with("test_increments:1:foo", -1)
       @x.decrement!(:foo)
     end
     
@@ -225,7 +225,7 @@ describe Rhoconnect::Model do
   end
   
   context "redis commands" do
-    class TestCommands < Rhoconnect::Model
+    class TestCommands < Rhoconnect::StoreOrm
       field :foo
       list  :bar
       set   :sloppy
@@ -233,40 +233,42 @@ describe Rhoconnect::Model do
     
     before(:each) do
       @redisMock = RSpec::Mocks::Mock.new
+      @redisDbMock = RSpec::Mocks::Mock.new
       @x = TestCommands.with_key(1)
-      @x.stub!(:redis).and_return(@redisMock)
+      @x.stub!(:store).and_return(@redisMock)
+      @redisMock.stub!(:db).and_return(@redisDbMock)
     end
   
     it "should send GET on field read" do
-      @redisMock.should_receive(:[]).with('test_commands:1:foo')
+      @redisMock.should_receive(:get_value).with('test_commands:1:foo')
       @x.foo
     end
   
     it "should send SET on field write" do
-      @redisMock.should_receive(:[]=).with('test_commands:1:foo', 'bar')
+      @redisMock.should_receive(:put_value).with('test_commands:1:foo', 'bar')
       @x.foo = 'bar'
     end
   
     it "should send RPUSH on list <<" do
-      @redisMock.should_receive(:rpush).with('test_commands:1:bar', 'bar')
+      @redisDbMock.should_receive(:rpush).with('test_commands:1:bar', 'bar')
       @x.bar << 'bar'
     end
   
     it "should send SADD on set <<" do
-      @redisMock.should_receive(:sadd).with('test_commands:1:sloppy', 'bar')
+      @redisDbMock.should_receive(:sadd).with('test_commands:1:sloppy', 'bar')
       @x.sloppy << 'bar'
     end
     
     it "should delete separate fields" do
-      @redisMock.should_receive(:del).with('test_commands:1:foo')
+      @redisMock.should_receive(:delete_value).with('test_commands:1:foo')
       @x.delete :foo
     end
     
     it "should delete all field" do
-      @redisMock.should_receive(:del).with('test_commands:1:foo')
-      @redisMock.should_receive(:del).with('test_commands:1:rho__id')
-      @redisMock.should_receive(:del).with('test_commands:1:bar')
-      @redisMock.should_receive(:del).with('test_commands:1:sloppy')
+      @redisMock.should_receive(:delete_value).with('test_commands:1:foo')
+      @redisMock.should_receive(:delete_value).with('test_commands:1:rho__id')
+      @redisMock.should_receive(:delete_value).with('test_commands:1:bar')
+      @redisMock.should_receive(:delete_value).with('test_commands:1:sloppy')
       @x.delete
     end
   end