gotime-cassandra_object 2.10.2 → 2.10.3

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.10.2'
+  s.version = '2.10.3'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.test_files  = `git ls-files -- {test}/*`.split("\n")
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency('activemodel', "~> 3.0")
-  s.add_runtime_dependency('cassandra', "~> 0.12.0")
+  s.add_runtime_dependency('activemodel', ">= 3.0")
+  s.add_runtime_dependency('cassandra', ">= 0.12.0")
 
-  s.add_development_dependency('bundler', "~> 1.0.0")
+  s.add_development_dependency('bundler')
 end

data/lib/cassandra_object/base.rb

@@ -12,7 +12,7 @@ module CassandraObject
       end
 
       def column_family
-        @column_family || name.pluralize
+        @column_family ||= base_class.name.pluralize
       end
 
       def base_class
@@ -37,6 +37,7 @@ module CassandraObject
     include AttributeMethods
     include AttributeMethods::Dirty
     include AttributeMethods::Typecasting
+    include BelongsTo
     include Callbacks
     include Validations
     include Associations

data/lib/cassandra_object/belongs_to.rb

@@ -0,0 +1,42 @@
+module CassandraObject
+  module BelongsTo
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      # === Options
+      # [:class_name]
+      #   Use if the class cannot be inferred from the association
+      # [:polymorphic]
+      #   Specify if the association is polymorphic
+      # Example:
+      #   class Driver < CassandraObject::Base
+      #   end
+      #   class Truck < CassandraObject::Base
+      #   end
+      def belongs_to(name, options = {})
+        instance_variable_name = "@#{name}"
+
+        define_method("#{name}=") do |record|
+          instance_variable_set(instance_variable_name, record)
+          send("#{name}_id=", record.try(:id))
+          if options[:polymorphic]
+            send("#{name}_type=", record.class.name)
+          end
+        end
+
+        define_method(name) do
+          unless instance_variable_defined?(instance_variable_name)
+            if record_id = send("#{name}_id").presence
+              model_name = options[:polymorphic] ? send("#{name}_type") : (options[:class_name] || name.to_s.classify)
+              instance_variable_set(instance_variable_name, model_name.constantize.find_by_id(record_id))
+            else
+              instance_variable_set(instance_variable_name, nil)
+            end
+          end
+
+          instance_variable_get(instance_variable_name)
+        end
+      end
+    end
+  end
+end

data/lib/cassandra_object/identity.rb

@@ -10,6 +10,10 @@ module CassandraObject
     autoload :HashedNaturalKeyFactory
     autoload :CustomKeyFactory
 
+    included do
+      class_attribute :key_factory
+    end
+
     module ClassMethods
       # Indicate what kind of key the model will have: uuid or natural
       #
@@ -17,26 +21,26 @@ module CassandraObject
       # @param the options you want to pass along to the key factory (like :attributes => :name, for a natural key).
       # 
       def key(name_or_factory = :uuid, *options)
-        @key_factory = case name_or_factory
-        when :uuid
-          UUIDKeyFactory.new
-        when :natural
-          NaturalKeyFactory.new(*options)
-        when :custom
-          CustomKeyFactory.new(*options)
-        else
-          name_or_factory
-        end
+        self.key_factory = case name_or_factory
+          when :uuid
+            UUIDKeyFactory.new
+          when :natural
+            NaturalKeyFactory.new(*options)
+          when :custom
+            CustomKeyFactory.new(*options)
+          else
+            name_or_factory
+          end
       end
 
       def next_key(object = nil)
-        @key_factory.next_key(object).tap do |key|
+        key_factory.next_key(object).tap do |key|
           raise "Keys may not be nil" if key.nil?
         end
       end
 
       def parse_key(string)
-        @key_factory.parse(string)
+        key_factory.parse(string)
       end
     end
 

data/lib/gotime-cassandra_object.rb

@@ -7,6 +7,7 @@ module CassandraObject
   autoload :Base
   autoload :Connection
   autoload :AttributeMethods
+  autoload :BelongsTo
   autoload :Consistency
   autoload :Persistence
   autoload :Callbacks

data/test/unit/base_test.rb

@@ -14,6 +14,7 @@ class CassandraObject::BaseTest < CassandraObject::TestCase
 
   test 'column family' do
     assert_equal 'CassandraObject::BaseTest::Sons', Son.column_family
+    assert_equal 'CassandraObject::BaseTest::Sons', Grandson.column_family
   end
 
   test 'initialiaze' do

data/test/unit/belongs_to_test.rb

@@ -0,0 +1,52 @@
+require 'test_helper'
+
+class CassandraObject::BelongsToTest < CassandraObject::TestCase
+  class TestObject < Issue
+    string :issue_id
+    belongs_to :issue
+
+    string :widget_id
+    belongs_to :widget, class_name: 'Issue'
+
+    string :target_id
+    string :target_type
+    belongs_to :target, polymorphic: true
+  end
+
+  test 'belongs_to' do
+    issue = Issue.create
+
+    record = TestObject.create(issue: issue)
+
+    assert_equal issue, record.issue
+    assert_equal issue.id, record.issue_id
+
+    record = TestObject.find(record.id)
+    assert_equal issue, record.issue
+  end
+
+  test 'belongs_to with class_name' do
+    issue = Issue.create
+
+    record = TestObject.create(widget: issue)
+
+    assert_equal issue, record.widget
+    assert_equal issue.id, record.widget_id
+
+    record = TestObject.find(record.id)
+    assert_equal issue, record.widget
+  end
+
+  test 'belongs_to with polymorphic' do
+    issue = Issue.create
+
+    record = TestObject.create(target: issue)
+
+    assert_equal issue, record.target
+    assert_equal issue.id, record.target_id
+    assert_equal 'Issue', record.target_type
+
+    record = TestObject.find(record.id)
+    assert_equal issue, record.target
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.10.2
+  version: 2.10.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,37 +14,37 @@ date: 2012-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70228572053300 !ruby/object:Gem::Requirement
+  requirement: &70254537627400 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70228572053300
+  version_requirements: *70254537627400
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70228572052320 !ruby/object:Gem::Requirement
+  requirement: &70254537638320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70228572052320
+  version_requirements: *70254537638320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70228572051560 !ruby/object:Gem::Requirement
+  requirement: &70254537637500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70228572051560
+  version_requirements: *70254537637500
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -69,6 +69,7 @@ files:
 - lib/cassandra_object/attribute_methods/typecasting.rb
 - lib/cassandra_object/base.rb
 - lib/cassandra_object/batches.rb
+- lib/cassandra_object/belongs_to.rb
 - lib/cassandra_object/callbacks.rb
 - lib/cassandra_object/collection.rb
 - lib/cassandra_object/connection.rb
@@ -124,6 +125,7 @@ files:
 - test/unit/attribute_methods_test.rb
 - test/unit/base_test.rb
 - test/unit/batches_test.rb
+- test/unit/belongs_to_test.rb
 - test/unit/callbacks_test.rb
 - test/unit/connection_test.rb
 - test/unit/consistency_test.rb