cequel 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcbe817545ecdf0979da9b91e5e790965efdf8c4
-  data.tar.gz: acaede9ff87f4f1c379ab0f47dcba0f110905b45
+  metadata.gz: 8ee94e15c942005f32077593e9518db59d425ec8
+  data.tar.gz: a8509b1748bc988890d99520bce4d2a89b1c0c86
 SHA512:
-  metadata.gz: 17b5623a4df15734d13f9c8d6bcef023d3b5a814582827260448a989c25832d4f95f8eda338a7bb322a5aeecc5e9ec04b6714b510719ec43d0e4531eaa84cca9
-  data.tar.gz: f75aac91c4ea18db149196aeaf3024a014bf5decc6a258b232c8c4c98fe2f41334d75d04b707d0ac459f990d104c606f68cd8717d2b3ab1954cd92cd098ca7d4
+  metadata.gz: 9c689b0b7db31b588fdc41d750b7e718cf472b72862cf76f372f3ceb1ddafe38b19e786c960fb4cdfaaba3d8249cdf68ff676ef3b521070230e0bef18fce30ae
+  data.tar.gz: 3df5b7b2591cf860f064c56cfcfa4e68b27e95317725301e0699d6972693f4f9b7195b316766c8b896c8abd9726657bb924f54b208a915e221d6d296475c7744

data/Appraisals

@@ -19,3 +19,11 @@ end
 appraise "thrift" do
   gem "cassandra-cql", "~> 1.2"
 end
+
+appraise "cql-rb-1" do
+  gem "cql-rb", "~> 1.2"
+end
+
+appraise "cql-rb-2" do
+  gem "cql-rb", "~> 2.0"
+end

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.3.1
+
+* Allow querying by both primary key and secondary index in `RecordSet`
+* Expand cql-rb dependency to allow 2.0
+
 ## 1.3.0
 
 * Add timestamps functionality (`created_at` and `updated_at`)

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    cequel (1.3.0)
+    cequel (1.3.1)
       activemodel (>= 3.1, < 5.0)
-      cql-rb (~> 1.2)
+      cql-rb (>= 1.2, < 3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -27,7 +27,8 @@ GEM
       debugger-linecache (~> 1.2)
     coderay (1.1.0)
     columnize (0.8.9)
-    cql-rb (1.2.2)
+    cql-rb (2.0.0)
+      ione (~> 1)
     debugger (1.6.6)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
@@ -38,6 +39,7 @@ GEM
     ffi (1.9.3-java)
     ffi2-generators (0.1.1)
     i18n (0.6.9)
+    ione (1.1.2)
     json (1.8.1)
     json (1.8.1-java)
     method_source (0.8.2)

data/README.md

@@ -563,6 +563,7 @@ Cequel was written by:
 * Dan Cardamore
 * Kei Kusakari
 * Oleh Novosad
+* John Smart
 
 Special thanks to [Brewster](https://www.brewster.com), which supported the 0.x
 releases of Cequel.

data/Vagrantfile

@@ -136,7 +136,7 @@ exec /opt/apache-cassandra-$1/bin/cassandra" > /etc/init/cassandra.conf
     service cassandra start
   SH
 
-  versions = (0..7).map { |p| "2.0.#{p}" } + (0..16).map { |p| "1.2.#{p}" }
+  versions = (0..8).map { |p| "2.0.#{p}" } + (0..16).map { |p| "1.2.#{p}" }
   versions.each do |version|
     java_version = version =~ /^1/ ? '6' : '7'
     config.vm.define version do |machine|

data/lib/cequel/record/record_set.rb

@@ -724,10 +724,6 @@ module Cequel
       end
 
       def filter_primary_key(value)
-        if scoped_indexed_column
-          fail IllegalQuery,
-               "Can't filter by both primary key and secondary index"
-        end
         if value.is_a?(Range)
           self.in(value)
         else
@@ -749,10 +745,6 @@ module Cequel
                "Can't scope key column #{column_name} without also scoping " \
                "#{missing_column_names.join(', ')}"
         end
-        if scoped_key_values.any?
-          fail IllegalQuery,
-               "Can't filter by both primary key and secondary index"
-        end
         if scoped_indexed_column
           fail IllegalQuery,
                "Can't scope by more than one indexed column in the same query"

data/lib/cequel/version.rb

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

data/spec/examples/record/record_set_spec.rb

@@ -729,22 +729,21 @@ describe Cequel::Record::RecordSet do
     end
 
     context 'mixing keys and secondary-indexed columns' do
-      it 'should not allow mixture in hash argument' do
-        expect { Post.where(blog_subdomain: 'cassandra',
-                            author_id: uuids.first) }
-          .to raise_error(Cequel::Record::IllegalQuery)
+      it 'should allow mixture in hash argument' do
+        Post.where(blog_subdomain: 'cassandra', author_id: uuids.first).
+          should have(3).entries
       end
 
-      it 'should not allow mixture in chain with primary first' do
-        expect { Post.where(blog_subdomain: 'cassandra')
-                  .where(author_id: uuids.first) }
-          .to raise_error(Cequel::Record::IllegalQuery)
+      it 'should allow mixture in chain with primary first' do
+        Post.where(blog_subdomain: 'cassandra')
+          .where(author_id: uuids.first)
+          .should have(3).entries
       end
 
-      it 'should not allow mixture in chain with secondary first' do
-        expect { Post.where(author_id: uuids.first)
-                  .where(blog_subdomain: 'cassandra') }
-          .to raise_error(Cequel::Record::IllegalQuery)
+      it 'should allow mixture in chain with secondary first' do
+        Post.where(author_id: uuids.first)
+          .where(blog_subdomain: 'cassandra')
+        .should have(3).entries
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Mat Brown
@@ -16,10 +16,11 @@ authors:
 - Dan Cardamore
 - Kei Kusakari
 - Oleh Novosad
+- John Smart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -45,16 +46,22 @@ dependencies:
   name: cql-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement