cequel 1.4.2 → 1.4.3

data/spec/examples/record/map_spec.rb

@@ -24,7 +24,7 @@ describe Cequel::Record::Map do
 
   context 'new record' do
     it 'should save set as-is' do
-      subject[:likes].should == {'alice' => 1, 'bob' => 2}
+      expect(subject[:likes]).to eq({'alice' => 1, 'bob' => 2})
     end
   end
 
@@ -32,13 +32,13 @@ describe Cequel::Record::Map do
     it 'should overwrite value' do
       post.likes = {'charlotte' => 3, 'dave' => 4}
       post.save!
-      subject[:likes].should == {'charlotte' => 3, 'dave' => 4}
+      expect(subject[:likes]).to eq({'charlotte' => 3, 'dave' => 4})
     end
 
     it 'should cast collection before overwriting' do
       post.likes = [['charlotte', 3], ['dave', 4]]
       post.save!
-      subject[:likes].should == {'charlotte' => 3, 'dave' => 4}
+      expect(subject[:likes]).to eq({'charlotte' => 3, 'dave' => 4})
     end
   end
 
@@ -49,8 +49,9 @@ describe Cequel::Record::Map do
       it 'should atomically update' do
         post.likes['david'] = 4
         post.save
-        subject[:likes].should == 
+        expect(subject[:likes]).to eq( 
           {'alice' => 1, 'bob' => 2, 'charles' => 3, 'david' => 4}
+        )
         expect(post.likes).to eq({'alice' => 1, 'bob' => 2, 'david' => 4})
       end
 
@@ -65,11 +66,13 @@ describe Cequel::Record::Map do
       end
 
       it 'should write without reading' do
-        max_statements! 2
-        unloaded_post.likes['david'] = 4
-        unloaded_post.save
-        subject[:likes].should ==
+        expect_statement_count 1 do
+          unloaded_post.likes['david'] = 4
+          unloaded_post.save
+        end
+        expect(subject[:likes]).to eq(
           {'alice' => 1, 'bob' => 2, 'charles' => 3, 'david' => 4}
+        )
       end
 
       it 'should set key value post-hoc' do
@@ -83,20 +86,21 @@ describe Cequel::Record::Map do
       it 'should atomically clear' do
         post.likes.clear
         post.save
-        subject[:likes].should be_blank
+        expect(subject[:likes]).to be_blank
         expect(post.likes).to eq({})
       end
 
       it 'should clear without reading' do
-        max_statements! 2
-        unloaded_post.likes.clear
-        unloaded_post.save
-        subject[:likes].should be_blank
+        expect_statement_count 1 do
+          unloaded_post.likes.clear
+          unloaded_post.save
+        end
+        expect(subject[:likes]).to be_blank
       end
 
       it 'should clear post-hoc' do
         unloaded_post.likes.clear
-        unloaded_post.likes.should be_blank
+        expect(unloaded_post.likes).to be_blank
       end
     end
 
@@ -104,7 +108,7 @@ describe Cequel::Record::Map do
       it 'should delete element atomically' do
         post.likes.delete('bob')
         post.save
-        subject[:likes].should == {'alice' => 1, 'charles' => 3}
+        expect(subject[:likes]).to eq({'alice' => 1, 'charles' => 3})
         expect(post.likes).to eq({'alice' => 1})
       end
 
@@ -114,10 +118,11 @@ describe Cequel::Record::Map do
       end
 
       it 'should delete without reading' do
-        max_statements! 2
-        unloaded_post.likes.delete('bob')
-        unloaded_post.save
-        subject[:likes].should == {'alice' => 1, 'charles' => 3}
+        expect_statement_count 1 do
+          unloaded_post.likes.delete('bob')
+          unloaded_post.save
+        end
+        expect(subject[:likes]).to eq({'alice' => 1, 'charles' => 3})
       end
 
       it 'should delete post-hoc' do
@@ -130,8 +135,9 @@ describe Cequel::Record::Map do
       it 'should atomically update' do
         post.likes.merge!('david' => 4, 'emily' => 5)
         post.save
-        subject[:likes].should == 
+        expect(subject[:likes]).to eq( 
           {'alice' => 1, 'bob' => 2, 'charles' => 3, 'david' => 4, 'emily' => 5}
+        )
         expect(post.likes).to eq(
           {'alice' => 1, 'bob' => 2, 'david' => 4, 'emily' => 5})
       end
@@ -146,18 +152,21 @@ describe Cequel::Record::Map do
       it 'should cast values before updating' do
         post.likes.merge!('david' => '4', 'emily' => 5.0)
         post.save
-        subject[:likes].should == 
+        expect(subject[:likes]).to eq( 
           {'alice' => 1, 'bob' => 2, 'charles' => 3, 'david' => 4, 'emily' => 5}
+        )
         expect(post.likes).to eq(
           {'alice' => 1, 'bob' => 2, 'david' => 4, 'emily' => 5})
       end
 
       it 'should write without reading' do
-        max_statements! 2
-        unloaded_post.likes.merge!('david' => 4, 'emily' => 5)
-        unloaded_post.save
-        subject[:likes].should ==
+        expect_statement_count 1 do
+          unloaded_post.likes.merge!('david' => 4, 'emily' => 5)
+          unloaded_post.save
+        end
+        expect(subject[:likes]).to eq(
           {'alice' => 1, 'bob' => 2, 'charles' => 3, 'david' => 4, 'emily' => 5}
+        )
       end
 
       it 'should merge post-hoc' do
@@ -171,7 +180,7 @@ describe Cequel::Record::Map do
       it 'should automatically overwrite' do
         post.likes.replace('david' => 4, 'emily' => 5)
         post.save
-        subject[:likes].should == {'david' => 4, 'emily' => 5}
+        expect(subject[:likes]).to eq({'david' => 4, 'emily' => 5})
         expect(post.likes).to eq({'david' => 4, 'emily' => 5})
       end
 
@@ -183,15 +192,16 @@ describe Cequel::Record::Map do
       it 'should cast values before overwriting' do
         post.likes.replace('david' => '4', 'emily' => 5.0)
         post.save
-        subject[:likes].should == {'david' => 4, 'emily' => 5}
+        expect(subject[:likes]).to eq({'david' => 4, 'emily' => 5})
         expect(post.likes).to eq({'david' => 4, 'emily' => 5})
       end
 
       it 'should overwrite without reading' do
-        max_statements! 2
-        unloaded_post.likes.replace('david' => 4, 'emily' => 5)
-        unloaded_post.save
-        subject[:likes].should == {'david' => 4, 'emily' => 5}
+        expect_statement_count 1 do
+          unloaded_post.likes.replace('david' => 4, 'emily' => 5)
+          unloaded_post.save
+        end
+        expect(subject[:likes]).to eq({'david' => 4, 'emily' => 5})
       end
 
       it 'should replace post-hoc' do
@@ -204,17 +214,20 @@ describe Cequel::Record::Map do
       it 'should atomically update' do
         post.likes.store('david', 4)
         post.save
-        subject[:likes].should == 
+        expect(subject[:likes]).to eq( 
           {'alice' => 1, 'bob' => 2, 'charles' => 3, 'david' => 4}
+        )
         expect(post.likes).to eq({'alice' => 1, 'bob' => 2, 'david' => 4})
       end
 
       it 'should write without reading' do
-        max_statements! 2
-        unloaded_post.likes.store('david', 4)
-        unloaded_post.save
-        subject[:likes].should == 
+        expect_statement_count 1 do
+          unloaded_post.likes.store('david', 4)
+          unloaded_post.save
+        end
+        expect(subject[:likes]).to eq( 
           {'alice' => 1, 'bob' => 2, 'charles' => 3, 'david' => 4}
+        )
       end
 
       it 'should store post-hoc' do
@@ -228,18 +241,21 @@ describe Cequel::Record::Map do
       it 'should atomically update' do
         post.likes.update('david' => 4, 'emily' => 5)
         post.save
-        subject[:likes].should == 
+        expect(subject[:likes]).to eq( 
           {'alice' => 1, 'bob' => 2, 'charles' => 3, 'david' => 4, 'emily' => 5}
+        )
         expect(post.likes).to eq(
           {'alice' => 1, 'bob' => 2, 'david' => 4, 'emily' => 5})
       end
 
       it 'should write without reading' do
-        max_statements! 2
-        unloaded_post.likes.update('david' => 4, 'emily' => 5)
-        unloaded_post.save
-        subject[:likes].should == 
+        expect_statement_count 1 do
+          unloaded_post.likes.update('david' => 4, 'emily' => 5)
+          unloaded_post.save
+        end
+        expect(subject[:likes]).to eq( 
           {'alice' => 1, 'bob' => 2, 'charles' => 3, 'david' => 4, 'emily' => 5}
+        )
       end
 
       it 'should update post-hoc' do

data/spec/examples/record/mass_assignment_spec.rb

@@ -9,12 +9,12 @@ describe Cequel::Record::MassAssignment do
     end
 
     it 'should allow assignment of vanilla hash' do
-      Post.new(:title => 'Cequel').title.should == 'Cequel'
+      expect(Post.new(:title => 'Cequel').title).to eq('Cequel')
     end
 
     it 'should allow assignment of permitted strong params' do
-      Post.new(StrongParams.new(true, :title => 'Cequel')).title.
-        should == 'Cequel'
+      expect(Post.new(StrongParams.new(true, :title => 'Cequel')).title).
+        to eq('Cequel')
     end
 
     it 'should raise exception when assigned non-permitted strong params' do
@@ -46,11 +46,11 @@ describe Cequel::Record::MassAssignment do
     let(:post) { Post.new(:title => 'Cequel', :page_views => 1000) }
 
     it 'should allow assignment of accessible params' do
-      post.title.should == 'Cequel'
+      expect(post.title).to eq('Cequel')
     end
 
     it 'should not allow assignment of inaccessible params' do
-      post.page_views.should be_nil
+      expect(post.page_views).to be_nil
     end
   end
 end

data/spec/examples/record/naming_spec.rb

@@ -8,10 +8,10 @@ describe 'naming' do
   end
 
   it 'should implement model_name' do
-    Blog.model_name.should == 'Blog'
+    expect(Blog.model_name).to eq('Blog')
   end
 
   it 'should implement model_name interpolations' do
-    Blog.model_name.i18n_key.should == :blog
+    expect(Blog.model_name.i18n_key).to eq(:blog)
   end
 end

data/spec/examples/record/persistence_spec.rb

@@ -29,18 +29,18 @@ describe Cequel::Record::Persistence do
     end
 
     describe 'new record' do
-      specify { Blog.new.should_not be_persisted }
-      specify { Blog.new.should be_transient }
+      specify { expect(Blog.new).not_to be_persisted }
+      specify { expect(Blog.new).to be_transient }
     end
 
     describe '#save' do
       context 'on create' do
         it 'should save row to database' do
-          subject[:name].should == 'Cequel'
+          expect(subject[:name]).to eq('Cequel')
         end
 
         it 'should mark row persisted' do
-          blog.should be_persisted
+          expect(blog).to be_persisted
         end
 
         it 'should fail fast if keys are missing' do
@@ -85,15 +85,15 @@ describe Cequel::Record::Persistence do
         end
 
         it 'should change existing column value' do
-          subject[:name].should == 'Cequel 1.0'
+          expect(subject[:name]).to eq('Cequel 1.0')
         end
 
         it 'should add new column value' do
-          subject[:owner_id].should == owner_id
+          expect(subject[:owner_id]).to eq(owner_id)
         end
 
         it 'should remove old column values' do
-          subject[:description].should be_nil
+          expect(subject[:description]).to be_nil
         end
 
         it 'should not allow changing key values' do
@@ -147,7 +147,7 @@ describe Cequel::Record::Persistence do
             end
           end
           blog.save
-          subject[:name].should == 'Pizza'
+          expect(subject[:name]).to eq('Pizza')
         end
       end
     end
@@ -164,11 +164,11 @@ describe Cequel::Record::Persistence do
         end
 
         it 'should initialize with block' do
-          blog.name.should == 'Big Data'
+          expect(blog.name).to eq('Big Data')
         end
 
         it 'should save instance' do
-          Blog.find(blog.subdomain).name.should == 'Big Data'
+          expect(Blog.find(blog.subdomain).name).to eq('Big Data')
         end
 
         it 'should fail fast if keys are missing' do
@@ -186,11 +186,11 @@ describe Cequel::Record::Persistence do
         end
 
         it 'should initialize with block' do
-          blog.name.should == 'Big Data'
+          expect(blog.name).to eq('Big Data')
         end
 
         it 'should save instance' do
-          Blog.find(blog.subdomain).name.should == 'Big Data'
+          expect(Blog.find(blog.subdomain).name).to eq('Big Data')
         end
 
         it 'should fail fast if keys are missing' do
@@ -209,11 +209,11 @@ describe Cequel::Record::Persistence do
       before { blog.update_attributes(:name => 'The Big Data Blog') }
 
       it 'should update instance in memory' do
-        blog.name.should == 'The Big Data Blog'
+        expect(blog.name).to eq('The Big Data Blog')
       end
 
       it 'should save instance' do
-        Blog.find(blog.subdomain).name.should == 'The Big Data Blog'
+        expect(Blog.find(blog.subdomain).name).to eq('The Big Data Blog')
       end
 
       it 'should not allow updating key values' do
@@ -226,11 +226,11 @@ describe Cequel::Record::Persistence do
       before { blog.destroy }
 
       it 'should delete entire row' do
-        subject.should be_nil
+        expect(subject).to be_nil
       end
 
       it 'should mark record transient' do
-        blog.should be_transient
+        expect(blog).to be_transient
       end
 
       it 'should destroy with specified consistency' do
@@ -266,11 +266,11 @@ describe Cequel::Record::Persistence do
     describe '#save' do
       context 'on create' do
         it 'should save row to database' do
-          subject[:title].should == 'Cequel'
+          expect(subject[:title]).to eq('Cequel')
         end
 
         it 'should mark row persisted' do
-          post.should be_persisted
+          expect(post).to be_persisted
         end
 
         it 'should fail fast if parent keys are missing' do
@@ -303,15 +303,15 @@ describe Cequel::Record::Persistence do
         end
 
         it 'should change existing column value' do
-          subject[:title].should == 'Cequel 1.0'
+          expect(subject[:title]).to eq('Cequel 1.0')
         end
 
         it 'should add new column value' do
-          subject[:author_id].should == author_id
+          expect(subject[:author_id]).to eq(author_id)
         end
 
         it 'should remove old column values' do
-          subject[:body].should be_nil
+          expect(subject[:body]).to be_nil
         end
 
         it 'should not allow changing parent key values' do
@@ -334,11 +334,11 @@ describe Cequel::Record::Persistence do
       before { post.destroy }
 
       it 'should delete entire row' do
-        subject.should be_nil
+        expect(subject).to be_nil
       end
 
       it 'should mark record transient' do
-        post.should be_transient
+        expect(post).to be_transient
       end
     end
   end

data/spec/examples/record/properties_spec.rb

@@ -17,44 +17,44 @@ describe Cequel::Record::Properties do
     end
 
     it 'should provide accessor for key' do
-      Post.new { |post| post.permalink = 'big-data' }.permalink.
-        should == 'big-data'
+      expect(Post.new { |post| post.permalink = 'big-data' }.permalink).
+        to eq('big-data')
     end
 
     it 'should cast key to correct value' do
-      Post.new { |post| post.permalink = 44 }.permalink.
-        should == '44'
+      expect(Post.new { |post| post.permalink = 44 }.permalink).
+        to eq('44')
     end
 
     it 'should have nil key if unset' do
-      Post.new.permalink.should be_nil
+      expect(Post.new.permalink).to be_nil
     end
 
     it 'should provide accessor for data column' do
-      Post.new { |post| post.title = 'Big Data' }.title.should == 'Big Data'
+      expect(Post.new { |post| post.title = 'Big Data' }.title).to eq('Big Data')
     end
 
     it 'should cast data column to correct value' do
-      Post.new { |post| post.title = 'Big Data'.force_encoding('US-ASCII') }.
-        title.encoding.name.should == 'UTF-8'
+      expect(Post.new { |post| post.title = 'Big Data'.force_encoding('US-ASCII') }.
+        title.encoding.name).to eq('UTF-8')
     end
 
     it 'should have nil data column value if unset' do
-      Post.new.title.should be_nil
+      expect(Post.new.title).to be_nil
     end
 
     it 'should allow setting attributes via #attributes=' do
-      Post.new.tap { |post| post.attributes = {:title => 'Big Data' }}.
-        title.should == 'Big Data'
+      expect(Post.new.tap { |post| post.attributes = {:title => 'Big Data' }}.
+        title).to eq('Big Data')
     end
 
     it 'should use writers when setting attributes' do
-      Post.new.tap { |post| post.attributes = {:downcased_title => 'big data' }}.
-        title.should == 'Big Data'
+      expect(Post.new.tap { |post| post.attributes = {:downcased_title => 'big data' }}.
+        title).to eq('Big Data')
     end
 
     it 'should take attribute arguments to ::new' do
-      Post.new(:downcased_title => 'big data').title.should == 'Big Data'
+      expect(Post.new(:downcased_title => 'big data').title).to eq('Big Data')
     end
 
     it 'should provide accessor for list column' do
@@ -145,11 +145,11 @@ describe Cequel::Record::Properties do
     end
 
     it 'should respect default for keys' do
-      Post.new.permalink.should == 'new_permalink'
+      expect(Post.new.permalink).to eq('new_permalink')
     end
 
     it 'should respect default for data column' do
-      Post.new.title.should == 'New Post'
+      expect(Post.new.title).to eq('New Post')
     end
 
     it 'should respect default for list column' do
@@ -173,7 +173,7 @@ describe Cequel::Record::Properties do
     end
 
     it 'should auto-generate UUID key' do
-      Cequel.uuid?(Post.new.id).should be_true
+      expect(Cequel.uuid?(Post.new.id)).to eq(true)
     end
 
     it 'should raise ArgumentError if auto specified for non-UUID' do
@@ -186,11 +186,11 @@ describe Cequel::Record::Properties do
     end
 
     it 'should run default proc on keys' do
-      Post.new.subid.should == "subid #{1+1}" 
+      expect(Post.new.subid).to eq("subid #{1+1}") 
     end
 
     it 'should run default proc' do
-      Post.new.title.should == "Post #{Date.today}"
+      expect(Post.new.title).to eq("Post #{Date.today}")
     end
   end
 end