cequel 1.0.0.rc1 → 1.0.0.rc2

data/lib/cequel/util.rb

@@ -1,12 +1,12 @@
 module Cequel
-
   module Util
-
+    #
+    # @api private
+    #
     module HashAccessors
-
       def hattr_reader(hash, *attributes)
         attributes.each do |attribute|
-          module_eval <<-RUBY, __FILE__, __LINE__+1
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{attribute}
               #{hash}[#{attribute.to_sym.inspect}]
             end
@@ -16,7 +16,7 @@ module Cequel
 
       def hattr_inquirer(hash, *attributes)
         attributes.each do |attribute|
-          module_eval <<-RUBY, __FILE__, __LINE__+1
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{attribute}?
               !!#{hash}[#{attribute.to_sym.inspect}]
             end
@@ -26,7 +26,7 @@ module Cequel
 
       def hattr_writer(hash, *attributes)
         attributes.each do |attribute|
-          module_eval <<-RUBY, __FILE__, __LINE__+1
+          module_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{attribute}=(value)
               #{hash}[#{attribute.to_sym.inspect}] = value
             end
@@ -38,9 +38,6 @@ module Cequel
         hattr_reader(hash, *attributes)
         hattr_writer(hash, *attributes)
       end
-
     end
-
   end
-  
 end

data/lib/cequel/version.rb

@@ -1,3 +1,4 @@
 module Cequel
-  VERSION = '1.0.0.rc1'
+  # The current version of the library
+  VERSION = '1.0.0.rc2'
 end

data/spec/examples/record/associations_spec.rb

@@ -27,12 +27,20 @@ describe Cequel::Record::Associations do
     belongs_to :post
     key :id, :uuid, auto: true
     column :content, :text
+
+    cattr_accessor :callback_count
+    self.callback_count = 0
+    before_destroy { self.class.callback_count += 1 }
   end
 
   model :Attachment do
     belongs_to :post
     key :id, :uuid, auto: true
     column :caption, :text
+
+    cattr_accessor :callback_count
+    self.callback_count = 0
+    before_destroy { self.class.callback_count += 1 }
   end
 
   describe '::belongs_to' do
@@ -156,10 +164,6 @@ describe Cequel::Record::Associations do
             comment.post = post_with_comments
           end.tap(&:save)
         end
-        @callback_count = 0
-        Comment.any_instance.stub(:run_callbacks).with(:destroy) do
-          @callback_count += 1
-        end
       end
 
       it "deletes all children when destroying the parent" do
@@ -171,11 +175,11 @@ describe Cequel::Record::Associations do
       it "executes :destroy callbacks on the children" do
         expect {
           post_with_comments.destroy
-        }.to change { @callback_count }.by(2)
+        }.to change { Comment.callback_count }.by(2)
       end
     end
 
-    context "with dependent => delete" do
+    context "with :dependent => :delete" do
       let(:post_with_attachments) { posts.first }
 
       before :each do
@@ -185,10 +189,6 @@ describe Cequel::Record::Associations do
             comment.post = post_with_attachments
           end.tap(&:save)
         end
-        @callback_count = 0
-        Attachment.any_instance.stub(:run_callbacks).with(:destroy) do
-          @callback_count += 1
-        end
       end
 
       it "deletes all children when destroying the parent" do
@@ -197,10 +197,10 @@ describe Cequel::Record::Associations do
         }.to change { Attachment.count }.by(-2)
       end
 
-      it "executes :destroy callbacks on the children" do
+      it "does not execute :destroy callbacks on the children" do
         expect {
           post_with_attachments.destroy
-        }.to change { @callback_count }.by(0)
+        }.not_to change { Attachment.callback_count }
       end
     end
   end

data/spec/examples/record/persistence_spec.rb

@@ -40,7 +40,7 @@ describe Cequel::Record::Persistence do
         it 'should fail fast if keys are missing' do
           expect {
             Blog.new.save
-          }.to raise_error(Cequel::MissingKeyError)
+          }.to raise_error(Cequel::Record::MissingKeyError)
         end
       end
 
@@ -99,7 +99,7 @@ describe Cequel::Record::Persistence do
             Blog.create do |blog|
               blog.name = 'Big Data'
             end
-          }.to raise_error(Cequel::MissingKeyError)
+          }.to raise_error(Cequel::Record::MissingKeyError)
         end
       end
 
@@ -119,7 +119,7 @@ describe Cequel::Record::Persistence do
         it 'should fail fast if keys are missing' do
           expect {
             Blog.create(:name => 'Big Data')
-          }.to raise_error(Cequel::MissingKeyError)
+          }.to raise_error(Cequel::Record::MissingKeyError)
         end
       end
     end
@@ -189,7 +189,7 @@ describe Cequel::Record::Persistence do
               post.permalink = 'cequel'
               post.title = 'Cequel'
             end.tap(&:save)
-          }.to raise_error(Cequel::MissingKeyError)
+          }.to raise_error(Cequel::Record::MissingKeyError)
         end
 
         it 'should fail fast if row keys are missing' do
@@ -198,7 +198,7 @@ describe Cequel::Record::Persistence do
               post.blog_subdomain = 'cassandra'
               post.title = 'Cequel'
             end.tap(&:save)
-          }.to raise_error(Cequel::MissingKeyError)
+          }.to raise_error(Cequel::Record::MissingKeyError)
         end
       end
 

data/spec/examples/record/record_set_spec.rb

@@ -192,30 +192,6 @@ describe Cequel::Record::RecordSet do
       end
     end
 
-    context 'multiple simple primary keys' do
-      let(:records) { blogs }
-      subject { Blog['blog-0', 'blog-1'] }
-
-      it 'should return both specified records' do
-        subject.map(&:subdomain).should =~ %w(blog-0 blog-1)
-      end
-
-      it 'should not query the database' do
-        disallow_queries!
-        subject.map(&:subdomain)
-      end
-
-      it 'should load value lazily' do
-        subject.first.name.should == 'Blog 0'
-      end
-
-      it 'should load values for all referenced records on first access' do
-        max_statements! 1
-        subject.first.name.should == 'Blog 0'
-        subject.last.name.should == 'Blog 1'
-      end
-    end
-
     context 'fully specified compound primary key' do
       let(:records) { posts }
       subject { Post['cassandra']['cequel0'] }
@@ -242,39 +218,43 @@ describe Cequel::Record::RecordSet do
       end
     end
 
-    context 'fully specified compound primary key with multiple clustering columns' do
+    context 'partially specified compound primary key' do
       let(:records) { posts }
-      subject { Post['cassandra']['cequel0', 'cequel1'] }
+      it 'should create partial collection if not all keys specified' do
+        Post['cassandra'].find_each(:batch_size => 2).map(&:title).
+          should == (0...5).map { |i| "Cequel #{i}" }
+      end
+    end
+  end
 
-      it 'should combine partition key with each clustering column' do
-        disallow_queries!
-        subject.map(&:key_values).
-          should == [['cassandra', 'cequel0'], ['cassandra', 'cequel1']]
+  describe '#values_at' do
+    context 'multiple simple primary keys' do
+      let(:records) { blogs }
+      subject { Blog.values_at('blog-0', 'blog-1') }
+
+      it 'should return both specified records' do
+        subject.map(&:subdomain).should =~ %w(blog-0 blog-1)
       end
 
-      it 'should lazily load all records when one record accessed' do
-        max_statements! 1
-        subject.first.title.should == 'Cequel 0'
-        subject.second.title.should == 'Cequel 1'
+      it 'should not query the database' do
+        disallow_queries!
+        subject.map(&:subdomain)
       end
 
-      it 'should not allow collection columns to be selected' do
-        expect { Post.select(:tags)['cassandra']['cequel0', 'cequel1'] }.
-          to raise_error(ArgumentError)
+      it 'should load value lazily' do
+        subject.first.name.should == 'Blog 0'
       end
-    end
 
-    context 'partially specified compound primary key' do
-      let(:records) { posts }
-      it 'should create partial collection if not all keys specified' do
-        Post['cassandra'].find_each(:batch_size => 2).map(&:title).
-          should == (0...5).map { |i| "Cequel #{i}" }
+      it 'should load values for all referenced records on first access' do
+        max_statements! 1
+        subject.first.name.should == 'Blog 0'
+        subject.last.name.should == 'Blog 1'
       end
     end
 
     context 'partially specified compound primary key with multiple partition keys' do
       let(:records) { posts }
-      subject { Post['cassandra', 'postgres'] }
+      subject { Post.values_at('cassandra', 'postgres') }
 
       it 'should return scope to keys' do
         subject.map { |post| post.title }.should =~ (0...5).
@@ -285,7 +265,7 @@ describe Cequel::Record::RecordSet do
     context 'fully specified compound primary key with multiple partition keys' do
       let(:records) { [posts, orm_posts] }
 
-      subject { Post['cassandra', 'orms']['cequel0'] }
+      subject { Post.values_at('cassandra', 'orms')['cequel0'] }
 
       it 'should return collection of unloaded models' do
         disallow_queries!
@@ -299,6 +279,38 @@ describe Cequel::Record::RecordSet do
         subject.second.title.should == 'Cequel ORM 0'
       end
     end
+
+    context 'fully specified compound primary key with multiple clustering columns' do
+      let(:records) { posts }
+      subject { Post['cassandra'].values_at('cequel0', 'cequel1') }
+
+      it 'should combine partition key with each clustering column' do
+        disallow_queries!
+        subject.map(&:key_values).
+          should == [['cassandra', 'cequel0'], ['cassandra', 'cequel1']]
+      end
+
+      it 'should lazily load all records when one record accessed' do
+        max_statements! 1
+        subject.first.title.should == 'Cequel 0'
+        subject.second.title.should == 'Cequel 1'
+      end
+
+      it 'should not allow collection columns to be selected' do
+        expect { Post.select(:tags)['cassandra'].values_at('cequel0', 'cequel1') }.
+          to raise_error(ArgumentError)
+      end
+    end
+
+    context 'non-final clustering column' do
+      let(:records) { [] }
+
+      it 'should raise IllegalQuery' do
+        disallow_queries!
+        expect { Comment['cassandra'].values_at('cequel0') }.
+          to raise_error(Cequel::Record::IllegalQuery)
+      end
+    end
   end
 
   describe '#all' do
@@ -608,11 +620,11 @@ describe Cequel::Record::RecordSet do
     end
 
     it 'should update fully specified collection' do
-      Post['cassandra']['cequel0', 'cequel1', 'cequel2'].
+      Post['cassandra'].values_at('cequel0', 'cequel1', 'cequel2').
         update_all(title: 'Same Title')
-      Post['cassandra']['cequel0', 'cequel1', 'cequel2'].map(&:title).
+      Post['cassandra'].values_at('cequel0', 'cequel1', 'cequel2').map(&:title).
         should == Array.new(3) { 'Same Title' }
-      Post['cassandra']['cequel3', 'cequel4'].map(&:title).
+      Post['cassandra'].values_at('cequel3', 'cequel4').map(&:title).
         should == cassandra_posts.drop(3).map(&:title)
     end
   end
@@ -632,7 +644,7 @@ describe Cequel::Record::RecordSet do
     end
 
     it 'should be able to delete fully specified collection' do
-      Post['postgres']['sequel0', 'sequel1'].delete_all
+      Post['postgres'].values_at('sequel0', 'sequel1').delete_all
       Post['postgres'].map(&:permalink).
         should == postgres_posts.drop(2).map(&:permalink)
     end
@@ -653,7 +665,7 @@ describe Cequel::Record::RecordSet do
     end
 
     it 'should be able to delete fully specified collection' do
-      Post['postgres']['sequel0', 'sequel1'].destroy_all
+      Post['postgres'].values_at('sequel0', 'sequel1').destroy_all
       Post['postgres'].map(&:permalink).
         should == postgres_posts.drop(2).map(&:permalink)
     end

data/spec/examples/schema/table_synchronizer_spec.rb

@@ -29,8 +29,8 @@ describe Cequel::Schema::TableSynchronizer do
       cequel.schema.create_table :posts do
         key :blog_subdomain, :text
         key :permalink, :text
-        column :title, :text, :index => true
-        column :body, :text
+        column :title, :ascii, :index => true
+        column :body, :ascii
         column :created_at, :timestamp
         set :author_names, :text
         with :comment, 'Test Table'
@@ -45,8 +45,8 @@ describe Cequel::Schema::TableSynchronizer do
         cequel.schema.sync_table :posts do
           key :blog_subdomain, :text
           key :post_permalink, :text
-          column :title, :text
-          column :body, :ascii
+          column :title, :ascii
+          column :body, :text
           column :primary_author_id, :uuid, :index => true
           column :created_at, :timestamp, :index => true
           column :published_at, :timestamp
@@ -81,7 +81,7 @@ describe Cequel::Schema::TableSynchronizer do
       end
 
       it 'should change column type' do
-        table.column(:body).type.should == Cequel::Type[:ascii]
+        table.column(:body).type.should == Cequel::Type[:text]
       end
 
       it 'should change properties' do
@@ -97,7 +97,7 @@ describe Cequel::Schema::TableSynchronizer do
           cequel.schema.sync_table :posts do
             key :blog_subdomain, :text
             key :permalink, :ascii
-            column :title, :text
+            column :title, :ascii
             column :body, :text
             column :created_at, :timestamp
             set :author_names, :text
@@ -112,7 +112,7 @@ describe Cequel::Schema::TableSynchronizer do
             key :blog_subdomain, :text
             key :permalink, :text
             key :year, :int
-            column :title, :text
+            column :title, :ascii
             column :body, :text
             column :created_at, :timestamp
             set :author_names, :text
@@ -125,7 +125,7 @@ describe Cequel::Schema::TableSynchronizer do
         expect {
           cequel.schema.sync_table :posts do
             key :blog_subdomain, :text
-            column :title, :text
+            column :title, :ascii
             column :body, :text
             column :created_at, :timestamp
             set :author_names, :text
@@ -139,7 +139,7 @@ describe Cequel::Schema::TableSynchronizer do
           cequel.schema.sync_table :posts do
             key :blog_subdomain, :text
             partition_key :permalink, :text
-            column :title, :text
+            column :title, :ascii
             column :body, :text
             column :created_at, :timestamp
             set :author_names, :text
@@ -153,7 +153,7 @@ describe Cequel::Schema::TableSynchronizer do
           cequel.schema.sync_table :posts do
             key :blog_subdomain, :text
             key :permalink, :text
-            column :title, :text
+            column :title, :ascii
             column :body, :text
             column :created_at, :timestamp
             list :author_names, :text
@@ -162,7 +162,33 @@ describe Cequel::Schema::TableSynchronizer do
         }.to raise_error(Cequel::InvalidSchemaMigration)
       end
 
-      it 'should not allow changing of clustering order'
+      it 'should not allow invalid type transitions of a data column' do
+        expect {
+          cequel.schema.sync_table :posts do
+            key :blog_subdomain, :text
+            key :permalink, :text
+            column :title, :ascii, :index => true
+            column :body, :int
+            column :created_at, :timestamp
+            set :author_names, :text
+            with :comment, 'Test Table'
+          end
+        }.to raise_error(Cequel::InvalidSchemaMigration)
+      end
+
+      it 'should not allow changing clustering order' do
+        expect {
+          cequel.schema.sync_table :posts do
+            key :blog_subdomain, :text
+            key :permalink, :text, :desc
+            column :title, :ascii, :index => true
+            column :body, :ascii
+            column :created_at, :timestamp
+            set :author_names, :text
+            with :comment, 'Test Table'
+          end
+        }.to raise_error(Cequel::InvalidSchemaMigration)
+      end
 
     end
 

data/spec/examples/schema/table_updater_spec.rb

@@ -5,7 +5,7 @@ describe Cequel::Schema::TableUpdater do
     cequel.schema.create_table(:posts) do
       key :blog_subdomain, :text
       key :permalink, :text
-      column :title, :text
+      column :title, :ascii
       column :body, :text
     end
   end
@@ -83,12 +83,12 @@ describe Cequel::Schema::TableUpdater do
   describe '#change_column' do
     before do
       cequel.schema.alter_table(:posts) do
-        change_column :title, :ascii
+        change_column :title, :text
       end
     end
 
     it 'should change the type' do
-      table.data_column(:title).type.should == Cequel::Type[:ascii]
+      table.data_column(:title).type.should == Cequel::Type[:text]
     end
   end