sessionm-cassandra_object 2.7.5 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb5b78800e765ca3a4ef0e4bb4857471f1a2bd11
-  data.tar.gz: bbfa6f43304cfb9fd57c4cbc6d9d20d7dfd17483
+  metadata.gz: c8c030402fac23c1c5582c18fb390760fafad77b
+  data.tar.gz: 153e5739c2ca48e426e244c9644386729c90d663
 SHA512:
-  metadata.gz: abeee5225d15083515f2cb7a261a411b3136859ed3123591b4a43a64b22a364d9db6f0ab9461d0835ee53245807e283e878fa5b9b9070b8d1a0e6e32cff34d37
-  data.tar.gz: 30463ca00ac7faef263340984e10e3cbae32d99eb9c451911c4d355d3efb6eb97caec09de8408346bf804efc15245d32d61fe93647be0a4a4c534fcb21d3f3a0
+  metadata.gz: 34bc064fa9b47e01e82deedd7c76ae77b981671bcb3f7e7cc13046e76d3a0732363851ca82fe77e73c37dcd5c03df20c63397e62f8c55be4338abccf8ec2cb80
+  data.tar.gz: 05abb454e907e44fa7defc4b98a1077449c5a38d6e032f1b49a141df72431c568af2a0371590fa79ae9b44897ff5911a5716add7442ea8e74fc38a5323dde593

data/.ruby-gemset

@@ -0,0 +1 @@
+cassandra_object

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.0

data/Gemfile

@@ -1,4 +1,6 @@
-source "http://rubygems.org"
-gemspec
+source 'http://gems.prod.sessionm.com'
 
-gem "mocha", :require => false
+gem 'rails', :require => 'rails/all'
+
+gem 'simple_uuid', '0.2.2'
+gem 'cassandra-driver', :require => 'cassandra'

data/config/boot.rb

@@ -0,0 +1,9 @@
+require 'rubygems'
+require 'openssl'
+require 'yaml'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+

data/config/cassandra.yml

@@ -0,0 +1,36 @@
+development: &id001
+  servers: ['127.0.0.1:9160']
+  keyspace: greyhound_development
+  replication:
+    strategy: org.apache.cassandra.locator.SimpleStrategy
+    factor: 1
+  consistency:
+    read_default: quorum
+    write_default: quorum
+  column_family_defaults:
+    compaction_strategy: org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy
+    row_cache_provider: org.apache.cassandra.cache.ConcurrentLinkedHashCacheProvider
+  thrift:
+    connect_timeout: 0.5
+    timeout: 3
+    retries: 2
+production: *id001
+test:
+  servers: ['127.0.0.1:9160']
+  keyspace: greyhound_test
+  replication:
+    strategy: org.apache.cassandra.locator.SimpleStrategy
+    factor: 1
+  consistency:
+    read_default: quorum
+    write_default: quorum
+  column_family_defaults:
+    compaction_strategy: org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy
+    row_cache_provider: org.apache.cassandra.cache.ConcurrentLinkedHashCacheProvider
+  thrift:
+    connect_timeout: 0.5
+    timeout: 3
+    retries: 2
+    exception_class_overrides:
+      - CassandraThrift::InvalidRequestException
+      - CassandraThrift::NotFoundException

data/config/environment.rb

@@ -0,0 +1,17 @@
+require File.expand_path('../boot', __FILE__)
+require 'pathname'
+
+ENV['RAILS_ENV'] ||= 'development'
+
+Bundler.require :default, ENV['RAILS_ENV']
+
+BASE_DIR = Pathname.new(File.expand_path('../..', __FILE__))
+
+CASSANDRA_YAML = "#{BASE_DIR}/config/cassandra.yml"
+
+DEFAULT_LOG_FILE = "#{BASE_DIR}/log/#{ENV['RAILS_ENV']}.log"
+
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+require 'cassandra_object'
+
+CassandraObject::Base.config = YAML.load_file(CASSANDRA_YAML)[ENV['RAILS_ENV']]

data/lib/cassandra_object.rb

@@ -26,6 +26,7 @@ module CassandraObject
   autoload :Schema
   autoload :RowTTL
   autoload :NestedAttributes
+  autoload :Adapters
 
   module Tasks
     extend ActiveSupport::Autoload

data/lib/cassandra_object/adapters.rb

@@ -0,0 +1,7 @@
+module CassandraObject
+  module Adapters
+    extend ActiveSupport::Autoload
+
+    autoload :CassandraDriver
+  end
+end

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -0,0 +1,121 @@
+module CassandraObject
+  module Adapters
+    class CassandraDriver
+      attr_reader :config
+
+      def initialize(config)
+        @config = config
+      end
+      
+      def cluster
+        @cluster ||= Cassandra.cluster cluster_config
+      end
+
+      def client
+        @client ||= Client.new(cluster.connect(config[:keyspace]))
+      end
+
+      def close
+        @client.try(:close)
+        @client = nil
+      end
+
+      def cluster_config
+        {
+          :hosts => config[:servers].map { |server| server.sub /:\d+/, '' },
+          :port => config[:port] || 9042,
+          :connect_timeout => config[:thrift][:connect_timeout] || 10,
+          :timeout => config[:thrift][:timeout] || 10,
+          :logger => Rails.logger || Logger.new(STDOUT),
+          :consistency => (config[:consistency] || {})[:write_default].try(:to_sym) || :one,
+        }
+      end
+
+      # The client class acts like the old cassandra gem
+      class Client
+        attr_reader :session
+
+        KEY_FIELD = 'key'
+        NAME_FIELD = 'column1'
+        VALUE_FIELD = 'value'
+
+        def initialize(session)
+          @session = session
+        end
+
+        def close
+          session.close
+        end
+
+        def execute(*args)
+          session.execute *args
+        end
+
+        def execute_async(*args)
+          session.execute_async *args
+        end
+
+        def insert(column_family, key, values, opts=nil)
+          ttl = opts.try(:[], :ttl)
+          async = opts.try(:[], :async)
+
+          insert_into_options = ttl ? " USING TTL #{ttl}" : ''
+          key = "textAsBlob('#{key}')"
+
+          query = "BEGIN BATCH\n"
+          query << values.map do |name, value|
+            "  INSERT INTO \"#{column_family}\" (#{KEY_FIELD}, #{NAME_FIELD}, #{VALUE_FIELD}) VALUES (#{key}, '#{name}', '#{value}')#{insert_into_options}"
+          end.join("\n")
+          query << "\nAPPLY BATCH;"
+
+          async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
+        end
+
+        def get(column_family, key, *columns_options)
+          opts = columns_options.pop if columns_options.last.is_a?(Hash)
+          async = opts.try(:[], :async)
+
+          columns = columns_options.flatten.compact
+
+          key = "textAsBlob('#{key}')"
+
+          query =
+            if columns.size == 1
+              "SELECT #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{key} AND #{NAME_FIELD} = '#{columns.first}'"
+            else
+              "SELECT #{NAME_FIELD}, #{VALUE_FIELD} FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{key}"
+            end
+
+          result = async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
+          return result if async
+
+          if columns.size == 1
+            result.size > 0 ? result.first[VALUE_FIELD] : nil
+          else
+            data = result.inject({}) { |hsh, row| hsh[row[NAME_FIELD]] = row[VALUE_FIELD]; hsh }
+            columns.size > 0 ? data.slice(*columns.map(&:to_s)) : data
+          end
+        end
+
+        def add(column_family, key, by, field, opts=nil)
+          async = opts.try(:[], :async)
+          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))
+        end
+
+        def execute_options(opts)
+          opts.try(:slice,
+                   :consistency,
+                   :page_size,
+                   :trace,
+                   :timeout,
+                   :serial_consistency
+                  ) || {}
+        end
+      end
+    end
+  end
+end

data/lib/cassandra_object/associations.rb

@@ -12,7 +12,8 @@ module CassandraObject
     autoload :OneToOne
     
     included do
-      class_inheritable_hash :associations
+      class_attribute :associations
+      self.associations = {}
     end
 
     module ClassMethods
@@ -29,10 +30,11 @@ module CassandraObject
       end
 
       def association(association_name, options= {})
+        self.association = self.association.dup
         if options[:unique]
-          write_inheritable_hash(:associations, {association_name => OneToOne.new(association_name, self, options)})
+          self.associations[association_name] = OneToOne.new(association_name, self, options)
         else
-          write_inheritable_hash(:associations, {association_name => OneToMany.new(association_name, self, options)})
+          self.associations[association_name] = OneToMany.new(association_name, self, options)
         end
       end
       
@@ -43,8 +45,9 @@ module CassandraObject
               connection.remove(relationships_column_family, key.to_s, consistency: thrift_write_consistency)
             end
           end
-        rescue Cassandra::AccessError => e
-          raise e unless e.message =~ /Invalid column family/
+        rescue Cassandra::Error => e
+          # pretty sure this is not the correct message for cassandra-driver gem, will need to investigate the actual message
+          raise e unless e.message =~ /invalid column family/i
         end
         super
       end

data/lib/cassandra_object/attributes.rb

@@ -75,19 +75,19 @@ module CassandraObject
       end
     end
 
-    def method_missing(method_id, *args, &block)
-      if !self.class.attribute_methods_generated?
-        self.class.define_attribute_methods
-        send(method_id, *args, &block)
-      else
-        super
-      end
-    end
+    # def method_missing(method_id, *args, &block)
+    #   if !self.class.attribute_methods_generated?
+    #     self.class.define_attribute_methods
+    #     send(method_id, *args, &block)
+    #   else
+    #     super
+    #   end
+    # end
 
-    def respond_to?(*args)
-      self.class.define_attribute_methods unless self.class.attribute_methods_generated?
-      super
-    end
+    # def respond_to?(*args)
+    #   self.class.define_attribute_methods unless self.class.attribute_methods_generated?
+    #   super
+    # end
 
     protected
       def attribute_method?(name)

data/lib/cassandra_object/base.rb

@@ -46,7 +46,7 @@ module CassandraObject
     include Timestamps
     include NestedAttributes
 
-    attr_accessor :key
+    attr_accessor :key, :schema_version
 
     include Serialization
     include Migrations

data/lib/cassandra_object/connection.rb

@@ -1,4 +1,4 @@
-require 'with_connection'
+require 'active_record/connection_adapters/connection_specification'
 
 module CassandraObject
   module Connection
@@ -7,164 +7,20 @@ module CassandraObject
     included do
       class_attribute :connection_spec
 
-      class_eval do
-
-        @@schema = nil
-        def self.new_connection(async, servers)
-          spec = connection_spec.dup
-
-          if async
-            require 'thrift_client/event_machine'
-            spec[:thrift] = spec[:thrift].dup.merge(:transport => Thrift::EventMachineTransport,
-                                                    :transport_wrapper => nil)
-          end
-
-          Cassandra.new(spec[:keyspace], servers || spec[:servers], spec[:thrift]).tap do |conn|
-            conn.disable_node_auto_discovery! if spec[:disable_node_auto_discovery]
-            if spec[:cache_schema]
-              if @@schema
-                conn.instance_variable_set '@schema', @@schema
-              else
-                begin
-                  @@schema = conn.schema
-                rescue CassandraThrift::InvalidRequestException => e
-                  # initially the schema doesn't exists
-                end
-              end
-            end
-          end
-        end
-
-        def self.new_async_connection(servers=nil)
-          new_connection true, servers
-        end
-
-        def self.new_sync_connection(servers=nil)
-          new_connection false, servers
-        end
-
-        def self.new_async_connection_pool(servers=nil)
-          adapter_method = Proc.new do
-            self.new_async_connection servers
-          end
-          spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
-          WithConnection::ConnectionPool.new "async cassandra", spec
-        end
-
-        def self.new_sync_connection_pool(servers=nil)
-          adapter_method = Proc.new do
-            self.new_sync_connection servers
-          end
-          spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
-          WithConnection::ConnectionPool.new "sync cassandra", spec
-        end
-
-        @@ring = nil
-        def self.ring
-          @@ring ||= self.new_sync_connection.ring
-        end
-
-        def self.servers_and_ranges(datacenter)
-          datacenter = datacenter.to_s
-          ring.map do |t| 
-            {
-              :start_token => t.start_token.to_i,
-              :end_token => t.end_token.to_i == 0 ? 0xffffffffffffffffffffffffffffffff : (t.end_token.to_i - 1), 
-              :servers => t.endpoint_details.select { |d| d.datacenter == datacenter }.map { |d| "#{d.host}:9160" }
-            }
-          end
-        end
-
-        NEGATIVE_TEST  = 0x80000000000000000000000000000000
-        FLIP_BITS_MASK = 0xffffffffffffffffffffffffffffffff
-        def self.ranged_connection_pool_key_algo
-          Proc.new do |key|
-            key = Digest::MD5.hexdigest(key.to_s).to_i(16)
-
-            # https://github.com/datastax/java-driver/blob/2.0/driver-core/src/main/java/com/datastax/driver/core/Token.java:259
-            # test to see if the unsigned integer is a negative singed value
-            if (key & NEGATIVE_TEST) != 0
-              # need to flip all the bits
-              # abs
-              (key ^ FLIP_BITS_MASK) + 1
-            else
-              key
-            end
-          end
-        end
-
-        def self.new_ranged_connection_pool(async)
-          if self.connection_spec[:datacenter]
-            require 'with_connection/ranged_connection_pool'
-
-            default_pool = async ? new_async_connection_pool : new_sync_connection_pool
-
-            ranges_and_pools = self.servers_and_ranges(self.connection_spec[:datacenter]).map do |info|
-              pool = async ? new_async_connection_pool(info[:servers]) : new_sync_connection_pool(info[:servers])
-              [WithConnection::RangedConnectionPool::BasicRange.new(info[:start_token], info[:end_token]), pool]
-            end
-
-            ranges_and_pools.size <= 1 ? default_pool : WithConnection::RangedConnectionPool.new(ranges_and_pools, default_pool, self.ranged_connection_pool_key_algo)
-          else
-            async ? new_async_connection_pool : new_sync_connection_pool
-          end
-        end
-
-        @@sync_connection_pool = nil
-        def self.sync_connection_pool
-          @@sync_connection_pool ||= new_ranged_connection_pool(false)
-        end
-
-        @@async_connection_pool = nil
-        def self.async_connection_pool
-          @@async_connection_pool ||= new_ranged_connection_pool(true)
-        end
-
-        if defined?(EM)
-          def self.connection_pool
-            EM.reactor_running? ? self.async_connection_pool : self.sync_connection_pool
-          end
-        else
-          def self.connection_pool
-            self.sync_connection_pool
-          end
-        end
-
-        def connection_pool
-          self.class.connection_pool
-        end
-
-        def self.connection
-          self.connection_pool.connection
-        end
-        def self.connection?; !!connection; end
-
-        def self.with_connection(key=nil, read_write=nil, &block)
-          self.connection_pool.with_connection(key, read_write, &block)
-        end
-
-        def with_connection(key=nil, read_write=nil, &block)
-          self.class.with_connection(key, read_write, &block)
-        end
-
-        def self.disconnect!
-          self.async_connection_pool.disconnect! if @@async_connection_pool
-          self.sync_connection_pool.disconnect! if @@sync_connection_pool
-          @@sync_connection_pool = nil
-          @@async_connection_pool = nil
-        end
+      def connection
+        self.class.connection
+      end
 
-        def disconnect!
-          self.class.disconnect!
-        end
+      def connection?
+        self.class.connection?
+      end
 
-        def connection
-          defined?(@connection) ? @connection : singleton_class.connection
-        end
+      def disconnect!
+        self.class.disconnect!
+      end
 
-        def connection?
-          !!connection
-        end
+      def with_connection(*args)
+        yield
       end
     end
 
@@ -185,6 +41,23 @@ module CassandraObject
 
         self.connection_spec = spec
       end
+
+      def connection
+        @connection ||= CassandraObject::Adapters::CassandraDriver.new(self.connection_spec).client
+      end
+
+      def connection?
+        !! @connection
+      end
+
+      def disconnect!
+        @connection.try(:close)
+        @connection = nil
+      end
+
+      def with_connection(*args)
+        yield
+      end
     end
   end
 end

data/lib/cassandra_object/consistency.rb

@@ -9,11 +9,11 @@ module CassandraObject
 
     module ClassMethods
       THRIFT_LEVELS = {
-        :one    => Cassandra::Consistency::ONE,
-        :quorum => Cassandra::Consistency::QUORUM,
-        :local_quorum => Cassandra::Consistency::LOCAL_QUORUM,
-        :each_quorum => Cassandra::Consistency::EACH_QUORUM,
-        :all    => Cassandra::Consistency::ALL
+        :one    => :one,
+        :quorum => :quorum,
+        :local_quorum => :local_quorum,
+        :each_quorum => :each_quorum,
+        :all    => :all
       }
       
       DEFAULT_OPTIONS = {

data/lib/cassandra_object/finder_methods.rb

@@ -2,22 +2,6 @@ module CassandraObject
   module FinderMethods
     extend ActiveSupport::Concern
     module ClassMethods
-      def column_parent
-        @column_parent ||= CassandraThrift::ColumnParent.new(:column_family => column_family)
-      end
-
-      def slice_range_count
-        @slice_range_count ||= 100
-      end
-
-      def slice_range_count=(v)
-        @slice_range_count = v
-      end
-
-      def slice_predicate
-        @slice_predicate ||= CassandraThrift::SlicePredicate.new(:slice_range => CassandraThrift::SliceRange.new(:count => slice_range_count, :reversed => false, :start => '', :finish => ''))
-      end
-
       def find(key, opts={})
         # kludge to play nice ActiveRecord association
         opts.assert_valid_keys(:conditions, :consistency)
@@ -29,7 +13,7 @@ module CassandraObject
           begin
             CassandraObject::Base.with_connection(key, :read) do
               ActiveSupport::Notifications.instrument("get.cassandra_object", column_family: column_family, key: key) do
-                connection.get column_parent, key, slice_predicate, opts.slice(:consistency)
+                connection.get column_family, key, opts.slice(:consistency)
               end
             end
           end
@@ -102,6 +86,19 @@ module CassandraObject
         multi_get_by_expression(expression, options).values
       end
 
+      # Selecting a slice of a super column
+      def get_slice(key, start, finish, opts={})
+        CassandraObject::Base.with_connection(key, :read) do
+          connection.get_slice(column_family,
+                               key, 
+                               start,
+                               finish,
+                               opts[:count] || 100,
+                               opts[:reversed] || false,
+                               opts[:consistency] || thrift_read_consistency)
+        end
+      end
+
       private
         def _columns_to_hash(columns)
           {}.tap do |hsh|

data/lib/cassandra_object/migrations.rb

@@ -4,8 +4,9 @@ module CassandraObject
     extend ActiveSupport::Autoload
 
     included do
-      class_inheritable_array :migrations
-      class_inheritable_accessor :current_schema_version
+      class_attribute :migrations
+      self.migrations = []
+      class_attribute :current_schema_version
       self.current_schema_version = 0
     end
 
@@ -29,7 +30,8 @@ module CassandraObject
     
     module ClassMethods
       def migrate(version, &blk)
-        write_inheritable_array(:migrations, [Migration.new(version, blk)])
+        self.migrations = self.migrations.dup
+        self.migrations << Migration.new(version, blk)
         
         if version > self.current_schema_version 
           self.current_schema_version = version
@@ -60,8 +62,8 @@ module CassandraObject
         end
         
         super(key, attributes).tap do |record|
-          original_attributes.diff(attributes).keys.each do |attribute|
-            record.attribute_will_change! attribute
+          attributes.each do |name, _|
+            record.attribute_will_change!(name) unless original_attributes.has_key?(name)
           end
         end
       end

data/lib/cassandra_object/mocking.rb

@@ -1,14 +1,9 @@
-require 'cassandra/mock'
 module CassandraObject
   module Mocking
     extend ActiveSupport::Concern
     module ClassMethods
       def use_mock!(really=true)
-        if really
-          self.connection_class = Cassandra::Mock
-        else
-          self.connection_class = Cassandra
-        end
+        self.connection_class = Cassandra
       end
     end
   end

data/lib/cassandra_object/nested_attributes.rb

@@ -11,7 +11,7 @@ module CassandraObject
     extend ActiveSupport::Concern
 
     included do
-      class_inheritable_accessor :nested_attributes_options, :instance_writer => false
+      class_attribute :nested_attributes_options
       self.nested_attributes_options = {}
     end
 
@@ -28,6 +28,7 @@ module CassandraObject
           if reflection = reflect_on_association(association_name)
             reflection.options[:autosave] = true
             add_autosave_association_callbacks(reflection)
+            self.nested_attributes_options = self.nested_attributes_options.dup
             nested_attributes_options[association_name.to_sym] = options
             type = (reflection.collection? ? :collection : :one_to_one)
 

data/lib/cassandra_object/schema/migrator.rb

@@ -50,7 +50,7 @@ module CassandraObject
 
       def self.get_all_versions
         cas = CassandraObject::Base.connection
-        cas.multi_get(schema_migrations_column_family, ['all'])['all'].map {|(name, _value)| name.to_i}.sort
+        cas.get(schema_migrations_column_family, 'all').map {|(name, _value)| name.to_i}.sort
       end
 
       def self.current_version

data/lib/cassandra_object/tasks/column_family.rb

@@ -27,6 +27,7 @@ module CassandraObject
           :column_type => 'Standard',
         }.merge(options)
 
+        # this won't work with cassandra-driver
         cf = Cassandra::ColumnFamily.new
         cf.name = name.to_s
         cf.keyspace = @keyspace.to_s

data/lib/cassandra_object/tasks/ks.rake

@@ -1,8 +1,6 @@
 namespace :ks do
   task :configure => :environment do
-    @configs = YAML::load(ERB.new(IO.read(Rails.root.join('config', 'cassandra.yml'))).result)
-    # use default thrift settings
-    @configs.each { |_, section| section.delete 'thrift' }
+    @configs = YAML.load_file(Rails.root.join("config", "cassandra.yml"))
     @config = @configs[Rails.env || 'development']
   end
 

data/script/console.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+require File.expand_path('../../config/environment', __FILE__)
+require "irb"
+
+if __FILE__ == $0
+  IRB.start(__FILE__)
+else
+  # check -e option
+  if /^-e$/ =~ $0
+    IRB.start(__FILE__)
+  else
+    IRB.setup(__FILE__)
+  end
+end
+

data/sessionm-cassandra_object.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '2.7.5'
+  s.version = '4.0.0'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 
   s.authors = ["Michael Koziarski", "gotime", "sessionm"]
-  s.email = 'klange@sessionm.com'
+  s.email = 'doug@sessionm.com'
   s.homepage = 'http://github.com/sessionm/cassandra_object'
 
   s.extra_rdoc_files = ["README.markdown"]

data/test/consistency_test.rb

@@ -6,11 +6,11 @@ class CassandraObject::ConsistencyTest < CassandraObject::TestCase
 
   test 'thrift_write_consistency' do
     TestModel.write_consistency = :all
-    assert_equal Cassandra::Consistency::ALL, TestModel.thrift_write_consistency
+    assert_equal :all, TestModel.thrift_write_consistency
   end
   
   test 'thrift_read_consistency' do
     TestModel.read_consistency = :all
-    assert_equal Cassandra::Consistency::ALL, TestModel.thrift_read_consistency
+    assert_equal :all, TestModel.thrift_read_consistency
   end
 end

data/test/persistence_test.rb

@@ -62,11 +62,11 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
       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.connection.expects(:add).with(Counter.column_family, 'key', 2, 'column', :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.connection.expects(:add).with(Counter.column_family, 'key', 2, 'column', :consistency => :local_quorum)
       Counter.add('key', 2, 'column')
     ensure
       CassandraObject::Consistency::ClassMethods.class_variable_set(:@@default_read_consistency, old_class_write_cl)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 4.0.0
 platform: ruby
 authors:
 - Michael Koziarski
@@ -10,23 +10,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies: []
 description: Cassandra ActiveModel
-email: klange@sessionm.com
+email: doug@sessionm.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG
 - Gemfile
 - LICENSE
 - MIT-LICENSE
 - README.markdown
 - Rakefile
+- config/boot.rb
+- config/cassandra.yml
+- config/environment.rb
 - lib/cassandra_object.rb
+- lib/cassandra_object/adapters.rb
+- lib/cassandra_object/adapters/cassandra_driver.rb
 - lib/cassandra_object/associations.rb
 - lib/cassandra_object/associations/one_to_many.rb
 - lib/cassandra_object/associations/one_to_one.rb
@@ -83,6 +90,7 @@ files:
 - lib/cassandra_object/types/time_with_zone_type.rb
 - lib/cassandra_object/types/utf8_string_type.rb
 - lib/cassandra_object/validations.rb
+- script/console.rb
 - sessionm-cassandra_object.gemspec
 - test/README
 - test/active_model_test.rb
@@ -128,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Cassandra ActiveModel