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

@@ -1,24 +1,22 @@
 require 'cassandra/0.8'
 require 'set'
 
 require 'cassandra_object/log_subscriber'
+require 'cassandra_object/types'
 
 module CassandraObject
   class Base
-    module Naming
+    class << self
       def column_family=(column_family)
         @column_family = column_family
       end
 
       def column_family
         @column_family || name.pluralize
       end
-    end
-    extend Naming
 
-    class << self
       def base_class
         klass = self
         while klass.superclass != Base
           klass = klass.superclass
         end
@@ -38,10 +36,11 @@
     include Dirty
     include Validation
     include Associations
     include Batches
     include FinderMethods
+    include Timestamps
 
     attr_reader :attributes
     attr_accessor :key
 
     include Serialization
@@ -60,7 +59,5 @@
     def to_model
       self
     end
   end
 end
-
-require 'cassandra_object/type_registration'