gotime-cassandra_object 2.7.1 → 2.7.2

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.7.1'
+  s.version = '2.7.2'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.extra_rdoc_files = ["README.rdoc"]
   s.files       = `git ls-files`.split("\n")
-  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files  = `git ls-files -- {test}/*`.split("\n")
   s.require_paths = ['lib']
 
   s.add_runtime_dependency('activemodel', "~> 3.0")

data/lib/cassandra_object/attribute_methods.rb

@@ -33,7 +33,7 @@ module CassandraObject
         coder         = options.delete :coder
 
         if expected_type.is_a?(Symbol)
-          type_mapping = CassandraObject::Type.get_mapping(expected_type) || (raise "Unknown type #{type}")
+          type_mapping = CassandraObject::Type.get_mapping(expected_type) || (raise "Unknown type #{expected_type}")
         elsif coder.nil?
           raise "Must supply a :coder for #{name}"
         else

data/lib/cassandra_object/finder_methods.rb

@@ -54,14 +54,9 @@ module CassandraObject
           connection.multi_get(column_family, keys.map(&:to_s), consistency: thrift_read_consistency)
         end
 
-        attribute_results.inject({}) do |memo, (key, attributes)|
-          if attributes.empty?
-            memo[key] = nil
-          else
-            memo[parse_key(key)] = instantiate(key, attributes)
-          end
-          memo
-        end
+        Hash[attribute_results.map do |key, attributes|
+          [parse_key(key), attributes.present? ? instantiate(key, attributes) : nil]
+        end]
       end
     end
   end

data/lib/cassandra_object/identity.rb

@@ -44,6 +44,7 @@ module CassandraObject
       key.to_s
     end
 
+    # TODO test this
     def id=(key)
       self.key = self.class.parse_key(key)
       id

data/lib/cassandra_object/types/string_type.rb

@@ -6,8 +6,8 @@ module CassandraObject
         str.dup
       end
 
-      def decode(str)
-        str.force_encoding('UTF-8')
+      def wrap(record, name, value)
+        value.force_encoding('UTF-8')
       end
     end
   end

data/test/attribute_methods_test.rb

@@ -21,7 +21,7 @@ class CassandraObject::AttributeMethodsTest < CassandraObject::TestCase
   end
 
   test 'custom attribute definer' do
-    model_attribute = TestIssue.attribute_definition[:custom_column]
+    model_attribute = TestIssue.attribute_definitions[:custom_column]
 
     assert_kind_of CustomCoder, model_attribute.coder
     assert_equal CustomType, model_attribute.expected_type

data/test/identity_test.rb

@@ -1,15 +1,6 @@
 require 'test_helper'
 
 class CassandraObject::IdentityTest < CassandraObject::TestCase
-  test 'parse_key' do
-    assert_kind_of(
-      CassandraObject::Identity::UUIDKeyFactory::UUID,
-      Issue.parse_key('bb4cbbbc-b7c7-11e0-9ca2-732604ff41fe')
-    )
-    
-    assert_nil Issue.parse_key('fail')
-  end
-
   test 'id' do
     issue = Issue.create
 
@@ -27,4 +18,13 @@ class CassandraObject::IdentityTest < CassandraObject::TestCase
     assert_equal first_issue, first_issue
     assert_not_equal first_issue, second_issue
   end
+
+  test 'parse_key' do
+    assert_kind_of(
+      CassandraObject::Identity::UUIDKeyFactory::UUID,
+      Issue.parse_key('bb4cbbbc-b7c7-11e0-9ca2-732604ff41fe')
+    )
+    
+    assert_nil Issue.parse_key('fail')
+  end
 end

data/test/types/string_type_test.rb

@@ -1,4 +1,18 @@
 require 'test_helper'
 
-class CassandraObject::Type::StringTypeTest < CassandraObject::Types::TestCase
+class CassandraObject::Types::StringTypeTest < CassandraObject::Types::TestCase
+  test 'encode' do
+    assert_equal 'abc', coder.encode('abc')
+
+    assert_raise ArgumentError do
+      coder.encode(123)
+    end
+  end
+
+  test 'wrap' do
+    assert_equal(
+      '123'.force_encoding('UTF-8').encoding,
+      coder.wrap(nil, nil, '123'.force_encoding('ASCII-8BIT')).encoding
+    )
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-30 00:00:00.000000000Z
+date: 2011-08-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70132262094800 !ruby/object:Gem::Requirement
+  requirement: &70248322073880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70132262094800
+  version_requirements: *70248322073880
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70132262094260 !ruby/object:Gem::Requirement
+  requirement: &70248322073300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70132262094260
+  version_requirements: *70248322073300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70132262093740 !ruby/object:Gem::Requirement
+  requirement: &70248322072840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70132262093740
+  version_requirements: *70248322072840
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -162,29 +162,4 @@ rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel
-test_files:
-- test/active_model_test.rb
-- test/attribute_methods/definition_test.rb
-- test/attribute_methods/dirty_test.rb
-- test/attribute_methods_test.rb
-- test/base_test.rb
-- test/batches_test.rb
-- test/callbacks_test.rb
-- test/connection_test.rb
-- test/consistency_test.rb
-- test/finder_methods_test.rb
-- test/identity/uuid_key_factory_test.rb
-- test/identity_test.rb
-- test/persistence_test.rb
-- test/test_helper.rb
-- test/timestamps_test.rb
-- test/types/array_type_test.rb
-- test/types/base_type_test.rb
-- test/types/boolean_type_test.rb
-- test/types/date_type_test.rb
-- test/types/float_type_test.rb
-- test/types/hash_type_test.rb
-- test/types/integer_type_test.rb
-- test/types/string_type_test.rb
-- test/types/time_type_test.rb
-- test/validations_test.rb
+test_files: []