gotime-cassandra_object 2.9.2 → 2.10.0

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attribute_methods/typecasting.rb

@@ -7,11 +7,11 @@ module CassandraObject
         class_attribute :attribute_definitions
         self.attribute_definitions = {}
 
-        %w(array boolean date float integer json string time time_with_zone).each do |type|
+        %w(array boolean date float integer json string time).each do |type|
           instance_eval <<-EOV, __FILE__, __LINE__ + 1
-            def #{type}(name, options = {})                               # def string(name, options = {})
-              attribute(name, options.update(type: :#{type}))             #   attribute(name, options.update(type: :string))
-            end                                                           # end
+            def #{type}(name, options = {})                             # def string(name, options = {})
+              attribute(name, options.update(type: :#{type}))           #   attribute(name, options.update(type: :string))
+            end                                                         # end
           EOV
         end
       end

data/lib/cassandra_object/types.rb

@@ -5,5 +5,4 @@ CassandraObject::Type.register(:float,          CassandraObject::Types::FloatTyp
 CassandraObject::Type.register(:integer,        CassandraObject::Types::IntegerType)
 CassandraObject::Type.register(:json,           CassandraObject::Types::JsonType)
 CassandraObject::Type.register(:time,           CassandraObject::Types::TimeType)
-CassandraObject::Type.register(:time_with_zone, CassandraObject::Types::TimeWithZoneType)
 CassandraObject::Type.register(:string,         CassandraObject::Types::StringType)

data/lib/cassandra_object/types/time_type.rb

@@ -1,7 +1,6 @@
 module CassandraObject
   module Types
     class TimeType < BaseType
-      # lifted from the implementation of Time.xmlschema and simplified
       REGEX = /\A\s*
                 (-?\d+)-(\d\d)-(\d\d)
                 T
@@ -12,13 +11,13 @@ module CassandraObject
 
       def encode(time)
         raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)
-        time.xmlschema(6)
+        time.utc.xmlschema(6)
       end
 
       def decode(str)
         return nil if str.empty?
-        raise ArgumentError.new("Cannot convert #{str} into a Time") unless str.kind_of?(String) && str.match(REGEX)
-        Time.xmlschema(str)
+        raise ArgumentError.new("Cannot convert #{str} into a Time") unless str.kind_of?(String) && str.match(TimeType::REGEX)
+        Time.xmlschema(str).in_time_zone
       end
     end
   end

data/lib/gotime-cassandra_object.rb

@@ -52,7 +52,6 @@ module CassandraObject
     autoload :JsonType
     autoload :StringType
     autoload :TimeType
-    autoload :TimeWithZoneType
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70334356748580 !ruby/object:Gem::Requirement
+  requirement: &70330271651220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70334356748580
+  version_requirements: *70330271651220
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70334356747580 !ruby/object:Gem::Requirement
+  requirement: &70330271650160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334356747580
+  version_requirements: *70330271650160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70334356745380 !ruby/object:Gem::Requirement
+  requirement: &70330271648000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70334356745380
+  version_requirements: *70330271648000
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -110,7 +110,6 @@ files:
 - lib/cassandra_object/types/json_type.rb
 - lib/cassandra_object/types/string_type.rb
 - lib/cassandra_object/types/time_type.rb
-- lib/cassandra_object/types/time_with_zone_type.rb
 - lib/cassandra_object/validations.rb
 - lib/gotime-cassandra_object.rb
 - test/performance/insert_test.rb
@@ -142,7 +141,6 @@ files:
 - test/unit/types/json_type_test.rb
 - test/unit/types/string_type_test.rb
 - test/unit/types/time_type_test.rb
-- test/unit/types/time_with_zone_type_test.rb
 - test/unit/validations_test.rb
 homepage: http://github.com/gotime/cassandra_object
 licenses: []

data/lib/cassandra_object/types/time_with_zone_type.rb

@@ -1,16 +0,0 @@
-module CassandraObject
-  module Types
-    class TimeWithZoneType < BaseType
-      def encode(time)
-        raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)
-        time.utc.xmlschema(6)
-      end
-
-      def decode(str)
-        return nil if str.empty?
-        raise ArgumentError.new("Cannot convert #{str} into a Time") unless str.kind_of?(String) && str.match(TimeType::REGEX)
-        Time.xmlschema(str).in_time_zone
-      end
-    end
-  end
-end

data/test/unit/types/time_with_zone_type_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class CassandraObject::Types::TimeWithZoneTypeTest < CassandraObject::Types::TestCase
-  test 'encode' do
-    assert_equal '2004-12-24T01:02:03.000000Z', coder.encode(Time.utc(2004, 12, 24, 1, 2, 3))
-  end
-end