cassilds-model 0.0.9 → 0.1.0

data/cassilds-model.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = CassandraModel::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Tien Le", "Umanni"]
-  s.email       = ["tienlx@gmail.com", "ygor@umanni.com"]
+  s.email       = ["tienlx@gmail.com", "contato@umanni.com"]
   s.homepage    = ""
   s.summary     = %q{Simple model support for Cassandra ColumnFamily/SuperColumnFamily mapping}
   s.description = %q{Cassandra-model allows you to map ColumnFamily/SuperColumnFamily in Cassandra to Ruby objects. It was designed to be fast and simple.}

data/lib/cassandra-model.rb

@@ -1,4 +1,4 @@
-require 'cassandra/0.7'
+require 'cassandra'
 require 'forwardable'
 require 'date'
 
@@ -27,4 +27,4 @@ require 'cassandra-model/callbacks'
 require 'cassandra-model/persistence'
 require 'cassandra-model/batches'
 require 'cassandra-model/base'
-#require 'cassandra-model/railtie'
+#require 'cassandra-model/railtie'

data/lib/cassandra-model/base.rb

@@ -35,11 +35,16 @@ module CassandraModel
             if @key_type.downcase == 'timeuuid' or @key_type.downcase == 'time_uuid'
               value = SimpleUUID::UUID.new(value)
             end
-            @key = value.to_s;
+            @key = value.bytes;
           end
           def #{name}
             @key;
           end
+          if @key_type.downcase == 'timeuuid' or @key_type.downcase == 'time_uuid'
+            def #{name}_str
+              SimpleUUID::UUID.new(@key).to_guid
+            end
+          end
         EVAL
       end
 
@@ -47,6 +52,9 @@ module CassandraModel
         columns[name] = type
         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"
+        end
       end
 
       def validate(&block)

data/lib/cassandra-model/persistence.rb

@@ -134,7 +134,17 @@ module CassandraModel
       def attrs2write attrs
         res = {}
         attrs.each do |key, item|
-          res[key] = item.kind_of?(Integer) ? Cassandra::Long.new(item).to_s : item
+          res[key] = case item
+            when ::Integer
+              Cassandra::Long.new(item).bytes
+            when ::Time
+              Cassandra::Long.new(item.utc.to_i).bytes
+            when ::DateTime
+              Cassandra::Long.new(item.to_time.utc.to_i).bytes
+            else
+              # String, Cassandra::Long, Float, Boolean
+              item.to_s
+            end
         end
         return res
       end
@@ -156,7 +166,7 @@ module CassandraModel
       end
 
       def init_model(key, attrs)
-        return new(attrs, false).tap do |object|
+        return new(attrs, true).tap do |object|
           object.key = key
           object.new_record = false
           object.deleted! if attrs.empty?
@@ -211,16 +221,16 @@ module CassandraModel
         (results || {}).each { |slice|
           
           ordered_hash = Cassandra::OrderedHash.new
-          if(!slice.nil? and slice.columns.kind_of?(Array))
-            slice.columns.each do |column|
-              if column.kind_of?(CassandraThrift::ColumnOrSuperColumn)                
+          if !slice.nil? and slice.size > 1
+            slice[1].each do |column|
+              if column.kind_of?(CassandraThrift::ColumnOrSuperColumn)
                 if !column.column.nil?
                   ordered_hash[column.column.name] = column.column.value
                 end
               end
             end  
           end
-          model = init_model(slice.key, ordered_hash)
+          model = init_model(slice[0], ordered_hash)
           model.readonly! if readonly
           records.push(model) unless nofilter && model.deleted?
         }
@@ -265,7 +275,8 @@ module CassandraModel
 
         records = []
         benchmark("CassandraModel[#{self.name}].find_every, keyrange: #{keyrange.to_s}") do
-          results = connection.get_range_columns(column_family, columns.stringify_keys.keys,
+          results = connection.get_range(column_family, 
+            :columns => columns.stringify_keys.keys,
             :start => keyrange.first, :finish => keyrange.last, :count => (options[:limit] || 100))
           
           (results || {}).each { |key, columns|

data/lib/cassandra-model/types.rb

@@ -36,11 +36,11 @@ module CassandraModel
 
   class DatetimeType
     def self.dump(v)
-      !v.blank? && v.strftime('%FT%T%z')
+      !v.blank? && Cassandra::Long.new(v.utc.to_i)
     end
 
     def self.load(v)
-      !v.blank? && ::DateTime.strptime(v, '%FT%T%z')
+      !v.blank? && ::Time.at(v.to_i)
     end
   end
 
@@ -73,4 +73,4 @@ module CassandraModel
       SimpleUUID::UUID.new(v)
     end
   end
-end
+end

data/lib/cassandra-model/version.rb

@@ -1,3 +1,3 @@
 class CassandraModel
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassilds-model
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000Z
+date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &19416780 !ruby/object:Gem::Requirement
+  requirement: &20771940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19416780
+  version_requirements: *20771940
 - !ruby/object:Gem::Dependency
   name: cassilds
-  requirement: &19416180 !ruby/object:Gem::Requirement
+  requirement: &20770340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19416180
+  version_requirements: *20770340
 - !ruby/object:Gem::Dependency
   name: simple_uuid
-  requirement: &19412420 !ruby/object:Gem::Requirement
+  requirement: &20766840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,12 +44,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19412420
+  version_requirements: *20766840
 description: Cassandra-model allows you to map ColumnFamily/SuperColumnFamily in Cassandra
   to Ruby objects. It was designed to be fast and simple.
 email:
 - tienlx@gmail.com
-- ygor@umanni.com
+- contato@umanni.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple model support for Cassandra ColumnFamily/SuperColumnFamily mapping