gotime-cassandra_object 4.12.0 → 4.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84be31ff7407fc7ec88e53d411ddbd7ab067fb27
-  data.tar.gz: b364e2178974653ae11328b7c3b352d24d262a2a
+  metadata.gz: 21e6e3bb0dbf786487b89866cc5c57a31e5caf71
+  data.tar.gz: c4191773adbef400bd499bcb6fe142dd2b39fcc4
 SHA512:
-  metadata.gz: 3397a56b362a21c9a6a9e9480195fdc23334e4ff081f49ef19f84638239f3e562d2e6f81ccb9f1be7c04663f8ec53a298758b8dd44f84c79491d56732922d4b3
-  data.tar.gz: 123c09faf6d4e07fdd4354619dd8e49bfd97d6f58cf7684a950ffcdf5c474a8579d2ce35fb4abdb7c43d4d072ddfc6bfacf2ba6d62b5e0d7cb447f53830a3968
+  metadata.gz: 57223e2269db0a93bec23217e3e8bf48463c9d8366a4ba03b3055df1c6789db33ffe67d2cb9b03f96eb81fa887120c9c4f61bddaec147d73386f7032ca1619a7
+  data.tar.gz: af2457981a4ff1102937d5d576e04d7c4dd08bc15a9ab4e9a87e889406ccf766a6c987f7375023145ee92552c0f8f13977d5ddfcdfdf63865ffd9e513c381944

data/Gemfile

@@ -2,9 +2,14 @@ source "http://rubygems.org"
 gemspec
 
 gem 'rake'
-gem 'mocha'
 gem 'thin'
 
-# group :development, :test do
-#   gem 'pry'
-# end
+group :test do
+  gem 'rails'
+  gem 'mocha', require: false
+end
+
+group :hstore do
+  gem 'activerecord'
+  gem 'pg'
+end

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/adapters/hstore_adapter.rb

@@ -54,8 +54,9 @@ module CassandraObject
       end
 
       def connection
-        conf = {:adapter=>"postgresql", :encoding=>"unicode", :database=>"axle_place_test", :pool=>5, :username=>"postgres"}
-        @connection ||= ActiveRecord::Base.postgresql_connection(conf)
+        # 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
 

data/lib/cassandra_object/base.rb

@@ -11,7 +11,6 @@ module CassandraObject
     extend ActiveSupport::DescendantsTracker
 
     include Connection
-    include Consistency
     include Identity
     include Inspect
     include Persistence

data/lib/cassandra_object/connection.rb

@@ -21,8 +21,10 @@ module CassandraObject
 
     module ClassMethods
       def adapter
-        @@adapter ||= CassandraObject::Adapters::CassandraAdapter.new(config)
-        # @@adapter ||= CassandraObject::Adapters::HstoreAdapter.new(config)
+        @@adapter ||= begin
+          CassandraObject::Adapters::CassandraAdapter.new(config)
+          # CassandraObject::Adapters::HstoreAdapter.new(config)
+        end
       end
     end
   end

data/lib/cassandra_object/counter_base.rb

@@ -76,7 +76,6 @@ module CassandraObject
     extend ActiveSupport::DescendantsTracker
 
     include Connection
-    include Consistency
     include Identity
     include Inspect
     extend  Model

data/lib/cassandra_object/schema/tasks.rb

@@ -2,7 +2,7 @@ module CassandraObject
   class Schema
     module Tasks
       def dump(io)
-        column_families.each do |column_family|
+        table_names.each do |column_family|
           io.puts run_command("DESCRIBE COLUMNFAMILY #{column_family}")
           io.puts
         end
@@ -23,7 +23,7 @@ module CassandraObject
         end
       end
 
-      def column_families
+      def table_names
         run_command('DESCRIBE COLUMNFAMILIES').split.sort
       end
 

data/lib/gotime-cassandra_object.rb

@@ -12,7 +12,6 @@ module CassandraObject
   autoload :Callbacks
   autoload :Config
   autoload :Connection
-  autoload :Consistency
   autoload :Core
   autoload :CounterBase
   autoload :Identity

data/test/support/{teardown.rb → cassandra.rb}

@@ -1,3 +1,21 @@
+CassandraObject::Base.config = {
+  keyspace: 'cassandra_object_test',
+  servers: '127.0.0.1:9160',
+  thrift: {
+    timeout: 5
+  }
+}
+
+begin
+  CassandraObject::Schema.drop_keyspace 'cassandra_object_test'
+rescue Exception => e
+end
+
+sleep 1
+CassandraObject::Schema.create_keyspace 'cassandra_object_test'
+CassandraObject::Schema.create_column_family 'Issues'
+CassandraObject::Base.adapter.consistency = 'QUORUM'
+
 CassandraObject::Base.class_eval do
   class_attribute :created_records
   self.created_records = []

data/test/support/hstore.rb

@@ -0,0 +1,46 @@
+Bundler.require :hstore
+require 'active_record'
+CassandraObject::Base.config = {}
+class PGInitializer
+  def self.initialize!
+    config = {
+      'adapter'   => 'postgresql',
+      'encoding'  => 'unicode',
+      'database'  => 'cassandra_object_test',
+      'pool'      => 5,
+      'username' => 'postgres'
+    }
+
+    ActiveRecord::Tasks::DatabaseTasks.drop config
+    ActiveRecord::Tasks::DatabaseTasks.create config
+    ActiveRecord::Base.establish_connection config
+
+    ActiveRecord::Base.connection.execute 'CREATE EXTENSION IF NOT EXISTS hstore'
+
+    table_names.each { |table_name| create_document_table(table_name) }
+  end
+
+  def self.create_document_table(table_name)
+    ActiveRecord::Migration.create_table table_name, id: false do |t|
+      t.string :id, null: false
+      t.hstore :attribute_store, null: false
+    end
+    ActiveRecord::Base.connection.execute "ALTER TABLE #{table_name} ADD CONSTRAINT #{table_name}_pkey PRIMARY KEY (id)"
+  end
+
+  def self.table_names
+    %w(issues)
+  end
+end
+
+PGInitializer.initialize!
+
+module ActiveSupport
+  class TestCase
+    teardown do
+      PGInitializer.table_names.each do |table_name|
+        ActiveRecord::Base.connection.execute "TRUNCATE #{table_name}"
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,9 +1,11 @@
 require 'bundler/setup'
-require 'minitest/autorun'
 Bundler.require(:default, :test)
 
-require 'support/connect'
-require 'support/teardown'
+require 'rails/test_help'
+require 'mocha/setup'
+
+# require 'support/hstore'
+require 'support/cassandra'
 require 'support/issue'
 
 module CassandraObject

data/test/unit/counter_base_test.rb

@@ -1,43 +1,43 @@
-require 'test_helper'
-
-class CassandraObject::CounterBaseTest < CassandraObject::TestCase
-  class AppCounts < CassandraObject::CounterBase
-    self.column_family = 'AppCounts'
-  end
-
-  def setup
-    CassandraObject::Schema.create_column_family 'AppCounts', 'default_validation' => 'CounterColumnType', 'replicate_on_write' => 'true'
-  end
-
-  def teardown
-    CassandraObject::Schema.drop_column_family 'AppCounts'
-  end
-
-  test 'class_loading' do
-    assert_equal CassandraObject::CounterBase, CassandraObject::CounterBase
-  end
-
-  test 'single update' do
-
-    AppCounts.update('poop', 'smells', 0)
-
-    assert_equal 0, AppCounts.get("poop", "smells")
-
-    AppCounts.update('poop', 'smells', 60)
-
-    assert_equal 60, AppCounts.get("poop", "smells")
-
-    assert_equal Hash['smells' => 60], AppCounts.get("poop")
-
-  end
-
-  test 'multiple update' do
-
-    AppCounts.update('poop', {'hankey_sightings' => 3, 'christmas_days' => 5})
-
-    assert_equal Hash['hankey_sightings' => 3, 'christmas_days' => 5], AppCounts.get("poop")
-
-    assert_equal 5, AppCounts.get("poop", "christmas_days")
-  end
-
-end
+# require 'test_helper'
+#
+# class CassandraObject::CounterBaseTest < CassandraObject::TestCase
+#   class AppCounts < CassandraObject::CounterBase
+#     self.column_family = 'AppCounts'
+#   end
+#
+#   def setup
+#     CassandraObject::Schema.create_column_family 'AppCounts', 'default_validation' => 'CounterColumnType', 'replicate_on_write' => 'true'
+#   end
+#
+#   def teardown
+#     CassandraObject::Schema.drop_column_family 'AppCounts'
+#   end
+#
+#   test 'class_loading' do
+#     assert_equal CassandraObject::CounterBase, CassandraObject::CounterBase
+#   end
+#
+#   test 'single update' do
+#
+#     AppCounts.update('poop', 'smells', 0)
+#
+#     assert_equal 0, AppCounts.get("poop", "smells")
+#
+#     AppCounts.update('poop', 'smells', 60)
+#
+#     assert_equal 60, AppCounts.get("poop", "smells")
+#
+#     assert_equal Hash['smells' => 60], AppCounts.get("poop")
+#
+#   end
+#
+#   test 'multiple update' do
+#
+#     AppCounts.update('poop', {'hankey_sightings' => 3, 'christmas_days' => 5})
+#
+#     assert_equal Hash['hankey_sightings' => 3, 'christmas_days' => 5], AppCounts.get("poop")
+#
+#     assert_equal 5, AppCounts.get("poop", "christmas_days")
+#   end
+#
+# end

data/test/unit/persistence_test.rb

@@ -160,19 +160,6 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     assert_equal persisted_issue, reloaded_issue
   end
 
-  test 'delete with consistency' do
-    issue = Issue.create
-    Issue.with_consistency 'QUORUM' do
-      issue.destroy
-    end
-  end
-
-  test 'insert with consistency' do
-    Issue.with_consistency 'QUORUM' do
-      Issue.create
-    end
-  end
-
   test 'allow CQL keyword in column name' do
     assert_nothing_raised do
       Issue.string :text

data/test/unit/schema/tasks_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
 class CassandraObject::Schema::TasksTest < CassandraObject::TestCase
-  test "column_families" do
-    assert_equal ['Issues'], CassandraObject::Schema.column_families
+  test "table_names" do
+    assert_equal ['Issues'], CassandraObject::Schema.table_names
   end
 
   test "dump" do

data/test/unit/scope/query_methods_test.rb

@@ -18,12 +18,6 @@ class CassandraObject::Scope::QueryMethodsTest < CassandraObject::TestCase
     assert_equal [foo_issue], Issue.select { |issue| issue.title == 'foo' }
   end
 
-  test "select with consistency" do
-    Issue.with_consistency 'ONE' do
-      Issue.all
-    end
-  end
-
   test "chaining where with scope" do
     issue = Issue.create title: 'abc', description: 'def'
     query = Issue.select(:title).for_key(issue.id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.12.1
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -85,7 +85,6 @@ files:
 - gotime-cassandra_object.gemspec
 - lib/cassandra_object/adapters/abstract_adapter.rb
 - lib/cassandra_object/adapters/cassandra_adapter.rb
-- lib/cassandra_object/adapters/dynamo_adapter.rb
 - lib/cassandra_object/adapters/hstore_adapter.rb
 - lib/cassandra_object/attribute_methods.rb
 - lib/cassandra_object/attribute_methods/definition.rb
@@ -100,7 +99,6 @@ files:
 - lib/cassandra_object/callbacks.rb
 - lib/cassandra_object/config.rb
 - lib/cassandra_object/connection.rb
-- lib/cassandra_object/consistency.rb
 - lib/cassandra_object/core.rb
 - lib/cassandra_object/counter_base.rb
 - lib/cassandra_object/errors.rb
@@ -135,9 +133,9 @@ files:
 - lib/cassandra_object/types/time_type.rb
 - lib/cassandra_object/validations.rb
 - lib/gotime-cassandra_object.rb
-- test/support/connect.rb
+- test/support/cassandra.rb
+- test/support/hstore.rb
 - test/support/issue.rb
-- test/support/teardown.rb
 - test/test_helper.rb
 - test/unit/active_model_test.rb
 - test/unit/attribute_methods/definition_test.rb
@@ -151,7 +149,6 @@ files:
 - test/unit/callbacks_test.rb
 - test/unit/config_test.rb
 - test/unit/connection_test.rb
-- test/unit/consistency_test.rb
 - test/unit/core_test.rb
 - test/unit/counter_base_test.rb
 - test/unit/identity_test.rb

data/lib/cassandra_object/adapters/dynamo_adapter.rb

@@ -1,59 +0,0 @@
-module CassandraObject
-  module Adapters
-    class DynamoAdapter < AbstractAdapter
-      def primary_key_column
-        'id'
-      end
-
-      def connection
-        # self.namespace = spec[:namespace]
-        @connection ||= AWS::DynamoDB.new(
-          access_key_id: spec[:access_key_id],
-          secret_access_key: spec[:secret_access_key]
-        )
-      end
-
-      def select(scope)
-        dynamo_table.items[key_string].attributes.to_h
-        dynamo_table.batch_get(:all, keys.map(&:to_s))
-      end
-
-      def insert(table, id, attributes)
-        attributes = {primary_key => id}.update(attributes)
-        self.class.dynamo_table.items.create(attributes)
-      end
-
-      def update(table, id, attributes)
-        dynamo_db_item = self.class.dynamo_table.items[id]
-
-        dynamo_db_item.attributes.update do |u|
-          attributes.each do |attr, value|
-            if value.nil?
-              u.delete(attr)
-            else
-              u.set(attr => value)
-            end
-          end
-        end
-      end
-
-      def delete(table, ids)
-        ids.each do |id|
-          dynamo_table.items[id].delete
-        end
-      end
-
-      def dynamo_table_name
-        "#{namespace}.#{column_family.underscore}"
-      end
-
-      def dynamo_table
-        @dynamo_table ||= begin
-          table = connection.tables[dynamo_table_name]
-          table.hash_key = [:id, :number]
-          table
-        end
-      end
-    end
-  end
-end

data/lib/cassandra_object/consistency.rb

@@ -1,22 +0,0 @@
-module CassandraObject
-  module Consistency
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def with_consistency(consistency)
-        previous, self.default_consistency = default_consistency, consistency
-        yield
-      ensure
-        self.default_consistency = previous
-      end
-
-      def default_consistency=(value)
-        adapter.consistency = value
-      end
-
-      def default_consistency
-        adapter.consistency
-      end
-    end
-  end
-end

data/test/support/connect.rb

@@ -1,17 +0,0 @@
-CassandraObject::Base.config = {
-  keyspace: 'cassandra_object_test',
-  servers: '127.0.0.1:9160',
-  thrift: {
-    timeout: 5
-  }
-}
-
-begin
-  CassandraObject::Schema.drop_keyspace 'cassandra_object_test'
-rescue Exception => e
-end
-
-sleep 1
-CassandraObject::Schema.create_keyspace 'cassandra_object_test'
-CassandraObject::Schema.create_column_family 'Issues'
-CassandraObject::Base.default_consistency = 'QUORUM'

data/test/unit/consistency_test.rb

@@ -1,13 +0,0 @@
-require "test_helper"
-
-class CassandraObject::ConsistencyTest < CassandraObject::TestCase
-  test "with_consistency" do
-    original = CassandraObject::Base.default_consistency
-
-    CassandraObject::Base.with_consistency 'LOL' do
-      assert_equal 'LOL', CassandraObject::Base.default_consistency
-    end
-
-    assert_equal original, CassandraObject::Base.default_consistency
-  end
-end