gotime-cassandra_object 4.12.1 → 4.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21e6e3bb0dbf786487b89866cc5c57a31e5caf71
-  data.tar.gz: c4191773adbef400bd499bcb6fe142dd2b39fcc4
+  metadata.gz: 2bc6183624ab74d725fd7e3987ccf1e94692b18d
+  data.tar.gz: 3f566d83342e4ee9732a7ac48edcf37ab753f3bc
 SHA512:
-  metadata.gz: 57223e2269db0a93bec23217e3e8bf48463c9d8366a4ba03b3055df1c6789db33ffe67d2cb9b03f96eb81fa887120c9c4f61bddaec147d73386f7032ca1619a7
-  data.tar.gz: af2457981a4ff1102937d5d576e04d7c4dd08bc15a9ab4e9a87e889406ccf766a6c987f7375023145ee92552c0f8f13977d5ddfcdfdf63865ffd9e513c381944
+  metadata.gz: 685060d649e8529db79557cdc23397adf1bb50bde0b22e5dc262d95f223f133470df90ea0b0f2999e9fd0acaa68db2c916b8d55cb43d1f17629d88cab1026843
+  data.tar.gz: e8f7b4a16e6b51391d6cb82b56ad5dda6446de2f04201b71ff6cd8e01b532221a986355b8ecbaf01b1977e2ae6f4dfb4a3c122edb9d2fcdbc90fb818ed3cd94e

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/adapters/cassandra_adapter.rb

@@ -49,7 +49,14 @@ module CassandraObject
       end
 
       def connection
-        @connection ||= CassandraCQL::Database.new(config.servers, {keyspace: config.keyspace}, config.thrift_options)
+        @connection ||= begin
+          thrift_options = (config[:thrift] || {})
+          CassandraCQL::Database.new(servers, {keyspace: config[:keyspace]}, thrift_options)
+        end
+      end
+
+      def servers
+        Array.wrap(config[:servers] || "127.0.0.1:9160")
       end
 
       def execute(statement)

data/lib/cassandra_object/adapters/hstore_adapter.rb

@@ -57,7 +57,6 @@ module CassandraObject
         # conf = {:adapter=>"postgresql", :encoding=>"unicode", :database=>"axle_place_test", :pool=>5, :username=>"postgres"}
         # @connection ||= ActiveRecord::Base.postgresql_connection(conf)
         ActiveRecord::Base.connection
-        # @connection ||= ActiveRecord::Base.postgresql_connection(config)
       end
 
       def execute(statement)
@@ -114,6 +113,15 @@ module CassandraObject
         execute stmt
       end
 
+      def create_table(table_name, options = {})
+        connection.execute 'CREATE EXTENSION IF NOT EXISTS hstore'
+        ActiveRecord::Migration.create_table table_name, id: false do |t|
+          t.string :id, null: false
+          t.hstore :attribute_store, null: false
+        end
+        connection.execute "ALTER TABLE #{table_name} ADD CONSTRAINT #{table_name}_pkey PRIMARY KEY (id)"
+      end
+
       def create_ids_where_clause(ids)
         ids = ids.first if ids.is_a?(Array) && ids.one?
 

data/lib/cassandra_object/attribute_methods/typecasting.rb

@@ -7,12 +7,12 @@ module CassandraObject
         class_attribute :attribute_definitions
         self.attribute_definitions = {}
 
-        %w(array boolean date float hash_t integer json string time).each do |type|
+        %w(array boolean date float integer json string time).each do |type|
           instance_eval <<-EOV, __FILE__, __LINE__ + 1
             def #{type}(*args)
               options = args.extract_options!
               args.each do |name|
-                attribute(name, options.merge(:type => :#{type == 'hash_t' ? 'hash' : type}))
+                attribute(name, options.merge(:type => :#{type}))
               end
             end
           EOV

data/lib/cassandra_object/connection.rb

@@ -21,9 +21,17 @@ module CassandraObject
 
     module ClassMethods
       def adapter
-        @@adapter ||= begin
-          CassandraObject::Adapters::CassandraAdapter.new(config)
-          # CassandraObject::Adapters::HstoreAdapter.new(config)
+        @@adapter ||= adapter_class.new(config)
+      end
+
+      def adapter_class
+        case config[:adapter]
+        when 'hstore'
+          CassandraObject::Adapters::HstoreAdapter
+        when nil, 'cassandra'
+          CassandraObject::Adapters::CassandraAdapter
+        else
+          raise "Unknown adapter #{config[:adapter]}"
         end
       end
     end

data/lib/cassandra_object/counter_base.rb

@@ -31,7 +31,7 @@ module CassandraObject
       end
 
       def cql
-        @@cql ||= CassandraCQL::Database.new(config.servers, {keyspace: config.keyspace}, config.thrift_options)
+        @@cql ||= CassandraObject::Base.adapter.connection
       end
 
       def execute_cql(cql_string, *bind_vars)

data/lib/cassandra_object/model.rb

@@ -13,7 +13,7 @@ module CassandraObject
     end
 
     def config=(config)
-      @@config = config.is_a?(Hash) ? CassandraObject::Config.new(config) : config
+      @@config = config.deep_symbolize_keys
     end
 
     def config

data/lib/cassandra_object/schema.rb

@@ -10,12 +10,10 @@ module CassandraObject
         'strategy_options:replication_factor' => 1
       }
 
-      def create_keyspace(keyspace, options = {})
+      def create_keyspace(keyspace, options = nil)
         stmt = "CREATE KEYSPACE #{keyspace}"
 
-        if options.empty?
-          options = DEFAULT_CREATE_KEYSPACE
-        end
+        options ||= DEFAULT_CREATE_KEYSPACE
 
         system_execute statement_with_options(stmt, options)
       end
@@ -25,7 +23,11 @@ module CassandraObject
       end
 
       def create_column_family(column_family, options = {})
-        stmt = "CREATE COLUMNFAMILY #{column_family} " +
+        create_table column_family, options
+      end
+
+      def create_table(table_name, options = {})
+        stmt = "CREATE COLUMNFAMILY #{table_name} " +
                "(KEY varchar PRIMARY KEY)"
 
         keyspace_execute statement_with_options(stmt, options)
@@ -64,11 +66,11 @@ module CassandraObject
         end
 
         def db
-          @db ||= CassandraCQL::Database.new(CassandraObject::Base.config.servers, {keyspace: 'system'}, {connect_timeout: 30, timeout: 30})
+          @db ||= CassandraCQL::Database.new(CassandraObject::Base.adapter.servers, {keyspace: 'system'}, {connect_timeout: 30, timeout: 30})
         end
 
         def keyspace_execute(cql)
-          db.execute "USE #{CassandraObject::Base.config.keyspace}"
+          db.execute "USE #{CassandraObject::Base.config[:keyspace]}"
           db.execute cql
         end
 

data/lib/cassandra_object/schema/tasks.rb

@@ -37,11 +37,11 @@ module CassandraObject
         end
 
         def keyspace
-          CassandraObject::Base.config.keyspace
+          CassandraObject::Base.config[:keyspace]
         end
 
         def server
-          CassandraObject::Base.config.servers.first.gsub(/:.*/, '')
+          CassandraObject::Base.adapter.servers.first.gsub(/:.*/, '')
         end
     end
   end

data/lib/cassandra_object/tasks/ks.rake

@@ -1,11 +1,11 @@
 ks_namespace = namespace :ks do
-  desc 'Create the keyspace in cassandra_config/cassandra.yml for the current environment'
+  desc 'Create the keyspace in config/cassandra.yml for the current environment'
   task create: :environment do
     begin
-      CassandraObject::Schema.create_keyspace cassandra_config.keyspace, cassandra_config.keyspace_options
+      CassandraObject::Schema.create_keyspace CassandraObject::Base.config[:keyspace], CassandraObject::Base.config[:keyspace_options]
     rescue Exception => e
       if e.message =~ /conflicts/
-        p "Keyspace #{cassandra_config.keyspace} already exists"
+        p "Keyspace #{CassandraObject::Base.config[:keyspace]} already exists"
       else
         raise e
       end
@@ -14,10 +14,10 @@ ks_namespace = namespace :ks do
 
   task drop: :environment do
     begin
-      CassandraObject::Schema.drop_keyspace cassandra_config.keyspace
+      CassandraObject::Schema.drop_keyspace CassandraObject::Base.config[:keyspace]
     rescue Exception => e
       if e.message =~ /non existing keyspace/
-        p "Keyspace #{cassandra_config.keyspace} does not exist"
+        p "Keyspace #{CassandraObject::Base.config[:keyspace]} does not exist"
       else
         raise e
       end
@@ -51,12 +51,4 @@ ks_namespace = namespace :ks do
   task :_load do
     ks_namespace["structure:load"].invoke
   end
-
-  private
-    def cassandra_config
-      @cassandra_config ||= begin
-        cassandra_configs = YAML.load_file(Rails.root.join('config', 'cassandra.yml'))
-        CassandraObject::Config.new cassandra_configs[Rails.env || 'development']
-      end
-    end
 end

data/lib/cassandra_object/types.rb

@@ -2,7 +2,6 @@ CassandraObject::Type.register(:array,          CassandraObject::Types::ArrayTyp
 CassandraObject::Type.register(:boolean,        CassandraObject::Types::BooleanType)
 CassandraObject::Type.register(:date,           CassandraObject::Types::DateType)
 CassandraObject::Type.register(:float,          CassandraObject::Types::FloatType)
-CassandraObject::Type.register(:hash,           CassandraObject::Types::HashType)
 CassandraObject::Type.register(:integer,        CassandraObject::Types::IntegerType)
 CassandraObject::Type.register(:json,           CassandraObject::Types::JsonType)
 CassandraObject::Type.register(:time,           CassandraObject::Types::TimeType)

data/lib/gotime-cassandra_object.rb

@@ -10,7 +10,6 @@ module CassandraObject
   autoload :Base
   autoload :BelongsTo
   autoload :Callbacks
-  autoload :Config
   autoload :Connection
   autoload :Core
   autoload :CounterBase
@@ -61,7 +60,6 @@ module CassandraObject
     autoload :BooleanType
     autoload :DateType
     autoload :FloatType
-    autoload :HashType
     autoload :IntegerType
     autoload :JsonType
     autoload :StringType

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.12.1
+  version: 4.12.2
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -97,7 +97,6 @@ files:
 - lib/cassandra_object/belongs_to/builder.rb
 - lib/cassandra_object/belongs_to/reflection.rb
 - lib/cassandra_object/callbacks.rb
-- lib/cassandra_object/config.rb
 - lib/cassandra_object/connection.rb
 - lib/cassandra_object/core.rb
 - lib/cassandra_object/counter_base.rb
@@ -126,7 +125,6 @@ files:
 - lib/cassandra_object/types/boolean_type.rb
 - lib/cassandra_object/types/date_type.rb
 - lib/cassandra_object/types/float_type.rb
-- lib/cassandra_object/types/hash_type.rb
 - lib/cassandra_object/types/integer_type.rb
 - lib/cassandra_object/types/json_type.rb
 - lib/cassandra_object/types/string_type.rb
@@ -147,7 +145,6 @@ files:
 - test/unit/belongs_to/reflection_test.rb
 - test/unit/belongs_to_test.rb
 - test/unit/callbacks_test.rb
-- test/unit/config_test.rb
 - test/unit/connection_test.rb
 - test/unit/core_test.rb
 - test/unit/counter_base_test.rb
@@ -168,7 +165,6 @@ files:
 - test/unit/types/boolean_type_test.rb
 - test/unit/types/date_type_test.rb
 - test/unit/types/float_type_test.rb
-- test/unit/types/hash_type_test.rb
 - test/unit/types/integer_type_test.rb
 - test/unit/types/json_type_test.rb
 - test/unit/types/string_type_test.rb

data/lib/cassandra_object/config.rb

@@ -1,15 +0,0 @@
-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/types/hash_type.rb

@@ -1,52 +0,0 @@
-module CassandraObject
-  module Types
-    class HashType < BaseType
-      class DirtyHash < Hash
-        attr_accessor :record, :name, :options
-        def initialize(record, name, hash, options)
-          @record   = record
-          @name     = name.to_s
-          @options  = options
-
-          self.merge!(hash)
-          @init_hash = self.hash
-          @init_value = hash
-        end
-
-        def []=(obj, val)
-          modifying { super }
-        end
-
-        def delete(obj)
-          modifying { super }
-        end
-
-        private
-        def modifying
-          result = yield
-
-          if !record.changed_attributes.key?(name) && @init_hash != self.hash
-            record.changed_attributes[name] = @init_value
-          end
-
-          record.send("#{name}=", self)
-
-          result
-        end
-      end
-
-      def encode(hash)
-        ActiveSupport::JSON.encode(hash)
-      end
-
-      def decode(str)
-        ActiveSupport::JSON.decode(str)
-      end
-
-      def wrap(record, name, value)
-        DirtyHash.new(record, name, Hash(value), options)
-      end
-
-    end
-  end
-end

data/test/unit/config_test.rb

@@ -1,23 +0,0 @@
-require 'test_helper'
-
-class CassandraObject::ConfigTest < CassandraObject::TestCase
-  test 'config writer' do
-    config =  CassandraObject::Config.new(
-      keyspace: 'place_directory_development',
-      servers: '192.168.0.100:9160',
-      thrift: {'timeout' => 10},
-      keyspace_options: {'placement_strategy' => 'NetworkTopologyStrategy'}
-    )
-
-    assert_equal ['192.168.0.100:9160'], config.servers
-    assert_equal 'place_directory_development', config.keyspace
-    assert_equal 10, config.thrift_options[:timeout]
-    assert_equal 'NetworkTopologyStrategy', config.keyspace_options[:placement_strategy]
-  end
-
-  test 'defaults' do
-    config = CassandraObject::Config.new(keyspace: 'widget_factory')
-
-    assert_equal ["127.0.0.1:9160"], config.servers
-  end
-end

data/test/unit/types/hash_type_test.rb

@@ -1,77 +0,0 @@
-require 'test_helper'
-
-class CassandraObject::Types::HashTypeTest < CassandraObject::Types::TestCase
-  test 'encode' do
-    assert_equal({a: 'b'}.to_json, coder.encode(a: 'b'))
-    assert_equal '-3', coder.encode(-3)
-  end
-
-  test 'decode' do
-    assert_equal({'a' => 'b'}, coder.decode({'a' => 'b'}.to_json))
-  end
-
-  test 'setting marks dirty' do
-    record = temp_object do
-      string :name
-      hash_t :stuff
-
-    end.new name: 'abcd', stuff: Hash[a: 1, b: 2]
-
-    record.save!
-    assert !record.stuff_changed?
-
-    record.stuff[:c] = 3
-
-    assert record.stuff_changed?
-    assert_equal Hash[a: 1, b: 2, c: 3], record.stuff
-  end
-
-  test 'hash change marks dirty' do
-    record = temp_object do
-      string :name
-      hash_t :stuff
-
-    end.new name: 'abcd', stuff: Hash[a: 1, b: 2, v: {}]
-
-    record.save!
-    assert !record.stuff_changed?
-
-    record.stuff[:v][:data] = 69
-    record.stuff[:v] = record.stuff[:v]
-
-    assert record.stuff_changed?
-    assert_equal Hash[a: 1, b: 2, v: Hash[data: 69]], record.stuff
-  end
-
-  test 'hash no change does not dirty' do
-    record = temp_object do
-      string :name
-      hash_t :stuff
-
-    end.new name: 'abcd', stuff: Hash[a: 1, b: 2, v: {data: 69}]
-
-    record.save!
-    assert !record.stuff_changed?
-
-    record.stuff[:v][:data] = 69
-    record.stuff[:v] = record.stuff[:v]
-
-    assert !record.stuff_changed?
-    assert_equal Hash[a: 1, b: 2, v: Hash[data: 69]], record.stuff
-  end
-
-  test 'delete marks dirty' do
-    record = temp_object do
-      string :name
-      hash_t :stuff
-
-    end.new name: 'abcd', stuff: Hash[a: 1, b: 2]
-
-    record.stuff.delete :b
-
-    assert record.stuff_changed?
-    assert_equal Hash[a: 1], record.stuff
-  end
-
-
-end