cequel 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06737301a7c04005670f2c38aa69a50d08a8166a
-  data.tar.gz: 9253937c264d5d6ef64a3861aa1d909779b9f853
+  metadata.gz: 2eda195d7d5e6aef81b19d481e572bfb1d51dac5
+  data.tar.gz: 414334060e4cc735fd00fffce7be63dea0046318
 SHA512:
-  metadata.gz: 3e1d63bb14b7f0f7d365533274a54805cce8298c65bb8128715af69338487f41190dda0912ae2980e27a5b021de60d763cc2a697043ef087607ea1071d1776c1
-  data.tar.gz: 1c0f57e5b8f3a53624da0a5eb694a4786ab59a362883cf0e3d4296a805947c0106e67310ba8bb5adf6c66cb17fd3ef1b8888b1ea3f9a0bed4c34656327b547b9
+  metadata.gz: ac630af7bebd8bc6567c796d0b7b2bcb6c02648b1d26f28b31a64e7e146368d7f1799083bd88ec419422de64dffc708e923581bd54485467730e36bc2d24e0e1
+  data.tar.gz: 0000ce0ab0b14cf5d08b90fb14aa1597e1f8c0ab4e23b8799ccc6972199bff6c39f610f588aa67ceb76b6fb0533016c810ca9a8c5f0ff34a2c7dd4e8fcc0d448

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.2.1
+- fix multiple non-index column filtering (https://github.com/cequel/cequel/pull/407)
+- fix KeySpace#client docs (https://github.com/cequel/cequel/pull/409)
+
 ## 3.2.0
 - Can filter on more than one non-indexed columns (https://github.com/cequel/cequel/pull/404)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (3.2.0)
+    cequel (3.2.1)
       activemodel (>= 4.0)
       cassandra-driver (~> 3.0)
 
@@ -357,4 +357,4 @@ DEPENDENCIES
   yard (~> 0.6)
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

data/lib/cequel/metal/keyspace.rb

@@ -167,7 +167,7 @@ module Cequel
       end
 
       #
-      # @return [Cql::Client::Client] the low-level client provided by the
+      # @return [Cassandra::Session] the low-level client session provided by the
       #   adapter
       # @api private
       #

data/lib/cequel/record/data_set_builder.rb

@@ -52,7 +52,7 @@ module Cequel
       attr_reader :record_set
       def_delegators :record_set, :row_limit, :select_columns,
                      :scoped_key_names, :scoped_key_values,
-                     :scoped_indexed_column, :lower_bound,
+                     :scoped_secondary_columns, :lower_bound,
                      :upper_bound, :reversed?, :order_by_column,
                      :query_consistency, :query_page_size, :query_paging_state,
                      :ascends_by?, :allow_filtering
@@ -72,8 +72,8 @@ module Cequel
           key_conditions = Hash[scoped_key_names.zip(scoped_key_values)]
           self.data_set = data_set.where(key_conditions)
         end
-        if scoped_indexed_column
-          self.data_set = data_set.where(scoped_indexed_column)
+        if scoped_secondary_columns
+          self.data_set = data_set.where(scoped_secondary_columns)
         end
       end
 

data/lib/cequel/record/record_set.rb

@@ -107,7 +107,7 @@ module Cequel
 
       # @private
       def self.default_attributes
-        {scoped_key_values: [], select_columns: []}
+        { scoped_key_values: [], select_columns: [], scoped_secondary_columns: {} }
       end
 
       # @return [Class] the Record class that this collection yields instances
@@ -743,7 +743,7 @@ module Cequel
 
       hattr_reader :cequel_attributes, :select_columns, :scoped_key_values,
                    :row_limit, :lower_bound, :upper_bound,
-                   :scoped_indexed_column, :query_consistency,
+                   :scoped_secondary_columns, :query_consistency,
                    :query_page_size, :query_paging_state,
                    :allow_filtering
 
@@ -818,7 +818,7 @@ module Cequel
         if column_values.key?(next_unscoped_key_name)
           filter_primary_key(column_values.delete(next_unscoped_key_name))
         else
-          filter_secondary_index(*column_values.shift)
+          filter_secondary_column(*column_values.shift)
         end.filter_columns(column_values)
       end
 
@@ -832,29 +832,14 @@ module Cequel
         end
       end
 
-      def filter_secondary_index(column_name, value)
+      def filter_secondary_column(column_name, value)
         column = target_class.reflect_on_column(column_name)
         if column.nil?
-          fail ArgumentError,
-               "No column #{column_name} configured for #{target_class.name}"
-        end
-        if column.key?
-          missing_column_names = unscoped_key_names.take_while do |key_name|
-            key_name != column_name
-          end
-          fail IllegalQuery,
-               "Can't scope key column #{column_name} without also scoping " \
-               "#{missing_column_names.join(', ')}"
+          fail ArgumentError, "No column #{column_name} configured for #{target_class.name}"
         end
-        if scoped_indexed_column && !allow_filtering
-          fail IllegalQuery,
-               "Can't scope by more than one indexed column in the same query"
-        end
-        unless column.indexed? || allow_filtering
-          fail ArgumentError,
-               "Can't scope by non-indexed column #{column_name}"
-        end
-        scoped(scoped_indexed_column: {column_name => column.cast(value)})
+        validate_secondary_column_filter(column)
+        scoped(scoped_secondary_columns:
+               scoped_secondary_columns.merge(column_name => column.cast(value)))
       end
 
       def scoped_key_columns
@@ -995,6 +980,32 @@ module Cequel
           next_unscoped_key_column.cast(value)
         end
       end
+
+      def validate_secondary_column_filter(column)
+        if column.key?
+          missing_column_names = unscoped_key_names.take_while do |key_name|
+            key_name != column.name
+          end
+          fail IllegalQuery,
+               "Can't scope key column #{column.name} without also scoping " \
+               "#{missing_column_names.join(', ')}"
+        else
+          validate_non_key_column_filter(column)
+        end
+      end
+
+      def validate_non_key_column_filter(column)
+        return if allow_filtering
+
+        if scoped_secondary_columns.any?
+          fail IllegalQuery,
+               "Can't scope by more than one indexed column in the same query without allow_filtering!"
+        end
+        unless column.indexed?
+          fail ArgumentError,
+               "Can't scope by non-indexed column #{column.name} without allow_filtering!"
+        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 = '3.2.0'
+  VERSION = '3.2.1'
 end

data/spec/examples/record/record_set_spec.rb

@@ -13,6 +13,7 @@ describe Cequel::Record::RecordSet do
     key :permalink, :ascii
     column :title, :text
     column :body, :text
+    column :subtitle, :text
     column :author_id, :uuid, index: true
     column :author_name, :text, index: true
     list :tags, :text
@@ -54,11 +55,12 @@ describe Cequel::Record::RecordSet do
   let(:cassandra_posts) do
     5.times.map do |i|
       Post.new(
-        :blog_subdomain => 'cassandra',
-        :permalink => "cequel#{i}",
-        :title => "Cequel #{i}",
-        :body => "Post number #{i}",
-        :author_id => uuids[i%2]
+        blog_subdomain: 'cassandra',
+        permalink: "cequel#{i}",
+        title: "Cequel #{i}",
+        subtitle: 'New Cequel Post',
+        body: "Post number #{i}",
+        author_id: uuids[i%2]
       )
     end
   end
@@ -826,7 +828,7 @@ describe Cequel::Record::RecordSet do
       it 'should allow filtering for more than one non-indexed column' do
         expect(Post.allow_filtering!.where(
           title: 'Cequel 0',
-          body: 'Post number 0'
+          subtitle: 'New Cequel Post'
         ).entries.length).to be(1)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Mat Brown
@@ -31,7 +31,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel