sessionm-cassandra_object 2.3.6 → 2.3.8

data/Gemfile

@@ -1,2 +1,4 @@
 source "http://rubygems.org"
 gemspec
+
+gem "mocha", :require => false

data/lib/cassandra_object/connection.rb

@@ -18,7 +18,7 @@ module CassandraObject
       def establish_connection(config)
         spec = config.reverse_merge(DEFAULT_OPTIONS)
 
-        spec[:thrift] = (spec[:thrift] || {}).reverse_merge(DEFAULT_THRIFT_OPTIONS)
+        spec[:thrift] = (spec[:thrift].try(:symbolize_keys) || {}).reverse_merge(DEFAULT_THRIFT_OPTIONS)
         spec[:thrift][:exception_class_overrides] = spec[:thrift][:exception_class_overrides].map(&:constantize)
 
         self.connection = Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift])

data/lib/cassandra_object/consistency.rb

@@ -20,8 +20,8 @@ module CassandraObject
         :write_default => :quorum,
       }
 
-      @@default_read_consistency
-      @@default_write_consistency
+      @@default_read_consistency = DEFAULT_OPTIONS[:read_default]
+      @@default_write_consistency = DEFAULT_OPTIONS[:write_default]
       def set_default_consistencies(config)
         config = (config[:consistency] || {}).reverse_merge(DEFAULT_OPTIONS)
         @@default_read_consistency = config[:read_default].to_sym

data/lib/cassandra_object/persistence.rb

@@ -4,17 +4,17 @@ module CassandraObject
 
     module ClassMethods
       def add(key, value, *columns_and_options)
-        defaults = Cassandra::WRITE_DEFAULTS.merge(:consistency => Cassandra::Consistency::QUORUM)
-
-        column_family, column, sub_column, options = connection.extract_and_validate_params(self.column_family, key, columns_and_options, defaults)
+        column_family, column, sub_column, options = connection.extract_and_validate_params(self.column_family, key, columns_and_options, {})
+        # the options are removed, leaving just columns
+        columns = columns_and_options
 
         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_and_options)
+          connection.add(column_family, key, value, *columns, :consistency => thrift_write_consistency)
         end
       end
 
       def remove(key)
-        ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: column_family, key: key) do
+        ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: column_family, key: key) do 
           connection.remove(column_family, key.to_s, consistency: thrift_write_consistency)
         end
       end

data/sessionm-cassandra_object.gemspec

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

data/test/README

@@ -0,0 +1,18 @@
+To run tests:
+
+1) Install gems
+
+$ rvm 1.9.3-p327@cassandra_object --create
+$ bundle install
+
+2) Create keyspace and CFs
+
+$ cassandra-cli
+] create keyspace place_directory_development;
+] use place_directory_development;
+] create column family Issues;
+] create column family Counters with default_validation_class=CounterColumnType and comparator=UTF8Type;
+
+3) Run tests
+
+$ rake test

data/test/persistence_test.rb

@@ -45,6 +45,35 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     assert !issue.new_record?
   end
 
+  test 'add should work' do
+    assert_equal nil, Counter.connection.get(Counter.column_family, 'key', 'column')
+
+    Counter.add('key', 1, 'column')
+    assert_equal 1, Counter.connection.get(Counter.column_family, 'key', 'column')
+
+    Counter.add('key', -1, 'column')
+    assert_equal 0, Counter.connection.get(Counter.column_family, 'key', 'column')
+  end
+
+  test 'add should respect default and class consistency option' do
+    begin
+      old_default_write_cl = CassandraObject::Consistency::ClassMethods.class_variable_get(:@@default_read_consistency)
+      old_class_write_cl = Counter.write_consistency
+      CassandraObject::Consistency::ClassMethods.class_variable_set(:@@default_read_consistency, :quorum)
+      Counter.write_consistency = nil
+
+      Counter.connection.expects(:add).with(Counter.column_family, 'key', 2, 'column', :consistency => Cassandra::Consistency::QUORUM)
+      Counter.add('key', 2, 'column')
+
+      Counter.write_consistency = :local_quorum
+      Counter.connection.expects(:add).with(Counter.column_family, 'key', 2, 'column', :consistency => Cassandra::Consistency::LOCAL_QUORUM)
+      Counter.add('key', 2, 'column')
+    ensure
+      CassandraObject::Consistency::ClassMethods.class_variable_set(:@@default_read_consistency, old_class_write_cl)
+      Counter.write_consistency = old_class_write_cl
+    end
+  end
+
   test 'update_attribute' do
     issue = Issue.create
     issue.update_attribute(:description, 'lol')

data/test/test_helper.rb

@@ -4,6 +4,7 @@
 require 'cassandra/0.8'
 require 'cassandra_object'
 require 'rails/test_help'
+require 'mocha/setup'
 
 class Issue < CassandraObject::Base
   key :uuid
@@ -17,6 +18,10 @@ class Issue < CassandraObject::Base
   end
 end
 
+class Counter < CassandraObject::Base
+  self.write_consistency = :all
+end
+
 module CassandraObject
   class TestCase < ActiveSupport::TestCase
     TEST_KEYSPACE = 'place_directory_development'
@@ -31,6 +36,7 @@ module CassandraObject
 
     teardown do
       Issue.delete_all
+      Counter.delete_all
     end
 
     def connection

metadata

@@ -1,75 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 3
-  - 6
-  version: 2.3.6
+version: !ruby/object:Gem::Version
+  version: 2.3.8
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michael Koziarski
 - gotime
 - sessionm
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-18 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 9
+      - !ruby/object:Gem::Version
         version: 3.0.9
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cassandra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 11
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.9
+- !ruby/object:Gem::Dependency
+  name: cassandra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.11.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.11.3
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Cassandra ActiveModel
 email: klange@sessionm.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -136,6 +134,7 @@ files:
 - lib/cassandra_object/types/utf8_string_type.rb
 - lib/cassandra_object/validations.rb
 - sessionm-cassandra_object.gemspec
+- test/README
 - test/active_model_test.rb
 - test/attributes_test.rb
 - test/base_test.rb
@@ -160,41 +159,32 @@ files:
 - test/types/time_type_test.rb
 - test/types/utf8_string_type_test.rb
 - test/validations_test.rb
-has_rdoc: true
 homepage: http://github.com/sessionm/cassandra_object
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 5
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel
-test_files: 
+test_files:
+- test/README
 - test/active_model_test.rb
 - test/attributes_test.rb
 - test/base_test.rb