cequel 1.4.2 → 1.4.3

data/spec/support/helpers.rb

@@ -65,7 +65,7 @@ module Cequel
       end
 
       def self.host
-        '127.0.0.1'
+        ENV['CEQUEL_TEST_HOST'] || '127.0.0.1'
       end
 
       def self.port
@@ -77,7 +77,14 @@ module Cequel
       end
 
       def self.keyspace_name
-        ENV['CEQUEL_TEST_KEYSPACE'] || 'cequel_test'
+        ENV.fetch('CEQUEL_TEST_KEYSPACE') do
+          test_env_number = ENV['TEST_ENV_NUMBER']
+          if test_env_number.present?
+            "cequel_test_#{test_env_number}"
+          else
+            'cequel_test'
+          end
+        end
       end
 
       def self.legacy_connection
@@ -106,28 +113,29 @@ module Cequel
         Helpers.legacy_connection
       end
 
-      def max_statements!(number)
-        cequel.client.should_receive(:execute).at_most(number).times.and_call_original
+      def expect_statement_count(number)
+        allow(cequel.client).to receive(:execute).and_call_original
+        yield
+        expect(cequel.client).to have_received(:execute).exactly(number).times
       end
 
       def disallow_queries!
-        cequel.client.should_not_receive(:execute)
+        expect(cequel.client).to_not receive(:execute)
       end
 
       def with_client_error(error)
-        cequel.client.stub(:execute).and_raise(error)
+        allow(cequel.client).to receive(:execute).once.and_raise(error)
         begin
           yield
         ensure
-          cequel.client.unstub(:execute)
+          allow(cequel.client).to receive(:execute).and_call_original
         end
       end
 
       def expect_query_with_consistency(matcher, consistency)
-        expect(cequel.client).to receive(:execute).with(matcher, consistency)
-          .and_call_original
+        allow(cequel.client).to receive(:execute).and_call_original
         yield
-        RSpec::Mocks.proxy_for(cequel.client).reset
+        expect(cequel.client).to have_received(:execute).with(matcher, consistency)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Mat Brown
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -110,14 +110,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +287,6 @@ files:
 - spec/examples/spec_support/preparation_spec.rb
 - spec/examples/type_spec.rb
 - spec/examples/uuids_spec.rb
-- spec/shared/readable_dictionary.rb
 - spec/support/helpers.rb
 - spec/support/result_stub.rb
 - templates/config/cequel.yml

data/spec/shared/readable_dictionary.rb

@@ -1,192 +0,0 @@
-# -*- encoding : utf-8 -*-
-shared_examples 'readable dictionary' do
-  let(:uuid1) { uuid }
-  let(:uuid2) { uuid }
-  let(:uuid3) { uuid }
-  let(:cf) { dictionary.class.column_family.column_family }
-
-  context 'without row in memory' do
-
-    describe '#each_pair' do
-
-      it 'should load columns in batches and yield them' do
-        connection.should_receive(:execute).
-          with("SELECT FIRST 2 * FROM #{cf} WHERE ? = ? LIMIT 1", :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid1 => 1, uuid2 => 2)
-        connection.should_receive(:execute).
-          with("SELECT FIRST 2 ?..? FROM #{cf} WHERE ? = ? LIMIT 1", uuid2, '', :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid2 => 2, uuid3 => 3)
-        connection.should_receive(:execute).
-          with("SELECT FIRST 2 ?..? FROM #{cf} WHERE ? = ? LIMIT 1", uuid3, '', :blog_id, 1).
-          and_return result_stub({'blog_id' => 1})
-        hash = {}
-        dictionary.each_pair do |key, value|
-          hash[key] = value
-        end
-        hash.should == {uuid1 => 1, uuid2 => 2, uuid3 => 3}
-      end
-
-    end
-
-    describe '#[]' do
-
-      it 'should load column from cassandra' do
-        connection.stub(:execute).
-          with("SELECT ? FROM #{cf} WHERE ? = ? LIMIT 1", [uuid1], :blog_id, 1).
-          and_return result_stub(uuid1 => 1)
-        dictionary[uuid1].should == 1
-      end
-
-    end
-
-    describe '#slice' do
-      it 'should load columns from data store' do
-        connection.stub(:execute).
-          with("SELECT ? FROM #{cf} WHERE ? = ? LIMIT 1", [uuid1,uuid2], :blog_id, 1).
-          and_return result_stub(uuid1 => 1, uuid2 => 2)
-        dictionary.slice(uuid1, uuid2).should == {uuid1 => 1, uuid2 => 2}
-      end
-    end
-
-    describe '#keys' do
-      it 'should load keys from data store' do
-        connection.should_receive(:execute).
-          with("SELECT FIRST 2 * FROM #{cf} WHERE ? = ? LIMIT 1", :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid1 => 1, uuid2 => 2)
-        connection.should_receive(:execute).
-          with("SELECT FIRST 2 ?..? FROM #{cf} WHERE ? = ? LIMIT 1", uuid2, '', :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid2 => 2, uuid3 => 3)
-        connection.should_receive(:execute).
-          with("SELECT FIRST 2 ?..? FROM #{cf} WHERE ? = ? LIMIT 1", uuid3, '', :blog_id, 1).
-          and_return result_stub({'blog_id' => 1})
-        dictionary.keys.should == [uuid1, uuid2, uuid3]
-      end
-    end
-
-    describe '#values' do
-      it 'should load values from data store' do
-        connection.should_receive(:execute).
-          with("SELECT FIRST 2 * FROM #{cf} WHERE ? = ? LIMIT 1", :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid1 => 1, uuid2 => 2)
-        connection.should_receive(:execute).
-          with("SELECT FIRST 2 ?..? FROM #{cf} WHERE ? = ? LIMIT 1", uuid2, '', :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid2 => 2, uuid3 => 3)
-        connection.should_receive(:execute).
-          with("SELECT FIRST 2 ?..? FROM #{cf} WHERE ? = ? LIMIT 1", uuid3, '', :blog_id, 1).
-          and_return result_stub({'blog_id' => 1})
-        dictionary.values.should == [1, 2, 3]
-      end
-    end
-
-    describe '#first' do
-      it 'should load value from data store' do
-        connection.should_receive(:execute).
-          with("SELECT FIRST 1 * FROM #{cf} WHERE ? = ? LIMIT 1", :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid1 => 1)
-        dictionary.first.should == [uuid1, 1]
-      end
-    end
-
-    describe '#last' do
-      it 'should load value from data store' do
-        connection.should_receive(:execute).
-          with("SELECT FIRST 1 REVERSED * FROM #{cf} WHERE ? = ? LIMIT 1", :blog_id, 1).
-          and_return result_stub('blog_id' => 1, uuid3 => 3)
-        dictionary.last.should == [uuid3, 3]
-      end
-    end
-
-  end
-
-  context 'with data loaded in memory' do
-    before do
-      connection.stub(:execute).
-        with("SELECT FIRST 2 * FROM #{cf} WHERE ? = ? LIMIT 1", :blog_id, 1).
-        and_return result_stub('blog_id' => 1, uuid1 => 1, uuid2 => 2)
-      connection.stub(:execute).
-        with("SELECT FIRST 2 ?..? FROM #{cf} WHERE ? = ? LIMIT 1", uuid2, '', :blog_id, 1).
-        and_return result_stub('blog_id' => 1, uuid2 => 2, uuid3 => 3)
-      connection.stub(:execute).
-        with("SELECT FIRST 2 ?..? FROM #{cf} WHERE ? = ? LIMIT 1", uuid3, '', :blog_id, 1).
-        and_return result_stub({'blog_id' => 1})
-      dictionary.load
-      connection.should_not_receive(:execute)
-    end
-
-    describe '#each_pair' do
-      it 'should yield data from memory' do
-        hash = {}
-        dictionary.each_pair do |key, value|
-          hash[key] = value
-        end
-        hash.should == {uuid1 => 1, uuid2 => 2, uuid3 => 3}
-      end
-    end
-
-    describe '#[]' do
-      it 'should return value from memory' do
-        dictionary[uuid1].should == 1
-      end
-    end
-
-    describe '#slice' do
-      it 'should return slice of data in memory' do
-        dictionary.slice(uuid1, uuid2).should == {uuid1 => 1, uuid2 => 2}
-      end
-    end
-
-    describe '#first' do
-      it 'should return first element in memory' do
-        dictionary.first.should == [uuid1, 1]
-      end
-    end
-
-    describe '#last' do
-      it 'should return first element in memory' do
-        dictionary.last.should == [uuid3, 3]
-      end
-    end
-
-    describe '#keys' do
-      it 'should return keys from memory' do
-        dictionary.keys.should == [uuid1, uuid2, uuid3]
-      end
-    end
-
-    describe '#values' do
-      it 'should return values from memory' do
-        dictionary.values.should == [1, 2, 3]
-      end
-    end
-  end
-
-  describe '::load' do
-    let :comments do
-      [
-        {'user' => 'Cequel User', 'comment' => 'How do I load multiple rows?'},
-        {'user' => 'Mat Brown', 'comment' => 'Just use the ::load class method'}
-      ]
-    end
-
-    it 'should load all rows in one query' do
-      connection.stub(:execute).
-        with(
-          'SELECT * FROM post_comments WHERE ? IN (?)',
-          'post_id', [1, 2]
-        ).and_return result_stub(
-          *comments.each_with_index.
-            map { |comment, i| {'post_id' => i+1, i+4 => comment.to_json} }
-          )
-      rows = PostComments.load(1, 2)
-      rows.map { |row| row.post_id }.should == [1, 2]
-      rows.map { |row| row.values.first }.should == comments
-    end
-  end
-
-  private
-
-  def uuid
-    SimpleUUID::UUID.new.to_guid
-  end
-end
-