corm 0.0.12 → 0.0.13

data/lib/corm/model.rb

@@ -8,6 +8,7 @@ require 'set'
 module Corm
 
   class Model
+    include Enumerable
 
     @@cluster = nil
 
@@ -84,7 +85,13 @@ module Corm
         elsif type.start_with?('map')
           value.nil? ? {} : value
         elsif type == ('timestamp')
-          value.is_a?(Fixnum) ? Time.at(value) : value
+          if value.is_a?(Fixnum)
+            Time.at(value)
+          elsif value.is_a?(String)
+            Time.parse(value)
+          else
+            value
+          end
         else
           value
         end
@@ -97,6 +104,26 @@ module Corm
       nil
     end
 
+    def to_h
+      Hash[self.collect {|k, v| [k, v]}]
+    end
+    alias_method :to_hash, :to_h
+
+    def to_json
+      res = self.to_h
+      fields.each do |k, t|
+        if t.start_with?("set")
+          res[k.to_sym] = res[k.to_sym].to_a
+        end
+      end
+      MultiJson.encode(res)
+    end
+
+    def each &block
+      return enum_for(:each) unless block_given?
+      fields.keys.each {|k| block.call([k.to_sym, self.send(k.to_sym)])}
+    end
+
     def self.fields
       class_variable_set :@@fields, {} unless class_variable_defined? :@@fields
       class_variable_get :@@fields

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corm
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver