hstore_accessor 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7288a6f9802b78a2c213dfd478de0d5963bd0947
-  data.tar.gz: 1b73b39baa507fbd1bdfc9380ef825832466ab51
+  metadata.gz: 2e53358ab1b69b9ae41faf29e52c620348a9241e
+  data.tar.gz: dbccbde5437d1aa332eaa60f0d8d500bd822b720
 SHA512:
-  metadata.gz: 3c608a5b3e069c9e325257183ea5056c15060ca8e590a6f85626606feaa506a1f2f46b42243d8c2bf556d851c81cec202abd864f587cd9d855dd75405e1cfb00
-  data.tar.gz: cb83f6c2a8b239fe43fdf267c41e57ca6893ea80cae4d3a2fd8f4843005dc394cdb70f23ac67587dac2c91d30dd754e5411d35bc01275b93fa9ad28105bfa380
+  metadata.gz: 69c6b255e86c6f15e96011c3641c0719bc7629927c96d9438368b7daaaf0ea6713393f4b17e69fa3d12bd12dac7a66738c5bb1b7c5027b822d5d1bafbe5274ca
+  data.tar.gz: dd2450efa79dcac2f941348471d8775207b0f6682a7f531025c6c08d505170d21cea39cfb4e7e4dca71db311244292fe7bb9048e94e556661e26553d3bcf228e

data/lib/hstore_accessor.rb

@@ -1,4 +1,7 @@
 require "hstore_accessor/version"
+require "hstore_accessor/type_helpers"
+require "hstore_accessor/serialization"
+require "hstore_accessor/macro"
 require "hstore_accessor/time_helper"
 require "active_support"
 require "active_record"
@@ -6,133 +9,8 @@ require "bigdecimal"
 
 module HstoreAccessor
   extend ActiveSupport::Concern
-
-  InvalidDataTypeError = Class.new(StandardError)
-
-  VALID_TYPES = [:string, :integer, :float, :time, :boolean, :array, :hash, :date, :decimal]
-
-  SEPARATOR = "||;||"
-
-  DEFAULT_SERIALIZER = ->(value) { value.to_s }
-  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 }
-  }
-
-  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 },
-    decimal:  -> value { BigDecimal.new(value) }
-  }
-
-  def serialize(type, value, serializer=nil)
-    return nil if value.nil?
-    serializer ||= (SERIALIZERS[type] || DEFAULT_SERIALIZER)
-    serializer.call(value)
-  end
-
-  def deserialize(type, value, deserializer=nil)
-    return nil if value.nil?
-    deserializer ||= (DESERIALIZERS[type] || DEFAULT_DESERIALIZER)
-    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,
-      :decimal                 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)
-      fields.each do |key, type|
-
-        data_type = type
-        store_key = key
-        if type.is_a?(Hash)
-          type = type.with_indifferent_access
-          data_type = type[:data_type]
-          store_key = type[:store_key]
-        end
-
-        data_type = data_type.to_sym
-
-        raise InvalidDataTypeError unless VALID_TYPES.include?(data_type)
-
-        define_method("hstore_metadata_for_#{hstore_attribute}") do
-          fields
-        end
-
-        define_method("#{key}=") do |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
-
-        define_method(key) do
-          value = send(hstore_attribute) && send(hstore_attribute).with_indifferent_access[store_key.to_s]
-          deserialize(data_type, value)
-        end
-
-        if type == :boolean
-          define_method("#{key}?") do
-            return send("#{key}")
-          end
-        end
-
-        query_field = "#{hstore_attribute} -> '#{store_key}'"
-
-        case data_type
-        when :string
-          send(:scope, "with_#{key}", -> value { where("#{query_field} = ?", value.to_s) })
-        when :integer, :float, :decimal
-          send(:scope, "#{key}_lt",  -> value { where("(#{query_field})::#{data_type} < ?", value.to_s) })
-          send(:scope, "#{key}_lte", -> value { where("(#{query_field})::#{data_type} <= ?", value.to_s) })
-          send(:scope, "#{key}_eq",  -> value { where("(#{query_field})::#{data_type} = ?", value.to_s) })
-          send(:scope, "#{key}_gte", -> value { where("(#{query_field})::#{data_type} >= ?", value.to_s) })
-          send(:scope, "#{key}_gt",  -> value { where("(#{query_field})::#{data_type} > ?", value.to_s) })
-        when :time
-          send(:scope, "#{key}_before", -> value { where("(#{query_field})::integer < ?", value.to_i) })
-          send(:scope, "#{key}_eq",     -> value { where("(#{query_field})::integer = ?", value.to_i) })
-          send(:scope, "#{key}_after",  -> value { where("(#{query_field})::integer > ?", value.to_i) })
-        when :date
-          send(:scope, "#{key}_before", -> value { where("#{query_field} < ?", value.to_s) })
-          send(:scope, "#{key}_eq",     -> value { where("#{query_field} = ?", value.to_s) })
-          send(:scope, "#{key}_after",  -> value { where("#{query_field} > ?", value.to_s) })
-        when :boolean
-          send(:scope, "is_#{key}", -> { where("#{query_field} = 'true'") })
-          send(:scope, "not_#{key}", -> { where("#{query_field} = 'false'") })
-        when :array
-          send(:scope, "#{key}_eq",        -> value { where("#{query_field} = ?", value.join(SEPARATOR)) })
-          send(:scope, "#{key}_contains",  -> value do
-            where("string_to_array(#{query_field}, '#{SEPARATOR}') @> string_to_array(?, '#{SEPARATOR}')", Array[value].flatten)
-          end)
-        end
-      end
-
-    end
-
-  end
-
+  include Serialization
+  include Macro
 end
 
 ActiveSupport.on_load(:active_record) do

data/lib/hstore_accessor/macro.rb

@@ -0,0 +1,76 @@
+module HstoreAccessor
+  module Macro
+
+    module ClassMethods
+
+      def hstore_accessor(hstore_attribute, fields)
+        fields.each do |key, type|
+
+          data_type = type
+          store_key = key
+          if type.is_a?(Hash)
+            type = type.with_indifferent_access
+            data_type = type[:data_type]
+            store_key = type[:store_key]
+          end
+
+          data_type = data_type.to_sym
+
+          raise Serialization::InvalidDataTypeError unless Serialization::VALID_TYPES.include?(data_type)
+
+          define_method("hstore_metadata_for_#{hstore_attribute}") do
+            fields
+          end
+
+          define_method("#{key}=") do |value|
+            send("#{hstore_attribute}=", (send(hstore_attribute) || {}).merge(store_key.to_s => serialize(data_type, TypeHelpers.cast(type, value))))
+            send("#{hstore_attribute}_will_change!")
+          end
+
+          define_method(key) do
+            value = send(hstore_attribute) && send(hstore_attribute).with_indifferent_access[store_key.to_s]
+            deserialize(data_type, value)
+          end
+
+          if type == :boolean
+            define_method("#{key}?") do
+              return send("#{key}")
+            end
+          end
+
+          query_field = "#{hstore_attribute} -> '#{store_key}'"
+
+          case data_type
+          when :string
+            send(:scope, "with_#{key}", -> value { where("#{query_field} = ?", value.to_s) })
+          when :integer, :float, :decimal
+            send(:scope, "#{key}_lt",  -> value { where("(#{query_field})::#{data_type} < ?", value.to_s) })
+            send(:scope, "#{key}_lte", -> value { where("(#{query_field})::#{data_type} <= ?", value.to_s) })
+            send(:scope, "#{key}_eq",  -> value { where("(#{query_field})::#{data_type} = ?", value.to_s) })
+            send(:scope, "#{key}_gte", -> value { where("(#{query_field})::#{data_type} >= ?", value.to_s) })
+            send(:scope, "#{key}_gt",  -> value { where("(#{query_field})::#{data_type} > ?", value.to_s) })
+          when :time
+            send(:scope, "#{key}_before", -> value { where("(#{query_field})::integer < ?", value.to_i) })
+            send(:scope, "#{key}_eq",     -> value { where("(#{query_field})::integer = ?", value.to_i) })
+            send(:scope, "#{key}_after",  -> value { where("(#{query_field})::integer > ?", value.to_i) })
+          when :date
+            send(:scope, "#{key}_before", -> value { where("#{query_field} < ?", value.to_s) })
+            send(:scope, "#{key}_eq",     -> value { where("#{query_field} = ?", value.to_s) })
+            send(:scope, "#{key}_after",  -> value { where("#{query_field} > ?", value.to_s) })
+          when :boolean
+            send(:scope, "is_#{key}", -> { where("#{query_field} = 'true'") })
+            send(:scope, "not_#{key}", -> { where("#{query_field} = 'false'") })
+          when :array
+            send(:scope, "#{key}_eq",        -> value { where("#{query_field} = ?", value.join(Serialization::SEPARATOR)) })
+            send(:scope, "#{key}_contains",  -> value do
+              where("string_to_array(#{query_field}, '#{Serialization::SEPARATOR}') @> string_to_array(?, '#{Serialization::SEPARATOR}')", Array[value].flatten)
+            end)
+          end
+        end
+
+      end
+
+    end
+
+  end
+end

data/lib/hstore_accessor/serialization.rb

@@ -0,0 +1,45 @@
+module HstoreAccessor
+  module Serialization
+
+    InvalidDataTypeError = Class.new(StandardError)
+
+    VALID_TYPES = [:string, :integer, :float, :time, :boolean, :array, :hash, :date, :decimal]
+
+    SEPARATOR = "||;||"
+
+    DEFAULT_SERIALIZER = ->(value) { value.to_s }
+    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 }
+    }
+
+    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 { TypeHelpers.cast(:boolean, value) },
+      date:     -> value { (value && Date.parse(value)) || nil },
+      decimal:  -> value { BigDecimal.new(value) }
+    }
+
+    def serialize(type, value, serializer=nil)
+      return nil if value.nil?
+      serializer ||= (SERIALIZERS[type] || DEFAULT_SERIALIZER)
+      serializer.call(value)
+    end
+
+    def deserialize(type, value, deserializer=nil)
+      return nil if value.nil?
+      deserializer ||= (DESERIALIZERS[type] || DEFAULT_DESERIALIZER)
+      deserializer.call(value)
+    end
+
+  end
+end

data/lib/hstore_accessor/time_helper.rb

@@ -1,7 +1,7 @@
 module HstoreAccessor
   module TimeHelper
 
-    # There is a bug in ActiveRecord::ConnectionAdapters::Column#string_to_time 
+    # 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
 

data/lib/hstore_accessor/type_helpers.rb

@@ -0,0 +1,20 @@
+module HstoreAccessor
+  module TypeHelpers
+
+    def self.cast(type, value)
+      return nil if value.nil?
+      column_class = ActiveRecord::ConnectionAdapters::Column
+      case type
+      when :string,:hash,:array,
+        :decimal                 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
+
+  end
+end

data/lib/hstore_accessor/version.rb

@@ -1,3 +1,3 @@
 module HstoreAccessor
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/spec/hstore_accessor_spec.rb

@@ -104,6 +104,26 @@ describe HstoreAccessor do
       expect(product.popular?).to be_false
     end
 
+    it "return true for boolean field set via hash using real boolean" do
+      product.options = { "popular" => true }
+      expect(product.popular?).to be_true
+    end
+
+    it "return false for boolean field set via hash using real boolean" do
+      product.options = { "popular" => false }
+      expect(product.popular?).to be_false
+    end
+
+    it "return true for boolean field set via hash using string" do
+      product.options = { "popular" => "true" }
+      expect(product.popular?).to be_true
+    end
+
+    it "return false for boolean field set via hash using string" do
+      product.options = { "popular" => "false" }
+      expect(product.popular?).to be_false
+    end
+
   end
 
   describe "scopes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hstore_accessor
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Joe Hirn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,7 +126,10 @@ files:
 - Rakefile
 - hstore_accessor.gemspec
 - lib/hstore_accessor.rb
+- lib/hstore_accessor/macro.rb
+- lib/hstore_accessor/serialization.rb
 - lib/hstore_accessor/time_helper.rb
+- lib/hstore_accessor/type_helpers.rb
 - lib/hstore_accessor/version.rb
 - spec/hstore_accessor_spec.rb
 - spec/spec_helper.rb