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

data/lib/cequel/schema/column.rb

@@ -18,6 +18,10 @@ module Cequel
         false
       end
 
+      def type?(type_in)
+        type.is_a?(type_in)
+      end
+
       def clustering_column?
         false
       end

data/lib/cequel/schema/table_reader.rb

@@ -57,7 +57,7 @@ module Cequel
         unless comparators
           table.compact_storage = true
           return unless column_data.empty?
-          column_aliases << nil if column_aliases.empty?
+          column_aliases << :column1 if column_aliases.empty?
           comparators = [table_data['comparator']]
         end
         column_aliases.zip(comparators) do |column_alias, type|
@@ -66,7 +66,7 @@ module Cequel
             clustering_order = :desc
           end
           table.add_clustering_column(
-            column_alias.try(:to_sym),
+            column_alias.to_sym,
             Type.lookup_internal(type),
             clustering_order
           )
@@ -76,7 +76,7 @@ module Cequel
       def read_data_columns
         if column_data.empty?
           table.add_data_column(
-            table_data['value_alias'],
+            (table_data['value_alias'] || :value).to_sym,
             Type.lookup_internal(table_data['default_validator']),
             false
           )

data/lib/cequel/type.rb

@@ -58,18 +58,18 @@ module Cequel
 
     class String < Base
 
-      private
-
-      def ensure_encoding(value, encoding)
-        str = value.to_s
+      def cast(value)
+        str = String(value)
         str.encoding.name == encoding ? str : str.dup.force_encoding(encoding)
       end
 
     end
 
     class Ascii < String
-      def cast(value)
-        ensure_encoding(value, 'US-ASCII')
+      private
+
+      def encoding
+        'US-ASCII'
       end
     end
     register Ascii.instance
@@ -81,10 +81,14 @@ module Cequel
       end
 
       def cast(value)
-        case value
-        when Integer then ensure_encoding(value.to_s(16), 'ASCII-8BIT')
-        else ensure_encoding(value.to_s, 'ASCII-8BIT')
-        end
+        value = value.to_s(16) if Integer === value
+        super
+      end
+
+      private
+
+      def encoding
+        'ASCII-8BIT'
       end
 
     end
@@ -104,7 +108,7 @@ module Cequel
       end
 
       def cast(value)
-        value.to_i
+        Integer(value)
       end
 
     end
@@ -112,14 +116,14 @@ module Cequel
 
     class Decimal < Base
       def cast(value)
-        BigDecimal.new(value, 0)
+        BigDecimal === value ? value : BigDecimal.new(value, 0)
       end
     end
     register Decimal.instance
 
     class Double < Base
       def cast(value)
-        value.to_f
+        Float(value)
       end
     end
     register Double.instance
@@ -140,7 +144,7 @@ module Cequel
       end
 
       def cast(value)
-        value.to_i
+        Integer(value)
       end
 
     end
@@ -168,8 +172,10 @@ module Cequel
         [:varchar]
       end
 
-      def cast(value)
-        ensure_encoding(value, 'UTF-8')
+      private
+
+      def encoding
+        'UTF-8'
       end
 
     end
@@ -186,7 +192,7 @@ module Cequel
         elsif value.respond_to?(:to_time) then value.to_time
         elsif Numeric === value then Time.at(value)
         else Time.parse(value.to_s)
-        end
+        end.utc
       end
 
     end

data/lib/cequel/version.rb

@@ -1,3 +1,3 @@
 module Cequel
-  VERSION = '1.0.0.pre.4'
+  VERSION = '1.0.0.pre.5'
 end

data/spec/examples/record/list_spec.rb

@@ -5,6 +5,7 @@ describe Cequel::Record::List do
     key :permalink, :text
     column :title, :text
     list :tags, :text
+    list :contributor_ids, :int
   end
 
   let(:scope) { cequel[:posts].where(:permalink => 'cequel') }
@@ -14,6 +15,7 @@ describe Cequel::Record::List do
     Post.new do |post|
       post.permalink = 'cequel'
       post.tags = %w(one two)
+      post.contributor_ids = [1, 2]
     end.tap(&:save)
   end
 
@@ -27,6 +29,20 @@ describe Cequel::Record::List do
     end
   end
 
+  context 'updating' do
+    it 'should overwrite value' do
+      post.tags = %w(three four)
+      post.save!
+      subject[:tags].should == %w(three four)
+    end
+
+    it 'should cast collection before overwriting' do
+      post.tags = Set['three', 'four']
+      post.save!
+      subject[:tags].should == %w(three four)
+    end
+  end
+
   describe '#<<' do
     it 'should add new items' do
       post.tags << 'three' << 'four'
@@ -52,6 +68,11 @@ describe Cequel::Record::List do
       unloaded_post.tags << 'four' << 'five'
       unloaded_post.tags.should == %w(one two four five)
     end
+
+    it 'should cast to defined value' do
+      post.contributor_ids << '3' << 4.0
+      post.contributor_ids.should == [1, 2, 3, 4]
+    end
   end
 
   describe '#[]=' do
@@ -64,6 +85,11 @@ describe Cequel::Record::List do
       post.tags.should == %w(one TWO)
     end
 
+    it 'should cast element before replacing' do
+      post.contributor_ids[1] = '5'
+      post.contributor_ids.should == [1, 5]
+    end
+
     it 'should replace an element without reading' do
       cequel.should_not_receive :execute
       unloaded_post.tags[1] = 'TWO'
@@ -87,6 +113,11 @@ describe Cequel::Record::List do
       post.tags.should == %w(One Two)
     end
 
+    it 'should cast multiple elements before replacing them' do
+      post.contributor_ids[0, 2] = %w(4 5)
+      post.contributor_ids.should == [4, 5]
+    end
+
     it 'should remove elements beyond positional arguments' do
       scope.list_append(:tags, 'four')
       post.tags[0, 3] = 'ONE'
@@ -151,6 +182,11 @@ describe Cequel::Record::List do
       post.tags.should == %w(one two four five)
     end
 
+    it 'should cast elements before concatentating' do
+      post.contributor_ids.concat(%w(3 4))
+      post.contributor_ids.should == [1, 2, 3, 4]
+    end
+
     it 'should concat elements without loading' do
       cequel.should_not_receive :execute
       unloaded_post.tags.concat(['four', 'five'])
@@ -178,6 +214,11 @@ describe Cequel::Record::List do
       post.tags.should == %w(one)
     end
 
+    it 'should cast argument' do
+      post.contributor_ids.delete('2')
+      post.contributor_ids.should == [1]
+    end
+
     it 'should delete without loading' do
       cequel.should_not_receive :execute
       unloaded_post.tags.delete('two')
@@ -292,6 +333,11 @@ describe Cequel::Record::List do
       post.tags.should == %w(four five)
     end
 
+    it 'should cast before overwriting' do
+      post.contributor_ids.replace(%w(3 4 5))
+      post.contributor_ids.should == [3, 4, 5]
+    end
+
     it 'should overwrite without reading' do
       cequel.should_not_receive :execute
       unloaded_post.tags.replace(%w(four five))
@@ -374,6 +420,11 @@ describe Cequel::Record::List do
       post.tags.should == %w(minustwo minusone one two)
     end
 
+    it 'should cast element before unshifting' do
+      post.contributor_ids.unshift('0')
+      post.contributor_ids.should == [0, 1, 2]
+    end
+
     it 'should unshift without reading' do
       cequel.should_not_receive :execute
       unloaded_post.tags.unshift('minustwo', 'minusone')

data/spec/examples/record/map_spec.rb

@@ -27,6 +27,20 @@ describe Cequel::Record::Map do
     end
   end
 
+  context 'updating' do
+    it 'should overwrite value' do
+      post.likes = {'charlotte' => 3, 'dave' => 4}
+      post.save!
+      subject[:likes].should == {'charlotte' => 3, 'dave' => 4}
+    end
+
+    it 'should cast collection before overwriting' do
+      post.likes = [['charlotte', 3], ['dave', 4]]
+      post.save!
+      subject[:likes].should == {'charlotte' => 3, 'dave' => 4}
+    end
+  end
+
   describe 'atomic modification' do
     before { scope.map_update(:likes, 'charles' => 3) }
 
@@ -39,6 +53,16 @@ describe Cequel::Record::Map do
         post.likes.should == {'alice' => 1, 'bob' => 2, 'david' => 4}
       end
 
+      it 'should cast keys when updating' do
+        post.likes[:david] = 4
+        post.likes.should == {'alice' => 1, 'bob' => 2, 'david' => 4}
+      end
+
+      it 'should cast values when updating' do
+        post.likes['david'] = 4.0
+        post.likes.should == {'alice' => 1, 'bob' => 2, 'david' => 4}
+      end
+
       it 'should write without reading' do
         max_statements! 2
         unloaded_post.likes['david'] = 4
@@ -83,6 +107,11 @@ describe Cequel::Record::Map do
         post.likes.should == {'alice' => 1}
       end
 
+      it 'should cast key before deleting' do
+        post.likes.delete(:bob)
+        post.likes.should == {'alice' => 1}
+      end
+
       it 'should delete without reading' do
         max_statements! 2
         unloaded_post.likes.delete('bob')
@@ -106,6 +135,22 @@ describe Cequel::Record::Map do
           {'alice' => 1, 'bob' => 2, 'david' => 4, 'emily' => 5}
       end
 
+      it 'should cast keys before updating' do
+        post.likes.merge!(david: 4, emily: 5)
+        post.save
+        post.likes.should ==
+          {'alice' => 1, 'bob' => 2, 'david' => 4, 'emily' => 5}
+      end
+
+      it 'should cast values before updating' do
+        post.likes.merge!('david' => '4', 'emily' => 5.0)
+        post.save
+        subject[:likes].should == 
+          {'alice' => 1, 'bob' => 2, 'charles' => 3, 'david' => 4, 'emily' => 5}
+        post.likes.should ==
+          {'alice' => 1, 'bob' => 2, 'david' => 4, 'emily' => 5}
+      end
+
       it 'should write without reading' do
         max_statements! 2
         unloaded_post.likes.merge!('david' => 4, 'emily' => 5)
@@ -129,6 +174,18 @@ describe Cequel::Record::Map do
         post.likes.should == {'david' => 4, 'emily' => 5}
       end
 
+      it 'should cast keys before overwriting' do
+        post.likes.replace(david: 4, emily: 5)
+        post.likes.should == {'david' => 4, 'emily' => 5}
+      end
+
+      it 'should cast values before overwriting' do
+        post.likes.replace('david' => '4', 'emily' => 5.0)
+        post.save
+        subject[:likes].should == {'david' => 4, 'emily' => 5}
+        post.likes.should == {'david' => 4, 'emily' => 5}
+      end
+
       it 'should overwrite without reading' do
         max_statements! 2
         unloaded_post.likes.replace('david' => 4, 'emily' => 5)

data/spec/examples/record/persistence_spec.rb

@@ -36,6 +36,12 @@ describe Cequel::Record::Persistence do
         it 'should mark row persisted' do
           blog.should be_persisted
         end
+
+        it 'should fail fast if keys are missing' do
+          expect {
+            Blog.new.save
+          }.to raise_error(Cequel::MissingKeyError)
+        end
       end
 
       context 'on update' do
@@ -59,6 +65,13 @@ describe Cequel::Record::Persistence do
         it 'should remove old column values' do
           subject[:description].should be_nil
         end
+
+        it 'should not allow changing key values' do
+          expect {
+            blog.subdomain = 'soup'
+            blog.save
+          }.to raise_error(ArgumentError)
+        end
       end
     end
 
@@ -80,6 +93,14 @@ describe Cequel::Record::Persistence do
         it 'should save instance' do
           Blog.find(blog.subdomain).name.should == 'Big Data'
         end
+
+        it 'should fail fast if keys are missing' do
+          expect {
+            Blog.create do |blog|
+              blog.name = 'Big Data'
+            end
+          }.to raise_error(Cequel::MissingKeyError)
+        end
       end
 
       describe 'with attributes' do
@@ -94,6 +115,12 @@ describe Cequel::Record::Persistence do
         it 'should save instance' do
           Blog.find(blog.subdomain).name.should == 'Big Data'
         end
+
+        it 'should fail fast if keys are missing' do
+          expect {
+            Blog.create(:name => 'Big Data')
+          }.to raise_error(Cequel::MissingKeyError)
+        end
       end
     end
 
@@ -111,6 +138,11 @@ describe Cequel::Record::Persistence do
       it 'should save instance' do
         Blog.find(blog.subdomain).name.should == 'The Big Data Blog'
       end
+
+      it 'should not allow updating key values' do
+        expect { blog.update_attributes(:subdomain => 'soup') }
+          .to raise_error(ArgumentError)
+      end
     end
 
     describe '#destroy' do
@@ -150,6 +182,24 @@ describe Cequel::Record::Persistence do
         it 'should mark row persisted' do
           post.should be_persisted
         end
+
+        it 'should fail fast if parent keys are missing' do
+          expect {
+            Post.new do |post|
+              post.permalink = 'cequel'
+              post.title = 'Cequel'
+            end.tap(&:save)
+          }.to raise_error(Cequel::MissingKeyError)
+        end
+
+        it 'should fail fast if row keys are missing' do
+          expect {
+            Post.new do |post|
+              post.blog_subdomain = 'cassandra'
+              post.title = 'Cequel'
+            end.tap(&:save)
+          }.to raise_error(Cequel::MissingKeyError)
+        end
       end
 
       context 'on update' do
@@ -173,6 +223,20 @@ describe Cequel::Record::Persistence do
         it 'should remove old column values' do
           subject[:body].should be_nil
         end
+
+        it 'should not allow changing parent key values' do
+          expect {
+            post.blog_subdomain = 'soup'
+            post.save
+          }.to raise_error(ArgumentError)
+        end
+
+        it 'should not allow changing row key values' do
+          expect {
+            post.permalink = 'soup-recipes'
+            post.save
+          }.to raise_error(ArgumentError)
+        end
       end
     end