activerecord2-hstore 1.0.3 → 1.0.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.0.4
+* Better fix for passing in nil, string, or hash into ActiveRecord setter (@kwstannard)
+* Additional and improved specs
+
 1.0.3
 * Corrected ActiveRecord setter to allow for nil input (again)
 
@@ -5,7 +9,7 @@
 * Corrected ActiveRecord setter to allow for nil input
 
 1.0.1
-* Corrected Hash.to_hstore to take into account apostrophes (Thanks, sisk)
+* Corrected Hash.to_hstore to take into account apostrophes (@sisk)
 
 1.0.0
 * First release

data/lib/activerecord2-hstore/hstore.rb

@@ -28,9 +28,9 @@ module Hstore
         end
 
         define_method "#{column}=".to_sym do |value|
-          value = {}.to_hstore if value.nil?
-          value ||= value.is_a?(String) ? value : value.to_hstore
-          write_attribute(column.to_sym, value)
+          val = {}.to_hstore if value.nil?
+          val ||= value.is_a?(String) ? value : value.to_hstore
+          write_attribute(column.to_sym, val)
         end
       end
 

data/lib/activerecord2-hstore/version.rb

@@ -1,5 +1,5 @@
 module Activerecord2
   module Hstore
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/spec/hstore_spec.rb

@@ -50,8 +50,8 @@ describe Hstore do
     end
 
     describe "setter method" do
-      it "uses ActiveRecord's write_attribute" do
-        subject.should_receive(:write_attribute)
+      it "uses ActiveRecord's write_attribute and accepts a hash" do
+        subject.should_receive(:write_attribute).with(:some_field, "a=>b")
         subject.some_field = {:a => :b}
       end
 
@@ -61,20 +61,47 @@ describe Hstore do
       end
 
       it "can also accept a hstore string instead of a hash" do
-        subject.stub(:write_attribute)
+        subject.should_receive(:write_attribute).with(:some_field, "a=>b")
         subject.some_field = "a=>b"
       end
     end
   end
 
+  describe "reading attributes" do
+    before(:each) do
+      MyHstore.create( :label=> "A", :some_field => {"key" => "1"} )
+      MyHstore.create( :label=> "B", :some_field => "" )
+      MyHstore.create( :label=> "C", :some_field => nil )
+    end
+
+    it "should return a hash for label A" do
+      result = MyHstore.find_by_label("A")
+      result.label.should == "A"
+      result.some_field.should == {"key" => "1"}
+    end
+
+    it "should return an empty hash for label B (empty string passed in)" do
+      result = MyHstore.find_by_label("B")
+      result.label.should == "B"
+      result.some_field.should == {}
+    end
+
+   it "should return an empty hash for label C (nil passed in)" do
+      result = MyHstore.find_by_label("C")
+      result.label.should == "C"
+      result.some_field.should == {}
+    end
+
+  end
+
   describe "querying data" do
     before(:each) do
-      MyHstore.create( :label=> "A", :some_field => {"key" => "1"}.to_hstore )
-      MyHstore.create( :label=> "B", :some_field => {:key => 1, "a" => "b"}.to_hstore )
-      MyHstore.create( :label=> "C", :some_field => {"key" => "2"}.to_hstore )
-      MyHstore.create( :label=> "D", :some_field => {"key" => "3"}.to_hstore )
-      MyHstore.create( :label=> "E", :some_field => {"key" => "123456789"}.to_hstore )
-      MyHstore.create( :label=> "F", :some_field => {"c" => "x"}.to_hstore )
+      MyHstore.create( :label=> "A", :some_field => {"key" => "1"} )
+      MyHstore.create( :label=> "B", :some_field => {:key => 1, "a" => "b"} )
+      MyHstore.create( :label=> "C", :some_field => {"key" => "2"} )
+      MyHstore.create( :label=> "D", :some_field => {"key" => "3"} )
+      MyHstore.create( :label=> "E", :some_field => {"key" => "123456789"} )
+      MyHstore.create( :label=> "F", :some_field => {"c" => "x"} )
     end
 
     it "queries for the records containing a specific key" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord2-hstore
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Tony Drake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-27 00:00:00 Z
+date: 2012-07-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec