cequel 1.10.0 → 2.0.0

data/spec/examples/record/timestamps_spec.rb

@@ -28,10 +28,14 @@ describe Cequel::Record::Timestamps do
     end
 
     it 'should update updated_at after record update but not created_at' do
-      future = Timecop.freeze(now + 2.minutes)
+      before = now
+      sleep 1
+      after = Time.now
+
       blog.name = 'name'
       blog.save!
-      expect(blog.updated_at).to be_within(one_millisecond).of(future)
+      expect(blog.created_at).to be_within(one_millisecond).of(before)
+      expect(blog.updated_at).to be_within(one_millisecond).of(after)
     end
 
     it 'should cast the timestamp in the same way that Cassandra records it' do
@@ -55,11 +59,14 @@ describe Cequel::Record::Timestamps do
     end
 
     it 'should update updated_at after record update but not created_at' do
-      future = Timecop.freeze(now + 2.minutes)
+      before = now
+      sleep 1
+      after = Time.now
+
       post.name = 'name'
       post.save!
-      expect(post.created_at).to be_within(one_millisecond).of(now)
-      expect(post.updated_at).to be_within(one_millisecond).of(future)
+      expect(post.created_at).to be_within(one_millisecond).of(before)
+      expect(post.updated_at).to be_within(one_millisecond).of(after)
     end
   end
 end

data/spec/examples/schema/keyspace_spec.rb

@@ -29,7 +29,7 @@ describe Cequel::Schema::Keyspace do
     end
 
     let(:schema_config) do
-      connection.client.execute("SELECT * FROM system.schema_keyspaces WHERE keyspace_name = '#{keyspace_name}'").first
+      connection.send(:cluster).tap{|x| x.refresh_schema}.keyspace(keyspace_name)
     end
 
     context 'with default options' do
@@ -37,12 +37,8 @@ describe Cequel::Schema::Keyspace do
 
       it 'uses default keyspace configuration' do
         keyspace.create!
-        expect(schema_config).to eq({
-          "keyspace_name"=>keyspace_name,
-          "durable_writes"=>true,
-          "strategy_class"=>"org.apache.cassandra.locator.SimpleStrategy",
-          "strategy_options"=>"{\"replication_factor\":\"1\"}"
-        })
+        expect(schema_config.name).to eq keyspace_name
+        expect(schema_config.durable_writes?).to eq true
       end
     end
 
@@ -51,12 +47,8 @@ describe Cequel::Schema::Keyspace do
 
       it 'uses specified options' do
         keyspace.create! replication: { class: "SimpleStrategy", replication_factor: 2 }
-        expect(schema_config).to eq({
-          "keyspace_name"=>keyspace_name,
-          "durable_writes"=>true,
-          "strategy_class"=>"org.apache.cassandra.locator.SimpleStrategy",
-          "strategy_options"=>"{\"replication_factor\":\"2\"}"
-        })
+        expect(schema_config.name).to eq keyspace_name
+        expect(schema_config.durable_writes?).to eq true
       end
     end
 
@@ -65,12 +57,8 @@ describe Cequel::Schema::Keyspace do
 
       it 'accepts class and replication_factor options' do
         keyspace.create! class: "SimpleStrategy", replication_factor: 2
-        expect(schema_config).to eq({
-          "keyspace_name"=>keyspace_name,
-          "durable_writes"=>true,
-          "strategy_class"=>"org.apache.cassandra.locator.SimpleStrategy",
-          "strategy_options"=>"{\"replication_factor\":\"2\"}"
-        })
+        expect(schema_config.name).to eq keyspace_name
+        expect(schema_config.durable_writes?).to eq true
       end
 
       it "raises an error if a class other than SimpleStrategy is given"  do
@@ -87,12 +75,8 @@ describe Cequel::Schema::Keyspace do
 
       it 'uses default keyspace configuration' do
         keyspace.create!
-        expect(schema_config).to eq({
-          "keyspace_name"=>keyspace_name,
-          "durable_writes"=>true,
-          "strategy_class"=>"org.apache.cassandra.locator.SimpleStrategy",
-          "strategy_options"=>"{\"replication_factor\":\"3\"}"
-        })
+        expect(schema_config.name).to eq keyspace_name
+        expect(schema_config.durable_writes?).to eq true
       end
     end
 
@@ -103,12 +87,8 @@ describe Cequel::Schema::Keyspace do
 
       it 'uses default keyspace configuration' do
         keyspace.create!
-        expect(schema_config).to eq({
-          "keyspace_name"=>keyspace_name,
-          "durable_writes"=>true,
-          "strategy_class"=>"org.apache.cassandra.locator.NetworkTopologyStrategy",
-          "strategy_options"=>"{\"datacenter1\":\"3\",\"datacenter2\":\"2\"}"
-        })
+        expect(schema_config.name).to eq keyspace_name
+        expect(schema_config.durable_writes?).to eq true
       end
     end
 
@@ -119,12 +99,8 @@ describe Cequel::Schema::Keyspace do
 
       it 'uses default keyspace configuration' do
         keyspace.create!
-        expect(schema_config).to eq({
-          "keyspace_name"=>keyspace_name,
-          "durable_writes"=>false,
-          "strategy_class"=>"org.apache.cassandra.locator.SimpleStrategy",
-          "strategy_options"=>"{\"replication_factor\":\"1\"}"
-        })
+        expect(schema_config.name).to eq keyspace_name
+        expect(schema_config.durable_writes?).to eq false
       end
     end
   end # describe 'creating keyspace'

data/spec/examples/schema/table_reader_spec.rb

@@ -13,6 +13,7 @@ describe Cequel::Schema::TableReader do
   describe 'reading simple key' do
     before do
       cequel.execute("CREATE TABLE #{table_name} (permalink text PRIMARY KEY)")
+      cequel.send(:cluster).refresh_schema
     end
 
     it 'should read name correctly' do
@@ -295,8 +296,10 @@ describe Cequel::Schema::TableReader do
     end
 
     it 'should read and simplify compression class' do
-      expect(table.property(:compression)[:sstable_compression]).
+      expect(table.property(:compression)[:sstable_compression] ||
+             table.property(:compression)[:class]).
         to eq('DeflateCompressor')
+
     end
 
     it 'should read integer properties from compression class' do

data/spec/examples/schema/table_updater_spec.rb

@@ -121,16 +121,31 @@ describe Cequel::Schema::TableUpdater do
   end
 
   describe '#drop_index' do
-    before do
-      tab_name = table_name
-      cequel.schema.alter_table(table_name) do
-        create_index :title
-        drop_index :"#{tab_name}_title_idx"
+    context 'index exists' do
+      before 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 drop the index' do
+        expect(table.data_column(:title)).not_to be_indexed
       end
     end
 
-    it 'should drop the index' do
-      expect(table.data_column(:title)).not_to be_indexed
+    context 'index does not exist' do
+      before do
+        tab_name = table_name
+        cequel.schema.alter_table(table_name) do
+          drop_index :"#{tab_name}_title_idx"
+        end
+      end
+
+      it 'should nop on non existent index' do
+        expect(table.data_column(:title)).not_to be_indexed
+      end
     end
   end
 

data/spec/examples/schema/table_writer_spec.rb

@@ -167,10 +167,9 @@ describe Cequel::Schema::TableWriter do
       end
 
       it 'should set map collection properties' do
-        expect(table.property(:compression)).to eq({
-          :sstable_compression => 'DeflateCompressor',
+        expect(table.property(:compression)).to include(
           :chunk_length_kb => 64
-        })
+        )
       end
     end
 

data/spec/examples/spec_helper.rb

@@ -2,6 +2,7 @@
 require File.expand_path('../../environment', __FILE__)
 require 'cequel'
 require 'tzinfo'
+require 'pp'
 
 Dir.glob(File.expand_path('../../support/**/*.rb', __FILE__)).each do |file|
   require file

data/spec/examples/spec_support/preparation_spec.rb

@@ -63,11 +63,12 @@ describe Cequel::SpecSupport::Preparation do
 
     it "allows keyspace can be created" do
       prep.create_keyspace
+      keyspace.cluster.refresh_schema
       expect(keyspace).to exist
     end
 
     it "causes #sync_schema to fail" do
-      expect{ prep.sync_schema }.to raise_error(Cassandra::Errors::InvalidError)
+      expect{ prep.sync_schema }.to raise_error(Cequel::NoSuchKeyspaceError)
     end
   end
 
@@ -84,12 +85,18 @@ describe Cequel::SpecSupport::Preparation do
 
   matcher :contain_table do |table_name|
     match do |keyspace|
-      keyspace.execute(<<-CQL).any?
-        SELECT columnfamily_name
-        FROM System.schema_columnfamilies
-        WHERE keyspace_name='#{keyspace.name}'
-          AND columnfamily_name='#{table_name}'
-      CQL
+      keyspace.cluster.refresh_schema
+      ks = keyspace.cluster.keyspace(keyspace.name)
+
+      ks && ks.has_table?(table_name)
+    end
+
+    failure_message do |keyspace|
+      if keyspace.cluster.has_keyspace?(keyspace.name)
+        "no such keyspace #{keyspace.name}"
+      else
+        "no such table #{keyspace.name}.#{table_name}"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Mat Brown
@@ -29,20 +29,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Cassandra >= 2.0.0
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Full-featured, ActiveModel-compliant ORM for Cassandra using CQL3
@@ -361,4 +361,3 @@ test_files:
 - spec/examples/spec_support/preparation_spec.rb
 - spec/examples/type_spec.rb
 - spec/examples/uuids_spec.rb
-has_rdoc: true