cassandra_mocks 0.0.8.2 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e116917fa04c58c22eba8ccc9c08e9787a9ba54d
-  data.tar.gz: a860d89cdece466b8a74af23abb2fd646a6846b5
+  metadata.gz: 8e2d95f2fb8187c3115ac8fd3f59323d313ecc68
+  data.tar.gz: 1e8626d1efa66a8dca995fbd96baa43bbedbb08a
 SHA512:
-  metadata.gz: e98abfe9fe97cb40bcf5f97829d86673902a5e7d0e97257bf84cbbecc5a3f7a67eb20270c6a10ddfc3affb23e88a6ff3f2ab7e0645dd751163c4e6f2f72b7ed1
-  data.tar.gz: 2898cbb5fd7759b4ddc80d922ee57daf67827887fd7cf24abf1ab638e69bccd28893a79dc88eaecb8dbe55bade37bf8824c2faf3eec4de549e38057fedf41aba
+  metadata.gz: aff5b44d199bbb4541ac9bcf415a4161e65be9ac21daeac50967d05c28ca07846de6b73f07ab534ed2dbf17037146f936c53cb90374c30f975676700498ea73a
+  data.tar.gz: 4ea6949e26cc0d4ef665288ed2a0bbf0f0ceaa37afdc153aaca55902848738ad925f0301ea1745f751d718d7c21476af87558f8b79c48bc05645fa4a49f8c6e6

data/lib/cassandra_mocks/session.rb

@@ -79,7 +79,7 @@ module Cassandra
 
       def select_query(statement)
         table = cluster.keyspace(keyspace_for_statement(statement)).table(statement.args[:table])
-        options = statement.args[:filter].merge(limit: statement.args[:limit], order: statement.args[:order])
+        options = {restriction: statement.args[:filter], limit: statement.args[:limit], order: statement.args[:order]}
         table.select(*statement.args[:columns], options)
       end
 
@@ -90,7 +90,7 @@ module Cassandra
 
       def update_query(statement)
         table = cluster.keyspace(keyspace_for_statement(statement)).table(statement.args[:table])
-        rows_to_update = table.select('*', statement.args[:filter])
+        rows_to_update = table.select('*', restriction: statement.args[:filter])
         rows_to_update = [statement.args[:filter].dup] if rows_to_update.empty?
         rows_to_update.each do |row|
           updated_row = updated_row(row, statement)

data/lib/cassandra_mocks/statement.rb

@@ -88,7 +88,13 @@ module Cassandra
                               Comparitor.new(value.operation, value.column, pending_value(value.value, params))
                             end
                           elsif value.is_a?(Array)
-                            value.map { |value| pending_value(value, params) }
+                            value.map do |value|
+                              if value.is_a?(Comparitor)
+                                Comparitor.new(value.operation, value.column, pending_value(value.value, params))
+                              else
+                                pending_value(value, params)
+                              end
+                            end
                           else
                             pending_value(value, params)
                           end
@@ -325,7 +331,9 @@ module Cassandra
 
       def insert_args(insert_keys, insert_values)
         insert_keys.count.times.inject({}) do |memo, index|
+          key = insert_keys[index]
           value = mapped_value(insert_values[index])
+          value = [memo[key], value] if memo[key]
           memo.merge!(insert_keys[index] => value)
         end
       end

data/lib/cassandra_mocks/table.rb

@@ -29,6 +29,7 @@ module Cassandra
         filter = select_filter(columns)
         limit = filter.delete(:limit)
         order = select_order(filter)
+        filter = filter.fetch(:restriction) { {} }
         unless filter.empty?
           validate_partion_key_filter!(filter)
           validate_clustering_column_filter!(filter)
@@ -48,7 +49,7 @@ module Cassandra
       end
 
       def delete(filter)
-        rows_to_remove = select('*', filter)
+        rows_to_remove = select('*', restriction: filter)
         @rows.reject! { |row| rows_to_remove.include?(row) }
       end
 
@@ -149,7 +150,11 @@ module Cassandra
             if value.is_a?(Statement::Comparitor)
               value.check_against(partial_row)
             elsif value.is_a?(Array)
-              value.include?(partial_row[column])
+              if value.first.is_a?(Statement::Comparitor)
+                value.all? { |value| value.check_against(partial_row) }
+              else
+                value.include?(partial_row[column])
+              end
             else
               partial_row[column] == value
             end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: cassandra_mocks
 version: !ruby/object:Gem::Version
-  version: 0.0.8.2
+  version: 0.0.9
 platform: ruby
 authors:
 - Thomas RM Rogers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 description: |-
@@ -73,12 +73,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []