cequel 1.7.0 → 1.8.0

data/spec/examples/schema/table_synchronizer_spec.rb

@@ -2,12 +2,13 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe Cequel::Schema::TableSynchronizer do
+  let(:table_name) { :"posts_#{SecureRandom.hex(4)}" }
 
-  let(:table) { cequel.schema.read_table(:posts) }
+  let(:table) { cequel.schema.read_table(table_name) }
 
   context 'with no existing table' do
     before do
-      cequel.schema.sync_table :posts do
+      cequel.schema.sync_table table_name do
         key :blog_subdomain, :text
         key :permalink, :text
         column :title, :text
@@ -18,7 +19,7 @@ describe Cequel::Schema::TableSynchronizer do
       end
     end
 
-    after { cequel.schema.drop_table(:posts) }
+    after { cequel.schema.drop_table(table_name) }
 
     it 'should create table' do
       expect(table.column(:title).type).to eq(Cequel::Type[:text]) #etc.
@@ -27,7 +28,7 @@ describe Cequel::Schema::TableSynchronizer do
 
   context 'with an existing table' do
     before do
-      cequel.schema.create_table :posts do
+      cequel.schema.create_table table_name do
         key :blog_subdomain, :text
         key :permalink, :text
         column :title, :ascii, :index => true
@@ -38,12 +39,12 @@ describe Cequel::Schema::TableSynchronizer do
       end
     end
 
-    after { cequel.schema.drop_table(:posts) }
+    after { cequel.schema.drop_table(table_name) }
 
     context 'with valid changes' do
 
       before do
-        cequel.schema.sync_table :posts do
+        cequel.schema.sync_table table_name do
           key :blog_subdomain, :text
           key :post_permalink, :text
           column :title, :ascii
@@ -95,7 +96,7 @@ describe Cequel::Schema::TableSynchronizer do
 
       it 'should not allow changing type of key' do
         expect {
-          cequel.schema.sync_table :posts do
+          cequel.schema.sync_table table_name do
             key :blog_subdomain, :text
             key :permalink, :ascii
             column :title, :ascii
@@ -109,7 +110,7 @@ describe Cequel::Schema::TableSynchronizer do
 
       it 'should not allow adding a key' do
         expect {
-          cequel.schema.sync_table :posts do
+          cequel.schema.sync_table table_name do
             key :blog_subdomain, :text
             key :permalink, :text
             key :year, :int
@@ -124,7 +125,7 @@ describe Cequel::Schema::TableSynchronizer do
 
       it 'should not allow removing a key' do
         expect {
-          cequel.schema.sync_table :posts do
+          cequel.schema.sync_table table_name do
             key :blog_subdomain, :text
             column :title, :ascii
             column :body, :text
@@ -137,7 +138,7 @@ describe Cequel::Schema::TableSynchronizer do
 
       it 'should not allow changing the partition status of a key' do
         expect {
-          cequel.schema.sync_table :posts do
+          cequel.schema.sync_table table_name do
             key :blog_subdomain, :text
             partition_key :permalink, :text
             column :title, :ascii
@@ -151,7 +152,7 @@ describe Cequel::Schema::TableSynchronizer do
 
       it 'should not allow changing the data structure of a column' do
         expect {
-          cequel.schema.sync_table :posts do
+          cequel.schema.sync_table table_name do
             key :blog_subdomain, :text
             key :permalink, :text
             column :title, :ascii
@@ -165,7 +166,7 @@ describe Cequel::Schema::TableSynchronizer do
 
       it 'should not allow invalid type transitions of a data column' do
         expect {
-          cequel.schema.sync_table :posts do
+          cequel.schema.sync_table table_name do
             key :blog_subdomain, :text
             key :permalink, :text
             column :title, :ascii, :index => true
@@ -179,7 +180,7 @@ describe Cequel::Schema::TableSynchronizer do
 
       it 'should not allow changing clustering order' do
         expect {
-          cequel.schema.sync_table :posts do
+          cequel.schema.sync_table table_name do
             key :blog_subdomain, :text
             key :permalink, :text, :desc
             column :title, :ascii, :index => true

data/spec/examples/schema/table_updater_spec.rb

@@ -2,8 +2,10 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe Cequel::Schema::TableUpdater do
+  let(:table_name) { :"posts_#{SecureRandom.hex(4)}" }
+
   before do
-    cequel.schema.create_table(:posts) do
+    cequel.schema.create_table(table_name) do
       key :blog_subdomain, :text
       key :permalink, :text
       column :title, :ascii
@@ -11,13 +13,13 @@ describe Cequel::Schema::TableUpdater do
     end
   end
 
-  after { cequel.schema.drop_table(:posts) }
+  after { cequel.schema.drop_table(table_name) }
 
-  let(:table) { cequel.schema.read_table(:posts) }
+  let(:table) { cequel.schema.read_table(table_name) }
 
   describe '#add_column' do
     before do
-      cequel.schema.alter_table(:posts) do
+      cequel.schema.alter_table(table_name) do
         add_column :published_at, :timestamp
       end
     end
@@ -29,7 +31,7 @@ describe Cequel::Schema::TableUpdater do
 
   describe '#add_list' do
     before do
-      cequel.schema.alter_table(:posts) do
+      cequel.schema.alter_table(table_name) do
         add_list :author_names, :text
       end
     end
@@ -45,7 +47,7 @@ describe Cequel::Schema::TableUpdater do
 
   describe '#add_set' do
     before do
-      cequel.schema.alter_table(:posts) do
+      cequel.schema.alter_table(table_name) do
         add_set :author_names, :text
       end
     end
@@ -61,7 +63,7 @@ describe Cequel::Schema::TableUpdater do
 
   describe '#add_map' do
     before do
-      cequel.schema.alter_table(:posts) do
+      cequel.schema.alter_table(table_name) do
         add_map :trackbacks, :timestamp, :ascii
       end
     end
@@ -83,7 +85,7 @@ describe Cequel::Schema::TableUpdater do
 
   describe '#change_column' do
     before do
-      cequel.schema.alter_table(:posts) do
+      cequel.schema.alter_table(table_name) do
         change_column :title, :text
       end
     end
@@ -95,7 +97,7 @@ describe Cequel::Schema::TableUpdater do
 
   describe '#rename_column' do
     before do
-      cequel.schema.alter_table(:posts) do
+      cequel.schema.alter_table(table_name) do
         rename_column :permalink, :slug
       end
     end
@@ -108,7 +110,7 @@ describe Cequel::Schema::TableUpdater do
 
   describe '#change_properties' do
     before do
-      cequel.schema.alter_table(:posts) do
+      cequel.schema.alter_table(table_name) do
         change_properties :comment => 'Test Comment'
       end
     end
@@ -118,35 +120,36 @@ describe Cequel::Schema::TableUpdater do
     end
   end
 
-  describe '#add_index' do
+  describe '#drop_index' do
     before do
-      cequel.schema.alter_table(:posts) do
+      tab_name = table_name
+      cequel.schema.alter_table(table_name) do
         create_index :title
+        drop_index :"#{tab_name}_title_idx"
       end
     end
 
-    it 'should add the index' do
-      expect(table.data_column(:title)).to be_indexed
+    it 'should drop the index' do
+      expect(table.data_column(:title)).not_to be_indexed
     end
   end
 
-  describe '#drop_index' do
+  describe '#add_index' do
     before do
-      cequel.schema.alter_table(:posts) do
+      cequel.schema.alter_table(table_name) do
         create_index :title
-        drop_index :posts_title_idx
       end
     end
 
-    it 'should drop the index' do
-      expect(table.data_column(:title)).not_to be_indexed
+    it 'should add the index' do
+      expect(table.data_column(:title)).to be_indexed
     end
   end
 
   describe '#drop_column' do
     before do
       pending 'Support in a future Cassandra version'
-      cequel.schema.alter_table(:posts) do
+      cequel.schema.alter_table(table_name) do
         drop_column :body
       end
     end

data/spec/examples/schema/table_writer_spec.rb

@@ -2,18 +2,19 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe Cequel::Schema::TableWriter do
+  let(:table_name) { :"posts_#{SecureRandom.hex(4)}" }
 
-  let(:table) { cequel.schema.read_table(:posts) }
+  let(:table) { cequel.schema.read_table(table_name) }
 
   describe '#create_table' do
 
     after do
-      cequel.schema.drop_table(:posts)
+      cequel.schema.drop_table(table_name)
     end
 
     describe 'with simple skinny table' do
       before do
-        cequel.schema.create_table(:posts) do
+        cequel.schema.create_table(table_name) do
           key :permalink, :ascii
           column :title, :text
         end
@@ -35,7 +36,7 @@ describe Cequel::Schema::TableWriter do
 
     describe 'with multi-column primary key' do
       before do
-        cequel.schema.create_table(:posts) do
+        cequel.schema.create_table(table_name) do
           key :blog_subdomain, :ascii
           key :permalink, :ascii
           column :title, :text
@@ -61,7 +62,7 @@ describe Cequel::Schema::TableWriter do
 
     describe 'with composite partition key' do
       before do
-        cequel.schema.create_table(:posts) do
+        cequel.schema.create_table(table_name) do
           partition_key :blog_subdomain, :ascii
           partition_key :permalink, :ascii
           column :title, :text
@@ -80,7 +81,7 @@ describe Cequel::Schema::TableWriter do
 
     describe 'with composite partition key and non-partition keys' do
       before do
-        cequel.schema.create_table(:posts) do
+        cequel.schema.create_table(table_name) do
           partition_key :blog_subdomain, :ascii
           partition_key :permalink, :ascii
           key :month, :timestamp
@@ -109,7 +110,7 @@ describe Cequel::Schema::TableWriter do
 
     describe 'collection types' do
       before do
-        cequel.schema.create_table(:posts) do
+        cequel.schema.create_table(table_name) do
           key :permalink, :ascii
           column :title, :text
           list :authors, :blob
@@ -151,7 +152,7 @@ describe Cequel::Schema::TableWriter do
 
     describe 'storage properties' do
       before do
-        cequel.schema.create_table(:posts) do
+        cequel.schema.create_table(table_name) do
           key :permalink, :ascii
           column :title, :text
           with :comment, 'Blog posts'
@@ -175,7 +176,7 @@ describe Cequel::Schema::TableWriter do
 
     describe 'compact storage' do
       before do
-        cequel.schema.create_table(:posts) do
+        cequel.schema.create_table(table_name) do
           key :permalink, :ascii
           column :title, :text
           compact_storage
@@ -189,7 +190,7 @@ describe Cequel::Schema::TableWriter do
 
     describe 'clustering order' do
       before do
-        cequel.schema.create_table(:posts) do
+        cequel.schema.create_table(table_name) do
           key :blog_permalink, :ascii
           key :id, :uuid, :desc
           column :title, :text
@@ -203,7 +204,7 @@ describe Cequel::Schema::TableWriter do
 
     describe 'indices' do
       it 'should create indices' do
-        cequel.schema.create_table(:posts) do
+        cequel.schema.create_table(table_name) do
           key :blog_permalink, :ascii
           key :id, :uuid, :desc
           column :title, :text, :index => true
@@ -212,7 +213,7 @@ describe Cequel::Schema::TableWriter do
       end
 
       it 'should create indices with specified name' do
-        cequel.schema.create_table(:posts) do
+        cequel.schema.create_table(table_name) do
           key :blog_permalink, :ascii
           key :id, :uuid, :desc
           column :title, :text, :index => :silly_idx

data/spec/examples/spec_support/preparation_spec.rb

@@ -49,6 +49,14 @@ describe Cequel::SpecSupport::Preparation do
       Cequel::Record.connection.schema.drop!
     end
 
+    let!(:model) {
+      Class.new do
+        include Cequel::Record
+        self.table_name = "blog_" + SecureRandom.hex(4)
+        key :name, :text
+      end
+    }
+
     it "doesn't cause failure upon drop requests" do
       expect{ prep.drop_keyspace }.not_to raise_error
     end

data/spec/support/helpers.rb

@@ -139,6 +139,14 @@ module Cequel
         expect(cequel.client).to have_received(:execute).
           with(matcher, hash_including(:consistency => consistency))
       end
+
+      def expect_query_with_options(matcher, options)
+        allow(cequel.client).to receive(:execute).and_call_original
+        yield
+        expect(cequel.client).to have_received(:execute).
+          with(matcher, hash_including(options))
+      end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -199,14 +199,12 @@ files:
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
-- DRIVER_TODO
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - Vagrantfile
-- cequel.gemspec
 - lib/cequel.rb
 - lib/cequel/errors.rb
 - lib/cequel/instrumentation.rb
@@ -304,7 +302,6 @@ files:
 - spec/examples/uuids_spec.rb
 - spec/support/helpers.rb
 - spec/support/result_stub.rb
-- tags
 - templates/config/cequel.yml
 - templates/record.rb
 homepage: https://github.com/cequel/cequel
@@ -328,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Cassandra >= 2.0.0
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Full-featured, ActiveModel-compliant ORM for Cassandra using CQL3

data/DRIVER_TODO

@@ -1,5 +0,0 @@
-* Why is it so slow?
-* Use built in batches
-* Use built in bind variable replacement
-* Use built in pagination(?)
-* Use built in retry(?)

data/cequel.gemspec

@@ -1,42 +0,0 @@
-require File.expand_path('../lib/cequel/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name = 'cequel'
-  s.version = Cequel::VERSION
-  s.authors = [
-    'Mat Brown', 'Aubrey Holland', 'Keenan Brock', 'Insoo Buzz Jung',
-    'Louis Simoneau', 'Peter Williams', 'Kenneth Hoffman', 'Antti Tapio',
-    'Ilya Bazylchuk', 'Dan Cardamore', 'Kei Kusakari', 'Oleh Novosad',
-    'John Smart', 'Angelo Lakra', 'Olivier Lance', 'Tomohiro Nishimura',
-    'Masaki Takahashi', 'G Gordon Worley III', 'Clark Bremer', 'Tamara Temple',
-    'Long On', 'Lucas Mundim'
-  ]
-  s.homepage = "https://github.com/cequel/cequel"
-  s.email = 'mat.a.brown@gmail.com'
-  s.license = 'MIT'
-  s.summary = 'Full-featured, ActiveModel-compliant ORM for Cassandra using CQL3'
-  s.description = <<DESC
-Cequel is an ActiveRecord-like domain model layer for Cassandra that exposes
-the robust data modeling capabilities of CQL3, including parent-child
-relationships via compound primary keys and in-memory atomic manipulation of
-collection columns.
-DESC
-
-  s.files = Dir['lib/**/*.rb', 'templates/**/*', 'spec/**/*.rb', '[A-Z]*']
-  s.test_files = Dir['spec/examples/**/*.rb']
-  s.has_rdoc = true
-  s.extra_rdoc_files = 'README.md'
-  s.required_ruby_version = '>= 2.0'
-  s.add_runtime_dependency 'activemodel', '~> 4.0'
-  s.add_runtime_dependency 'cassandra-driver', '~> 2.0'
-  s.add_development_dependency 'appraisal', '~> 1.0'
-  s.add_development_dependency 'wwtd', '~> 0.5'
-  s.add_development_dependency 'rake', '~> 10.1'
-  s.add_development_dependency 'rspec', '~> 3.1'
-  s.add_development_dependency 'rspec-its', '~> 1.0'
-  s.add_development_dependency 'rubocop', '~> 0.28'
-  s.add_development_dependency 'timecop', '~> 0.7'
-  s.add_development_dependency 'travis', '~> 1.7'
-  s.add_development_dependency 'yard', '~> 0.6'
-  s.requirements << 'Cassandra >= 2.0.0'
-end