hstore_accessor 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d23ddd527acbb0674ecfd96295e7d3beb700227
-  data.tar.gz: 6b28bf320949ccd5dd7c4fe4db8b635b62eee289
+  metadata.gz: 7c01e590bd0c9ae91fc49ddc4dc1c2b687292d6e
+  data.tar.gz: cca0f9e8ff8bcb3ab3081123e43568393b6006b4
 SHA512:
-  metadata.gz: 66ffe18f15a1460a4acdfc105548351853b67a2c346578c415ff066e5d4c69e5f9902b935dae09d6781405162a2b4797f36edd7d570d38337215bd45126f47a7
-  data.tar.gz: 7e033e6d488067acd6ba7d3d4517427e2bc69920264d7b8e736ccb660d02054371a704130f6b82019054525390c8ab947023343da0c09ea6e0197ed526f4ca49
+  metadata.gz: 10e8633baf66a5119571d8d47d1e1617cdb223529671596ac84e8547240fd2cc004f9620795ad3166965fe69d4afe4f482eff5429a0a692bea7cb828895dff37
+  data.tar.gz: a241e6f63c92b4e3e11d8677c8846fd274a94b7bffeacf45c7294fc92fa3ce473ff2318d910fe164765d11945f2cead9fbe681c24c5367bbfdae27bef8f9529d

data/README.md

@@ -78,6 +78,18 @@ In the above example you can continue to interact with the fields using
 their full name but when saved to the database the field will be set
 using the `store_key`.
 
+Additionally, dirty tracking is implemented in the same way that normal
+`ActiveRecord` fields work.
+
+```ruby
+p.color           #=> "green"
+p.color = "blue"
+p.changed?        #=> true
+p.color_changed?  #=> true
+p.color_was       #=> "green"
+p.color_changes   #=> ["green", "blue"]
+``` 
+
 ### Scopes
 
 The `hstore_accessor` macro also creates scopes for `string`, `integer`,

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+task default: :spec
+RSpec::Core::RakeTask.new

data/lib/hstore_accessor/macro.rb

@@ -24,9 +24,12 @@ module HstoreAccessor
           raise Serialization::InvalidDataTypeError unless Serialization::VALID_TYPES.include?(data_type)
 
           field_methods.send(:define_method, "#{key}=") do |value|
-            serialized_value = serialize(data_type, TypeHelpers.cast(type, value))
-            send(:attribute_will_change!, key)
-            send("#{hstore_attribute}_will_change!")
+            casted_value = TypeHelpers.cast(data_type, value)
+            serialized_value = serialize(data_type, casted_value)
+            unless send(key) == casted_value
+              send(:attribute_will_change!, key)
+              send("#{hstore_attribute}_will_change!")
+            end
             send("#{hstore_attribute}=", (send(hstore_attribute) || {}).merge(store_key.to_s => serialized_value))
           end
 
@@ -76,7 +79,7 @@ module HstoreAccessor
           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)
+              where("string_to_array(#{query_field}, '#{Serialization::SEPARATOR}') @> string_to_array(?, '#{Serialization::SEPARATOR}')", Array[value].flatten.join(Serialization::SEPARATOR))
             end)
           end
         end

data/lib/hstore_accessor/version.rb

@@ -1,3 +1,3 @@
 module HstoreAccessor
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/hstore_accessor_spec.rb

@@ -4,6 +4,7 @@ require "active_support/all"
 FIELDS = {
   color: :string,
   price: :integer,
+  published: { data_type: :boolean, store_key: "p" },
   weight: { data_type: :float, store_key: "w" },
   popular: :boolean,
   build_timestamp: :time,
@@ -99,7 +100,7 @@ describe HstoreAccessor do
     it "uses 'present?' to determine return value" do
       stub = double(present?: :result_of_present)
       expect(stub).to receive(:present?)
-      product.stub(color: stub)
+      allow(product).to receive_messages(color: stub)
       expect(product.color?).to eq(:result_of_present)
     end
 
@@ -109,34 +110,34 @@ describe HstoreAccessor do
         product.popular = true
         product.save
         product.reload
-        expect(product.popular?).to be_true
+        expect(product.popular?).to be true
       end
 
       it "return the state for false boolean fields" do
         product.popular = false
         product.save
         product.reload
-        expect(product.popular?).to be_false
+        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
+        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
+        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
+        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
+        expect(product.popular?).to be false
       end
     end
 
@@ -239,6 +240,8 @@ describe HstoreAccessor do
       it "contains" do
         expect(Product.tags_contains("tag2").to_a).to eq [product_a, product_b]
         expect(Product.tags_contains(["tag2", "tag3"]).to_a).to eq [product_a, product_b]
+        expect(Product.tags_contains(["tag1", "tag2", "tag3"]).to_a).to eq [product_a]
+        expect(Product.tags_contains(["tag1", "tag2", "tag3", "tag4"]).to_a).to eq []
       end
 
     end
@@ -378,20 +381,20 @@ describe HstoreAccessor do
         product.popular = 'true'
         product.save
         product.reload
-        expect(product.popular).to be_true
+        expect(product.popular).to be true
       end
 
       it "when a real boolean is passed" do
         product.popular = true
         product.save
         product.reload
-        expect(product.popular).to be_true
+        expect(product.popular).to be true
       end
 
     end
 
     it "setters call the _will_change! method of the store attribute" do
-      product.should_receive(:options_will_change!)
+      expect(product).to receive(:options_will_change!)
       product.color = "green"
     end
 
@@ -422,11 +425,17 @@ describe HstoreAccessor do
       it "type casts boolean values" do
         ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.each do |value|
           product.popular = value
-          expect(product.popular).to be_true
+          expect(product.popular).to be true
+
+          product.published = value
+          expect(product.published).to be true
         end
         ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.each do |value|
           product.popular = value
-          expect(product.popular).to be_false
+          expect(product.popular).to be false
+
+          product.published = value
+          expect(product.published).to be false
         end
       end
     end
@@ -442,7 +451,7 @@ describe HstoreAccessor do
           end
 
           def color
-            super.downcase
+            super.try(:downcase)
           end
         end
       end
@@ -475,11 +484,22 @@ describe HstoreAccessor do
     let(:product) { Product.new }
 
     it "<attr>_changed? should return the expected value" do
-      expect(product.color_changed?).to be_false
+      expect(product.color_changed?).to be false
       product.color = "ORANGE"
-      expect(product.color_changed?).to be_true
+      expect(product.color_changed?).to be true
+      product.save
+      expect(product.color_changed?).to be false
+      product.color = "ORANGE"
+      expect(product.color_changed?).to be false
+
+      expect(product.price_changed?).to be false
+      product.price = 100
+      expect(product.price_changed?).to be true
       product.save
-      expect(product.color_changed?).to be_false
+      expect(product.price_changed?).to be false
+      product.price = "100"
+      expect(product.price).to be 100
+      expect(product.price_changed?).to be false
     end
 
     it "<attr>_was should return the expected value" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hstore_accessor
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Joe Hirn
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport