gotime-cassandra_object 2.7.8 → 2.7.9

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attribute_methods.rb

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

data/lib/cassandra_object/base.rb

@@ -55,7 +55,7 @@ module CassandraObject
       @attributes = {}
       self.attributes = attributes
       attribute_definitions.each do |attr, attribute_definition|
-        unless read_attribute(attr)
+        unless attribute_exists?(attr)
           write_attribute(attr, attribute_definition.instantiate(self, nil))
         end
       end

data/lib/cassandra_object/persistence.rb

@@ -41,13 +41,14 @@ module CassandraObject
       end
 
       def encode_attributes(attributes, schema_version)
-        attributes.inject({}) do |memo, (column_name, value)|
-          # cassandra stores bytes, not strings, so it has no concept of encodings. The ruby thrift gem 
-          # expects all strings to be encoded as ascii-8bit.
-          # don't attempt to encode columns that are nil
-          memo[column_name.to_s] = value.nil? ? '' : attribute_definitions[column_name.to_sym].coder.encode(value).force_encoding('ASCII-8BIT')
-          memo
-        end.merge({"schema_version" => schema_version.to_s})
+        encoded = {"schema_version" => schema_version.to_s}
+        attributes.each do |column_name, value|
+          # The ruby thrift gem expects all strings to be encoded as ascii-8bit.
+          unless value.nil?
+            encoded[column_name.to_s] = attribute_definitions[column_name.to_sym].coder.encode(value).force_encoding('ASCII-8BIT')
+          end
+        end
+        encoded
       end
 
       def instantiate_attributes(object, attributes)

data/test/attribute_methods/dirty_test.rb

@@ -42,9 +42,7 @@ class CassandraObject::AttributeMethods::DirtyTest < CassandraObject::TestCase
     record = temp_object do
       boolean :awesome
     end.create(awesome: false)
-
-    p record.changes
-
+    
     record.awesome = false
     assert !record.changed?
 

data/test/attribute_methods_test.rb

@@ -59,4 +59,15 @@ class CassandraObject::AttributeMethodsTest < CassandraObject::TestCase
 
     assert_equal 'foo', issue.description
   end
+
+  test 'read and write attributes' do
+    issue = Issue.new
+    assert_nil issue.read_attribute(:description)
+
+    issue.write_attribute(:description, nil)
+    assert_nil issue.read_attribute(:description)
+
+    issue.write_attribute(:description, 'foo')
+    assert_equal 'foo', issue.read_attribute(:description)
+  end
 end

data/test/persistence_test.rb

@@ -1,6 +1,27 @@
 require 'test_helper'
 
 class CassandraObject::PersistenceTest < CassandraObject::TestCase
+  test 'encode_attributes' do
+    klass = temp_object do
+      string :description
+    end
+    
+    assert_equal(
+      {'schema_version' => 'foo'},
+      klass.encode_attributes({}, 'foo')
+    )
+
+    assert_equal(
+      {'schema_version' => 'foo'},
+      klass.encode_attributes({description: nil}, 'foo')
+    )
+
+    assert_equal(
+      {'description' => 'lol', 'schema_version' => 'foo'},
+      klass.encode_attributes({description: 'lol'}, 'foo')
+    )
+  end
+
   test 'persistance inquiries' do
     issue = Issue.new
     assert issue.new_record?
@@ -19,16 +40,17 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
   end
 
   test 'save!' do
-    begin
-      Issue.validates(:description, presence: true)
-
-      issue = Issue.new(description: 'bad')
-      issue.save!
+    klass = temp_object do
+      string :description
+      validates :description, presence: true
+    end
+    
+    record = klass.new(description: 'bad')
+    record.save!
 
-      issue = Issue.new
-      assert_raise(CassandraObject::RecordInvalid) { issue.save! }
-    ensure
-      Issue.reset_callbacks(:validate)
+    assert_raise CassandraObject::RecordInvalid do
+      record = klass.new
+      record.save!
     end
   end
 

data/test/test_helper.rb

@@ -28,6 +28,11 @@ module CassandraObject
       Class.new(CassandraObject::Base) do
         key :uuid
         self.column_family = 'Issues'
+
+        def self.name
+          'Issue'
+        end
+
         instance_eval(&block)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.7.8
+  version: 2.7.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-08 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70102740233680 !ruby/object:Gem::Requirement
+  requirement: &70218458238440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102740233680
+  version_requirements: *70218458238440
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70102740233220 !ruby/object:Gem::Requirement
+  requirement: &70218458237480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70102740233220
+  version_requirements: *70218458237480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70102740232720 !ruby/object:Gem::Requirement
+  requirement: &70218458236260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70102740232720
+  version_requirements: *70218458236260
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []