sessionm-cassandra_object 2.2.55 → 2.3.0

data/lib/cassandra_object.rb

@@ -4,6 +4,7 @@ module CassandraObject
   extend ActiveSupport::Autoload
 
   autoload :Base
+  autoload :Configuration
   autoload :AsyncConnection
   autoload :Connection
   autoload :Attributes

data/lib/cassandra_object/async_connection.rb

@@ -42,11 +42,18 @@ module CassandraObject
     module ClassMethods
       DEFAULT_OPTIONS = {
         servers: "127.0.0.1:9160",
-        thrift: {}
       }
-      def establish_connection(spec)
-        spec.reverse_merge!(DEFAULT_OPTIONS)
-        spec[:thrift].symbolize_keys!
+      DEFAULT_THRIFT_OPTIONS = {
+        exception_class_overrides: [],
+      }
+
+      # This doesn't open a connection. It merely conifgures the connection object.
+      def establish_connection(config)
+        spec = config.reverse_merge(DEFAULT_OPTIONS)
+
+        spec[:thrift] = (spec[:thrift] || {}).reverse_merge(DEFAULT_THRIFT_OPTIONS)
+        spec[:thrift][:exception_class_overrides] = spec[:thrift][:exception_class_overrides].map(&:constantize)
+
         self.connection_spec = spec
       end
     end

data/lib/cassandra_object/base.rb

@@ -29,7 +29,8 @@ module CassandraObject
     extend ActiveModel::Naming
     include ActiveModel::Conversion
     extend ActiveSupport::DescendantsTracker
-    
+
+    include Configuration
     include Fiber.respond_to?(:current) ? AsyncConnection : Connection
     include Consistency
     include RowTTL

data/lib/cassandra_object/configuration.rb

@@ -0,0 +1,29 @@
+module CassandraObject
+  module Configuration
+    extend ActiveSupport::Concern
+    
+    module ClassMethods
+
+      def recursive_symbolize_keys!(hash)
+        hash.symbolize_keys!
+        hash.values.select{|v| v.is_a? Hash}.each{|h| recursive_symbolize_keys!(h)}
+      end
+
+      @@config = nil
+      def config=(config)
+        raise('attempt to set config multiple times') if @@config
+
+        recursive_symbolize_keys!(config)
+
+        (@@config = config).tap do
+          set_default_consistencies(@@config)
+          establish_connection(@@config)
+        end
+      end
+      def config
+        @@config
+      end
+
+    end
+  end
+end

data/lib/cassandra_object/connection.rb

@@ -9,11 +9,19 @@ module CassandraObject
     module ClassMethods
       DEFAULT_OPTIONS = {
         servers: "127.0.0.1:9160",
-        thrift: {}
       }
-      def establish_connection(spec)
-        spec.reverse_merge!(DEFAULT_OPTIONS)
-        self.connection = Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift].symbolize_keys!)
+      DEFAULT_THRIFT_OPTIONS = {
+        exception_class_overrides: [],
+      }
+
+      # This doesn't open a connection. It merely conifgures the connection object.
+      def establish_connection(config)
+        spec = config.reverse_merge(DEFAULT_OPTIONS)
+
+        spec[:thrift] = (spec[:thrift] || {}).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])
       end
     end
   end

data/lib/cassandra_object/consistency.rb

@@ -3,29 +3,40 @@ module CassandraObject
     extend ActiveSupport::Concern
 
     included do
-      cattr_accessor :consistency_levels
-      self.consistency_levels = [:one, :quorum, :all]
-
       class_attribute :write_consistency
       class_attribute :read_consistency
-      self.write_consistency  = :quorum
-      self.read_consistency   = :quorum
     end
 
     module ClassMethods
       THRIFT_LEVELS = {
         :one    => Cassandra::Consistency::ONE,
         :quorum => Cassandra::Consistency::QUORUM,
+        :local_quorum => Cassandra::Consistency::LOCAL_QUORUM,
         :all    => Cassandra::Consistency::ALL
       }
+      
+      DEFAULT_OPTIONS = {
+        :read_default => :quorum,
+        :write_default => :quorum,
+      }
+
+      @@default_read_consistency
+      @@default_write_consistency
+      def set_default_consistencies(config)
+        config = (config[:consistency] || {}).reverse_merge(DEFAULT_OPTIONS)
+        @@default_read_consistency = config[:read_default].to_sym
+        @@default_write_consistency = config[:write_default].to_sym
+      end
 
       def thrift_read_consistency
-        THRIFT_LEVELS[read_consistency] || (raise "Invalid consistency level #{read_consistency}")
+        consistency = read_consistency || @@default_read_consistency
+        THRIFT_LEVELS[consistency] || (raise "Invalid consistency level #{consistency}")
       end
 
       def thrift_write_consistency
-        THRIFT_LEVELS[write_consistency] || (raise "Invalid consistency level #{write_consistency}")
+        consistency = write_consistency || @@default_write_consistency
+        THRIFT_LEVELS[consistency] || (raise "Invalid consistency level #{consistency}")
       end
     end
   end
-end
+end

data/lib/cassandra_object/migrations.rb

@@ -23,7 +23,7 @@ module CassandraObject
       end
 
       def attribute_will_change!(attribute)
-        logger.warn "#{self.class}##{attribute} added/removed/changed and attribute_will_change! not implemented."
+        Rails.logger.warn "#{self.class}##{attribute} added/removed/changed and attribute_will_change! not implemented."
       end
     end
     

data/lib/cassandra_object/schema/migration.rb

@@ -45,7 +45,7 @@ module CassandraObject
       # Scroll down to the CfDef definition.
       def self.create_column_family(name, &block)
         say_with_time("create_column_family #{name}") do
-          column_family_tasks.create(name, &block)
+          column_family_tasks.create(name, CassandraObject::Base.config[:column_family_defaults], &block)
         end
       end
 

data/lib/cassandra_object/tasks/column_family.rb

@@ -21,12 +21,18 @@ module CassandraObject
         connection.schema.cf_defs.find { |cf_def| cf_def.name == name.to_s }
       end
 
-      def create(name, &block)
+      def create(name, options={}, &block)
+        options = {
+          :comparator_type => 'BytesType',
+          :column_type => 'Standard',
+        }.merge(options)
+
         cf = Cassandra::ColumnFamily.new
         cf.name = name.to_s
         cf.keyspace = @keyspace.to_s
-        cf.comparator_type = 'BytesType'
-        cf.column_type = 'Standard'
+        options.each do |option, value|
+          cf.send("#{option}=", value)
+        end
 
         block.call cf if block
 

data/lib/cassandra_object/tasks/keyspace.rb

@@ -18,9 +18,16 @@ module CassandraObject
       end
 
       def create(name, options = {})
+        options = options.symbolize_keys
+
+        replication_opts = {
+          :strategy => 'org.apache.cassandra.locator.SimpleStrategy',
+          :factor => 1,
+        }.merge(options[:replication].symbolize_keys || {})
+
         opts = { :name => name.to_s,
-                 :strategy_class => 'org.apache.cassandra.locator.SimpleStrategy',
-                 :replication_factor => 1,
+                 :strategy_class => replication_opts[:strategy],
+                 :replication_factor => replication_opts[:factor],
                  :cf_defs => [] }.merge(options)
 
         ks = Cassandra::Keyspace.new.with_fields(opts)

data/sessionm-cassandra_object.gemspec

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

data/test/consistency_test.rb

@@ -4,10 +4,6 @@ class CassandraObject::ConsistencyTest < CassandraObject::TestCase
   class TestModel < CassandraObject::Base
   end
 
-  test 'consistency_levels' do
-    assert_equal [:one, :quorum, :all].to_set, TestModel.consistency_levels.to_set
-  end
-
   test 'thrift_write_consistency' do
     TestModel.write_consistency = :all
     assert_equal Cassandra::Consistency::ALL, TestModel.thrift_write_consistency
@@ -17,4 +13,4 @@ class CassandraObject::ConsistencyTest < CassandraObject::TestCase
     TestModel.read_consistency = :all
     assert_equal Cassandra::Consistency::ALL, TestModel.thrift_read_consistency
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.2.55
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -85,6 +85,7 @@ files:
 - lib/cassandra_object/batches.rb
 - lib/cassandra_object/callbacks.rb
 - lib/cassandra_object/collection.rb
+- lib/cassandra_object/configuration.rb
 - lib/cassandra_object/connection.rb
 - lib/cassandra_object/consistency.rb
 - lib/cassandra_object/cursor.rb