gotime-cassandra_object 4.5.1 → 4.6.0

data/.travis.yml

@@ -1,5 +1,7 @@
+language: ruby
 services:
   - cassandra
 rvm:
   - 1.9.2
   - 1.9.3
+env: CQLSH=/usr/local/cassandra/bin/cqlsh

data/Gemfile

@@ -2,4 +2,8 @@ source "http://rubygems.org"
 gemspec
 
 gem 'rake'
-gem 'mocha'
+gem 'mocha'
+
+# group :development, :test do
+#   gem 'pry'
+# end

data/README.rdoc

@@ -68,5 +68,3 @@ Some lightweight scoping features are available:
   Widget.where('color' => 'red')
   Widget.select(['name', 'color'])
   Widget.limit(10)
-
-  

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '4.5.1'
+  s.version = '4.6.0'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/attribute_methods.rb

@@ -9,7 +9,7 @@ module CassandraObject
       else
         attribute_method_suffix("=")
       end
-      
+
       # (Alias for the protected read_attribute method).
       def [](attr_name)
         read_attribute(attr_name)
@@ -26,11 +26,11 @@ module CassandraObject
       def define_attribute_methods
         return if attribute_methods_generated?
         super(attribute_definitions.keys)
-        @attribute_methods_generated = true
+        @@attribute_methods_generated = true
       end
 
       def attribute_methods_generated?
-        @attribute_methods_generated ||= false
+        @@attribute_methods_generated ||= false
       end
     end
 
@@ -79,7 +79,7 @@ module CassandraObject
       def attribute(name)
         read_attribute(name)
       end
-    
+
       def attribute=(name, value)
         write_attribute(name, value)
       end

data/lib/cassandra_object/attribute_methods/dirty.rb

@@ -41,4 +41,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/attribute_methods/primary_key.rb

@@ -22,4 +22,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/attribute_methods/typecasting.rb

@@ -9,9 +9,12 @@ module CassandraObject
 
         %w(array boolean date float integer json string time).each do |type|
           instance_eval <<-EOV, __FILE__, __LINE__ + 1
-            def #{type}(name, options = {})                             # def string(name, options = {})
-              attribute(name, options.update(type: :#{type}))           #   attribute(name, options.update(type: :string))
-            end                                                         # end
+            def #{type}(*args)
+              options = args.extract_options!
+              args.each do |name|
+                attribute(name, options.merge(:type => :#{type}))
+              end
+            end
           EOV
         end
       end
@@ -22,10 +25,10 @@ module CassandraObject
           child.attribute_definitions = attribute_definitions.dup
         end
 
-        # 
+        #
         # attribute :name, type: :string
         # attribute :ammo, type: Ammo, coder: AmmoCodec
-        # 
+        #
         def attribute(name, options)
           type  = options[:type]
           coder = options[:coder]
@@ -53,4 +56,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/base.rb

@@ -22,12 +22,20 @@ module CassandraObject
         end
         klass
       end
+
+      def config=(config)
+        @@config = config.is_a?(Hash) ? CassandraObject::Config.new(config) : config
+      end
+
+      def config
+        @@config
+      end
     end
 
     extend ActiveModel::Naming
     include ActiveModel::Conversion
     extend ActiveSupport::DescendantsTracker
-    
+
     include Connection
     include Consistency
     include Identity
@@ -43,50 +51,10 @@ module CassandraObject
     include Timestamps
     include Savepoints
     include Scoping
+    include Core
 
     include Serialization
-
-    def initialize(attributes=nil)
-      @new_record = true
-      @destroyed = false
-      @attributes = {}
-      self.attributes = attributes || {}
-      attribute_definitions.each do |attr, attribute_definition|
-        unless attribute_exists?(attr)
-          @attributes[attr.to_s] = self.class.typecast_attribute(self, attr, nil)
-        end
-      end
-    end
-
-    def initialize_dup(other)
-      @attributes = other.attributes
-      @attributes['created_at'] = nil
-      @attributes['updated_at'] = nil
-      @attributes.delete(self.class.primary_key)
-      @id = nil
-      @new_record = true
-      @destroyed = false
-      super
-    end
-
-    def to_param
-      id
-    end
-
-    def hash
-      id.hash
-    end
-
-    def ==(comparison_object)
-      comparison_object.equal?(self) ||
-        (comparison_object.instance_of?(self.class) &&
-          comparison_object.id == id)
-    end
-
-    def eql?(comparison_object)
-      self == (comparison_object)
-    end
   end
 end
 
-ActiveSupport.run_load_hooks(:cassandra_object, CassandraObject::Base)
+ActiveSupport.run_load_hooks(:cassandra_object, CassandraObject::Base)

data/lib/cassandra_object/belongs_to.rb

@@ -56,4 +56,4 @@ module CassandraObject
         belongs_to_cache[name.to_sym] = association
       end
   end
-end
+end

data/lib/cassandra_object/belongs_to/association.rb

@@ -50,4 +50,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/belongs_to/reflection.rb

@@ -23,8 +23,8 @@ module CassandraObject
       end
 
       def class_name
-        options[:class_name] || name.to_s.classify 
+        options[:class_name] || name.to_s.camelize
       end
     end
   end
-end
+end

data/lib/cassandra_object/config.rb

@@ -0,0 +1,15 @@
+require 'active_support/core_ext/hash/keys'
+
+module CassandraObject
+  class Config
+    attr_accessor :servers, :keyspace, :thrift_options, :keyspace_options
+
+    def initialize(options)
+      options = options.symbolize_keys
+      self.servers  = Array.wrap(options[:servers] || "127.0.0.1:9160")
+      self.keyspace = options[:keyspace]
+      self.thrift_options = (options[:thrift] || {}).symbolize_keys
+      self.keyspace_options = (options[:keyspace_options] || {}).symbolize_keys
+    end
+  end
+end

data/lib/cassandra_object/connection.rb

@@ -16,30 +16,12 @@ module CassandraCQL
 end
 
 module CassandraObject
-  class Config
-    attr_accessor :servers, :keyspace, :thrift_options
-
-    def initialize(options)
-      self.servers  = Array.wrap(options[:servers] || "127.0.0.1:9160")
-      self.keyspace = options[:keyspace]
-      self.thrift_options = (options[:thrift] || {}).symbolize_keys
-    end
-  end
-
   module Connection
     extend ActiveSupport::Concern
-    
-    included do
-      class_attribute :connection_config
-    end
 
     module ClassMethods
-      def establish_connection(spec)
-        self.connection_config = Config.new(spec)
-      end
-
       def cql
-        @@cql ||= CassandraCQL::Database.new(connection_config.servers, {keyspace: connection_config.keyspace}, connection_config.thrift_options)
+        @@cql ||= CassandraCQL::Database.new(config.servers, {keyspace: config.keyspace}, config.thrift_options)
       end
 
       def execute_cql(cql_string, *bind_vars)

data/lib/cassandra_object/consistency.rb

@@ -15,4 +15,4 @@ module CassandraObject
       class_attribute :default_consistency
     end
   end
-end
+end

data/lib/cassandra_object/core.rb

@@ -0,0 +1,46 @@
+module CassandraObject
+  module Core
+    def initialize(attributes=nil)
+      @new_record = true
+      @destroyed = false
+      @attributes = {}
+      self.attributes = attributes || {}
+      attribute_definitions.each do |attr, attribute_definition|
+        unless attribute_exists?(attr)
+          @attributes[attr.to_s] = self.class.typecast_attribute(self, attr, nil)
+        end
+      end
+
+      yield self if block_given?
+    end
+
+    def initialize_dup(other)
+      @attributes = other.attributes
+      @attributes['created_at'] = nil
+      @attributes['updated_at'] = nil
+      @attributes.delete(self.class.primary_key)
+      @id = nil
+      @new_record = true
+      @destroyed = false
+      super
+    end
+
+    def to_param
+      id
+    end
+
+    def hash
+      id.hash
+    end
+
+    def ==(comparison_object)
+      comparison_object.equal?(self) ||
+        (comparison_object.instance_of?(self.class) &&
+          comparison_object.id == id)
+    end
+
+    def eql?(comparison_object)
+      self == (comparison_object)
+    end
+  end
+end

data/lib/cassandra_object/errors.rb

@@ -4,7 +4,7 @@ module CassandraObject
 
   class RecordNotSaved < CasssandraObjectError
   end
-  
+
   class RecordNotFound < CasssandraObjectError
   end
-end
+end

data/lib/cassandra_object/identity.rb

@@ -6,7 +6,7 @@ module CassandraObject
       class_attribute :key_generator
 
       key do
-        SimpleUUID::UUID.new.to_guid
+        SimpleUUID::UUID.new.to_guid.tr('-','')
       end
     end
 

data/lib/cassandra_object/persistence.rb

@@ -11,8 +11,8 @@ module CassandraObject
         execute_cql "TRUNCATE #{column_family}"
       end
 
-      def create(attributes = {})
-        new(attributes).tap do |object|
+      def create(attributes = {}, &block)
+        new(attributes, &block).tap do |object|
           object.save
         end
       end
@@ -20,12 +20,12 @@ module CassandraObject
       def write(id, attributes)
         if (encoded = encode_attributes(attributes)).any?
           insert_attributes = {'KEY' => id}.update encode_attributes(attributes)
-          statement = "INSERT INTO #{column_family} (#{insert_attributes.keys * ','}) VALUES (#{Array.new(insert_attributes.size, '?') * ','})#{write_option_string}"
+          statement = "INSERT INTO #{column_family} (#{quote_columns(insert_attributes.keys) * ','}) VALUES (#{Array.new(insert_attributes.size, '?') * ','})#{write_option_string}"
           execute_batchable_cql statement, *insert_attributes.values
         end
 
         if (nil_attributes = attributes.select { |key, value| value.nil? }).any?
-          execute_batchable_cql "DELETE #{nil_attributes.keys * ','} FROM #{column_family}#{write_option_string} WHERE KEY = ?", id
+          execute_batchable_cql "DELETE #{quote_columns(nil_attributes.keys) * ','} FROM #{column_family}#{write_option_string} WHERE KEY = ?", id
         end
       end
 
@@ -37,9 +37,9 @@ module CassandraObject
         return nil unless @batch.any?
 
         [
-            "BEGIN BATCH#{write_option_string(true)}",
-            @batch * "\n",
-            'APPLY BATCH'
+          "BEGIN BATCH#{write_option_string(true)}",
+          @batch * "\n",
+          'APPLY BATCH'
         ] * "\n"
       end
 
@@ -84,6 +84,11 @@ module CassandraObject
       end
 
       private
+
+        def quote_columns(column_names)
+          column_names.map { |name| "'#{name}'" }
+        end
+
         def execute_batchable_cql(cql_string, *bind_vars)
           if @batch
             @batch << CassandraCQL::Statement.sanitize(cql_string, bind_vars)
@@ -142,8 +147,17 @@ module CassandraObject
       save!
     end
 
+    def becomes(klass)
+      became = klass.new
+      became.instance_variable_set("@attributes", @attributes)
+      became.instance_variable_set("@new_record", new_record?)
+      became.instance_variable_set("@destroyed", destroyed?)
+      became
+    end
+
     def reload
       @attributes.update(self.class.find(id).instance_variable_get('@attributes'))
+      self
     end
 
     private

data/lib/cassandra_object/railtie.rb

@@ -4,4 +4,4 @@ module CassandraObject
       load 'cassandra_object/tasks/ks.rake'
     end
   end
-end
+end

data/lib/cassandra_object/savepoints.rb

@@ -73,7 +73,7 @@ module CassandraObject
 
       def update
         self.class.add_savepoint_rollback(:update, self)
-        super        
+        super
       end
   end
 end

data/lib/cassandra_object/schema.rb

@@ -5,10 +5,19 @@ module CassandraObject
     extend Tasks
 
     class << self
-      def create_keyspace(keyspace)
-        system_execute "CREATE KEYSPACE #{keyspace} " +
-                       "WITH strategy_class = SimpleStrategy " +
-                       " AND strategy_options:replication_factor = 1"
+      DEFAULT_CREATE_KEYSPACE = {
+        'strategy_class' => 'SimpleStrategy',
+        'strategy_options:replication_factor' => 1
+      }
+
+      def create_keyspace(keyspace, options = {})
+        stmt = "CREATE KEYSPACE #{keyspace}"
+
+        if options.empty?
+          options = DEFAULT_CREATE_KEYSPACE
+        end
+
+        system_execute statement_with_options(stmt, options)
       end
 
       def drop_keyspace(keyspace)
@@ -19,30 +28,36 @@ module CassandraObject
         stmt = "CREATE COLUMNFAMILY #{column_family} " +
                "(KEY varchar PRIMARY KEY)"
 
-        if options.any?
-          with_stmt = options.map do |k,v|
-            "#{k} = #{CassandraCQL::Statement.quote(v)}"
-          end.join(' AND ')
-          stmt << " WITH #{with_stmt}"
-        end
-
-        execute stmt
+        execute statement_with_options(stmt, options)
       end
 
-      def alter_column_family_with(with)
-        execute "ALTER TABLE users WITH #{with}"
+      def alter_column_family(column_family, options)
+        stmt = "ALTER TABLE #{column_family}"
+        execute statement_with_options(stmt, options)
       end
 
       def add_index()
       end
 
       private
+        def statement_with_options(stmt, options)
+          if options.any?
+            with_stmt = options.map do |k,v|
+              "#{k} = #{CassandraCQL::Statement.quote(v)}"
+            end.join(' AND ')
+
+            stmt << " WITH #{with_stmt}"
+          end
+
+          stmt
+        end
+      
         def execute(cql)
           CassandraObject::Base.execute_cql cql
         end
 
         def system_execute(cql)
-          @system_cql ||= CassandraCQL::Database.new(CassandraObject::Base.connection_config.servers, keyspace: 'system')
+          @system_cql ||= CassandraCQL::Database.new(CassandraObject::Base.config.servers, keyspace: 'system')
           @system_cql.execute cql
         end
     end