cequel 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ee94e15c942005f32077593e9518db59d425ec8
-  data.tar.gz: a8509b1748bc988890d99520bce4d2a89b1c0c86
+  metadata.gz: 6143aa040bd563d95f997e29285ec19dc636e2ff
+  data.tar.gz: 9c91d530af0b021624b83ee1d4bc0081428a5b4d
 SHA512:
-  metadata.gz: 9c689b0b7db31b588fdc41d750b7e718cf472b72862cf76f372f3ceb1ddafe38b19e786c960fb4cdfaaba3d8249cdf68ff676ef3b521070230e0bef18fce30ae
-  data.tar.gz: 3df5b7b2591cf860f064c56cfcfa4e68b27e95317725301e0699d6972693f4f9b7195b316766c8b896c8abd9726657bb924f54b208a915e221d6d296475c7744
+  metadata.gz: 0c66344642c23a1551c924c88ccaace992be584a2bb8555a5c61da97e6ce641bd624300e1ce4ba3ae6ce10431d4b4750db01ed531aa524aa153a024bc7fee6d1
+  data.tar.gz: 6491fc3e289cea01be5125ae4829789266221538799e09d9e221820d487d3026a9c612d892bc80b60b3b63dc51b1bb1766692a4439f06ba9256032243e561a75

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.2
+
+* Cast values passed to primary key filters in record sets
+
 ## 1.3.1
 
 * Allow querying by both primary key and secondary index in `RecordSet`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (1.3.1)
+    cequel (1.3.2)
       activemodel (>= 3.1, < 5.0)
       cql-rb (>= 1.2, < 3.0)
 

data/lib/cequel/record/record_set.rb

@@ -727,7 +727,9 @@ module Cequel
         if value.is_a?(Range)
           self.in(value)
         else
-          scoped { |attributes| attributes[:scoped_key_values] << value }
+          scoped do |attributes|
+            attributes[:scoped_key_values] << cast_next_primary_key(value)
+          end
         end
       end
 
@@ -900,6 +902,14 @@ module Cequel
           yield record.key_attributes
         end
       end
+
+      def cast_next_primary_key(value)
+        if value.is_a?(Array)
+          value.map { |element| next_unscoped_key_column.cast(element) }
+        else
+          next_unscoped_key_column.cast(value)
+        end
+      end
     end
   end
 end

data/lib/cequel/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Cequel
   # The current version of the library
-  VERSION = '1.3.1'
+  VERSION = '1.3.2'
 end

data/spec/examples/record/finders_spec.rb

@@ -16,7 +16,7 @@ describe Cequel::Record::Finders do
 
   model :Post do
     key :blog_subdomain, :text
-    key :permalink, :text
+    key :id, :timeuuid, auto: true
     column :title, :text
     column :body, :text
     column :author_id, :uuid, index: true
@@ -37,7 +37,6 @@ describe Cequel::Record::Finders do
       5.times.map do |i|
         Post.create!(
           blog_subdomain: 'cassandra',
-          permalink: "cassandra#{i}",
           author_id: author_ids[i%2]
         )
       end
@@ -47,7 +46,7 @@ describe Cequel::Record::Finders do
   let :postgres_posts do
     cequel.batch do
       5.times.map do |i|
-        Post.create!(blog_subdomain: 'postgres', permalink: "postgres#{i}")
+        Post.create!(blog_subdomain: 'postgres')
       end
     end
   end
@@ -113,15 +112,20 @@ describe Cequel::Record::Finders do
       end
 
       it 'should not exist for all keys' do
-        expect { Post.find_all_by_blog_subdomain_and_permalink('f', 'b') }
+        expect { Post.find_all_by_blog_subdomain_and_id('f', Cequel.uuid) }
           .to raise_error(NoMethodError)
       end
     end
 
     describe '#find_by_*' do
       it 'should return record matching all keys' do
-        expect(Post.find_by_blog_subdomain_and_permalink('cassandra',
-                                                         'cassandra0'))
+        expect(Post.find_by_blog_subdomain_and_id(
+          'cassandra', cassandra_posts.first.id)).to eq(cassandra_posts.first)
+      end
+
+      it 'should cast arguments to correct type' do
+        expect(Post.find_by_blog_subdomain_and_id(
+          'cassandra', cassandra_posts.first.id.to_s))
           .to eq(cassandra_posts.first)
       end
 
@@ -132,14 +136,21 @@ describe Cequel::Record::Finders do
 
       it 'should allow lower-order key if chained' do
         expect(Post.where(blog_subdomain: 'cassandra')
-                 .find_by_permalink('cassandra0')).to eq(cassandra_posts.first)
+                 .find_by_id(cassandra_posts.first.id))
+                 .to eq(cassandra_posts.first)
       end
     end
 
     describe '#with_*' do
       it 'should return record matching all keys' do
-        expect(Post.with_blog_subdomain_and_permalink('cassandra',
-                                                      'cassandra0'))
+        expect(Post.with_blog_subdomain_and_id('cassandra',
+                                               cassandra_posts.first.id))
+          .to eq(cassandra_posts.first(1))
+      end
+
+      it 'should cast arguments to correct type' do
+        expect(Post.with_blog_subdomain_and_id('cassandra',
+                                               cassandra_posts.first.id.to_s))
           .to eq(cassandra_posts.first(1))
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Mat Brown
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel