hstore_accessor 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2753b17f6ee9e44bfba27f7b30e7cdaf4fdd4d2b
-  data.tar.gz: f33add0bc32112703c01523a559107bb69fdd8ad
+  metadata.gz: c81705ab4bfeff9568f1f9e580411a1a8fb52387
+  data.tar.gz: bf60a484be88e5f63a5d08165bc76db186b05b33
 SHA512:
-  metadata.gz: 109e4f9e17c588beedd863053c33ebd28d9cfb65b754fc56572a08a421b74be127d056249111f33264b1db9d2849f9aa18b5cdfe3abfc55b46ce2f3c517ea22c
-  data.tar.gz: 670573a1d9d928f125bf7bd1a6abee48e070e7aa207b874a855c562cc4125ee9e57017b8a59a70859471653f794137599c0d2986773866a9b310e8a15f9e59e9
+  metadata.gz: 1a8cb7b16656ef6cf9e12677d1206a9b5663e3d6b97bac6267fba3bacef27e24ec675c06d8173eac0434ad14a128b9f73da0e9b2d8fa55c7fae3b84ed6aecb82
+  data.tar.gz: 819667a3a55d48918d2e6b79dd52a71bbf43c3ff91752f389d66c8a020e29f1feb58d114c31df69b46592dc0aeb9092c9996161171816bcc07ab1b399e6a4834

data/lib/hstore_accessor.rb

@@ -1,4 +1,5 @@
 require "hstore_accessor/version"
+require "hstore_accessor/time_helper"
 require "active_support"
 require "active_record"
 
@@ -15,21 +16,21 @@ module HstoreAccessor
   DEFAULT_DESERIALIZER = DEFAULT_SERIALIZER
 
   SERIALIZERS = {
-    :array    => -> value { (value && value.join(SEPARATOR)) || nil },
-    :hash     => -> value { (value && value.to_json) || nil },
-    :time     => -> value { value.to_i },
-    :boolean  => -> value { (value.to_s == "true").to_s },
-    :date     => -> value { (value && value.to_s) || nil }
+    array:    -> value { (value && value.join(SEPARATOR)) || nil },
+    hash:     -> value { (value && value.to_json) || nil },
+    time:     -> value { value.to_i },
+    boolean:  -> value { (value.to_s == "true").to_s },
+    date:     -> value { (value && value.to_s) || nil }
   }
 
   DESERIALIZERS = {
-    :array    => -> value { (value && value.split(SEPARATOR)) || nil },
-    :hash     => -> value { (value && JSON.parse(value)) || nil },
-    :integer  => -> value { value.to_i },
-    :float    => -> value { value.to_f },
-    :time     => -> value { Time.at(value.to_i) },
-    :boolean  => -> value { value == "true" },
-    :date     => -> value { (value && Date.parse(value)) || nil }
+    array:    -> value { (value && value.split(SEPARATOR)) || nil },
+    hash:     -> value { (value && JSON.parse(value)) || nil },
+    integer:  -> value { value.to_i },
+    float:    -> value { value.to_f },
+    time:     -> value { Time.at(value.to_i) },
+    boolean:  -> value { value == "true" },
+    date:     -> value { (value && Date.parse(value)) || nil }
   }
 
   def serialize(type, value, serializer=nil)
@@ -44,6 +45,20 @@ module HstoreAccessor
     deserializer.call(value)
   end
 
+  def type_cast(type, value)
+    return nil if value.nil?
+    column_class = ActiveRecord::ConnectionAdapters::Column
+    case type
+    when :string,:hash,:array  then value
+    when :integer              then column_class.value_to_integer(value)
+    when :float                then value.to_f
+    when :time                 then TimeHelper.string_to_time(value)
+    when :date                 then column_class.value_to_date(value)
+    when :boolean              then column_class.value_to_boolean(value)
+    else value
+    end
+  end
+
   module ClassMethods
 
     def hstore_accessor(hstore_attribute, fields)
@@ -66,7 +81,7 @@ module HstoreAccessor
         end
 
         define_method("#{key}=") do |value|
-          send("#{hstore_attribute}=", (send(hstore_attribute) || {}).merge(store_key.to_s => serialize(data_type, value)))
+          send("#{hstore_attribute}=", (send(hstore_attribute) || {}).merge(store_key.to_s => serialize(data_type, type_cast(type, value))))
           send("#{hstore_attribute}_will_change!")
         end
 

data/lib/hstore_accessor/time_helper.rb

@@ -0,0 +1,31 @@
+module HstoreAccessor
+  module TimeHelper
+
+    # There is a bug in ActiveRecord::ConnectionAdapters::Column#string_to_time 
+    # which drops the timezone. This has been fixed, but not released.
+    # This method includes the fix. See: https://github.com/rails/rails/pull/12290
+
+    def self.string_to_time(string)
+      return string unless string.is_a?(String)
+      return nil if string.empty?
+
+      time_hash = Date._parse(string)
+      time_hash[:sec_fraction] = ActiveRecord::ConnectionAdapters::Column.send(:microseconds, time_hash)
+      (year, mon, mday, hour, min, sec, microsec, offset) = *time_hash.values_at(:year, :mon, :mday, :hour, :min, :sec, :sec_fraction, :offset)
+
+      # Treat 0000-00-00 00:00:00 as nil.
+      return nil if year.nil? || (year == 0 && mon == 0 && mday == 0)
+
+      if offset
+        time = Time.utc(year, mon, mday, hour, min, sec, microsec) rescue nil
+        return nil unless time
+
+        time -= offset
+        ActiveRecord::Base.default_timezone == :utc ? time : time.getlocal
+      else
+        Time.public_send(ActiveRecord::Base.default_timezone, year, mon, mday, hour, min, sec, microsec) rescue nil
+      end
+    end
+
+  end
+end

data/lib/hstore_accessor/version.rb

@@ -1,3 +1,3 @@
 module HstoreAccessor
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/hstore_accessor_spec.rb

@@ -325,6 +325,40 @@ describe HstoreAccessor do
       product.color = "green"
     end
 
+    describe "type casting" do
+      it "type casts integer values" do
+        product.price = '468'
+        expect(product.price).to eq 468
+      end
+      it "type casts float values" do
+        product.weight = '93.45'
+        expect(product.weight).to eq 93.45
+      end
+      it "type casts time values" do
+        timestamp = Time.now - 10.days
+        product.build_timestamp = timestamp.to_s
+        expect(product.build_timestamp.to_i).to eq timestamp.to_i
+      end
+      it "type casts date values" do
+        datestamp = Date.today - 9.days
+        product.released_at = datestamp.to_s
+        expect(product.released_at).to eq datestamp
+      end
+
+      it "type casts boolean values" do
+        ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.each do |value|
+          product.popular = value
+          expect(product.popular).to be_true
+        end
+        ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.each do |value|
+          product.popular = value
+          expect(product.popular).to be_false
+        end
+      end
+
+
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hstore_accessor
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Joe Hirn
@@ -10,118 +10,118 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds typed hstore backed fields to an ActiveRecord model.
@@ -133,13 +133,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - hstore_accessor.gemspec
 - lib/hstore_accessor.rb
+- lib/hstore_accessor/time_helper.rb
 - lib/hstore_accessor/version.rb
 - spec/hstore_accessor_spec.rb
 - spec/spec_helper.rb
@@ -153,17 +154,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Adds typed hstore backed fields to an ActiveRecord model.