gotime-cassandra_object 4.2.0 → 4.2.2

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '4.2.0'
+  s.version = '4.2.2'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/scope/finder_methods.rb

@@ -40,7 +40,7 @@ module CassandraObject
 
           ids = ids.compact.map(&:to_s).uniq
 
-          where("KEY in (#{ids * ','})").to_a
+          where("KEY" => ids).to_a
         end
     end
   end

data/lib/cassandra_object/scope/query_methods.rb

@@ -30,7 +30,7 @@ module CassandraObject
 
       def to_a
         statement = [
-          "select #{select_string} from #{klass.column_family}",
+          "SELECT #{select_string} FROM #{klass.column_family}",
           where_string,
           limit_string
         ].delete_if(&:blank?) * ' '
@@ -52,13 +52,7 @@ module CassandraObject
             wheres = []
 
             where_values.map do |where_value|
-              if where_value.is_a?(String)
-                wheres << where_value
-              elsif where_value.is_a?(Hash)
-                where_value.each do |column, value|
-                  wheres << "#{column} = #{value}"
-                end
-              end
+              wheres.concat format_where_statement(where_value)
             end
 
             "WHERE #{wheres * ' AND '}"
@@ -67,9 +61,34 @@ module CassandraObject
           end
         end
 
+        def format_where_statement(where_value)
+          if where_value.is_a?(String)
+            [where_value]
+          elsif where_value.is_a?(Hash)
+            where_value.map do |column, value|
+              if value.is_a?(Array)
+                "#{column} IN (#{escape_where_value(value)})"
+              else
+                "#{column} = #{escape_where_value(value)}"
+              end
+            end
+          end
+        end
+
+        def escape_where_value(value)
+          if value.is_a?(Array)
+            value.map { |v| escape_where_value(v) }.join(",")
+          elsif value.is_a?(String)
+            value = value.gsub("'", "''")
+            "'#{value}'"
+          else
+            value
+          end
+        end
+
         def limit_string
           if limit_value
-            "limit #{limit_value}"
+            "LIMIT #{limit_value}"
           else
             ""
           end

data/test/support/teardown.rb

@@ -0,0 +1,23 @@
+CassandraObject::Base.class_eval do
+  class_attribute :created_records
+  self.created_records = []
+
+  after_create do
+    created_records << self
+  end
+
+  def self.delete_after_test
+    created_records.reject(&:destroyed?).each(&:destroy)
+    created_records.clear
+  end
+end
+
+module ActiveSupport
+  class TestCase
+    teardown do
+      if CassandraObject::Base.created_records.any?
+        Issue.delete_all
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -3,14 +3,11 @@ require 'minitest/autorun'
 Bundler.require(:default, :test)
 
 require 'support/connect'
-autoload :Issue, 'support/issue'
+require 'support/teardown'
+require 'support/issue'
 
 module CassandraObject
   class TestCase < ActiveSupport::TestCase
-    teardown do
-      Issue.delete_all
-    end
-
     def temp_object(&block)
       Class.new(CassandraObject::Base) do
         self.column_family = 'Issues'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -137,6 +137,7 @@ files:
 - test/performance_helper.rb
 - test/support/connect.rb
 - test/support/issue.rb
+- test/support/teardown.rb
 - test/test_helper.rb
 - test/unit/active_model_test.rb
 - test/unit/attribute_methods/definition_test.rb