sessionm-cassandra_object 4.0.5 → 4.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4355a6422c75d897dd919952f07b87dabfd8a542
-  data.tar.gz: 4ef8a17c0c792362b827f6751321fc68f1152b51
+  metadata.gz: 539bceeb4486ffdd621cb72f76d716f870f4e18a
+  data.tar.gz: 45e22b538f31d1c1657be029fac182f8e16b618f
 SHA512:
-  metadata.gz: 91b46f858386b3986381750dceee7c0c1cbac2212e8752678ca1c48fe9b54c95a2a7c74370bf57b5c6dbe01d992f4c7d9eaf2727e7f3c31c38e71f704d4be88d
-  data.tar.gz: b55520ae9c9a8d5a080d80ee6b28e342243971fe2ad820501b8a909fbac79b77ad9d9fe97230e701d9740ddb3063afcae556f73cd12c61db816ee5b15f929ff4
+  metadata.gz: 85e074b00d7e502eb1b7e20d42dd2b6b47a4cd2de6e5dc324612636f3db5c9f130d17ca4d9f3d7aa3ff667efc16fe817ef819158a449e7c1b923a71e43674bff
+  data.tar.gz: e2d391a541f081c3e262ecd61eeeeff0144c7cdce355873795800578818559eee845170baf132d54549252358c1ac6114a656413d495d8d68ef5b3fa28b325c9

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -108,13 +108,15 @@ module CassandraObject
           end
         end
 
-        def add(column_family, key, by, field, opts=nil)
+        def add(column_family, key, by, fields, opts=nil)
           async = opts.try(:[], :async)
+          fields = [fields] unless fields.is_a?(Array)
           key = "textAsBlob('#{key}')"
 
-          query = "UPDATE \"#{column_family}\" SET #{VALUE_FIELD} = #{VALUE_FIELD} + #{by} WHERE #{KEY_FIELD} = #{key} AND #{NAME_FIELD} = '#{field}';"
-
-          async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
+          fields.each do |field|
+            query = "UPDATE \"#{column_family}\" SET #{VALUE_FIELD} = #{VALUE_FIELD} + #{by} WHERE #{KEY_FIELD} = #{key} AND #{NAME_FIELD} = '#{field}';"
+            async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
+          end
         end
 
         def remove(column_family, key, *args)
@@ -168,6 +170,10 @@ module CassandraObject
         def schema_cache
           @schema_cache ||= SchemaCache.new(self)
         end
+
+        def column_families
+          @column_families ||= self.cluster.keyspace(session.keyspace).tables.inject({}) { |hsh, table| hsh[table.name] = table; hsh }
+        end
       end
     end
   end

data/lib/cassandra_object/persistence.rb

@@ -3,14 +3,10 @@ module CassandraObject
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def add(key, value, *columns_and_options)
-        column_family, column, sub_column, options = CassandraObject::Base.with_connection(key, :write) { connection.extract_and_validate_params(self.column_family, key, columns_and_options, {}) }
-        # the options are removed, leaving just columns
-        columns = columns_and_options
-
+      def add(key, value, *columns)
         CassandraObject::Base.with_connection(key, :write) do
-          ActiveSupport::Notifications.instrument("add.cassandra_object", column_family: column_family, key: key, column: column, sub_column: sub_column, value: value) do
-            connection.add(column_family, key, value, *columns, :consistency => thrift_write_consistency)
+          ActiveSupport::Notifications.instrument("add.cassandra_object", column_family: column_family, key: key, column: columns, value: value) do
+            connection.add(column_family, key, value, columns, :consistency => thrift_write_consistency)
           end
         end
       end

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '4.0.5'
+  s.version = '4.0.6'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

data/spec/cassandra_object/adapters/cassandra_driver_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe CassandraObject::Adapters::CassandraDriver do
+  context "Client" do
+    it "should return the column family definition by name" do
+      expect(Issue.connection.column_families['Issues'].present?).to be true
+      expect(Issue.connection.column_families['Unknowns'].present?).to be false
+    end
+  end
+end

data/spec/cassandra_object/persistence_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe CassandraObject::Persistence do
+  context "add" do
+    it "should increment the counter" do
+      id = SimpleUUID::UUID.new.to_guid
+      Counter.add id, 1, 'foo'
+      expect(Counter.get_counter(id, 'foo')).to eq 1
+      Counter.add id, 1, 'foo'
+      expect(Counter.get_counter(id, 'foo')).to eq 2
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
 platform: ruby
 authors:
 - Michael Koziarski
@@ -96,8 +96,10 @@ files:
 - lib/cassandra_object/validations.rb
 - script/console.rb
 - sessionm-cassandra_object.gemspec
+- spec/cassandra_object/adapters/cassandra_driver_spec.rb
 - spec/cassandra_object/associations_spec.rb
 - spec/cassandra_object/base_spec.rb
+- spec/cassandra_object/persistence_spec.rb
 - spec/spec_helper.rb
 - spec/support/cassandra.rb
 - spec/support/db/migrate/001_create_test_tables.rb
@@ -154,8 +156,10 @@ signing_key:
 specification_version: 4
 summary: Cassandra ActiveModel
 test_files:
+- spec/cassandra_object/adapters/cassandra_driver_spec.rb
 - spec/cassandra_object/associations_spec.rb
 - spec/cassandra_object/base_spec.rb
+- spec/cassandra_object/persistence_spec.rb
 - spec/spec_helper.rb
 - spec/support/cassandra.rb
 - spec/support/db/migrate/001_create_test_tables.rb