rhoconnect 4.0.4 → 5.1.1

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'rspec'
 require 'webmock/rspec'
-require 'rspec/autorun' # Required for Rcov to run with rspec '~> 2.8.0'
 
 require 'simplecov'
 require 'simplecov-rcov'
@@ -56,10 +55,10 @@ ENV['RACK_ENV'] = 'test'
 ERROR = '0_broken_object_id' unless defined? ERROR
 
 class Rhoconnect::Model::Base
-  def inject_result(result) 
+  def inject_result(result)
     @result = result
   end
-  
+
   def inject_tmpdoc(doctype)
     @tmp_docname = doctype
     @stash_size = 0
@@ -144,7 +143,7 @@ module TestHelpers
   end
 
   def setup_post_yield(response)
-    RestClient.stub!(:post).and_yield(response, nil, nil)
+    RestClient.stub(:post).and_yield(response, nil, nil)
   end
 
   def set_state(state,append=false)
@@ -345,7 +344,7 @@ module TestHelpers
   end
 
   def unzip_file(file,file_dir)
-    Zip::ZipFile.open(file) do |zip_file|
+    Zip::File.open(file) do |zip_file|
       zip_file.each do |f|
         f_path = File.join(file_dir,f.name)
         FileUtils.mkdir_p(File.dirname(f_path))

data/spec/stats/record_spec.rb

@@ -7,67 +7,68 @@ STATS_RECORD_SIZE = 8 unless defined? STATS_RECORD_SIZE
 include Rhoconnect
 
 describe "Record" do
-  
+
   before(:each) do
     @now = 9
+    Store.create
     Store.flush_all
-    Store.stub!(:lock).and_yield
+    Store.stub(:lock).and_yield
   end
-  
+
   it "should add metric to the record and trim record size" do
-    Time.stub!(:now).and_return { @now }
+    Time.stub(:now).and_return { @now }
     10.times { @now += 1; Rhoconnect::Stats::Record.add('foo') }
     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 }
+    Time.stub(:now).and_return { @now += 1; @now }
     Rhoconnect::Stats::Record.add('foo')
     Store.zrange('stat:foo', 0, -1).should == ["1:10"]
   end
-  
+
   it "should return type of metric" do
     Rhoconnect::Stats::Record.add('foo')
     Rhoconnect::Stats::Record.rtype('foo').should == 'zset'
   end
-  
+
   it "should set string metric" do
     Rhoconnect::Stats::Record.set_value('foo', 'bar')
     Store.get_value('stat:foo').should == 'bar'
   end
-  
+
   it "should get string metric" do
     Store.put_value('stat:foo', 'bar')
     Rhoconnect::Stats::Record.get_value('foo').should == 'bar'
   end
-  
+
   it "should get keys" do
     Rhoconnect::Stats::Record.add('foo')
     Rhoconnect::Stats::Record.add('bar')
     Rhoconnect::Stats::Record.keys.sort.should == ['bar','foo']
   end
-  
+
   it "should add absolute metric value" do
-    Time.stub!(:now).and_return { @now }
+    Time.stub(:now).and_return { @now }
     time = 0
-    4.times do 
+    4.times do
       @now += 1
       Rhoconnect::Stats::Record.save_average('foo',time)
       time += 1
     end
     Store.zrange('stat:foo', 0, -1).should == ["2.0,1.0:10", "2.0,5.0:12"]
   end
-  
+
   it "should update metric" do
     Rhoconnect.stats = true
     @incr = 0
-    Time.stub!(:now).and_return do
+    Time.stub(:now).and_return do
       if @incr > 0
         @now += 1
         @incr -= 1
       end
       @now
-    end  
+    end
     4.times do
       @now += 1
       Rhoconnect::Stats::Record.update('foo') do
@@ -77,21 +78,21 @@ describe "Record" do
     Store.zrange('stat:foo', 0, -1).should == ["1,1.0:14", "1,1.0:18", "1,1.0:20"]
     Rhoconnect.stats = false
   end
-  
+
   it "should get range of metric values" do
-    Time.stub!(:now).and_return { @now }
+    Time.stub(:now).and_return { @now }
     10.times { @now += 1; Rhoconnect::Stats::Record.add('foo') }
     Rhoconnect::Stats::Record.range('foo', 0, 1).should == ["2:12", "2:14"]
   end
-  
+
   it "should reset metric" do
-    Time.stub!(:now).and_return { @now }
+    Time.stub(:now).and_return { @now }
     10.times { @now += 1; Rhoconnect::Stats::Record.add('foo') }
     Store.zrange('stat:foo', 0, -1).should == ["2:12", "2:14", "2:16", "2:18"]
     Rhoconnect::Stats::Record.reset('foo')
     Store.zrange('stat:foo', 0, -1).should == []
   end
-  
+
   it "should reset all metrics" do
     Rhoconnect::Stats::Record.add('foo')
     Rhoconnect::Stats::Record.add('bar')

data/spec/store_orm_spec.rb

@@ -2,31 +2,31 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
 
 describe Rhoconnect::StoreOrm do
-  
+
   context "DSL" do
     class TestDSL < Rhoconnect::StoreOrm
       field :foo
       list  :bar
       set   :sloppy
     end
-  
+
     before(:each) do
       @x = TestDSL.with_key(1)
     end
-  
+
     it "should define rw accessors for field" do
       @x.should respond_to(:foo)
       @x.should respond_to(:foo=)
     end
-  
+
     it "should define r accessor for list" do
       @x.should respond_to(:bar)
     end
-  
+
     it "should define r accessor for set" do
       @x.should respond_to(:sloppy)
     end
-  
+
     it "should raise error on invalid type" do
       lambda do
         class TestInvalidType < Rhoconnect::StoreOrm
@@ -35,7 +35,7 @@ describe Rhoconnect::StoreOrm do
       end.should raise_error(ArgumentError, 'Unknown type invalid_type for field invalid')
     end
   end
-  
+
   context "field type cast" do
     class TestType < Rhoconnect::StoreOrm
       field :foo_string, :string
@@ -43,21 +43,21 @@ describe Rhoconnect::StoreOrm do
       field :foo_date,   :datetime
       field :foo_int,    :int
       field :foo_float,  :float
-      
+
       list  :list_date,  :datetime
-      set   :set_date,   :datetime      
+      set   :set_date,   :datetime
     end
-    
+
     class TestValidateType < Rhoconnect::StoreOrm
       field :v_field, :string
       validates_presence_of :v_field
     end
-    
+
     class TestLoadType < Rhoconnect::StoreOrm
       field :something, :string
       attr_accessor :foo
     end
-  
+
     before(:each) do
       Store.create
       Store.flush_all
@@ -67,47 +67,47 @@ describe Rhoconnect::StoreOrm do
       @yRedisDbMock = RSpec::Mocks::Mock.new
       @x = TestType.with_key(1)
       @y = TestType.with_key(1)
-      @x.stub!(:store).and_return(@xRedisMock)
-      @y.stub!(:store).and_return(@yRedisMock)
-      @xRedisMock.stub!(:db).and_return(@xRedisDbMock)
-      @yRedisMock.stub!(:db).and_return(@yRedisDbMock)
+      @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
       @x = TestType.create(:id => 'test')
       @x.id.should == 'test'
     end
-    
+
     it "should create with auto-increment id" do
       @x = TestType.create
       @x1 = TestType.create
       @x1.id.should == @x.id + 1
     end
-    
+
     it "should raise ArgumentError on create with duplicate id" do
       @x = TestType.create(:id => 'test1')
-      lambda { TestType.create(:id => 'test1') }.should 
+      lambda { TestType.create(:id => 'test1') }.should
         raise_error(ArgumentError, "Record already exists for 'test1'")
     end
-    
+
     it "should validate_presence_of v_field" do
       lambda { TestValidateType.create(:id => 'test2') }.should
         raise_error(ArgumentError, "Missing required field 'v_field'")
     end
-    
+
     it "should load with attributes set" do
       TestLoadType.create(:id => 'test2')
       @x = TestLoadType.load('test2',{:foo => 'bar'})
       @x.foo.should == 'bar'
     end
-  
+
     it "should save string as is" do
       @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(:put_value).with('test_type:1:foo_int', '12')
       @yRedisMock.should_receive(:get_value).with('test_type:1:foo_int').and_return('12')
@@ -115,7 +115,7 @@ describe Rhoconnect::StoreOrm do
       @y.foo_int.should be_kind_of(Integer)
       @y.foo_int.should == 12
     end
-  
+
     it "should marshal float fields" do
       @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')
@@ -123,7 +123,7 @@ describe Rhoconnect::StoreOrm do
       @y.foo_float.should be_kind_of(Float)
       @y.foo_float.should == 12.1
     end
-  
+
     it "should marshal datetime fields" do
       time = DateTime.now
       str  = time.strftime('%FT%T%z')
@@ -133,7 +133,7 @@ describe Rhoconnect::StoreOrm do
       @y.foo_date.should be_kind_of(DateTime)
       @y.foo_date.should.to_s == time.to_s
     end
-  
+
     it "should marshal json structs" do
       data = {'foo' => 'bar', 'x' => 2}
       str  = JSON.dump(data)
@@ -143,16 +143,16 @@ describe Rhoconnect::StoreOrm do
       @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(:get_value).with('test_type:1:foo_date').and_return(nil)
       @x.foo_date.should be_nil
     end
-    
+
     it "should marshal list values" do
       data = DateTime.now
       str  = data.strftime('%FT%T%z')
-      
+
       @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)
@@ -172,7 +172,7 @@ describe Rhoconnect::StoreOrm do
       @x.list_date.pop_tail.should be_kind_of(DateTime)
       @x.list_date.pop_head.should be_kind_of(DateTime)
     end
-    
+
     it "should marshal set values" do
       data = DateTime.now
       str  = data.strftime('%FT%T%z')
@@ -188,34 +188,34 @@ describe Rhoconnect::StoreOrm do
     end
 
     it "should handle empty members" do
-      @xRedisDbMock.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::StoreOrm
       field :foo, :integer
       field :bar, :string
       field :baz, :float
     end
-    
+
     before do
       @redisMock = RSpec::Mocks::Mock.new
       @x = TestIncrements.with_key(1)
-      @x.stub!(:store).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(: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(:update_count).with("test_increments:1:foo", -1)
       @x.decrement!(:foo)
     end
-    
+
     it "should raise an ArgumentError when called on non-integers" do
       [:bar, :baz].each do |f|
         lambda{@x.increment!(f)}.should raise_error(ArgumentError)
@@ -223,47 +223,47 @@ describe Rhoconnect::StoreOrm do
       end
     end
   end
-  
+
   context "redis commands" do
     class TestCommands < Rhoconnect::StoreOrm
       field :foo
       list  :bar
       set   :sloppy
     end
-    
+
     before(:each) do
       @redisMock = RSpec::Mocks::Mock.new
       @redisDbMock = RSpec::Mocks::Mock.new
       @x = TestCommands.with_key(1)
-      @x.stub!(:store).and_return(@redisMock)
-      @redisMock.stub!(:db).and_return(@redisDbMock)
+      @x.stub(:store).and_return(@redisMock)
+      @redisMock.stub(:db).and_return(@redisDbMock)
     end
-  
+
     it "should send GET on field read" do
       @redisMock.should_receive(:get_value).with('test_commands:1:foo')
       @x.foo
     end
-  
+
     it "should send SET on field write" do
       @redisMock.should_receive(:put_value).with('test_commands:1:foo', 'bar')
       @x.foo = 'bar'
     end
-  
+
     it "should send RPUSH on list <<" do
       @redisDbMock.should_receive(:rpush).with('test_commands:1:bar', 'bar')
       @x.bar << 'bar'
     end
-  
+
     it "should send SADD on set <<" do
       @redisDbMock.should_receive(:sadd).with('test_commands:1:sloppy', 'bar')
       @x.sloppy << 'bar'
     end
-    
+
     it "should delete separate fields" do
       @redisMock.should_receive(:delete_value).with('test_commands:1:foo')
       @x.delete :foo
     end
-    
+
     it "should delete all field" do
       @redisMock.should_receive(:delete_value).with('test_commands:1:foo')
       @redisMock.should_receive(:delete_value).with('test_commands:1:rho__id')