gotime-cassandra_object 2.4.2 → 2.5.0

data/README.rdoc

@@ -12,9 +12,9 @@ Add the following to your Gemfile:
 
   class Widget < CassandraObject::Base
     key :uuid
-    attribute :name, type: :string
-    attribute :description, type: :string
-    attribute :price, type: :integer
+    string :name
+    string :description
+    integer :price
 
     validates :name, presence: :true
 

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object/attributes.rb

@@ -17,6 +17,21 @@ module CassandraObject
     extend ActiveSupport::Concern
     include ActiveModel::AttributeMethods
 
+    included do
+      class_attribute :model_attributes
+      self.model_attributes = {}.with_indifferent_access
+
+      attribute_method_suffix("", "=")
+      
+      %w(array boolean date float integer time time_with_zone set string).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
+        EOV
+      end
+    end
+
     module ClassMethods
       def inherited(child)
         super
@@ -42,13 +57,6 @@ module CassandraObject
       end
     end
 
-    included do
-      class_attribute :model_attributes
-      self.model_attributes = {}.with_indifferent_access
-
-      attribute_method_suffix("", "=")      
-    end
-
     def write_attribute(name, value)
       if ma = self.class.model_attributes[name]
         @attributes[name.to_s] = ma.check_value!(value)

data/lib/cassandra_object/types.rb

@@ -7,5 +7,4 @@ CassandraObject::Type.register(:integer, Integer, CassandraObject::Types::Intege
 CassandraObject::Type.register(:set, Array, CassandraObject::Types::SetType)
 CassandraObject::Type.register(:time, Time, CassandraObject::Types::TimeType)
 CassandraObject::Type.register(:time_with_zone, ActiveSupport::TimeWithZone, CassandraObject::Types::TimeWithZoneType)
-CassandraObject::Type.register(:string, String, CassandraObject::Types::UTF8StringType) #This could be changed to StringType to support non-utf8 strings
-CassandraObject::Type.register(:utf8, String, CassandraObject::Types::UTF8StringType)
+CassandraObject::Type.register(:string, String, CassandraObject::Types::StringType)

data/lib/cassandra_object/types/set_type.rb

@@ -17,4 +17,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/types/string_type.rb

@@ -7,7 +7,7 @@ module CassandraObject
       end
 
       def decode(str)
-        str
+        str.force_encoding('UTF-8')
       end
     end
   end

data/lib/gotime-cassandra_object.rb

@@ -41,9 +41,9 @@ module CassandraObject
     autoload :HashType
     autoload :IntegerType
     autoload :SetType
+    autoload :StringType
     autoload :TimeType
     autoload :TimeWithZoneType
-    autoload :UTF8StringType
   end
 end
 

data/test/attributes_test.rb

@@ -6,7 +6,7 @@ class CassandraObject::AttributesTest < CassandraObject::TestCase
   end
 
   class TestChildIssue < TestIssue
-    attribute :description, type: :string
+    string :description
   end
 
   test 'attributes not shared' do

data/test/callbacks_test.rb

@@ -4,7 +4,7 @@ class CassandraObject::CallbacksTest < CassandraObject::TestCase
   class TestIssue < CassandraObject::Base
     self.column_family = 'Issues'
     key :uuid
-    attribute :description, type: :string
+    string :description
 
     %w(after_save after_create after_update after_destroy).each do |method|
       send(method) do

data/test/test_helper.rb

@@ -6,7 +6,7 @@ require 'gotime-cassandra_object'
 
 class Issue < CassandraObject::Base
   key :uuid
-  attribute :description, type: :string
+  string :description
 end
 
 module CassandraObject

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-08-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70186624012980 !ruby/object:Gem::Requirement
+  requirement: &70322955465140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186624012980
+  version_requirements: *70322955465140
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70186624012360 !ruby/object:Gem::Requirement
+  requirement: &70322955464620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70186624012360
+  version_requirements: *70322955464620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70186624011700 !ruby/object:Gem::Requirement
+  requirement: &70322955464020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70186624011700
+  version_requirements: *70322955464020
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -110,7 +110,6 @@ files:
 - 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/types/utf8_string_type.rb
 - lib/cassandra_object/validations.rb
 - lib/gotime-cassandra_object.rb
 - test/active_model_test.rb
@@ -135,7 +134,6 @@ files:
 - test/types/set_type_test.rb
 - test/types/string_type_test.rb
 - test/types/time_type_test.rb
-- test/types/utf8_string_type_test.rb
 - test/validations_test.rb
 homepage: http://github.com/gotime/cassandra_object
 licenses: []
@@ -184,5 +182,4 @@ test_files:
 - test/types/set_type_test.rb
 - test/types/string_type_test.rb
 - test/types/time_type_test.rb
-- test/types/utf8_string_type_test.rb
 - test/validations_test.rb

data/lib/cassandra_object/types/utf8_string_type.rb

@@ -1,16 +0,0 @@
-module CassandraObject
-  module Types
-    class UTF8StringType
-      def encode(str)
-        # This is technically the most correct, but it is a pain to require utf-8 encoding for all strings. Should revisit.
-        #raise ArgumentError.new("#{self} requires a UTF-8 encoded String") unless str.kind_of?(String) && str.encoding == Encoding::UTF_8
-        raise ArgumentError.new("#{self} requires a String") unless str.kind_of?(String)
-        str.dup
-      end
-
-      def decode(str)
-        str.force_encoding('UTF-8')
-      end
-    end
-  end
-end

data/test/types/utf8_string_type_test.rb

@@ -1,4 +0,0 @@
-require 'test_helper'
-
-class CassandraObject::Type::BooleanTypeTest < CassandraObject::Types::TestCase
-end