hstore_accessor 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a5d9f17253e89a2b07c07a55c190d7c2a04b8ae
-  data.tar.gz: d285866bb3f67915215e7266d3de5d3f5a65a35d
+  metadata.gz: 562c366519112f79fb774a0a0d95ee3a67eb102c
+  data.tar.gz: b4a6a2aeb1095f3fa29bd92e349dc26442f9ca34
 SHA512:
-  metadata.gz: cf306876687e4430a522deb04adf10ccf166c4a3d6362e0daf0bdc119cd07345c265646e1f33131bd690f5b34292f1cb6908f51e94a7b15bf5cbcd1153fc5663
-  data.tar.gz: 7717387fe1db69737e6fc73c5cdb2d6967876ac027f5bc840b970ea846e1737b40d1e943b5d1e6aaea965e8652d000fb99ddd8fdaa32c80c8b0f905444e8acf3
+  metadata.gz: 6576cf6f73c0f602b8f825d326d09e3dd1d03eab7e6e1f4ed298484a33f96d0754cbeca846cffb13c45562bd3fac09bfbd8596c781cecfcb77fb3d70ed699909
+  data.tar.gz: 1bec8ccdd58531c62333ff9b9ab6b8276741b65b5406312052be78e178d02a7c250d803383b81a9aa14aa4fdab21bf8e9aa78637d2493b6b343689fef113275d

data/lib/hstore_accessor.rb

@@ -3,42 +3,41 @@ require "active_support"
 require "active_record"
 
 module HstoreAccessor
+  extend ActiveSupport::Concern
 
   InvalidDataTypeError = Class.new(StandardError)
 
   VALID_TYPES = [:string, :integer, :float, :time, :boolean, :array, :hash]
 
-  SEPARATOR = ";|;"
+  SEPARATOR = "||;||"
 
   DEFAULT_SERIALIZER = ->(value) { value.to_s }
-  DEFAULT_DESERIALIZER = ->(value) { value.to_s }
+  DEFAULT_DESERIALIZER = DEFAULT_SERIALIZER
 
   SERIALIZERS = {
-    :array    => -> value { (value && value.join(SEPARATOR)) || "" },
-    :hash     => -> value { (value && value.to_json) || {} },
+    :array    => -> value { (value && value.join(SEPARATOR)) || nil },
+    :hash     => -> value { (value && value.to_json) || nil },
     :time     => -> value { value.to_i },
     :boolean  => -> value { (value == true).to_s }
   }
 
   DESERIALIZERS = {
-    :array    => -> value { (value && value.split(SEPARATOR)) || [] },
-    :hash     => -> value { (value && JSON.parse(value)) || {} },
+    :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" }
   }
 
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
   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
@@ -46,7 +45,6 @@ module HstoreAccessor
   module ClassMethods
 
     def hstore_accessor(hstore_attribute, fields)
-
       fields.each do |key, type|
 
         raise InvalidDataTypeError unless VALID_TYPES.include?(type)
@@ -57,7 +55,7 @@ module HstoreAccessor
         end
 
         define_method(key) do
-          value = send(hstore_attribute) && send(hstore_attribute)[key.to_s]
+          value = send(hstore_attribute) && send(hstore_attribute).with_indifferent_access[key.to_s]
           deserialize(type, value)
         end
 

data/lib/hstore_accessor/version.rb

@@ -1,3 +1,3 @@
 module HstoreAccessor
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/hstore_accessor_spec.rb

@@ -1,15 +1,18 @@
 require "spec_helper"
 require "active_support/all"
 
+FIELDS = {
+  color: :string,
+  price: :integer,
+  weight: :float,
+  popular: :boolean,
+  build_timestamp: :time,
+  tags: :array,
+  reviews: :hash
+}
+
 class Product < ActiveRecord::Base
-  hstore_accessor :options,
-    color: :string,
-    price: :integer,
-    weight: :float,
-    popular: :boolean,
-    build_timestamp: :time,
-    tags: :array,
-    reviews: :hash
+  hstore_accessor :options, FIELDS
 end
 
 describe HstoreAccessor do
@@ -18,14 +21,14 @@ describe HstoreAccessor do
 
     let(:product) { Product.new }
 
-    it "creates getters for the hstore fields" do
-      [:color, :price, :weight, :tags, :reviews].each do |field|
+    FIELDS.keys.each do |field|
+      it "creates a getter for the hstore field: #{field}" do
         expect(product).to respond_to(field)
       end
     end
 
-    it "creates setters for the hstore fields" do
-      [:color, :price, :weight, :tags, :reviews].each do |field|
+    FIELDS.keys.each do |field|
+      it "creates a setter for the hstore field: #{field}=" do
         expect(product).to respond_to(:"#{field}=")
       end
     end
@@ -41,6 +44,25 @@ describe HstoreAccessor do
 
   end
 
+  context "nil values" do
+    let!(:timestamp) { Time.now }
+    let!(:product)   { Product.new }
+    let!(:product_a) { Product.create(color: "green",  price: 10, weight: 10.1, tags: ["tag1", "tag2", "tag3"], popular: true,  build_timestamp: (timestamp - 10.days)) }
+
+    FIELDS.keys.each do |field|
+      it "reponds with nil when #{field} is not set" do
+        expect(product.send(field)).to be_nil
+      end
+    end
+
+    FIELDS.keys.each do |field|
+      it "reponds with nil when #{field} is set back to nil after being set initially" do
+        product_a.send("#{field}=", nil)
+        expect(product_a.send(field)).to be_nil
+      end
+    end
+
+  end
   describe "scopes" do
 
     let!(:timestamp) { Time.now }
@@ -158,6 +180,24 @@ describe HstoreAccessor do
       expect(product.color).to eq "blue"
     end
 
+    it "allows access to bulk set values via string before saving" do
+      product.options = {
+        "color" => "blue",
+        "price" => 120
+      }
+      expect(product.color).to eq "blue"
+      expect(product.price).to eq 120
+    end
+
+    it "allows access to bulk set values via :symbols before saving" do
+      product.options = {
+        color: "blue",
+        price: 120
+      }
+      expect(product.color).to eq "blue"
+      expect(product.price).to eq 120
+    end
+
     it "correctly stores integer values" do
       product.price = 468
       product.save
@@ -179,14 +219,6 @@ describe HstoreAccessor do
       expect(product.tags).to eq ["household", "living room", "kitchen"]
     end
 
-    it "returns an empty array if an array value is not set" do
-      expect(Product.new.tags).to eq []
-      product.tags = nil
-      product.save
-      product.reload
-      expect(product.tags).to eq []
-    end
-
     it "correctly stores hash values" do
       product.reviews = { "user_123" => "4 stars", "user_994" => "3 stars" }
       product.save
@@ -194,14 +226,6 @@ describe HstoreAccessor do
       expect(product.reviews).to eq({ "user_123" => "4 stars", "user_994" => "3 stars" })
     end
 
-    it "returns an empty hash if a hash value is not set" do
-      expect(Product.new.reviews).to eq({})
-      product.reviews = nil
-      product.save
-      product.reload
-      expect(product.reviews).to eq({})
-    end
-
     it "correctly stores time values" do
       timestamp = Time.now - 10.days
       product.build_timestamp = timestamp

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ ActiveRecord::Base.establish_connection(
   username: "root"
 )
 
-ActiveRecord::Base.connection.execute("CREATE EXTENSION hstore;") rescue PG::Error
+ActiveRecord::Base.connection.execute("CREATE EXTENSION hstore;") rescue ActiveRecord::StatementInvalid
 ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS products;")
 
 ActiveRecord::Base.connection.create_table(:products) do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hstore_accessor
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Joe Hirn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg