sessionm-cassandra_object 4.0.3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc26d22e02e21c2be4d61d54240bafffa24d411
-  data.tar.gz: a0d6ff6c258975e3eb271a374ca62ca91e7fabe6
+  metadata.gz: f8c817cbeb631838baf909acfbf6b5bebdc5d5d9
+  data.tar.gz: e6e953e9e94ef1b572ab08ce513d15e2fea99db8
 SHA512:
-  metadata.gz: 13a8276f70d0a89537081a60577afd044e9f514f06bc1033a4d7f70db9ade605a4610e8a08d3545c48a43bac013c26278b8d7525eb6000738f2a58d0bff69fe2
-  data.tar.gz: e3f44b48c7f076a2ba30899b9ae551e9236a3a0b1e634b9575170bf0becc8bce0b1778fd3b9b6fbd60dfc429b3c359f0b17139b33bb6de3537d005eea1fa8309
+  metadata.gz: 743af911cfb055f00414fa4cd156fdfec15bd43318cf9e8d2495474b5e13a3b7e05f07836822b1b7ef07441bae395f1b18dc70f98bc3fdc1daba22d88928f128
+  data.tar.gz: cc93690d7f0d979642c7adc867eeb1254dadc8633979957f86dfb5cb2e701d2ce86a923422e297c7639d0a3f5637469b2988f1b6c7cfbdcdba437af374318889

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem 'activesupport', :require => 'active_support/all'
 gem 'activerecord', :require => 'active_record'
 
-gem 'simple_uuid', '0.2.2'
+gem 'simple_uuid'
 gem 'cassandra-driver', :require => 'cassandra'
 gem 'mysql2'
 

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.2)
+      activemodel (= 4.2.2)
+      activesupport (= 4.2.2)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -22,30 +22,26 @@ GEM
     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)
+    json (1.8.3)
     metaclass (0.0.4)
-    minitest (5.6.1)
+    minitest (5.7.0)
     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)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.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)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    simple_uuid (0.4.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -61,4 +57,4 @@ DEPENDENCIES
   mocha
   mysql2
   rspec
-  simple_uuid (= 0.2.2)
+  simple_uuid

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -35,8 +35,14 @@ module CassandraObject
         }
       end
 
+      class SchemaCache < ActiveRecord::ConnectionAdapters::SchemaCache
+        def columns_hash(table_name)
+          @columns_hash[table_name] ||= {'id' => 'id'}
+        end
+      end
+
       # The client class acts like the old cassandra gem
-      class Client
+      class Client < ActiveRecord::ConnectionAdapters::AbstractAdapter
         attr_reader :session, :cluster
 
         KEY_FIELD = 'key'
@@ -158,6 +164,10 @@ module CassandraObject
         def has_table?(name)
           self.cluster.keyspace(session.keyspace).has_table? name
         end
+
+        def schema_cache
+          @schema_cache ||= SchemaCache.new(self)
+        end
       end
     end
   end

data/lib/cassandra_object/base.rb

@@ -10,10 +10,12 @@ module CassandraObject
       def column_family=(column_family)
         @column_family = column_family
       end
+      alias table_name= column_family=
 
       def column_family
         @column_family || name.pluralize
       end
+      alias table_name column_family
 
       def base_class
         klass = self
@@ -26,6 +28,14 @@ module CassandraObject
       def compute_type(*args)
         ActiveRecord::Base.send :compute_type, *args
       end
+
+      def primary_key
+        'id'
+      end
+
+      def columns_hash
+        connection.schema_cache.columns_hash table_name
+      end
     end
 
     extend ActiveModel::Naming

data/lib/cassandra_object/finder_methods.rb

@@ -48,22 +48,47 @@ module CassandraObject
         end
       end
 
-      def all(options = {})
-        limit = options[:limit] || 100
-        results = CassandraObject::Base.with_connection(nil, :read) do
-          ActiveSupport::Notifications.instrument("get_range.cassandra_object", column_family: column_family, key_count: limit) do
-            connection.get_range(column_family, key_count: limit, consistency: thrift_read_consistency)
+      def all(options={})
+        CassandraObject::Relation.new(self, self.arel_table, options)
+      end
+
+      def first(options=nil)
+        result = CassandraObject::Base.with_connection(nil, :read) do
+          ActiveSupport::Notifications.instrument("get_range.cassandra_object", column_family: column_family, key_count: 1) do
+            connection.get_range(column_family, key_count: 1, consistency: thrift_read_consistency)
+          end
+        end.first
+
+        result ? instantiate(result[0], result[1]) : nil
+      end
+
+      def find_by_sql(arel, bind_values)
+        if bind_values.size == 0
+          limit = 100
+          results = CassandraObject::Base.with_connection(nil, :read) do
+            ActiveSupport::Notifications.instrument("get_range.cassandra_object", column_family: column_family, key_count: limit) do
+              connection.get_range(column_family, key_count: limit, consistency: thrift_read_consistency)
+            end
+          end
+
+          return results.map do |k, v|
+            v.empty? ? nil : instantiate(k, v)
+          end.compact
+        elsif bind_values.size == 1
+          if bind_values[0][0] == 'id' && bind_values[0][1].is_a?(String)
+            return [find_by_id(bind_values[0][1])]
+          elsif bind_values[0][:id]
+            return [find_by_id(bind_values[0][:id])]
           end
         end
 
-        results.map do |k, v|
-          v.empty? ? nil : instantiate(k, v)
-        end.compact
+        raise "only supports lookups by id currently bind_values #{bind_values}"
       end
 
-      def first(options = {})
-        all(options.merge(:limit => 1)).first
+      def unscoped
+        CassandraObject::Relation.new(self, self.arel_table, {})
       end
+      alias current_scope unscoped
 
       def find_with_ids(*ids)
         expects_array = ids.first.kind_of?(Array)

data/lib/cassandra_object/relation.rb

@@ -0,0 +1,4 @@
+module CassandraObject
+  class Relation < ActiveRecord::Relation
+  end
+end

data/lib/cassandra_object.rb

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

data/sessionm-cassandra_object.gemspec

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

data/spec/cassandra_object/associations_spec.rb

@@ -11,6 +11,9 @@ describe CassandraObject::Associations do
     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
+      role = Role.create! :name => 'admin', :user_id => user.id
+
+      expect(role.user.id).to eq user.id
       expect(user.issue.id).to eq issue.id
     end
   end

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

@@ -4,9 +4,15 @@ class CreateTestTables < ActiveRecord::Migration
       t.string :issue_id
       t.integer :position
     end
+
+    create_table :roles do |t|
+      t.string :name
+      t.integer :user_id
+    end
   end
 
   def self.down
     drop_table :users
+    drop_table :roles
   end
 end

data/spec/support/models/role.rb

@@ -0,0 +1,3 @@
+class Role < ActiveRecord::Base
+  belongs_to :user
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Michael Koziarski
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies: []
 description: Cassandra ActiveModel
 email: doug@sessionm.com
@@ -68,6 +68,7 @@ files:
 - lib/cassandra_object/nested_attributes.rb
 - lib/cassandra_object/persistence.rb
 - lib/cassandra_object/railtie.rb
+- lib/cassandra_object/relation.rb
 - lib/cassandra_object/row_ttl.rb
 - lib/cassandra_object/schema.rb
 - lib/cassandra_object/schema/migration.rb
@@ -102,6 +103,7 @@ files:
 - spec/support/db/migrate/001_create_test_tables.rb
 - spec/support/models/counter.rb
 - spec/support/models/issue.rb
+- spec/support/models/role.rb
 - spec/support/models/user.rb
 - test/README
 - test/active_model_test.rb
@@ -159,6 +161,7 @@ test_files:
 - spec/support/db/migrate/001_create_test_tables.rb
 - spec/support/models/counter.rb
 - spec/support/models/issue.rb
+- spec/support/models/role.rb
 - spec/support/models/user.rb
 - test/README
 - test/active_model_test.rb