gotime-cassandra_object 2.11.9 → 2.12.0

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.11.9'
+  s.version = '2.12.0'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

data/lib/cassandra_object/attribute_methods/primary_key.rb

@@ -10,12 +10,11 @@ module CassandraObject
       end
 
       def id
-        key.to_s
+        @id ||= self.class._generate_key(self)
       end
 
-      def id=(key)
-        @key = self.class.parse_key(key)
-        id
+      def id=(id)
+        @id = id
       end
 
       def attributes

data/lib/cassandra_object/finder_methods.rb

@@ -3,20 +3,18 @@ module CassandraObject
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def find(key)
-        key_string = key.try(:to_s)
-
-        if key_string.blank?
-          raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{key.inspect}"
-        elsif attributes = connection.get(column_family, key_string, {:count => 500}).presence
-          instantiate(key_string, attributes)
+      def find(id)
+        if id.blank?
+          raise CassandraObject::RecordNotFound, "Couldn't find #{self.name} with key #{id.inspect}"
+        elsif attributes = connection.get(column_family, id, {:count => 500}).presence
+          instantiate(id, attributes)
         else
           raise CassandraObject::RecordNotFound
         end
       end
 
-      def find_by_id(key)
-        find(key)
+      def find_by_id(id)
+        find(id)
       rescue CassandraObject::RecordNotFound
         nil
       end
@@ -55,7 +53,7 @@ module CassandraObject
         end
 
         Hash[attribute_results.map do |key, attributes|
-          [parse_key(key), attributes.present? ? instantiate(key, attributes) : nil]
+          [key, attributes.present? ? instantiate(key, attributes) : nil]
         end]
       end
     end

data/lib/cassandra_object/generators/templates/migration.rb.erb

@@ -1,4 +1,4 @@
-class <%= name.classify %> < CassandraObject::Schema::Migration
+class <%= name.camelcase %> < CassandraObject::Schema::Migration
   def self.up
 
   end

data/lib/cassandra_object/identity.rb

@@ -1,52 +1,24 @@
 module CassandraObject
   module Identity
     extend ActiveSupport::Concern
-    extend ActiveSupport::Autoload
-
-    autoload :Key
-    autoload :AbstractKeyFactory
-    autoload :UUIDKeyFactory
-    autoload :NaturalKeyFactory
-    autoload :HashedNaturalKeyFactory
-    autoload :CustomKeyFactory
 
     included do
-      class_attribute :key_factory
-      key :uuid
-    end
+      class_attribute :key_generator
 
-    module ClassMethods
-      # Indicate what kind of key the model will have: uuid or natural
-      #
-      # @param [:uuid, :natural] the type of key
-      # @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)
-        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
+      key do
+        SimpleUUID::UUID.new.to_guid
       end
+    end
 
-      def next_key(object = nil)
-        key_factory.next_key(object).tap do |key|
-          raise "Keys may not be nil" if key.nil?
-        end
+    module ClassMethods
+      # Define a key generator. Default is UUID.
+      def key(&block)
+        self.key_generator = block
       end
 
-      def parse_key(string)
-        key_factory.parse(string)
+      def _generate_key(object)
+        object.instance_eval(&key_generator)
       end
     end
-
-    def key
-      @key ||= self.class.next_key(self)
-    end
   end
 end

data/lib/cassandra_object/persistence.rb

@@ -33,7 +33,7 @@ module CassandraObject
 
       def instantiate(key, attributes)
         allocate.tap do |object|
-          object.instance_variable_set("@key", parse_key(key)) if key
+          object.instance_variable_set("@id", key) if key
           object.instance_variable_set("@new_record", false)
           object.instance_variable_set("@destroyed", false)
           object.instance_variable_set("@attributes", typecast_attributes(object, attributes))
@@ -82,7 +82,7 @@ module CassandraObject
     end
 
     def destroy
-      self.class.remove(key)
+      self.class.remove(id)
       @destroyed = true
       freeze
     end
@@ -104,7 +104,7 @@ module CassandraObject
     end
 
     def reload
-      @attributes.update(self.class.find(self.id).instance_variable_get('@attributes'))
+      @attributes.update(self.class.find(id).instance_variable_get('@attributes'))
     end
 
     private
@@ -116,7 +116,7 @@ module CassandraObject
       def create
         write
         @new_record = false
-        key
+        id
       end
     
       def update
@@ -125,7 +125,7 @@ module CassandraObject
 
       def write
         changed_attributes = changed.inject({}) { |h, n| h[n] = read_attribute(n); h }
-        self.class.write(key, changed_attributes)
+        self.class.write(id, changed_attributes)
       end
   end
 end

data/test/unit/attribute_methods/primary_key_test.rb

@@ -1,17 +1,21 @@
 require 'test_helper'
 
-class CassandraObject::AttributeMethods::PrimaryTest < CassandraObject::TestCase
+class CassandraObject::AttributeMethods::PrimaryKeyTest < CassandraObject::TestCase
   test 'get id' do
-    issue = Issue.new
+    model = temp_object do
+      key do
+        "foo"
+      end
+    end
+    record = model.new
 
-    assert_equal issue.key.to_s, issue.id
+    assert_equal 'foo', record.id
   end
 
   test 'set id' do
-    uuid = SimpleUUID::UUID.new.to_guid
-    issue = Issue.new id: uuid
+    issue = Issue.new id: 'foo'
 
-    assert_equal issue.key.to_s, uuid
+    assert_equal 'foo', issue.id
   end
 
   test 'attributes' do

data/test/unit/finder_methods_test.rb

@@ -4,7 +4,6 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
   test 'find' do
     Issue.create.tap do |issue|
       assert_equal issue, Issue.find(issue.id)
-      assert_equal issue, Issue.find(issue.key)
     end
 
     begin
@@ -47,7 +46,7 @@ class CassandraObject::FinderMethodsTest < CassandraObject::TestCase
     third_issue = Issue.create
 
     assert_equal [], Issue.find_with_ids([])
-    assert_equal [first_issue, second_issue].to_set, Issue.find_with_ids(first_issue.key, second_issue.key).to_set
-    assert_equal [first_issue, second_issue].to_set, Issue.find_with_ids([first_issue.key, second_issue.key]).to_set
+    assert_equal [first_issue, second_issue].to_set, Issue.find_with_ids(first_issue.id, second_issue.id).to_set
+    assert_equal [first_issue, second_issue].to_set, Issue.find_with_ids([first_issue.id, second_issue.id]).to_set
   end
 end

data/test/unit/identity_test.rb

@@ -5,18 +5,22 @@ class CassandraObject::IdentityTest < CassandraObject::TestCase
     assert_equal 'id', Issue.primary_key
   end
 
-  test 'get key' do
+  test 'default _generate_key' do
     issue = Issue.new
 
-    assert_not_nil issue.key
+    assert_not_nil Issue._generate_key(issue)
   end
 
-  test 'parse_key' do
-    assert_kind_of(
-      CassandraObject::Identity::UUIDKeyFactory::UUID,
-      Issue.parse_key('bb4cbbbc-b7c7-11e0-9ca2-732604ff41fe')
-    )
+  test 'custom key' do
+    model = temp_object do
+      key do
+        "name:#{name}"
+      end
+      attr_accessor :name
+    end
+    record = model.new
+    record.name = 'bar'
 
-    assert_nil Issue.parse_key('fail')
+    assert_equal 'name:bar', model._generate_key(record)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.11.9
+  version: 2.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -108,11 +108,6 @@ files:
 - lib/cassandra_object/generators/migration_generator.rb
 - lib/cassandra_object/generators/templates/migration.rb.erb
 - lib/cassandra_object/identity.rb
-- lib/cassandra_object/identity/abstract_key_factory.rb
-- lib/cassandra_object/identity/custom_key_factory.rb
-- lib/cassandra_object/identity/hashed_natural_key_factory.rb
-- lib/cassandra_object/identity/natural_key_factory.rb
-- lib/cassandra_object/identity/uuid_key_factory.rb
 - lib/cassandra_object/inspect.rb
 - lib/cassandra_object/log_subscriber.rb
 - lib/cassandra_object/migrations.rb
@@ -160,7 +155,6 @@ files:
 - test/unit/connection_test.rb
 - test/unit/consistency_test.rb
 - test/unit/finder_methods_test.rb
-- test/unit/identity/uuid_key_factory_test.rb
 - test/unit/identity_test.rb
 - test/unit/inspect_test.rb
 - test/unit/persistence_test.rb

data/lib/cassandra_object/identity/abstract_key_factory.rb

@@ -1,26 +0,0 @@
-module CassandraObject
-  module Identity
-    # Key factories need to support 3 operations
-    class AbstractKeyFactory
-      # Next key takes an object and returns the key object it should use.
-      # object will be ignored with synthetic keys but could be useful with natural ones
-      #
-      # @param  [CassandraObject::Base] the object that needs a new key
-      # @return [CassandraObject::Identity::Key] the key
-      #
-      def next_key(object)
-        raise NotImplementedError, "#{self.class.name}#next_key isn't implemented."
-      end
-
-      # Parse should create a new key object from the 'to_param' format
-      #
-      # @param  [String] the result of calling key.to_param
-      # @return [CassandraObject::Identity::Key] the parsed key
-      #
-      def parse(string)
-        raise NotImplementedError, "#{self.class.name}#parse isn't implemented."
-      end
-    end
-  end
-end
-

data/lib/cassandra_object/identity/custom_key_factory.rb

@@ -1,36 +0,0 @@
-module CassandraObject
-  module Identity
-    class CustomKeyFactory < AbstractKeyFactory
-      class CustomKey
-        attr_reader :value
-
-        def initialize(value)
-          @value = value
-        end
-
-        def to_s
-          value
-        end
-
-        def ==(other)
-          other.to_s == value
-        end
-      end
-
-      attr_reader :method
-
-      def initialize(options)
-        @method = options[:method]
-      end
-
-      def next_key(object)
-        CustomKey.new(object.send(@method))
-      end
-
-      def parse(value)
-        value
-      end
-    end
-  end
-end
-

data/lib/cassandra_object/identity/hashed_natural_key_factory.rb

@@ -1,10 +0,0 @@
-require 'digest/sha1'
-module CassandraObject
-  module Identity
-    class HashedNaturalKeyFactory < NaturalKeyFactory
-      def next_key(object)
-        NaturalKey.new(Digest::SHA1.hexdigest(attributes.map { |attribute| object[attribute] }.join(separator)))
-      end
-    end
-  end
-end

data/lib/cassandra_object/identity/natural_key_factory.rb

@@ -1,37 +0,0 @@
-module CassandraObject
-  module Identity
-    class NaturalKeyFactory < AbstractKeyFactory
-      class NaturalKey
-        attr_reader :value
-
-        def initialize(value)
-          @value = value
-        end
-
-        def to_s
-          value
-        end
-
-        def ==(other)
-          other.to_s == to_s
-        end
-      end
-
-      attr_reader :attributes, :separator
-
-      def initialize(options)
-        @attributes = [*options[:attributes]]
-        @separator  = options[:separator] || "-"
-      end
-
-      def next_key(object)
-        NaturalKey.new(attributes.map { |a| object.attributes[a.to_s] }.join(separator))
-      end
-
-      def parse(paramized_key)
-        NaturalKey.new(paramized_key)
-      end
-    end
-  end
-end
-

data/lib/cassandra_object/identity/uuid_key_factory.rb

@@ -1,23 +0,0 @@
-module CassandraObject
-  module Identity
-    # Key factories need to support 3 operations
-    class UUIDKeyFactory < AbstractKeyFactory
-      class UUID < SimpleUUID::UUID
-        def to_s
-          to_guid
-        end
-      end
-    
-      def next_key(object)
-        UUID.new
-      end
-      
-      def parse(string)
-        UUID.new(string) if string
-      rescue
-        nil
-      end
-    end
-  end
-end
-

data/test/unit/identity/uuid_key_factory_test.rb

@@ -1,14 +0,0 @@
-require 'test_helper'
-
-class CassandraObject::Identity::UuidKeyFactoryTest < CassandraObject::TestCase
-  test 'parse' do
-    assert_not_nil key_factory.parse('95b2cf70-c318-11e0-962b-0800200c9a66')
-    assert_nil key_factory.parse('xyz')
-    assert_nil key_factory.parse(nil)
-  end
-
-  private
-    def key_factory
-      @key_factory ||= CassandraObject::Identity::UUIDKeyFactory.new
-    end
-end