sessionm-cassandra_object 2.4.1 → 2.4.2

data/lib/cassandra_object/migrations.rb

@@ -19,8 +19,7 @@ module CassandraObject
     
     module InstanceMethods
       def schema_version
-        version = @schema_version || self.class.current_schema_version
-        version.nil? ? nil : Integer(version)
+        Integer(@schema_version || self.class.current_schema_version)
       end
 
       def attribute_will_change!(attribute)

data/lib/cassandra_object/persistence.rb

@@ -95,9 +95,7 @@ module CassandraObject
           # don't attempt to encode columns that are nil
           memo[column_name.to_s] = value.nil? ? '' : model_attributes[column_name].converter.encode(value).force_encoding('ASCII-8BIT')
           memo
-        end.tap do |hash|
-          hash["schema_version"] = schema_version.to_s unless schema_version.nil?
-        end
+        end.merge({"schema_version" => schema_version.to_s})
       end
 
       def decode_columns_hash(attributes)

data/lib/cassandra_object/timestamps.rb

@@ -3,21 +3,16 @@ module CassandraObject
     extend ActiveSupport::Concern
 
     included do
-      # Derived classes must declare the :created_at and :updated_at attributes.
+      attribute :created_at, type: :time#_with_zone
+      attribute :updated_at, type: :time#_with_zone
 
       before_create do #|r|
-        if attribute_method?(:created_at)
-          self.created_at ||= Time.current
-        end
-        if attribute_method?(:updated_at)
-          self.updated_at ||= Time.current
-        end
+        self.created_at ||= Time.current
+        self.updated_at ||= Time.current
       end
 
       before_update if: :changed? do #|r|
-        if attribute_method?(:updated_at)
-          self.updated_at = Time.current
-        end
+        self.updated_at = Time.current
       end
     end
   end

data/sessionm-cassandra_object.gemspec

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

data/test/README

@@ -2,7 +2,7 @@ To run tests:
 
 1) Install gems
 
-$ cd cassandra_object
+$ rvm 1.9.3-p327@cassandra_object --create
 $ bundle install
 
 2) Create keyspace and CFs

data/test/attributes_test.rb

@@ -7,13 +7,11 @@ class CassandraObject::AttributesTest < CassandraObject::TestCase
   end
 
   class B < CassandraObject::Base
-    attribute :created_at, :type => :time
-    attribute :updated_at, :type => :time
     attribute :b, :type => :integer
   end
 
   test 'model_attributes' do
-    assert_equal %W[a], A.model_attributes.keys
+    assert_equal %W[created_at updated_at a], A.model_attributes.keys
     assert_equal %W[created_at updated_at b], B.model_attributes.keys
   end
 

data/test/persistence_test.rb

@@ -36,17 +36,6 @@ class CassandraObject::PersistenceTest < CassandraObject::TestCase
     end
   end
 
-  test 'save! without current schema version' do
-    begin
-      old_current_schema_version = Issue.current_schema_version
-      Issue.current_schema_version = nil
-      record = Issue.create!
-      assert_equal nil, record.connection.get(Issue.column_family, record.id, 'schema_version')
-    ensure
-      Issue.current_schema_version = old_current_schema_version
-    end
-  end
-
   test 'destroy' do
     issue = Issue.create
     issue.destroy

data/test/test_helper.rb

@@ -7,22 +7,6 @@ require 'rails/test_help'
 require 'mocha/setup'
 
 class Issue < CassandraObject::Base
-  key :uuid
-  attribute :created_at, :type => :time
-  attribute :updated_at, :type => :time
-  attribute :description, :type => :string
-  attribute :worth, :type => :decimal, :precision => 100
-  attribute :name, :type => :string
-  before_validation :set_defaults, :on => :create
-
-  def set_defaults
-    self.name ||= 'default name'
-  end
-end
-
-class IssueWithoutTimestamps < CassandraObject::Base
-  self.column_family = 'Issues'
-
   key :uuid
   attribute :description, :type => :string
   attribute :worth, :type => :decimal, :precision => 100
@@ -35,9 +19,6 @@ class IssueWithoutTimestamps < CassandraObject::Base
 end
 
 class Counter < CassandraObject::Base
-  attribute :created_at, :type => :time
-  attribute :updated_at, :type => :time
-
   self.write_consistency = :all
 end
 

data/test/timestamps_test.rb

@@ -24,11 +24,4 @@ class CassandraObject::TimestampsTest < CassandraObject::TestCase
 
     assert_equal time, issue.created_at
   end
-
-  test 'without timestamps' do
-    record = IssueWithoutTimestamps.create!
-    assert_equal nil, IssueWithoutTimestamps.connection.get(IssueWithoutTimestamps.column_family, record.id, 'created_at')
-    assert_equal nil, IssueWithoutTimestamps.connection.get(IssueWithoutTimestamps.column_family, record.id, 'updated_at')
-  end
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -69,7 +69,6 @@ extra_rdoc_files:
 - README.markdown
 files:
 - .gitignore
-- .rvmrc
 - CHANGELOG
 - Gemfile
 - LICENSE

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.3-p327@cassandra_object --create