sessionm-cassandra_object 2.2.10 → 2.2.12

data/lib/cassandra_object/identity.rb

@@ -43,6 +43,7 @@ module CassandraObject
     def id
       key.to_s
     end
+    alias :quoted_id :id
 
     def id=(key)
       self.key = self.class.parse_key(key)

data/lib/cassandra_object/types/decimal_type.rb

@@ -2,18 +2,20 @@ module CassandraObject
   module Types
     module DecimalType
       def encode(value)
-        raise ArgumentError.new("#{self} requires a BigDecimal") unless value.kind_of?(BigDecimal)
+        return nil if value.nil?
+        raise ArgumentError.new("#{self} requires a Numeric") unless value.kind_of?(Numeric)
         value.to_s
       end
       module_function :encode
 
-      def decode(str, options={})
-        return nil if str.empty?
-        raise ArgumentError.new("Cannot convert #{str} into a BigDecimal") unless str.kind_of?(String)
+      def decode(value, options={})
+        return nil if value.nil?
+        value = value.to_s if value.kind_of?(Numeric)
+        raise ArgumentError.new("Cannot convert #{value} into a BigDecimal") unless value.kind_of?(String)
         if options[:precision].present?
-          BigDecimal.new(str, options[:precision])
+          BigDecimal.new(value, options[:precision])
         else
-          BigDecimal.new(str)
+          BigDecimal.new(value)
         end
       end
       module_function :decode

data/sessionm-cassandra_object.gemspec

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

data/test/types/decimal_type_test.rb

@@ -2,10 +2,15 @@ require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
 class CassandraObject::Types::DecimalTypeTest < CassandraObject::TestCase
   test 'encode' do
+    assert_equal nil, CassandraObject::Types::DecimalType.encode(nil)
+    assert_equal '3', CassandraObject::Types::DecimalType.encode(3)
+    assert_equal '3.14', CassandraObject::Types::DecimalType.encode(3.14)
     assert_equal '3.14', CassandraObject::Types::DecimalType.encode(BigDecimal.new('3.14'))
   end
 
   test 'decode' do
+    assert_equal nil, CassandraObject::Types::DecimalType.decode(nil)
+    assert_equal BigDecimal.new('0.001'), CassandraObject::Types::DecimalType.decode(0.001)
     assert_equal BigDecimal.new('0.001'), CassandraObject::Types::DecimalType.decode('.001')
     assert_equal [9, 18], CassandraObject::Types::DecimalType.decode('.001').precs
     assert_equal [9, 27], CassandraObject::Types::DecimalType.decode('.001', :precision => 14).precs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-08-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70293952989880 !ruby/object:Gem::Requirement
+  requirement: &70325359150480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70293952989880
+  version_requirements: *70325359150480
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70293952989420 !ruby/object:Gem::Requirement
+  requirement: &70325359149920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *70293952989420
+  version_requirements: *70325359149920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70293952988960 !ruby/object:Gem::Requirement
+  requirement: &70325359149440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,7 +45,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70293952988960
+  version_requirements: *70325359149440
 description: Cassandra ActiveModel
 email: klange@sessionm.com
 executables: []