ardm 0.0.1 → 0.1.0

data/spec/unit/epoch_time_spec.rb

@@ -16,13 +16,13 @@ describe Ardm::Property::EpochTime do
     describe 'with a Time instance' do
       let(:value) { Time.now }
 
-      it { should == value.to_i }
+      it { is_expected.to eq(value.to_i) }
     end
 
     describe 'with nil' do
       let(:value) { nil }
 
-      it { should == value }
+      it { is_expected.to eq(value) }
     end
   end
 
@@ -32,25 +32,25 @@ describe Ardm::Property::EpochTime do
     describe 'with a DateTime instance' do
       let(:value) { DateTime.now }
 
-      it { should == Time.parse(value.to_s) }
+      it { is_expected.to eq(Time.parse(value.to_s)) }
     end
 
     describe 'with a number' do
       let(:value) { Time.now.to_i }
 
-      it { should == ::Time.at(value) }
+      it { is_expected.to eq(::Time.at(value)) }
     end
 
     describe 'with a numeric string' do
       let(:value) { Time.now.to_i.to_s }
 
-      it { should == ::Time.at(value.to_i) }
+      it { is_expected.to eq(::Time.at(value.to_i)) }
     end
 
     describe 'with a DateTime string' do
       let(:value) { '2011-07-11 15:00:04 UTC' }
 
-      it { should == ::Time.parse(value) }
+      it { is_expected.to eq(::Time.parse(value)) }
     end
   end
 
@@ -60,13 +60,13 @@ describe Ardm::Property::EpochTime do
     describe 'with a number' do
       let(:value) { Time.now.to_i }
 
-      it { should == Time.at(value) }
+      it { is_expected.to eq(Time.at(value)) }
     end
 
     describe 'with nil' do
       let(:value) { nil }
 
-      it { should == value }
+      it { is_expected.to eq(value) }
     end
   end
 end

data/spec/unit/file_path_spec.rb

@@ -15,19 +15,19 @@ try_spec do
     describe '.dump' do
       describe 'when input is a string' do
         it 'does not modify input' do
-          @property.dump(@input).should == @input
+          expect(@property.dump(@input)).to eq(@input)
         end
       end
 
       describe 'when input is nil' do
         it 'returns nil' do
-          @property.dump(nil).should be_nil
+          expect(@property.dump(nil)).to be_nil
         end
       end
 
       describe 'when input is a blank string' do
         it 'returns nil' do
-          @property.dump('').should be_nil
+          expect(@property.dump('')).to be_nil
         end
       end
     end
@@ -35,19 +35,19 @@ try_spec do
     describe '.load' do
       describe 'when value is a non-blank file path' do
         it 'returns Pathname for a path' do
-          @property.load(@input).should == @path
+          expect(@property.load(@input)).to eq(@path)
         end
       end
 
       describe 'when value is nil' do
         it 'return nil' do
-          @property.load(nil).should be_nil
+          expect(@property.load(nil)).to be_nil
         end
       end
 
       describe 'when value is a blank string' do
         it 'returns nil' do
-          @property.load('').should be_nil
+          expect(@property.load('')).to be_nil
         end
       end
     end
@@ -55,19 +55,19 @@ try_spec do
     describe '.typecast' do
       describe 'when a Pathname is given' do
         it 'does not modify input' do
-          @property.typecast(@path).should == @path
+          expect(@property.typecast(@path)).to eq(@path)
         end
       end
 
       describe 'when a nil is given' do
         it 'does not modify input' do
-          @property.typecast(nil).should == nil
+          expect(@property.typecast(nil)).to eq(nil)
         end
       end
 
       describe 'when a string is given' do
         it 'returns Pathname for given path' do
-          @property.typecast(@input).should == @path
+          expect(@property.typecast(@input)).to eq(@path)
         end
       end
     end

data/spec/unit/flag_spec.rb

@@ -20,7 +20,7 @@ try_spec do
         end
 
         it 'returns flag bit of value' do
-          @result.should == 1
+          expect(@result).to eq(1)
         end
       end
 
@@ -30,7 +30,7 @@ try_spec do
         end
 
         it 'returns flag bit of value' do
-          @result.should == 2
+          expect(@result).to eq(2)
         end
       end
 
@@ -40,7 +40,7 @@ try_spec do
         end
 
         it 'builds binary flag from key values of all matches' do
-          @result.should == 10
+          expect(@result).to eq(10)
         end
       end
 
@@ -50,7 +50,7 @@ try_spec do
         end
 
         it 'builds binary flag from key values of all matches' do
-          @result.should == 31
+          expect(@result).to eq(31)
         end
       end
 
@@ -60,7 +60,7 @@ try_spec do
         end
 
         it 'returns zero' do
-          @result.should == 0
+          expect(@result).to eq(0)
         end
       end
 
@@ -70,7 +70,7 @@ try_spec do
         end
 
         it 'behaves the same as if there were no duplicates' do
-          @result.should == @flag.dump([ :second, :fourth ])
+          expect(@result).to eq(@flag.dump([ :second, :fourth ]))
         end
       end
     end
@@ -86,7 +86,7 @@ try_spec do
         end
 
         it 'returns array with a single matching element' do
-          @result.should == [ :tres ]
+          expect(@result).to eq([ :tres ])
         end
       end
 
@@ -96,7 +96,7 @@ try_spec do
         end
 
         it 'returns array of matching values' do
-          @result.should == [ :dos, :cuatro ]
+          expect(@result).to eq([ :dos, :cuatro ])
         end
       end
 
@@ -106,7 +106,7 @@ try_spec do
         end
 
         it 'returns an empty array' do
-          @result.should == []
+          expect(@result).to eq([])
         end
       end
     end

data/spec/unit/ip_address_spec.rb

@@ -17,7 +17,7 @@ try_spec do
         end
 
         it 'dumps input into a string' do
-          @result.should == @stored
+          expect(@result).to eq(@stored)
         end
       end
 
@@ -27,7 +27,7 @@ try_spec do
         end
 
         it 'returns nil' do
-          @result.should be_nil
+          expect(@result).to be_nil
         end
       end
 
@@ -37,7 +37,7 @@ try_spec do
         end
 
         it 'retuns a blank string' do
-          @result.should == ''
+          expect(@result).to eq('')
         end
       end
     end
@@ -49,7 +49,7 @@ try_spec do
         end
 
         it 'returns IPAddr instance from stored value' do
-          @result.should == @input
+          expect(@result).to eq(@input)
         end
       end
 
@@ -59,7 +59,7 @@ try_spec do
         end
 
         it 'returns nil' do
-          @result.should be_nil
+          expect(@result).to be_nil
         end
       end
 
@@ -69,7 +69,7 @@ try_spec do
         end
 
         it 'returns IPAddr instance from stored value' do
-          @result.should == IPAddr.new('0.0.0.0')
+          expect(@result).to eq(IPAddr.new('0.0.0.0'))
         end
       end
 
@@ -79,7 +79,7 @@ try_spec do
         end
 
         it 'raises ArgumentError with a meaningful message' do
-          @operation.should raise_error(ArgumentError, '+value+ must be nil or a String')
+          expect(@operation).to raise_error(ArgumentError, '+value+ must be nil or a String')
         end
       end
     end
@@ -91,7 +91,7 @@ try_spec do
         end
 
         it 'does not change the value' do
-          @result.should == @input
+          expect(@result).to eq(@input)
         end
       end
 
@@ -101,7 +101,7 @@ try_spec do
         end
 
         it 'instantiates IPAddr instance' do
-          @result.should == @input
+          expect(@result).to eq(@input)
         end
       end
     end

data/spec/unit/json_spec.rb

@@ -13,21 +13,21 @@ try_spec do
     describe '.load' do
       describe 'when nil is provided' do
         it 'returns nil' do
-          @property.load(nil).should be_nil
+          expect(@property.load(nil)).to be_nil
         end
       end
 
       describe 'when Json encoded primitive string is provided' do
         it 'returns decoded value as Ruby string' do
-          @property.load(MultiJson.dump(:value => 'JSON encoded string')).should == { 'value' => 'JSON encoded string' }
+          expect(@property.load(MultiJson.dump(:value => 'JSON encoded string'))).to eq({ 'value' => 'JSON encoded string' })
         end
       end
 
       describe 'when something else is provided' do
         it 'raises ArgumentError with a meaningful message' do
-          lambda {
+          expect {
             @property.load(:sym)
-          }.should raise_error(ArgumentError, '+value+ of a property of JSON type must be nil or a String')
+          }.to raise_error(ArgumentError, '+value+ of a property of JSON type must be nil or a String')
         end
       end
     end
@@ -35,32 +35,32 @@ try_spec do
     describe '.dump' do
       describe 'when nil is provided' do
         it 'returns nil' do
-          @property.dump(nil).should be_nil
+          expect(@property.dump(nil)).to be_nil
         end
       end
 
       describe 'when Json encoded primitive string is provided' do
         it 'does not do double encoding' do
-          @property.dump('Json encoded string').should == 'Json encoded string'
+          expect(@property.dump('Json encoded string')).to eq('Json encoded string')
         end
       end
 
       describe 'when regular Ruby string is provided' do
         it 'dumps argument to Json' do
-          @property.dump('dump me (to JSON)').should == 'dump me (to JSON)'
+          expect(@property.dump('dump me (to JSON)')).to eq('dump me (to JSON)')
         end
       end
 
       describe 'when Ruby array is provided' do
         it 'dumps argument to Json' do
-          @property.dump([1, 2, 3]).should == '[1,2,3]'
+          expect(@property.dump([1, 2, 3])).to eq('[1,2,3]')
         end
       end
 
       describe 'when Ruby hash is provided' do
         it 'dumps argument to Json' do
-          @property.dump({ :datamapper => 'Data access layer in Ruby' }).
-            should == '{"datamapper":"Data access layer in Ruby"}'
+          expect(@property.dump({ :datamapper => 'Data access layer in Ruby' })).
+            to eq('{"datamapper":"Data access layer in Ruby"}')
         end
       end
     end
@@ -108,7 +108,7 @@ try_spec do
         end
 
         it 'decodes value from JSON' do
-          @result.should == { 'value' => 11 }
+          expect(@result).to eq({ 'value' => 11 })
         end
       end
 

data/spec/unit/paranoid_boolean_spec.rb

@@ -5,6 +5,7 @@ module ::ParanoidBooleanBlog
     self.table_name = "articles"
     property :id,      Serial
     property :deleted, ParanoidBoolean
+    timestamps :at
 
     before_destroy :before_destroy
 
@@ -30,16 +31,16 @@ describe Ardm::Property::ParanoidBoolean do
       end
 
       it 'should not delete the resource from the datastore' do
-        method(:subject).should_not change { @model.with_deleted.size }.from(0)
+        expect(method(:subject)).not_to change { @model.with_deleted.size }.from(0)
       end
 
       it 'should not set the paranoid column' do
-        method(:subject).should_not change { @resource.deleted }.from(false)
+        expect(method(:subject)).not_to change { @resource.deleted }.from(false)
       end
 
       it 'should run the destroy hook' do
         # NOTE: changed behavior because AR doesn't call hooks on destroying new objects
-        @resource.should_not_receive(:before_destroy).with(no_args)
+        expect(@resource).not_to receive(:before_destroy).with(no_args)
         subject
       end
     end
@@ -49,18 +50,18 @@ describe Ardm::Property::ParanoidBoolean do
         @resource = @model.create
       end
 
-      it { (!!subject).should be_true }
+      it { expect(!!subject).to be true }
 
       it 'should not delete the resource from the datastore' do
-        method(:subject).should_not change { @model.with_deleted.size }.from(1)
+        expect(method(:subject)).not_to change { @model.with_deleted.size }.from(1)
       end
 
       it 'should set the paranoid column' do
-        method(:subject).should change { @resource.deleted }.from(false).to(true)
+        expect(method(:subject)).to change { @resource.deleted }.from(false).to(true)
       end
 
       it 'should run the destroy hook' do
-        @resource.should_receive(:before_destroy).with(no_args)
+        expect(@resource).to receive(:before_destroy).with(no_args)
         subject
       end
     end
@@ -75,15 +76,15 @@ describe Ardm::Property::ParanoidBoolean do
       end
 
       it 'should not delete the resource from the datastore' do
-        method(:subject).should_not change { @model.with_deleted.size }.from(0)
+        expect(method(:subject)).not_to change { @model.with_deleted.size }.from(0)
       end
 
       it 'should not set the paranoid column' do
-        method(:subject).should_not change { @resource.deleted }.from(false)
+        expect(method(:subject)).not_to change { @resource.deleted }.from(false)
       end
 
       it 'should not run the destroy hook' do
-        @resource.should_not_receive(:before_destroy).with(no_args)
+        expect(@resource).not_to receive(:before_destroy).with(no_args)
         subject
       end
     end
@@ -93,18 +94,18 @@ describe Ardm::Property::ParanoidBoolean do
         @resource = @model.create
       end
 
-      it { (!!subject).should be_true }
+      it { expect(!!subject).to be true }
 
       it 'should delete the resource from the datastore' do
-        method(:subject).should change { @model.with_deleted.size }.from(1).to(0)
+        expect(method(:subject)).to change { @model.with_deleted.size }.from(1).to(0)
       end
 
       it 'should not set the paranoid column' do
-        method(:subject).should_not change { @resource.deleted }.from(false)
+        expect(method(:subject)).not_to change { @resource.deleted }.from(false)
       end
 
       it 'should not run the destroy hook' do
-        @resource.should_not_receive(:before_destroy).with(no_args)
+        expect(@resource).not_to receive(:before_destroy).with(no_args)
         subject
       end
     end
@@ -120,7 +121,7 @@ describe Ardm::Property::ParanoidBoolean do
       subject { @model.with_deleted { @model.all } }
 
       it 'should scope the block to return all resources' do
-        subject.map { |resource| resource.key }.should == [ @resource.key ]
+        expect(subject.map { |resource| resource.key }).to eq([ @resource.key ])
       end
     end
 
@@ -128,15 +129,16 @@ describe Ardm::Property::ParanoidBoolean do
       subject { @model.with_deleted }
 
       it 'should return a collection scoped to return all resources' do
-        subject.map { |resource| resource.key }.should == [ @resource.key ]
+        expect(subject.map { |resource| resource.key }).to eq([ @resource.key ])
       end
     end
   end
 
   describe 'Model.inherited' do
     it 'sets @paranoid_properties' do
-      ::ParanoidBooleanBlog::Review.instance_variable_get(:@paranoid_properties).should ==
+      expect(::ParanoidBooleanBlog::Review.instance_variable_get(:@paranoid_properties)).to eq(
         ::ParanoidBooleanBlog::Article.instance_variable_get(:@paranoid_properties)
+      )
     end
   end
 end