gotime-cassandra_object 2.11.4 → 2.11.5

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attribute_methods.rb

@@ -42,6 +42,10 @@ module CassandraObject
       @attributes.key?(name.to_s)
     end
 
+    def attributes
+      Hash[@attributes.map { |name, _| [name, read_attribute(name)] }]
+    end
+
     def attributes=(attributes)
       attributes.each do |(name, value)|
         send("#{name}=", value)

data/lib/cassandra_object/attribute_methods/primary_key.rb

@@ -0,0 +1,26 @@
+module CassandraObject
+  module AttributeMethods
+    module PrimaryKey
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def primary_key
+          'id'
+        end
+      end
+
+      def id
+        key.to_s
+      end
+
+      def id=(key)
+        @key = self.class.parse_key(key)
+        id
+      end
+
+      def attributes
+        super.update(self.class.primary_key => id)
+      end
+    end
+  end
+end

data/lib/cassandra_object/base.rb

@@ -37,14 +37,13 @@ module CassandraObject
     include Batches
     include AttributeMethods
     include AttributeMethods::Dirty
+    include AttributeMethods::PrimaryKey
     include AttributeMethods::Typecasting
     include BelongsTo
     include Validations
     include Callbacks
     include Timestamps
 
-    attr_reader :attributes
-
     include Serialization
     include Migrations
     include Mocking

data/lib/cassandra_object/identity.rb

@@ -43,23 +43,10 @@ module CassandraObject
       def parse_key(string)
         key_factory.parse(string)
       end
-
-      def primary_key
-        'id'
-      end
     end
 
     def key
       @key ||= self.class.next_key(self)
     end
-
-    def id
-      key.to_s
-    end
-
-    def id=(key)
-      @key = self.class.parse_key(key)
-      id
-    end
   end
 end

data/lib/cassandra_object/migrations.rb

@@ -19,10 +19,8 @@ module CassandraObject
       end
     end
     
-    module InstanceMethods
-      def schema_version
-        Integer(@schema_version || self.class.current_schema_version)
-      end
+    def schema_version
+      Integer(@schema_version || self.class.current_schema_version)
     end
     
     module ClassMethods

data/lib/gotime-cassandra_object.rb

@@ -30,6 +30,7 @@ module CassandraObject
     eager_autoload do
       autoload :Definition
       autoload :Dirty
+      autoload :PrimaryKey
       autoload :Typecasting
     end
   end

data/test/unit/attribute_methods/primary_key_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+class CassandraObject::AttributeMethods::PrimaryTest < CassandraObject::TestCase
+  test 'get id' do
+    issue = Issue.new
+
+    assert_equal issue.key.to_s, issue.id
+  end
+
+  test 'set id' do
+    uuid = SimpleUUID::UUID.new.to_guid
+    issue = Issue.new id: uuid
+
+    assert_equal issue.key.to_s, uuid
+  end
+
+  test 'attributes' do
+    issue = Issue.new
+
+    assert_not_nil issue.attributes['id']
+  end
+end

data/test/unit/identity_test.rb

@@ -11,19 +11,6 @@ class CassandraObject::IdentityTest < CassandraObject::TestCase
     assert_not_nil issue.key
   end
 
-  test 'get id' do
-    issue = Issue.new
-
-    assert_equal issue.key.to_s, issue.id
-  end
-
-  test 'set id' do
-    uuid = SimpleUUID::UUID.new.to_guid
-    issue = Issue.new id: uuid
-
-    assert_equal issue.key.to_s, uuid
-  end
-
   test 'parse_key' do
     assert_kind_of(
       CassandraObject::Identity::UUIDKeyFactory::UUID,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.11.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70326022571280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326022571280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70326022570600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70326022570600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: thrift_client
-  requirement: &70326022569860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70326022569860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70326022568360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +70,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70326022568360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -74,6 +94,7 @@ files:
 - lib/cassandra_object/attribute_methods.rb
 - lib/cassandra_object/attribute_methods/definition.rb
 - lib/cassandra_object/attribute_methods/dirty.rb
+- lib/cassandra_object/attribute_methods/primary_key.rb
 - lib/cassandra_object/attribute_methods/typecasting.rb
 - lib/cassandra_object/base.rb
 - lib/cassandra_object/batches.rb
@@ -129,6 +150,7 @@ files:
 - test/unit/active_model_test.rb
 - test/unit/attribute_methods/definition_test.rb
 - test/unit/attribute_methods/dirty_test.rb
+- test/unit/attribute_methods/primary_key_test.rb
 - test/unit/attribute_methods/typecasting_test.rb
 - test/unit/attribute_methods_test.rb
 - test/unit/base_test.rb
@@ -174,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel