cequel 1.0.0.pre.4 → 1.0.0.pre.5

data/spec/examples/record/properties_spec.rb

@@ -61,11 +61,15 @@ describe Cequel::Record::Properties do
         should == %w(one two three)
     end
 
-    it 'should cast values in list column' do
-      Post.new { |post| post.tags = Set[1, 2, 3] }.tags.
+    it 'should cast collection in list column to list' do
+      Post.new { |post| post.tags = Set['1', '2', '3'] }.tags.
         should == %w(1 2 3)
     end
 
+    it 'should cast elements in list' do
+      Post.new { |post| post.tags = [1, 2, 3] }.tags.should == %w(1 2 3)
+    end
+
     it 'should have empty list column value if unset' do
       Post.new.tags.should == []
     end
@@ -75,8 +79,13 @@ describe Cequel::Record::Properties do
         categories.should == Set['Big Data', 'Cassandra']
     end
 
-    it 'should cast values to correct type' do
-      Post.new { |post| post.categories = [1, 2, 3] }.categories.
+    it 'should cast values in set column to correct type' do
+      Post.new { |post| post.categories = Set[1, 2, 3] }.categories.
+        should == Set['1', '2', '3']
+    end
+
+    it 'should cast collection to set in set column' do
+      Post.new { |post| post.categories = ['1', '2', '3'] }.categories.
         should == Set['1', '2', '3']
     end
 
@@ -90,7 +99,12 @@ describe Cequel::Record::Properties do
     end
 
     it 'should cast values for map column' do
-      Post.new { |post| post.shares = [[:facebook, '1'], [:twitter, '2']] }.
+      Post.new { |post| post.shares = {facebook: '1', twitter: '2'} }.
+        shares.should == {'facebook' => 1, 'twitter' => 2}
+    end
+
+    it 'should cast collection passed to map column to map' do
+      Post.new { |post| post.shares = [['facebook', 1], ['twitter', 2]] }.
         shares.should == {'facebook' => 1, 'twitter' => 2}
     end
 

data/spec/examples/record/record_set_spec.rb

@@ -2,18 +2,18 @@ require File.expand_path('../spec_helper', __FILE__)
 
 describe Cequel::Record::RecordSet do
   model :Blog do
-    key :subdomain, :text
+    key :subdomain, :ascii
     column :name, :text
     column :description, :text
   end
 
   model :Post do
-    key :blog_subdomain, :text
-    key :permalink, :text
+    key :blog_subdomain, :ascii
+    key :permalink, :ascii
     column :title, :text
     column :body, :text
-    column :author_id, :uuid, :index => true
-    column :author_name, :text, :index => true
+    column :author_id, :uuid, index: true
+    column :author_name, :text, index: true
     list :tags, :text
     set :categories, :text
     map :shares, :text, :int
@@ -23,8 +23,22 @@ describe Cequel::Record::RecordSet do
     end
   end
 
+  model :Comment do
+    key :blog_subdomain, :text
+    key :permalink, :text
+    key :id, :uuid, :auto => true
+    column :body, :text
+  end
+
+  model :PublishedPost do
+    key :blog_subdomain, :ascii
+    key :published_at, :timeuuid
+    column :permalink, :ascii, index: true
+  end
+
   let(:subdomains) { [] }
   let(:uuids) { Array.new(2) { CassandraCQL::UUID.new }}
+  let(:now) { Time.at(Time.now.to_i) }
 
   before do
     cequel.batch do
@@ -35,8 +49,7 @@ describe Cequel::Record::RecordSet do
           blog.description = "This is Blog number #{i}"
         end.save
       end
-    end
-    cequel.batch do
+
       5.times do |i|
         cequel[:posts].insert(
           :blog_subdomain => 'cassandra',
@@ -45,12 +58,26 @@ describe Cequel::Record::RecordSet do
           :body => "Post number #{i}",
           :author_id => uuids[i%2]
         )
+        cequel[:published_posts].insert(
+          :blog_subdomain => 'cassandra',
+          :published_at => max_uuid(now + (i - 4).minutes),
+          :permalink => "cequel#{i}"
+        )
         cequel[:posts].insert(
           :blog_subdomain => 'postgres',
           :permalink => "sequel#{i}",
           :title => "Sequel #{i}"
         )
       end
+
+      5.times do |i|
+        cequel[:comments].insert(
+          :blog_subdomain => 'cassandra',
+          :permalink => 'cequel0',
+          :id => CassandraCQL::UUID.new(Time.now - 5 + i),
+          :body => "Comment #{i}"
+        )
+      end
     end
   end
 
@@ -66,7 +93,11 @@ describe Cequel::Record::RecordSet do
       specify { Blog.new.should_not be_persisted }
       specify { Blog.new.should be_transient }
 
-      specify do
+      it 'should cast argument to correct type' do
+        Blog.find('blog-0'.force_encoding('ASCII-8BIT')).should be
+      end
+
+      it 'should raise RecordNotFound if bad argument passed' do
         expect { Blog.find('bogus') }.
           to raise_error(Cequel::Record::RecordNotFound)
       end
@@ -84,7 +115,12 @@ describe Cequel::Record::RecordSet do
       specify { Post.new.should_not be_persisted }
       specify { Post.new.should be_transient }
 
-      specify do
+      it 'should cast all keys to correct type' do
+        Post['cassandra'.force_encoding('ASCII-8BIT')].
+          find('cequel0'.force_encoding('ASCII-8BIT')).should be
+      end
+
+      it 'should raise RecordNotFound if bad argument passed' do
         expect { Post['cequel'].find('bogus')}.
           to raise_error(Cequel::Record::RecordNotFound)
       end
@@ -109,6 +145,10 @@ describe Cequel::Record::RecordSet do
         disallow_queries!
         subject.description.should == 'This is Blog number 0'
       end
+
+      it 'should cast argument' do
+        subject.subdomain.encoding.name.should == 'US-ASCII'
+      end
     end
 
     context 'compound primary key' do
@@ -120,6 +160,11 @@ describe Cequel::Record::RecordSet do
         subject.permalink.should == 'cequel0'
       end
 
+      it 'should cast all keys to the correct type' do
+        subject.blog_subdomain.encoding.name.should == 'US-ASCII'
+        subject.permalink.encoding.name.should == 'US-ASCII'
+      end
+
       it 'should lazily query the database when attribute accessed' do
         subject.title.should == 'Cequel 0'
       end
@@ -155,6 +200,12 @@ describe Cequel::Record::RecordSet do
       Post.at('cassandra').find_each(:batch_size => 2).map(&:title).
         should == (0...5).map { |i| "Cequel #{i}" }
     end
+
+    it 'should cast arguments correctly' do
+      Post.at('cassandra'.force_encoding('ASCII-8BIT')).
+        find_each(:batch_size => 2).map(&:title).
+        should == (0...5).map { |i| "Cequel #{i}" }
+    end
   end
 
   describe '#[]' do
@@ -176,6 +227,16 @@ describe Cequel::Record::RecordSet do
       Post.at('cassandra').after('cequel1').map(&:title).
         should == (2...5).map { |i| "Cequel #{i}" }
     end
+
+    it 'should cast argument' do
+      Post.at('cassandra').after('cequel1'.force_encoding('ASCII-8BIT')).
+        map(&:title).should == (2...5).map { |i| "Cequel #{i}" }
+    end
+
+    it 'should query Time range for Timeuuid key' do
+      PublishedPost['cassandra'].after(now - 3.minutes).map(&:permalink).
+        should == %w(cequel2 cequel3 cequel4)
+    end
   end
 
   describe '#from' do
@@ -184,6 +245,16 @@ describe Cequel::Record::RecordSet do
         should == (1...5).map { |i| "Cequel #{i}" }
     end
 
+    it 'should cast argument' do
+      Post.at('cassandra').from('cequel1'.force_encoding('ASCII-8BIT')).
+        map(&:title).should == (1...5).map { |i| "Cequel #{i}" }
+    end
+
+    it 'should query Time range for Timeuuid key' do
+      PublishedPost['cassandra'].from(now - 3.minutes).map(&:permalink).
+        should == %w(cequel1 cequel2 cequel3 cequel4)
+    end
+
     it 'should raise ArgumentError when called on partition key' do
       expect { Post.from('cassandra') }.
         to raise_error(Cequel::Record::IllegalQuery)
@@ -195,6 +266,16 @@ describe Cequel::Record::RecordSet do
       Post.at('cassandra').before('cequel3').map(&:title).
         should == (0...3).map { |i| "Cequel #{i}" }
     end
+
+    it 'should query Time range for Timeuuid key' do
+      PublishedPost['cassandra'].before(now - 1.minute).map(&:permalink).
+        should == %w(cequel0 cequel1 cequel2)
+    end
+
+    it 'should cast argument' do
+      Post.at('cassandra').before('cequel3'.force_encoding('ASCII-8BIT')).
+        map(&:title).should == (0...3).map { |i| "Cequel #{i}" }
+    end
   end
 
   describe '#upto' do
@@ -202,6 +283,16 @@ describe Cequel::Record::RecordSet do
       Post.at('cassandra').upto('cequel3').map(&:title).
         should == (0..3).map { |i| "Cequel #{i}" }
     end
+
+    it 'should cast argument' do
+      Post.at('cassandra').upto('cequel3'.force_encoding('ASCII-8BIT')).
+        map(&:title).should == (0..3).map { |i| "Cequel #{i}" }
+    end
+
+    it 'should query Time range for Timeuuid key' do
+      PublishedPost['cassandra'].upto(now - 1.minute).map(&:permalink).
+        should == %w(cequel0 cequel1 cequel2 cequel3)
+    end
   end
 
   describe '#in' do
@@ -210,10 +301,26 @@ describe Cequel::Record::RecordSet do
         should == (1..3).map { |i| "Cequel #{i}" }
     end
 
+    it 'should cast arguments' do
+      Post.at('cassandra').in('cequel1'.force_encoding('ASCII-8BIT')..
+                              'cequel3'.force_encoding('ASCII-8BIT')).
+        map(&:title).should == (1..3).map { |i| "Cequel #{i}" }
+    end
+
     it 'should return collection with exclusive upper bound' do
       Post.at('cassandra').in('cequel1'...'cequel3').map(&:title).
         should == (1...3).map { |i| "Cequel #{i}" }
     end
+
+    it 'should query Time range for Timeuuid key' do
+      PublishedPost['cassandra'].in((now - 3.minutes)..(now - 1.minute)).
+        map(&:permalink).should == %w(cequel1 cequel2 cequel3)
+    end
+
+    it 'should query Time range for Timeuuid key with exclusive upper bound' do
+      PublishedPost['cassandra'].in((now - 3.minutes)...(now - 1.minute)).
+        map(&:permalink).should == %w(cequel1 cequel2)
+    end
   end
 
   describe '#reverse' do
@@ -235,6 +342,11 @@ describe Cequel::Record::RecordSet do
     it 'should raise an error if range key is a partition key' do
       expect { Post.all.reverse }.to raise_error(Cequel::Record::IllegalQuery)
     end
+
+    it 'should use the correct ordering column in deeply nested models' do
+      Comment['cassandra']['cequel0'].reverse.map(&:body).
+        should == (0...5).map { |i| "Comment #{i}" }.reverse
+    end
   end
 
   describe 'last' do
@@ -295,6 +407,11 @@ describe Cequel::Record::RecordSet do
         should == %w(cequel0 cequel2 cequel4)
     end
 
+    it 'should cast argument for column' do
+      Post.where(:author_id, uuids.first.to_s).map(&:permalink).
+        should == %w(cequel0 cequel2 cequel4)
+    end
+
     it 'should raise ArgumentError if column is not recognized' do
       expect { Post.where(:bogus, 'Business') }.
         to raise_error(ArgumentError)

data/spec/examples/record/schema_spec.rb

@@ -83,6 +83,10 @@ describe Cequel::Record::Schema do
       its(:clustering_columns) { should == [Cequel::Schema::Column.new(:id, :uuid)] }
       it { should be_compact_storage }
       its(:data_columns) { should == [Cequel::Schema::Column.new(:data, :text)] }
+
+      it 'should be able to synchronize schema again' do
+        expect { legacy_model.synchronize_schema }.to_not raise_error
+      end
     end
   end
 end

data/spec/examples/record/set_spec.rb

@@ -27,6 +27,20 @@ describe Cequel::Record::Set do
     end
   end
 
+  context 'updating' do
+    it 'should overwrite value' do
+      post.tags = Set['three', 'four']
+      post.save!
+      subject[:tags].should == Set['three', 'four']
+    end
+
+    it 'should cast collection before overwriting' do
+      post.tags = %w(three four)
+      post.save!
+      subject[:tags].should == Set['three', 'four']
+    end
+  end
+
   describe 'atomic modification' do
     before { scope.set_add(:tags, 'three') }
 
@@ -38,6 +52,11 @@ describe Cequel::Record::Set do
         post.tags.should == Set['one', 'two', 'four']
       end
 
+      it 'should cast before adding' do
+        post.tags.add(4)
+        post.tags.should == Set['one', 'two', '4']
+      end
+
       it 'should add without reading' do
         max_statements! 2
         unloaded_post.tags.add('four')
@@ -80,6 +99,11 @@ describe Cequel::Record::Set do
         post.tags.should == Set['one']
       end
 
+      it 'should cast before deleting' do
+        post.tags.delete(:two)
+        post.tags.should == Set['one']
+      end
+
       it 'should delete without reading' do
         max_statements! 2
         unloaded_post.tags.delete('two')
@@ -101,6 +125,11 @@ describe Cequel::Record::Set do
         post.tags.should == Set['a', 'b']
       end
 
+      it 'should cast before replacing' do
+        post.tags.replace(Set[1, 2, :three])
+        post.tags.should == Set['1', '2', 'three']
+      end
+
       it 'should replace without reading' do
         max_statements! 2
         unloaded_post.tags.replace(Set['a', 'b'])

data/spec/examples/schema/table_reader_spec.rb

@@ -381,9 +381,9 @@ describe Cequel::Schema::TableReader do
     its(:partition_key_columns) { should ==
       [Cequel::Schema::PartitionKey.new(:blog_subdomain, :text)] }
     its(:clustering_columns) { should ==
-      [Cequel::Schema::ClusteringColumn.new(nil, :uuid)] }
+      [Cequel::Schema::ClusteringColumn.new(:column1, :uuid)] }
     its(:data_columns) { should ==
-      [Cequel::Schema::DataColumn.new(nil, :text)] }
+      [Cequel::Schema::DataColumn.new(:value, :text)] }
   end
 
 end

data/spec/support/helpers.rb

@@ -76,6 +76,24 @@ module Cequel
         )
       end
 
+      def min_uuid(time = Time.now)
+        CassandraCQL::UUID.new(time, :randomize => false)
+      end
+
+      def max_uuid(time = Time.now)
+        time = time.stamp * 10 + SimpleUUID::UUID::GREGORIAN_EPOCH_OFFSET
+        # See http://github.com/spectra/ruby-uuid/
+        byte_array = [
+          time & 0xFFFF_FFFF,
+          time >> 32,
+          ((time >> 48) & 0x0FFF) | 0x1000,
+          (2**13 - 1) | SimpleUUID::UUID::VARIANT,
+          2**16 - 1,
+          2**32 - 1
+        ]
+        CassandraCQL::UUID.new(byte_array.pack("NnnnnN"))
+      end
+
       def cequel
         Helpers.cequel
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.4
+  version: 1.0.0.pre.5
 platform: ruby
 authors:
 - Mat Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -154,6 +154,7 @@ files:
 - lib/cequel/record/association_collection.rb
 - lib/cequel/record/associations.rb
 - lib/cequel/record/belongs_to_association.rb
+- lib/cequel/record/bound.rb
 - lib/cequel/record/callbacks.rb
 - lib/cequel/record/collection.rb
 - lib/cequel/record/dirty.rb