sessionm-cassandra_object 2.2.8 → 2.2.10

data/lib/cassandra_object/attributes.rb

@@ -1,15 +1,22 @@
 module CassandraObject
   class Attribute
-    attr_reader :name, :converter, :expected_type
-    def initialize(name, converter, expected_type)
+    attr_reader :name, :converter, :expected_type, :options
+    def initialize(name, converter, expected_type, options)
       @name          = name.to_s
       @converter     = converter
       @expected_type = expected_type
+      @options       = options
     end
 
     def check_value!(value)
       return value if value.nil?
-      value.kind_of?(expected_type) ? value : converter.decode(value)
+      if value.kind_of?(expected_type)
+        value
+      elsif converter.method(:decode).arity == 1
+        converter.decode(value)
+      else
+        converter.decode(value, @options)
+      end
     end
   end
 
@@ -32,8 +39,8 @@ module CassandraObject
         else
           raise "Unknown type #{options[:type]}"
         end
-
-        model_attributes[name] = Attribute.new(name, converter, expected_type)
+        
+        model_attributes[name] = Attribute.new(name, converter, expected_type, options.except(:type, :converter))
       end
 
       def define_attribute_methods

data/lib/cassandra_object/persistence.rb

@@ -55,7 +55,15 @@ module CassandraObject
       end
 
       def decode_columns_hash(attributes)
-        Hash[attributes.map { |k, v| [k.to_s, model_attributes[k].converter.decode(v)] }]
+        Hash[attributes.map do |k, v|
+               attribute = model_attributes[k]
+               decoded = if attribute.converter.method(:decode).arity == 1
+                           attribute.converter.decode(v)
+                         else
+                           attribute.converter.decode(v, attribute.options)
+                         end
+               [k.to_s, decoded]
+             end]
       end
       
       def column_family_configuration

data/lib/cassandra_object/types/decimal_type.rb

@@ -7,10 +7,14 @@ module CassandraObject
       end
       module_function :encode
 
-      def decode(str)
+      def decode(str, options={})
         return nil if str.empty?
         raise ArgumentError.new("Cannot convert #{str} into a BigDecimal") unless str.kind_of?(String)
-        BigDecimal.new(str)
+        if options[:precision].present?
+          BigDecimal.new(str, options[:precision])
+        else
+          BigDecimal.new(str)
+        end
       end
       module_function :decode
     end

data/sessionm-cassandra_object.gemspec

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

data/test/connection_test.rb

@@ -6,23 +6,23 @@ class CassandraObject::ConnectionTest < CassandraObject::TestCase
 
   test 'establish_connection' do
     TestObject.establish_connection(
-      keyspace: 'place_directory_development',
+      keyspace: TEST_KEYSPACE,
       servers: '192.168.0.100:9160',
       thrift: {'timeout' => 10}
     )
 
     assert_not_equal CassandraObject::Base.connection, TestObject.connection
-    assert_equal 'place_directory_development', TestObject.connection.keyspace
+    assert_equal TEST_KEYSPACE, TestObject.connection.keyspace
     assert_equal ["192.168.0.100:9160"], TestObject.connection.servers
     assert_equal 10, TestObject.connection.thrift_client_options[:timeout]
   end
 
   test 'establish_connection defaults' do
     TestObject.establish_connection(
-      keyspace: 'place_directory_development'
+      keyspace: TEST_KEYSPACE
     )
 
-    assert_equal 'place_directory_development', TestObject.connection.keyspace
+    assert_equal TEST_KEYSPACE, TestObject.connection.keyspace
     assert_equal ["127.0.0.1:9160"], TestObject.connection.servers
   end
-end
+end

data/test/persistence_test.rb

@@ -22,9 +22,13 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     begin
       Issue.validates(:description, presence: true)
 
-      issue = Issue.new(description: 'bad')
+      issue = Issue.new(description: 'bad', worth: '9000.00311219')
       issue.save!
 
+      issue = Issue.find(issue.id)
+      assert_equal BigDecimal.new('9000.00311219'), issue.worth
+      assert_equal [18, 117], issue.worth.precs
+
       issue = Issue.new
       assert_raise(CassandraObject::RecordInvalid) { issue.save! }
     ensure
@@ -81,4 +85,4 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     persisted_issue.reload
     assert_equal 'say what', persisted_issue.description
   end
-end
+end

data/test/test_helper.rb

@@ -8,13 +8,16 @@ require 'rails/test_help'
 class Issue < CassandraObject::Base
   key :uuid
   attribute :description, :type => :string
+  attribute :worth, :type => :decimal, :precision => 100
 end
 
 module CassandraObject
   class TestCase < ActiveSupport::TestCase
+    TEST_KEYSPACE = 'place_directory_development'
+
     setup do
       CassandraObject::Base.establish_connection(
-        :keyspace => 'place_directory_development',
+        :keyspace => TEST_KEYSPACE,
         # servers: '192.168.0.100:9160'
         :servers => '127.0.0.1:9160'
       )

data/test/types/decimal_type_test.rb

@@ -7,5 +7,7 @@ class CassandraObject::Types::DecimalTypeTest < CassandraObject::TestCase
 
   test 'decode' do
     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
   end
 end

metadata

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