lib/cassandra_object/base.rb in gotime-cassandra_object-0.9.1 vs lib/cassandra_object/base.rb in gotime-cassandra_object-2.0.0

@@ -1,26 +1,12 @@
-require 'cassandra/0.7'
+require 'cassandra/0.8'
 require 'set'
 
 require 'cassandra_object/log_subscriber'
 
 module CassandraObject
   class Base
-    class_inheritable_accessor :connection
-    class_inheritable_writer :connection_class
-
-    def self.connection_class
-      read_inheritable_attribute(:connection_class) || Cassandra
-    end
-
-    module ConnectionManagement
-      def establish_connection(*args)
-        self.connection = connection_class.new(*args)
-      end
-    end
-    extend ConnectionManagement
-
     module Naming
       def column_family=(column_family)
         @column_family = column_family
       end
 
@@ -41,19 +27,20 @@
     end
 
     extend ActiveModel::Naming
     extend ActiveSupport::DescendantsTracker
     
+    include Connection
     include Callbacks
     include Identity
     include Attributes
     include Persistence
     include Indexes
     include Dirty
     include Validation
     include Associations
-    include FindEach
-    include FindWithIds
+    include Batches
+    include FinderMethods
 
     attr_reader :attributes
     attr_accessor :key
 
     include Serialization