sessionm-cassandra_object 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6052d6c720f923eec9b114106e5a49d970348bcf
-  data.tar.gz: b3258446a414824776c5e4fd7cc6515448b6220a
+  metadata.gz: 3e1cdbe60a0e5d0445c81ca4a2cbbfe124392c1f
+  data.tar.gz: 8dbd7771413345f0477fdd98d8ae2198bdb6d26f
 SHA512:
-  metadata.gz: 3a42956c3dcbd6ebf8ea93c6029a4b3dad8e3eebe59287ff0c77b6e06937a0f673b5375eb73c7c42a93bf5205582535c3ff481d1695e0ff403f1924b32106995
-  data.tar.gz: 254dadc67d4d95237075a962cd6037bad649afd0c4541a82d5fb209388ad06d6aac5e2992b69e4857c926f5cf1ebaf4ea819ebc47ce55a298c78f9eabc23915e
+  metadata.gz: 47dc210f1595a73cbd8a900021facd42bfae16e81292d2b079f9ffb053e7f6dc72ad6864ccfe832110167f566c77540c417b4e75457e48347eabacac639a7c9a
+  data.tar.gz: 580fc7a117c73831b5b4cc6857a714e2cffdfb89187c741f0838afea11c701eec968b4f63f17b11985e6b52a4e73b9b70a201f8d74e4d4f13ad5d8bca861c4b6

data/.gitignore

@@ -1,2 +1,10 @@
-Gemfile.lock
+.bundle
+tmp/
+!.gitignore
+*~
+\#*\#
+.\#*
+cms/
+.DS_Store
+.*.swp
 *.gem

data/Gemfile

@@ -1,6 +1,12 @@
 source 'http://gems.prod.sessionm.com'
 
-gem 'rails', :require => 'rails/all'
+gem 'activesupport', :require => 'active_support/all'
+gem 'activerecord', :require => 'active_record'
 
 gem 'simple_uuid', '0.2.2'
 gem 'cassandra-driver', :require => 'cassandra'
+
+group :test, :spec do
+  gem 'rspec'
+  gem "mocha"
+end

data/Gemfile.lock

@@ -0,0 +1,60 @@
+GEM
+  remote: http://gems.prod.sessionm.com/
+  specs:
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
+      builder (~> 3.1)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    cassandra-driver (2.1.3)
+      ione (~> 1.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    ione (1.2.0)
+    json (1.8.2)
+    macaddr (1.6.1)
+      systemu (~> 2.5.0)
+    metaclass (0.0.4)
+    minitest (5.6.1)
+    mocha (1.1.0)
+      metaclass (~> 0.0.1)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.3)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    simple_uuid (0.2.2)
+      macaddr (= 1.6.1)
+    systemu (2.5.2)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  activesupport
+  cassandra-driver
+  mocha
+  rspec
+  simple_uuid (= 0.2.2)

data/config/cassandra.yml

@@ -1,26 +1,9 @@
-development: &id001
-  servers: ['127.0.0.1:9160']
-  keyspace: greyhound_development
-  replication:
-    strategy: org.apache.cassandra.locator.SimpleStrategy
-    factor: 1
-  consistency:
-    read_default: quorum
-    write_default: quorum
-  column_family_defaults:
-    compaction_strategy: org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy
-    row_cache_provider: org.apache.cassandra.cache.ConcurrentLinkedHashCacheProvider
-  thrift:
-    connect_timeout: 0.5
-    timeout: 3
-    retries: 2
-production: *id001
 test:
-  servers: ['127.0.0.1:9160']
-  keyspace: greyhound_test
+  servers: ['127.0.0.1']
+  keyspace: cassandra_object_test
   replication:
     strategy: org.apache.cassandra.locator.SimpleStrategy
-    factor: 1
+    replication_factor: 1
   consistency:
     read_default: quorum
     write_default: quorum
@@ -31,6 +14,3 @@ test:
     connect_timeout: 0.5
     timeout: 3
     retries: 2
-    exception_class_overrides:
-      - CassandraThrift::InvalidRequestException
-      - CassandraThrift::NotFoundException

data/lib/cassandra_object.rb

@@ -1,4 +1,5 @@
-require 'rails/all'
+require 'active_support/all'
+require 'active_record'
 
 module CassandraObject
   extend ActiveSupport::Autoload

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -12,7 +12,11 @@ module CassandraObject
       end
 
       def client
-        @client ||= Client.new(cluster.connect(config[:keyspace]))
+        @client ||= self.new_client
+      end
+
+      def new_client
+        Client.new(cluster.connect(config[:keyspace]), cluster)
       end
 
       def close
@@ -26,21 +30,22 @@ module CassandraObject
           :port => config[:port] || 9042,
           :connect_timeout => config[:thrift][:connect_timeout] || 10,
           :timeout => config[:thrift][:timeout] || 10,
-          :logger => Rails.logger || Logger.new(STDOUT),
+          :logger => config[:logger] || (defined?(Rails) && Rails.logger) || Logger.new(STDOUT),
           :consistency => (config[:consistency] || {})[:write_default].try(:to_sym) || :one,
         }
       end
 
       # The client class acts like the old cassandra gem
       class Client
-        attr_reader :session
+        attr_reader :session, :cluster
 
         KEY_FIELD = 'key'
         NAME_FIELD = 'column1'
         VALUE_FIELD = 'value'
 
-        def initialize(session)
+        def initialize(session, cluster)
           @session = session
+          @cluster = cluster
         end
 
         def close
@@ -106,6 +111,40 @@ module CassandraObject
           async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
         end
 
+        def remove(column_family, key, *args)
+          opts = args.pop if args.last.is_a?(Hash)
+          async = opts.try(:[], :async)
+          key = "textAsBlob('#{key}')"
+
+          query =
+            if args.first.nil? || args.first.is_a?(Hash)
+              "DELETE FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{key};"
+            else
+              "DELETE \"#{column_family}\" WHERE #{KEY_FIELD} = #{key} AND #{NAME_FIELD} = '#{args.first}';"
+            end
+
+          async ? self.execute_async(query, execute_options(opts)) : self.execute(query, execute_options(opts))
+        end
+
+        def get_range(column_family, opts={}, &blk)
+          key_count = opts[:key_count] || 100
+          query = "SELECT #{KEY_FIELD} FROM \"#{column_family}\" LIMIT #{key_count}"
+          keys = self.execute(query, execute_options(opts)).map { |result| result[KEY_FIELD] }
+          keys.size > 0 ? multi_get(column_family, keys) : {}
+        end
+
+        def multi_get(column_family, keys, *args)
+          opts = args.pop if args.last.is_a?(Hash)
+          keys = keys.map { |key| "textAsBlob('#{key}')" }.join(',')
+          results = {}
+          query = "SELECT * FROM \"#{column_family}\" WHERE #{KEY_FIELD} IN(#{keys})"
+          self.execute(query, execute_options(opts)).each do |row|
+            results[row[KEY_FIELD]] ||= {}
+            results[row[KEY_FIELD]][row[NAME_FIELD]] = row[VALUE_FIELD]
+          end
+          results
+        end
+
         def execute_options(opts)
           opts.try(:slice,
                    :consistency,
@@ -115,6 +154,10 @@ module CassandraObject
                    :serial_consistency
                   ) || {}
         end
+
+        def has_table?(name)
+          self.cluster.keyspace(session.keyspace).has_table? name
+        end
       end
     end
   end

data/lib/cassandra_object/associations.rb

@@ -52,16 +52,19 @@ module CassandraObject
       end
       
       def remove(key)
-        begin
-          CassandraObject::Base.with_connection(key, :write) do
-            ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: relationships_column_family, key: key) do
-              connection.remove(relationships_column_family, key.to_s, consistency: thrift_write_consistency)
+        if connection.has_table?(relationships_column_family)
+          begin
+            CassandraObject::Base.with_connection(key, :write) do
+              ActiveSupport::Notifications.instrument("remove.cassandra_object", column_family: relationships_column_family, key: key) do
+                connection.remove(relationships_column_family, key.to_s, consistency: thrift_write_consistency)
+              end
             end
+          rescue Cassandra::Errors::InvalidError => e
+            # pretty sure this is not the correct message for cassandra-driver gem, will need to investigate the actual message
+            raise e unless e.message =~ /unconfigured columnfamily/i
           end
-        rescue Cassandra::Error => e
-          # pretty sure this is not the correct message for cassandra-driver gem, will need to investigate the actual message
-          raise e unless e.message =~ /invalid column family/i
         end
+
         super
       end
     end

data/lib/cassandra_object/railtie.rb

@@ -8,4 +8,4 @@ module CassandraObject
       require 'cassandra_object/generators/migration_generator'
     end
   end
-end
+end if defined?(Rails)

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '4.0.1'
+  s.version = '4.0.2'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

data/spec/cassandra_object/base_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe CassandraObject::Base do
+  it "should be able to a create/fetch/destroy an issue" do
+    issue = Issue.create! :description => 'web site not working', :worth => 1.5
+    expect(issue.persisted?).to be true
+    issue = Issue.find issue.id
+    expect(issue.worth.to_f).to be 1.5
+    issue.destroy
+    expect(Issue.find_by_id(issue.id)).to be nil
+  end
+
+  it "should be able to get the first issue" do
+    issue = Issue.create! :description => 'web site not working', :worth => 1.5
+    expect(Issue.first.id).to eq issue.id
+  end
+
+  it "should be able to get all issues" do
+    issue1 = Issue.create! :description => 'web site not working', :worth => 1.5
+    issue2 = Issue.create! :description => 'button is disabled', :worth => 0.2
+    expect(Issue.all.map(&:id).sort).to eq [issue1.id, issue2.id].sort
+  end
+
+  it "should be able to find issues by id" do
+    issue1 = Issue.create! :description => 'web site not working', :worth => 1.5
+    issue2 = Issue.create! :description => 'button is disabled', :worth => 0.2
+    issue3 = Issue.create! :description => 'button is disabled', :worth => 0.2
+    expect(Issue.find_with_ids(issue1.id, issue2.id).map(&:id).sort).to eq [issue1.id, issue2.id].sort
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,60 @@
+require 'rubygems'
+
+ENV["RAILS_ENV"] = 'test'
+
+require File.expand_path('../../config/environment', __FILE__)
+
+Bundler.require :default, :test
+
+Dir[BASE_DIR.join("spec/support/**/*.rb")].each { |f| require f }
+
+KEYSPACE = 'cassandra_object_test'
+
+CassandraObject::Adapters::CassandraDriver.new(CassandraObject::Base.connection_spec).cluster.tap do |cluster|
+  cluster.connect.tap do |session|
+    session.execute("DROP KEYSPACE #{KEYSPACE}") if cluster.has_keyspace?(KEYSPACE)
+    replication = Cassandra::Keyspace::Replication.new('org.apache.cassandra.locator.SimpleStrategy', 'replication_factor' => 1)
+    keyspace = Cassandra::Keyspace.new(KEYSPACE, false, replication, [], [])
+    session.execute keyspace.to_cql
+    session.close
+  end
+
+  cluster.connect(KEYSPACE).tap do |session|
+    session.execute <<-CQL
+CREATE TABLE "Issues" (
+  key blob,
+  column1 text,
+  value text,
+  PRIMARY KEY (key, column1)
+)
+CQL
+
+    session.execute <<-CQL
+CREATE TABLE "Counters" (
+  key blob,
+  column1 text,
+  value counter,
+  PRIMARY KEY (key, column1)
+)
+CQL
+    session.close
+  end
+
+  cluster.close
+end
+
+RSpec.configure do |config|
+
+  config.before(:each) do
+    Cassandra::Session.delete_all_populated_column_families
+  end
+
+  config.after(:all) do
+    # we need to call this at the end of each set of tests because if the last test in an rspec file inserts data
+    #    into Cassandra it will not be cleaned up at the beginning of the next test in the next rspec file.  This was
+    #    first spotted in ref #361.  The test run in autotest called before_create on UserTransaction and added that
+    #    class to @@populated_column_families, but when you run an individual file after autotest @@populated_column_families
+    #    is empty, so Cassandra doesn't get cleaned up properly...
+    Cassandra::Session.delete_all_populated_column_families
+  end
+end

data/spec/support/cassandra.rb

@@ -0,0 +1,30 @@
+require 'cassandra'
+
+module Cassandra
+  class Session
+    @@populated_column_families = Set.new
+    @@test_client = CassandraObject::Adapters::CassandraDriver.new(CassandraObject::Base.connection_spec).client
+
+    def self.truncate_populated_column_family(column_family)
+      @@test_client.execute "TRUNCATE \"#{column_family}\""
+    end
+
+    def self.delete_all_populated_column_families
+      unless @@populated_column_families.empty?
+        @@populated_column_families.each { |column_family| self.truncate_populated_column_family(column_family) }
+        @@populated_column_families.clear
+      end
+    end
+
+    [:execute_async].each do |method|
+      define_method("#{method}_with_populated_tracking") do |*args|
+        send("#{method}_without_populated_tracking", *args).tap do
+          if args.first =~ /(insert into|update) "(.+?)"/i
+            @@populated_column_families.add $2
+          end
+        end
+      end
+      alias_method_chain method, :populated_tracking
+    end
+  end
+end

data/spec/support/models/counter.rb

@@ -0,0 +1,3 @@
+class Counter < CassandraObject::Base
+  self.write_consistency = :all
+end

data/spec/support/models/issue.rb

@@ -0,0 +1,11 @@
+class Issue < CassandraObject::Base
+  key :uuid
+  attribute :description, :type => :string
+  attribute :worth, :type => :decimal, :precision => 100
+  attribute :name, :type => :string
+  before_validation :set_defaults, :on => :create
+
+  def set_defaults
+    self.name ||= 'default name'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Michael Koziarski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies: []
 description: Cassandra ActiveModel
 email: doug@sessionm.com
@@ -24,6 +24,7 @@ files:
 - ".ruby-version"
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - MIT-LICENSE
 - README.markdown
@@ -92,6 +93,11 @@ files:
 - lib/cassandra_object/validations.rb
 - script/console.rb
 - sessionm-cassandra_object.gemspec
+- spec/cassandra_object/base_spec.rb
+- spec/spec_helper.rb
+- spec/support/cassandra.rb
+- spec/support/models/counter.rb
+- spec/support/models/issue.rb
 - test/README
 - test/active_model_test.rb
 - test/attributes_test.rb
@@ -141,6 +147,11 @@ signing_key:
 specification_version: 4
 summary: Cassandra ActiveModel
 test_files:
+- spec/cassandra_object/base_spec.rb
+- spec/spec_helper.rb
+- spec/support/cassandra.rb
+- spec/support/models/counter.rb
+- spec/support/models/issue.rb
 - test/README
 - test/active_model_test.rb
 - test/attributes_test.rb