sessionm-cassandra_object 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e1cdbe60a0e5d0445c81ca4a2cbbfe124392c1f
-  data.tar.gz: 8dbd7771413345f0477fdd98d8ae2198bdb6d26f
+  metadata.gz: 1cc26d22e02e21c2be4d61d54240bafffa24d411
+  data.tar.gz: a0d6ff6c258975e3eb271a374ca62ca91e7fabe6
 SHA512:
-  metadata.gz: 47dc210f1595a73cbd8a900021facd42bfae16e81292d2b079f9ffb053e7f6dc72ad6864ccfe832110167f566c77540c417b4e75457e48347eabacac639a7c9a
-  data.tar.gz: 580fc7a117c73831b5b4cc6857a714e2cffdfb89187c741f0838afea11c701eec968b4f63f17b11985e6b52a4e73b9b70a201f8d74e4d4f13ad5d8bca861c4b6
+  metadata.gz: 13a8276f70d0a89537081a60577afd044e9f514f06bc1033a4d7f70db9ade605a4610e8a08d3545c48a43bac013c26278b8d7525eb6000738f2a58d0bff69fe2
+  data.tar.gz: e3f44b48c7f076a2ba30899b9ae551e9236a3a0b1e634b9575170bf0becc8bce0b1778fd3b9b6fbd60dfc429b3c359f0b17139b33bb6de3537d005eea1fa8309

data/Gemfile

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

data/Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: http://gems.prod.sessionm.com/
+  remote: http://rubygems.org/
   specs:
     activemodel (4.2.1)
       activesupport (= 4.2.1)
@@ -18,6 +18,7 @@ GEM
     builder (3.2.2)
     cassandra-driver (2.1.3)
       ione (~> 1.2)
+    database_cleaner (1.4.1)
     diff-lcs (1.2.5)
     i18n (0.7.0)
     ione (1.2.0)
@@ -28,6 +29,7 @@ GEM
     minitest (5.6.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
+    mysql2 (0.3.18)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
@@ -55,6 +57,8 @@ DEPENDENCIES
   activerecord
   activesupport
   cassandra-driver
+  database_cleaner
   mocha
+  mysql2
   rspec
   simple_uuid (= 0.2.2)

data/config/database.yml

@@ -0,0 +1,6 @@
+test:
+  encoding: utf8
+  adapter: mysql2
+  database: cassandra_object_test
+  username: root
+  host: localhost

data/lib/cassandra_object.rb

@@ -28,6 +28,7 @@ module CassandraObject
   autoload :RowTTL
   autoload :NestedAttributes
   autoload :Adapters
+  autoload :Arel
 
   module Tasks
     extend ActiveSupport::Autoload

data/lib/cassandra_object/arel.rb

@@ -0,0 +1,16 @@
+# adds arel_table support for belongs_to relationships in ActiveRecord models
+module CassandraObject
+  module Arel
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def arel_table
+        @arel_table ||= ::Arel::Table.new(column_family, arel_engine)
+      end
+
+      def arel_engine
+        self
+      end
+    end
+  end
+end

data/lib/cassandra_object/attributes.rb

@@ -69,6 +69,8 @@ module CassandraObject
       @attributes[name.to_s]
     end
 
+    alias _read_attribute read_attribute
+
     def attributes=(attributes)
       attributes.each do |(name, value)|
         send("#{name}=", value)

data/lib/cassandra_object/base.rb

@@ -23,12 +23,15 @@ module CassandraObject
         klass
       end
 
-      delegate :compute_type, :to => 'ActiveRecord::Base'
+      def compute_type(*args)
+        ActiveRecord::Base.send :compute_type, *args
+      end
     end
 
     extend ActiveModel::Naming
     include ActiveModel::Conversion
     extend ActiveSupport::DescendantsTracker
+    extend ActiveRecord::Delegation::DelegateCache
 
     include Configuration
     include Connection
@@ -45,6 +48,7 @@ module CassandraObject
     include FinderMethods
     include Timestamps
     include NestedAttributes
+    include Arel
 
     attr_accessor :key, :schema_version, :association_cache
 

data/sessionm-cassandra_object.gemspec

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

data/spec/cassandra_object/associations_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe CassandraObject::Associations do
+  context "belongs_to" do
+    it "should fetch the user record from the belongs_to relationship from a cassandra object" do
+      user = User.create! :position => 1
+      issue = Issue.create! :description => 'web site not working', :worth => 1.5, :user_id => user.id
+      expect(issue.user.id).to eq user.id
+    end
+
+    it "should fetch the cassandra object from the belongs_to relationship from an active record object" do
+      issue = Issue.create! :description => 'web site not working', :worth => 1.5
+      user = User.create! :position => 1, :issue_id => issue.id
+      expect(user.issue.id).to eq issue.id
+    end
+  end
+end

data/spec/cassandra_object/base_spec.rb

@@ -27,4 +27,10 @@ describe CassandraObject::Base do
     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
+
+  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.find_with_ids([issue1.id, issue2.id]).map(&:id).sort).to eq [issue1.id, issue2.id].sort
+  end
 end

data/spec/spec_helper.rb

@@ -6,8 +6,6 @@ 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|
@@ -43,6 +41,13 @@ CQL
   cluster.close
 end
 
+ActiveRecord::Base.configurations = YAML.load_file('config/database.yml')
+ActiveRecord::Base.establish_connection ENV["RAILS_ENV"]
+ActiveRecord::Base.logger = Logger.new(STDOUT)
+ActiveRecord::Migrator.migrate('spec/support/db/migrate')
+
+Dir[BASE_DIR.join("spec/support/**/*.rb")].each { |f| require f }
+
 RSpec.configure do |config|
 
   config.before(:each) do

data/spec/support/db/migrate/001_create_test_tables.rb

@@ -0,0 +1,12 @@
+class CreateTestTables < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string :issue_id
+      t.integer :position
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end

data/spec/support/models/issue.rb

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

data/spec/support/models/user.rb

@@ -0,0 +1,3 @@
+class User < ActiveRecord::Base
+  belongs_to :issue
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - Michael Koziarski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies: []
 description: Cassandra ActiveModel
 email: doug@sessionm.com
@@ -31,10 +31,12 @@ files:
 - Rakefile
 - config/boot.rb
 - config/cassandra.yml
+- config/database.yml
 - config/environment.rb
 - lib/cassandra_object.rb
 - lib/cassandra_object/adapters.rb
 - lib/cassandra_object/adapters/cassandra_driver.rb
+- lib/cassandra_object/arel.rb
 - lib/cassandra_object/associations.rb
 - lib/cassandra_object/associations/one_to_many.rb
 - lib/cassandra_object/associations/one_to_one.rb
@@ -93,11 +95,14 @@ files:
 - lib/cassandra_object/validations.rb
 - script/console.rb
 - sessionm-cassandra_object.gemspec
+- spec/cassandra_object/associations_spec.rb
 - spec/cassandra_object/base_spec.rb
 - spec/spec_helper.rb
 - spec/support/cassandra.rb
+- spec/support/db/migrate/001_create_test_tables.rb
 - spec/support/models/counter.rb
 - spec/support/models/issue.rb
+- spec/support/models/user.rb
 - test/README
 - test/active_model_test.rb
 - test/attributes_test.rb
@@ -147,11 +152,14 @@ signing_key:
 specification_version: 4
 summary: Cassandra ActiveModel
 test_files:
+- spec/cassandra_object/associations_spec.rb
 - spec/cassandra_object/base_spec.rb
 - spec/spec_helper.rb
 - spec/support/cassandra.rb
+- spec/support/db/migrate/001_create_test_tables.rb
 - spec/support/models/counter.rb
 - spec/support/models/issue.rb
+- spec/support/models/user.rb
 - test/README
 - test/active_model_test.rb
 - test/attributes_test.rb