cassilds-model 0.1.13 → 0.1.14

data/lib/cassandra-model/base.rb

@@ -37,7 +37,7 @@ module CassandraModel
           end
           if @key_type.downcase == 'timeuuid' or @key_type.downcase == 'time_uuid'
             def #{name}_str
-              SimpleUUID::UUID.new(@key).to_guid
+              (@key.nil? or @key.size == 0) ? nil : SimpleUUID::UUID.new(@key).to_guid
             end
           end
         EVAL
@@ -48,7 +48,7 @@ module CassandraModel
         class_eval "def #{name}; #{type.capitalize}Type.load(@attributes['#{name}']); end"
         class_eval "def #{name}=(value); @attributes['#{name}'] = #{type.capitalize}Type.dump(value); end"
         if type.downcase == 'timeuuid' or type.downcase == 'time_uuid'
-          class_eval "def #{name}_str; #{type.capitalize}Type.load(@attributes['#{name}']).to_guid; end"
+          class_eval "def #{name}_str; (@attributes['#{name}'].nil? or @attributes['#{name}'].size == 0) ? nil : #{type.capitalize}Type.load(@attributes['#{name}']).to_guid; end"
         end
       end
 

data/lib/cassandra-model/types.rb

@@ -54,18 +54,18 @@ module CassandraModel
       ret = nil
       if !v.blank?
         case v
-        when String
-          if v.size == 8
-            ret = Cassandra::Long.new(v)
-          else
-            ret = Cassandra::Long.new(::Time.strptime(v, '%FT%T%z').utc.to_i)
-          end
-        when Cassandra::Long
-          ret =v
-        when Time
-          ret = Cassandra::Long.new(v.utc.to_i)
-        when DateTime
-          ret = Cassandra::Long.new(v.to_time.utc.to_i)
+          when String
+            if v.size == 8
+              ret = Cassandra::Long.new(v)
+            else
+              ret = Cassandra::Long.new(::Time.strptime(v, '%FT%T%z').utc.to_i)
+            end
+          when Cassandra::Long
+            ret =v
+          when Time
+            ret = Cassandra::Long.new(v.utc.to_i)
+          when DateTime
+            ret = Cassandra::Long.new(v.to_time.utc.to_i)
         end
       end
       ret
@@ -94,12 +94,12 @@ module CassandraModel
     def self.load(v)
       v == '1'
     end
-    
+
     def self.object_to_boolean value
       return [true, "true", 1, "1", "T", "t", "Y", "y", "yes"].include?(value.class == String ? value.downcase : value)
     end
   end
-  
+
   class TimeuuidType
     def self.dump(v)
       v && SimpleUUID::UUID.new(v).to_s

data/lib/cassandra-model/version.rb

@@ -1,3 +1,3 @@
 class CassandraModel
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassilds-model
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &13399180 !ruby/object:Gem::Requirement
+  requirement: &21230000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13399180
+  version_requirements: *21230000
 - !ruby/object:Gem::Dependency
   name: cassilds
-  requirement: &13395260 !ruby/object:Gem::Requirement
+  requirement: &21229480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *13395260
+  version_requirements: *21229480
 - !ruby/object:Gem::Dependency
   name: cassilds-connection-pool
-  requirement: &13394560 !ruby/object:Gem::Requirement
+  requirement: &21229000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *13394560
+  version_requirements: *21229000
 - !ruby/object:Gem::Dependency
   name: simple_uuid
-  requirement: &13393740 !ruby/object:Gem::Requirement
+  requirement: &21228520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13393740
+  version_requirements: *21228520
 description: Cassandra-model allows you to map ColumnFamily/SuperColumnFamily in Cassandra
   to Ruby objects. It was designed to be fast and simple.
 email: