hstore_attributes 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cde79926055a503605a9ad31cbad8853ec47766
-  data.tar.gz: 3cecb728f3de2f143665d98b37b4b391f1f35bbb
+  metadata.gz: 7670a1540b41cf655db5638737cb86086193661d
+  data.tar.gz: 6cb7f874632c3d5f92b5bb47d4edfa3460a7e9b4
 SHA512:
-  metadata.gz: eb3396da7e19369d6ee3e17ffb8df48b068fb02f975f84c03f49bb5b561bef6747ead9645d0171a26f6fee4e2da053b507dbf10fc576b59f2261c052873a246a
-  data.tar.gz: 022ef8515b44f9eb34e4f68bfe745c61d9e371f91a4fa4e05a78340379086dca0051c0030a6b3ea5b05b716dbcb5969d1d1cfa880010f57a34f59d0c7295b1e3
+  metadata.gz: 3a7dd48f1c828733a7b42947d1231c5fb3f2546976923d7b179b0120f858232b28bfe970f4d1e87ba04bb9c4edd26fbfdcc3a0a774b1183ba7fb8059b1709425
+  data.tar.gz: 6d0c78db0d3d51ef6b8cd59495f099593d63ab2ca56e0b79bc23bd096d5d9be137cc6172dda79740765ddbb5d5badb617e30b11817d24d5a60d0d882eed3e78f

data/lib/hstore_attributes/version.rb

@@ -1,3 +1,3 @@
 module HstoreAttributes
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/hstore_attributes.rb

@@ -1,13 +1,22 @@
 require "hstore_attributes/version"
 
 module HstoreAttributes
+  def self.convert(value, options = {})
+    if options[:allow_nil] == true and value.nil?
+      nil
+    elsif options[:type_cast]
+      options[:type_cast].to_proc.call(value)
+    else
+      value
+    end
+  end
+
   def hstore_reader(hstore, *attributes)
     options = attributes.extract_options!
     attributes.map(&:to_s).each do |attribute|
       define_method(attribute) do
         value = (send(hstore) || {})[attribute]
-        value = options[:type_cast].to_proc.call(value) if options[:type_cast]
-        value
+        HstoreAttributes.convert(value, options)
       end
     end
   end
@@ -16,7 +25,7 @@ module HstoreAttributes
     options = attributes.extract_options!
     attributes.map(&:to_s).each do |attribute|
       define_method("#{attribute}=") do |value|
-        value = options[:type_cast].to_proc.call(value) if options[:type_cast]
+        value = HstoreAttributes.convert(value, options)
         send("#{hstore}=", (send(hstore) || {}).merge(attribute => value))
       end
     end

data/test/hstore_reader_test.rb

@@ -7,14 +7,7 @@ class Product
   hstore_reader :data, :price, :price_2, type_cast: :to_i
   hstore_reader :data, :name, type_cast: ->(value) { value.to_s.upcase }
   hstore_reader :data, :description
-
-  def data
-    @data
-  end
-
-  def data=(data)
-    @data = data
-  end
+  hstore_reader :data, :money, type_cast: :to_d, allow_nil: true
 end
 
 describe "hstore_reader" do
@@ -68,4 +61,14 @@ describe "hstore_reader" do
     @product.data = {"name" => "zomg"}
     assert_equal "ZOMG", @product.name
   end
+
+  it "returns nil for nil money" do
+    @product.data = {"money" => nil}
+    assert_equal nil, @product.money
+  end
+
+  it "returns typecasted money" do
+    @product.data = {"money" => "1.23"}
+    assert_equal BigDecimal.new("1.23"), @product.money
+  end
 end

data/test/hstore_writer_test.rb

@@ -7,6 +7,7 @@ class Product
   hstore_writer :data, :name, :name_2
   hstore_writer :data, :price, type_cast: :to_i
   hstore_writer :data, :cents, type_cast: ->(value) { (value.to_f * 100).to_i }
+  hstore_writer :data, :money, type_cast: :to_d, allow_nil: true
 end
 
 describe "hstore_writer" do
@@ -70,4 +71,14 @@ describe "hstore_writer" do
     @product.cents = "1"
     assert_equal({"cents" => 100}, @product.data)
   end
+
+  it "sets money using type_cast function" do
+    @product.money = "1.53"
+    assert_equal({"money" => BigDecimal.new("1.53")}, @product.data)
+  end
+
+  it "allows money to be nil function" do
+    @product.money = nil
+    assert_equal({"money" => nil}, @product.data)
+  end
 end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
 require "minitest/autorun"
 require "active_support"
+require "bigdecimal"
+require "bigdecimal/util"
 require "hstore_attributes"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hstore_attributes
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Kuba Kuźma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Easy accessors for Hstore data.