superstore 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd5cf2fdffdd1441b0a0663f90ef27127795a75e
-  data.tar.gz: da3161e0e1f07c0fd2cb2f0f8378bc2c3e3fa679
+  metadata.gz: 7bc1d983f476687ecd39026cc3cd006bd371a53e
+  data.tar.gz: 8698caa08eaf6a434caa2b32ef18fc151559ccc6
 SHA512:
-  metadata.gz: 9eca1be4674e7b6ed593986499bf5daaed8f574794a6488de55a9b7c141c7da3ef50a5ca3d7dad0e6a29717e9b4c93cd0337c437409b44cffa98987c8c9533fc
-  data.tar.gz: 6eac3d6075b98f8658030c6d1d3aceeeb1e0b3e308ce88af92a9c20580a7d062d388fd849afff147cd134c64da9fb5bd70dd9048213a8f012c7f81f66225dcfb
+  metadata.gz: 6f6015ca26eb40b308dd763fb35c508ec6eff5b3e01198c34c0baaad7c655b4a87d7d7979ff319b7a51f5de2bcafbaf92b6721eac328532991c65bac8f00c879
+  data.tar.gz: c0dd0e4a5a9e9975184318a223498a77891f7998d2a627bb90e73be4b21ab49653037a9e71a8d5d39615b06c281b581a8930d1196f04c4010a38c2ca7f890526

data/lib/superstore/attribute_methods/definition.rb

@@ -11,7 +11,7 @@ module Superstore
         coder.default
       end
 
-      def instantiate(record, value)
+      def instantiate(value)
         value = value.nil? ? coder.default : value
         return if value.nil?
 

data/lib/superstore/attribute_methods/typecasting.rb

@@ -42,9 +42,9 @@ module Superstore
           attribute_definitions[name.to_s] = AttributeMethods::Definition.new(name, coder, options)
         end
 
-        def typecast_attribute(record, name, value)
+        def typecast_attribute(name, value)
           if attribute_definition = attribute_definitions[name.to_s]
-            attribute_definition.instantiate(record, value)
+            attribute_definition.instantiate(value)
           else
             raise NoMethodError, "Unknown attribute #{name.inspect}"
           end

data/lib/superstore/attribute_methods.rb

@@ -40,7 +40,7 @@ module Superstore
     end
 
     def write_attribute(name, value)
-      @attributes[name.to_s] = self.class.typecast_attribute(self, name, value)
+      @attributes[name.to_s] = self.class.typecast_attribute(name, value)
     end
 
     def read_attribute(name)

data/lib/superstore/persistence.rb

@@ -67,7 +67,7 @@ module Superstore
         def typecast_persisted_attributes(object, attributes)
           attributes.each do |key, value|
             if definition = attribute_definitions[key]
-              attributes[key] = definition.instantiate(object, value)
+              attributes[key] = definition.instantiate(value)
             else
               attributes.delete(key)
             end

data/lib/superstore/tasks/ks.rake

@@ -12,6 +12,7 @@ ks_namespace = namespace :ks do
     end
   end
 
+  desc 'Remove the keyspace in config/superstore.yml for the current environment'
   task drop: :environment do
     begin
       Superstore::CassandraSchema.drop_keyspace Superstore::Base.config[:keyspace]
@@ -24,11 +25,14 @@ ks_namespace = namespace :ks do
     end
   end
 
+  desc 'Alias for ks:drop and ks:setup'
   task reset: [:drop, :setup]
 
+  desc 'Alias for ks:create and ks:structure:load'
   task setup: [:create, :_load]
 
   namespace :structure do
+    desc 'Serialize the current structure for the keyspace in config/superstore.yml to the SCHEMA environment variable (defaults to "$RAILS_ROOT/ks/structure.cql")'
     task dump: :environment do
       filename = ENV['SCHEMA'] || "#{Rails.root}/ks/structure.cql"
       File.open(filename, "w:utf-8") do |file|
@@ -36,6 +40,7 @@ ks_namespace = namespace :ks do
       end
     end
 
+    desc 'Load the structure for the keyspace in config/superstore.yml from the SCHEMA environment variable (defaults to "$RAILS_ROOT/ks/structure.cql")'
     task load: :environment do
       filename = ENV['SCHEMA'] || "#{Rails.root}/ks/structure.cql"
       File.open(filename) do |file|

data/lib/superstore/types/json_type.rb

@@ -1,13 +1,27 @@
 module Superstore
   module Types
     class JsonType < BaseType
-      def encode(hash)
-        ActiveSupport::JSON.encode(hash)
+      def encode(data)
+        ActiveSupport::JSON.encode(data)
       end
 
       def decode(str)
         ActiveSupport::JSON.decode(str)
       end
+
+      def typecast(data)
+        return data if ActiveSupport.parse_json_times
+
+        if data.acts_like?(:time) || data.acts_like?(:date)
+          data.as_json
+        elsif data.is_a?(Array)
+          data.map { |d| typecast(d) }
+        elsif data.is_a?(Hash)
+          data.each_with_object({}) { |(key, value), hash| hash[key] = typecast(value) }
+        else
+          data
+        end
+      end
     end
   end
 end

data/lib/superstore/types/time_type.rb

@@ -2,7 +2,8 @@ module Superstore
   module Types
     class TimeType < BaseType
       def encode(time)
-        raise ArgumentError.new("#{time.inspect} is not a Time") unless time.kind_of?(Time)
+        raise ArgumentError.new("#{time.inspect} does not respond to #to_time") unless time.is_a?(Time) || time.respond_to?(:to_time)
+        time = time.to_time unless time.is_a?(Time)
         time.utc.xmlschema(6)
       end
 

data/superstore.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'superstore'
-  s.version = '1.0.4'
+  s.version = '1.0.5'
   s.description = 'ActiveModel for many attributes'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/test/support/pg.rb

@@ -32,6 +32,7 @@ class PGInitializer
 end
 
 PGInitializer.initialize!
+ActiveRecord::Migration.verbose = false
 
 module ActiveSupport
   class TestCase

data/test/test_helper.rb

@@ -7,8 +7,8 @@ require 'rails/test_help'
 require 'mocha/setup'
 
 require 'support/pg'
- # require 'support/hstore'
-require 'support/cassandra'
+ require 'support/hstore'
+# require 'support/cassandra'
 require 'support/issue'
 require 'support/user'
 

data/test/unit/attribute_methods/dirty_test.rb

@@ -51,6 +51,20 @@ class Superstore::AttributeMethods::DirtyTest < Superstore::TestCase
     assert record.changed?
   end
 
+  test 'typecast json with times' do
+    record = temp_object do
+      json :stuff
+    end.create(stuff: {'time' => Time.new(2004, 12, 24, 6, 42, 21)})
+
+    record.reload
+
+    record.stuff = {'time' => Time.new(2004, 12, 24, 6, 42, 21)}
+    assert !record.changed?
+
+    record.stuff = {'time' => Time.new(2004, 12, 24, 6, 42, 22)}
+    assert record.changed?
+  end
+
   test 'unapplied_changes' do
     record = temp_object do
       float :price

data/test/unit/attribute_methods/typecasting_test.rb

@@ -36,11 +36,11 @@ class Superstore::AttributeMethods::TypecastingTest < Superstore::TestCase
   end
 
   test 'typecast_attribute' do
-    assert_equal 1, TestIssue.typecast_attribute(TestIssue.new, 'price', 1)
-    assert_equal 1, TestIssue.typecast_attribute(TestIssue.new, :price, 1)
+    assert_equal 1, TestIssue.typecast_attribute('price', 1)
+    assert_equal 1, TestIssue.typecast_attribute(:price, 1)
 
     assert_raise NoMethodError do
-      TestIssue.typecast_attribute(TestIssue.new, 'wtf', 1)
+      TestIssue.typecast_attribute('wtf', 1)
     end
   end
 

data/test/unit/types/json_type_test.rb

@@ -19,5 +19,9 @@ class Superstore::Types::JsonTypeTest < Superstore::Types::TestCase
     assert_equal(['a', 'b'], coder.decode(['a', 'b'].to_json))
   end
 
-
+  test 'typecast' do
+    assert_equal({'enabled' => false}, coder.typecast('enabled' => false))
+    assert_equal({'born_at' => "2004-12-24T00:00:00Z"}, coder.typecast('born_at' => Time.utc(2004, 12, 24)))
+    assert_equal(["2004-12-24T00:00:00Z"], coder.typecast([Time.utc(2004, 12, 24)]))
+  end
 end

data/test/unit/types/time_type_test.rb

@@ -3,6 +3,10 @@ require 'test_helper'
 class Superstore::Types::TimeTypeTest < Superstore::Types::TestCase
   test 'encode' do
     assert_equal '2004-12-24T01:02:03.000000Z', coder.encode(Time.utc(2004, 12, 24, 1, 2, 3))
+    assert_equal '2004-12-24T01:02:03.000000Z', coder.encode(DateTime.new(2004, 12, 24, 1, 2, 3))
+    assert_raise ArgumentError do
+      coder.encode 123
+    end
   end
 
   test 'decode' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superstore
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Michael Koziarski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel