gotime-cassandra_object 2.1.0 → 2.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gotime-cassandra_object (2.0.0)
+    gotime-cassandra_object (2.1.0)
       cassandra (~> 0.11.3)
       rails (~> 3.0)
 

data/gotime-cassandra_object.gemspec

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

data/lib/cassandra_object.rb

@@ -31,14 +31,16 @@ module CassandraObject
     autoload :ColumnFamily
   end
 
-  class Types
+  module Types
     extend ActiveSupport::Autoload
     
+    autoload :ArrayType
     autoload :BooleanType
     autoload :DateType
     autoload :FloatType
     autoload :HashType
     autoload :IntegerType
+    autoload :SetType
     autoload :TimeType
     autoload :TimeWithZoneType
     autoload :UTF8StringType

data/lib/cassandra_object/tasks/ks.rake

@@ -1,5 +1,4 @@
 namespace :ks do
-
   task :configure => :environment do
     @configs = YAML.load_file(Rails.root.join("config", "cassandra.yml"))
     @config = @configs[Rails.env || 'development']
@@ -118,6 +117,5 @@ namespace :ks do
     ks.set config['keyspace']
     ks
   end
-
 end
 

data/lib/cassandra_object/types.rb

@@ -1,8 +1,10 @@
+CassandraObject::Type.register(:array, Array, CassandraObject::Types::ArrayType)
 CassandraObject::Type.register(:boolean, Object, CassandraObject::Types::BooleanType)
 CassandraObject::Type.register(:date, Date, CassandraObject::Types::DateType)
 CassandraObject::Type.register(:float, Float, CassandraObject::Types::FloatType)
 CassandraObject::Type.register(:hash, Hash, CassandraObject::Types::HashType)
 CassandraObject::Type.register(:integer, Integer, CassandraObject::Types::IntegerType)
+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

data/lib/cassandra_object/types/array_type.rb

@@ -0,0 +1,16 @@
+module CassandraObject
+  module Types
+    module ArrayType
+      def encode(array)
+        raise ArgumentError.new("#{self} requires an Array") unless array.kind_of?(Array)
+        array.to_json
+      end
+      module_function :encode
+
+      def decode(str)
+        ActiveSupport::JSON.decode(str)
+      end
+      module_function :decode
+    end
+  end
+end

data/lib/cassandra_object/types/boolean_type.rb

@@ -1,5 +1,5 @@
 module CassandraObject
-  class Types
+  module Types
     module BooleanType
       TRUE_VALS = [true, 'true', '1']
       FALSE_VALS = [false, 'false', '0', '', nil]

data/lib/cassandra_object/types/date_type.rb

@@ -1,5 +1,5 @@
 module CassandraObject
-  class Types
+  module Types
     module DateType
       FORMAT = '%Y-%m-%d'
       REGEX = /\A\d{4}-\d{2}-\d{2}\Z/

data/lib/cassandra_object/types/float_type.rb

@@ -1,5 +1,5 @@
 module CassandraObject
-  class Types
+  module Types
     module FloatType
       REGEX = /\A[-+]?\d+(\.\d+)?\Z/
       def encode(float)

data/lib/cassandra_object/types/hash_type.rb

@@ -1,5 +1,5 @@
 module CassandraObject
-  class Types
+  module Types
     module HashType
       def encode(hash)
         raise ArgumentError.new("#{self} requires a Hash") unless hash.kind_of?(Hash)

data/lib/cassandra_object/types/integer_type.rb

@@ -1,5 +1,5 @@
 module CassandraObject
-  class Types
+  module Types
     module IntegerType
       REGEX = /\A[-+]?\d+\Z/
       def encode(int)

data/lib/cassandra_object/types/set_type.rb

@@ -0,0 +1,22 @@
+module CassandraObject
+  module Types
+    module SetType
+      def encode(set)
+        if set.kind_of?(Set)
+          set.to_json
+        elsif set.kind_of?(Array)
+          set.uniq.to_json
+        else
+          raise ArgumentError.new("#{self} requires an Array or Set")
+        end
+      end
+      module_function :encode
+
+      def decode(str)
+        return str.to_a if str.kind_of?(Set)
+        ActiveSupport::JSON.decode(str)
+      end
+      module_function :decode
+    end
+  end
+end

data/lib/cassandra_object/types/string_type.rb

@@ -1,5 +1,5 @@
 module CassandraObject
-  class Types
+  module Types
     module StringType
       def encode(str)
         raise ArgumentError.new("#{self} requires a String") unless str.kind_of?(String)

data/lib/cassandra_object/types/time_type.rb

@@ -1,5 +1,5 @@
 module CassandraObject
-  class Types
+  module Types
     module TimeType
       # lifted from the implementation of Time.xmlschema and simplified
       REGEX = /\A\s*

data/lib/cassandra_object/types/time_with_zone_type.rb

@@ -1,5 +1,5 @@
 module CassandraObject
-  class Types
+  module Types
     module TimeWithZoneType
       def encode(time)
         raise ArgumentError.new("#{self} requires a Time") unless time.kind_of?(Time)

data/lib/cassandra_object/types/utf8_string_type.rb

@@ -1,5 +1,5 @@
 module CassandraObject
-  class Types
+  module Types
     module 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.

data/test/types/array_type_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class CassandraObject::Types::ArrayTypeTest < CassandraObject::TestCase
+  test 'encode' do
+    assert_equal ['1', '2'].to_json, CassandraObject::Types::ArrayType.encode(['1', '2'])
+    
+    assert_raise ArgumentError do
+      CassandraObject::Types::ArrayType.encode('wtf')
+    end
+  end
+
+  test 'decode' do
+    assert_equal ['1', '2'], CassandraObject::Types::ArrayType.decode(['1', '2'].to_json)
+  end
+end

data/test/types/set_type_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class CassandraObject::Types::SetTypeTest < CassandraObject::TestCase
+  test 'encode' do
+    assert_equal ['1', '2'].to_json, CassandraObject::Types::SetType.encode(['1', '2'].to_set)
+    assert_equal ['1', '2'].to_json, CassandraObject::Types::SetType.encode(['1', '2', '2'])
+
+    assert_raise ArgumentError do
+      CassandraObject::Types::SetType.encode('wtf')
+    end
+  end
+  
+  test 'decode' do
+    assert_equal ['1', '2'], CassandraObject::Types::SetType.decode(['1', '2'].to_set)
+    assert_equal ['1', '2'], CassandraObject::Types::SetType.decode(['1', '2'].to_json)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-07-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2170403800 !ruby/object:Gem::Requirement
+  requirement: &2152615720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2170403800
+  version_requirements: *2152615720
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &2152534000 !ruby/object:Gem::Requirement
+  requirement: &2152615260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152534000
+  version_requirements: *2152615260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152533540 !ruby/object:Gem::Requirement
+  requirement: &2152614800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152533540
+  version_requirements: *2152614800
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -103,11 +103,13 @@ files:
 - lib/cassandra_object/timestamps.rb
 - lib/cassandra_object/type.rb
 - lib/cassandra_object/types.rb
+- lib/cassandra_object/types/array_type.rb
 - lib/cassandra_object/types/boolean_type.rb
 - lib/cassandra_object/types/date_type.rb
 - lib/cassandra_object/types/float_type.rb
 - lib/cassandra_object/types/hash_type.rb
 - lib/cassandra_object/types/integer_type.rb
+- lib/cassandra_object/types/set_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
@@ -143,11 +145,13 @@ files:
 - test/persistence_test.rb
 - test/test_helper.rb
 - test/timestamps_test.rb
+- test/types/array_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/set_type_test.rb
 - test/types/string_type_test.rb
 - test/types/time_type_test.rb
 - test/types/utf8_string_type_test.rb
@@ -184,11 +188,13 @@ test_files:
 - test/persistence_test.rb
 - test/test_helper.rb
 - test/timestamps_test.rb
+- test/types/array_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/set_type_test.rb
 - test/types/string_type_test.rb
 - test/types/time_type_test.rb
 - test/types/utf8_string_type_test.rb