cassandro 1.0.7 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjFhNGEwMGIyYTgyOTkyMmExODA3NGZlZDJiNGJkM2ZjNzM2Nzk0Zg==
+    MGY2MDljZDAzYjFhOGZmYzZhZjM4MjE0YTcyOTIwNDYxZTIwNTQ4OA==
   data.tar.gz: !binary |-
-    ZjMxYzk2YWY1ODM2MGZjOWVjYTk2ZmE1ZWJmMDk1ZWQ0NDZiMzQyNw==
+    Y2M3MTA2ZTVjMGJkOTZjNTdiNWZmNGY0NzE0YzU4ZjMyNTM3NmFmNw==
 SHA512:
   metadata.gz: !binary |-
-    ZjNlZjIyMjQ5ZWY3MjliMWNiMDZmNGE1NmI0Y2ZiYWRhYTJjNTY1NmQ1ZDIx
-    MWE1MmRmMzRkOTRiNmU0OTczN2NiOTBkODI0NDMwNGIyYTAwMjFkMWFmNGIx
-    OWYzOWI1ZGNlOWUzYjBlOGE5NGI1ZDAzYjY4MzdlMWVlY2FhZmQ=
+    MjNjYjQ5MjA5MmJmZGNmMjVlZWE3NWRkNzdlYWQ5OTg1NWVhZjlhMmU0OTE1
+    N2E5NjNjZGVlNTFjZDE2NDAwNTJmMWY4ZmIyMzRkMWMyN2M1ODU1OTE0ODBi
+    MDhkODlhN2FmMjhkNWM3NjJlYWRiNzBhNmRlZDU5MjFlZTNlYWE=
   data.tar.gz: !binary |-
-    YWEyNGJlZWY1MDVmYjVhZDRiMDRkODczM2YwMDZkYTEzYWVjMmNjNTllNGJk
-    NjhmOGZjNWE2YzAyYWM4ZmNhMzMyYjUxZTM3ZTFjNDQ4MzFiODEzZmQwNjNi
-    ZTgzNzZkNmQ5MmFhOTJhZTQxNzRmOTM0N2RhYmQ0NzNkNTkwMzY=
+    MDc2OTk4YTA4NDc3MzI1MGZmMmViMWYxYjdjMjBkNGFiYTIyNjI4MmVlMDIz
+    ZGM5N2EzZDk1Y2ZlYjM0N2IwMmJmODM1NWU4ZWNkNDkxMmM3NDFjYmUzMTIy
+    ZTdlZDQ4MmRhMGRlOTM1YzAwMGNjYTZmYmMwZTM0YTU4MjY2ZGY=

data/cassandro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cassandro"
-  s.version = "1.0.7"
+  s.version = "1.1.0"
   s.summary = "Ruby ORM for Apache Cassandra"
   s.license = "MIT"
   s.description = "Lightweight Apache Cassandra ORM for Ruby"

data/lib/cassandro/model.rb

@@ -152,10 +152,14 @@ module Cassandro
     end
 
     def self.[](value)
+      return nil if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+
       if value.is_a?(Hash)
-        where = "#{value.map { |k,v| "#{k.to_s} = #{cast_as(k, v)}" }.join(' AND ')} ALLOW FILTERING"
+        where = "#{value.keys.map{ |k| "#{k} = ?" }.join(' AND ')} ALLOW FILTERING"
+        values = value.map{ |k,v| casts[k] == :uuid ? Cassandra::Uuid.new(v) : v }
       else
-        where = "#{partition_key} = #{cast_as(partition_key, value)}"
+        where = "#{partition_key} = ?"
+        values = [casts[partition_key] == :uuid ? Cassandra::Uuid.new(value) : value]
       end
 
       query = <<-QUERY
@@ -164,7 +168,9 @@ module Cassandro
         WHERE #{where}
       QUERY
 
-      result = Cassandro.execute(query)
+      st = Cassandro.client.prepare(query)
+      result = Cassandro.client.execute(st, *values)
+
       return nil unless result.any?
 
       self.new(result.first, true)
@@ -204,12 +210,17 @@ module Cassandro
       results
     end
 
-    def self.count(key, value)
-      key = key.to_sym
-      query = "SELECT count(*) FROM #{table_name} WHERE #{key} = ? ALLOW FILTERING"
+    def self.count(key = nil, value = nil)
+      query = "SELECT count(*) FROM #{table_name}"
 
-      st = Cassandro.client.prepare(query)
-      results = Cassandro.client.execute(st, value)
+      if key && value
+        key = key.to_sym
+        query << " WHERE #{key} = ? ALLOW FILTERING"
+        st = Cassandro.client.prepare(query)
+        results = Cassandro.client.execute(st, value)
+      else
+        results = Cassandro.client.execute(query)
+      end
 
       results.first["count"]
     end

data/test/cassandro_model_test.rb

@@ -47,7 +47,7 @@ Protest.describe "Cassandro Model" do
     test "allows setting and getting attributes" do
       uuid = SecureRandom.uuid
       test = Test.new(test_col_1: uuid, test_col_2: 'test_value_2')
-      assert_equal uuid, test.test_col_1
+      assert_equal uuid.to_s, test.test_col_1
       assert_equal 'test_value_2', test.test_col_2
     end
   end
@@ -124,9 +124,35 @@ Protest.describe "Cassandro Model" do
       uuid = SecureRandom.uuid
       Test.create(test_col_1: uuid, test_col_2: 'test_value_2')
       test = Test[uuid]
-      assert_equal uuid, test.test_col_1.to_s
+      assert_equal uuid.to_s, test.test_col_1.to_s
       assert_equal "test_value_2", test.test_col_2
     end
+
+    test "gets row with nil or empty values" do
+      test = Test[nil]
+      assert_equal nil, test
+
+      test = Test[""]
+      assert_equal nil, test
+
+      test = Test[{}]
+      assert_equal nil, test
+    end
+
+    test "counts the rows" do
+      Test.create(test_col_1: SecureRandom.uuid, test_col_2: 'test_value_2')
+      Test.create(test_col_1: SecureRandom.uuid, test_col_2: 'test_value_2')
+
+      assert_equal Test.all.size, Test.count
+    end
+
+    test "counts the rows with filter" do
+      uuid = SecureRandom.uuid
+      Test.create(test_col_1: uuid, test_col_2: 'test_value_2')
+      Test.create(test_col_1: SecureRandom.uuid, test_col_2: 'test_value_2')
+
+      assert_equal 1, Test.count(:test_col_1, Cassandra::Uuid.new(uuid))
+    end
   end
 
   context 'Updating' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandro
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Lautaro Orazi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver