sessionm-cassandra_object 2.2.6 → 2.2.8

data/lib/cassandra_object/connection.rb

@@ -3,7 +3,7 @@ module CassandraObject
     extend ActiveSupport::Concern
     
     included do
-      class_attribute :connection_spec
+      class_attribute :connection
     end
 
     module ClassMethods
@@ -13,16 +13,7 @@ module CassandraObject
       }
       def establish_connection(spec)
         spec.reverse_merge!(DEFAULT_OPTIONS)
-        @connection = Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift].symbolize_keys!)
-      end
-
-      def connection=(val)
-        @connection = val
-      end
-
-      def connection
-        establish_connection(connection_spec) if @connection.nil?
-        @connection
+        self.connection = Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift].symbolize_keys!)
       end
     end
   end

data/lib/cassandra_object/types/decimal_type.rb

@@ -0,0 +1,18 @@
+module CassandraObject
+  module Types
+    module DecimalType
+      def encode(value)
+        raise ArgumentError.new("#{self} requires a BigDecimal") unless value.kind_of?(BigDecimal)
+        value.to_s
+      end
+      module_function :encode
+
+      def decode(str)
+        return nil if str.empty?
+        raise ArgumentError.new("Cannot convert #{str} into a BigDecimal") unless str.kind_of?(String)
+        BigDecimal.new(str)
+      end
+      module_function :decode
+    end
+  end
+end

data/lib/cassandra_object/types.rb

@@ -2,6 +2,7 @@ CassandraObject::Type.register(:array, Array, CassandraObject::Types::ArrayType)
 CassandraObject::Type.register(:boolean, Object, CassandraObject::Types::BooleanType)
 CassandraObject::Type.register(:date, Date, CassandraObject::Types::DateType)
 CassandraObject::Type.register(:float, Float, CassandraObject::Types::FloatType)
+CassandraObject::Type.register(:decimal, BigDecimal, CassandraObject::Types::DecimalType)
 CassandraObject::Type.register(:hash, Hash, CassandraObject::Types::HashType)
 CassandraObject::Type.register(:integer, Integer, CassandraObject::Types::IntegerType)
 CassandraObject::Type.register(:set, Array, CassandraObject::Types::SetType)

data/lib/cassandra_object.rb

@@ -36,6 +36,7 @@ module CassandraObject
     autoload :ArrayType
     autoload :BooleanType
     autoload :DateType
+    autoload :DecimalType
     autoload :FloatType
     autoload :HashType
     autoload :IntegerType
@@ -46,4 +47,4 @@ module CassandraObject
   end
 end
 
-require 'cassandra_object/railtie'
+require 'cassandra_object/railtie'

data/sessionm-cassandra_object.gemspec

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

data/test/test_helper.rb

@@ -7,16 +7,16 @@ require 'rails/test_help'
 
 class Issue < CassandraObject::Base
   key :uuid
-  attribute :description, type: :string
+  attribute :description, :type => :string
 end
 
 module CassandraObject
   class TestCase < ActiveSupport::TestCase
     setup do
       CassandraObject::Base.establish_connection(
-        keyspace: 'place_directory_development',
+        :keyspace => 'place_directory_development',
         # servers: '192.168.0.100:9160'
-        servers: '127.0.0.1:9160'
+        :servers => '127.0.0.1:9160'
       )
     end
 
@@ -28,4 +28,4 @@ module CassandraObject
       CassandraObject::Base.connection
     end
   end
-end
+end

data/test/types/decimal_type_test.rb

@@ -0,0 +1,11 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+class CassandraObject::Types::DecimalTypeTest < CassandraObject::TestCase
+  test 'encode' do
+    assert_equal '3.14', CassandraObject::Types::DecimalType.encode(BigDecimal.new('3.14'))
+  end
+
+  test 'decode' do
+    assert_equal BigDecimal.new('0.001'), CassandraObject::Types::DecimalType.decode('.001')
+  end
+end

data/test/validations_test.rb

@@ -3,13 +3,13 @@ require 'test_helper'
 class CassandraObject::ValidationsTest < CassandraObject::TestCase
   test 'create!' do
     begin
-      Issue.validates(:description, presence: true)
+      Issue.validates(:description, :presence => true)
 
-      Issue.create!(description: 'lol')
+      Issue.create!(:description => 'lol')
 
-      assert_raise(CassandraObject::RecordInvalid) { Issue.create!(description: '') }
+      assert_raise(CassandraObject::RecordInvalid) { Issue.create!(:description => '') }
     ensure
       Issue.reset_callbacks(:validate)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-01 00:00:00.000000000Z
+date: 2011-08-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70162359838280 !ruby/object:Gem::Requirement
+  requirement: &70341720486380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70162359838280
+  version_requirements: *70341720486380
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70162359837820 !ruby/object:Gem::Requirement
+  requirement: &70341720484280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *70162359837820
+  version_requirements: *70341720484280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70162359837360 !ruby/object:Gem::Requirement
+  requirement: &70341720480680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,7 +45,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70162359837360
+  version_requirements: *70341720480680
 description: Cassandra ActiveModel
 email: klange@sessionm.com
 executables: []
@@ -104,6 +104,7 @@ files:
 - lib/cassandra_object/types/array_type.rb
 - lib/cassandra_object/types/boolean_type.rb
 - lib/cassandra_object/types/date_type.rb
+- lib/cassandra_object/types/decimal_type.rb
 - lib/cassandra_object/types/float_type.rb
 - lib/cassandra_object/types/hash_type.rb
 - lib/cassandra_object/types/integer_type.rb
@@ -127,6 +128,7 @@ files:
 - test/types/array_type_test.rb
 - test/types/boolean_type_test.rb
 - test/types/date_type_test.rb
+- test/types/decimal_type_test.rb
 - test/types/float_type_test.rb
 - test/types/hash_type_test.rb
 - test/types/integer_type_test.rb
@@ -173,6 +175,7 @@ test_files:
 - test/types/array_type_test.rb
 - test/types/boolean_type_test.rb
 - test/types/date_type_test.rb
+- test/types/decimal_type_test.rb
 - test/types/float_type_test.rb
 - test/types/hash_type_test.rb
 - test/types/integer_type_test.rb