hstore_accessor 0.9.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9947ed783eebb9457fc7ec4e47df6278dc1e9e8
-  data.tar.gz: aeb90a29e1da91b8bec4bcb8fa68678c4a5434bb
+  metadata.gz: a3b755ac2d804d78400da381e4cad63a68647145
+  data.tar.gz: 7737c2ce560de5ab95fd750234bd7293386b1ab6
 SHA512:
-  metadata.gz: ac8573daf232752241a7238afee768809b7b69de96bc63959736122a930b93009a97d818d136acc8ef98c866a5146ebd5444bd30f4eabe7976f2ba3df5730628
-  data.tar.gz: dfed111a025d41a09370f25193c4990aa1fe06d5dee6d5a330b6e2588c270c06bfcedb8db9c418c9009be096781c2f16db4bfc796bfac1d0dfb2b1ef45f77174
+  metadata.gz: 099b5d22584a1734c72760a026dd42898be87ed7d0df5bd2abc0be60d742df11efa341cb6596c3618524db9bf6d0fd5358a98d1d29fed9429d5fb47c2b5da2e2
+  data.tar.gz: eb978d8c446b53413fd04737a920e7961d61481687cf2de0235c588fc22469c0db949ee4e55e901ef1e388fec2baf8e16d7ae7a96d149696ede082027189e6e6

data/hstore_accessor.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop"
   spec.add_development_dependency "shoulda-matchers"
 
-  spec.post_install_message = "Please note that the `array` and `hash` types will no longer be supported in version 1.0.0"
+  spec.post_install_message = "Please note that the `array` and `hash` types are no longer supported in version 1.0.0"
 end

data/lib/hstore_accessor.rb

@@ -5,8 +5,8 @@ require "hstore_accessor/version"
 if ::ActiveRecord::VERSION::STRING.to_f >= 4.2
   require "hstore_accessor/active_record_4.2/type_helpers"
 else
-  require "hstore_accessor/active_record_pre_4.2/type_helpers"
-  require "hstore_accessor/active_record_pre_4.2/time_helper"
+  require "hstore_accessor/active_record_<_4.2/type_helpers"
+  require "hstore_accessor/active_record_<_4.2/time_helper"
 end
 
 require "hstore_accessor/serialization"

data/lib/hstore_accessor/active_record_4.2/type_helpers.rb

@@ -21,7 +21,7 @@ module HstoreAccessor
         return nil if value.nil?
 
         case type
-        when :string, :hash, :array, :decimal
+        when :string, :decimal
           value
         when :integer, :float, :datetime, :date, :boolean
           TYPES[type].new.type_cast_from_user(value)

data/lib/hstore_accessor/{active_record_pre_4.2 → active_record_<_4.2}/type_helpers.rb

@@ -21,7 +21,7 @@ module HstoreAccessor
         column_class = ActiveRecord::ConnectionAdapters::Column
 
         case type
-        when :string, :hash, :array, :decimal
+        when :string, :decimal
           value
         when :integer
           column_class.value_to_integer(value)

data/lib/hstore_accessor/macro.rb

@@ -92,7 +92,7 @@ module HstoreAccessor
               hstore_changes = send("#{hstore_attribute}_change")
               return if hstore_changes.nil?
               attribute_changes = hstore_changes.map { |change| change.try(:[], store_key.to_s) }
-              attribute_changes.uniq.size == 1 ? nil : attribute_changes
+              attribute_changes.compact.present? ? attribute_changes : nil
             end
 
             define_method("restore_#{key}!") do
@@ -115,8 +115,8 @@ module HstoreAccessor
             end
           end
 
-          query_field = "#{table_name}.#{hstore_attribute} -> '#{store_key}'"
-          eq_query_field = "#{table_name}.#{hstore_attribute} @> hstore('#{store_key}', ?)"
+          query_field = "#{hstore_attribute} -> '#{store_key}'"
+          eq_query_field = "#{hstore_attribute} @> hstore('#{store_key}', ?)"
 
           case data_type
           when :string
@@ -144,9 +144,6 @@ module HstoreAccessor
           when :boolean
             send(:scope, "is_#{key}", -> { where(eq_query_field, "true") })
             send(:scope, "not_#{key}", -> { where(eq_query_field, "false") })
-          when :array
-            send(:scope, "#{key}_eq", -> value { where("#{query_field} = ?", value.join(Serialization::SEPARATOR)) })
-            send(:scope, "#{key}_contains", -> value { where("string_to_array(#{query_field}, '#{Serialization::SEPARATOR}') @> string_to_array(?, '#{Serialization::SEPARATOR}')", Array[value].flatten.join(Serialization::SEPARATOR)) })
           end
         end
 

data/lib/hstore_accessor/serialization.rb

@@ -3,13 +3,11 @@ module HstoreAccessor
     InvalidDataTypeError = Class.new(StandardError)
 
     VALID_TYPES = [
-      :array,
       :boolean,
       :date,
       :datetime,
       :decimal,
       :float,
-      :hash,
       :integer,
       :string
     ]
@@ -17,24 +15,18 @@ module HstoreAccessor
     DEFAULT_SERIALIZER = ->(value) { value.to_s }
     DEFAULT_DESERIALIZER = DEFAULT_SERIALIZER
 
-    SEPARATOR = "||;||"
-
     SERIALIZERS = {
-      array: -> value { (value && value.join(SEPARATOR)) || nil },
       boolean: -> value { (value.to_s == "true").to_s },
       date: -> value { value && value.to_s },
-      hash: -> value { (value && value.to_json) || nil },
       datetime: -> value { value && value.to_i }
     }
     SERIALIZERS.default = DEFAULT_SERIALIZER
 
     DESERIALIZERS = {
-      array: -> value { (value && value.split(SEPARATOR)) || nil },
       boolean: -> value { TypeHelpers.cast(:boolean, value) },
       date: -> value { value && Date.parse(value) },
       decimal: -> value { value && BigDecimal.new(value) },
       float: -> value { value && value.to_f },
-      hash: -> value { (value && JSON.parse(value)) || nil },
       integer: -> value { value && value.to_i },
       datetime: -> value { value && Time.at(value.to_i).in_time_zone }
     }

data/lib/hstore_accessor/version.rb

@@ -1,3 +1,3 @@
 module HstoreAccessor
-  VERSION = "0.9.3"
+  VERSION = "1.0.0"
 end

data/spec/hstore_accessor_spec.rb

@@ -2,17 +2,13 @@ require "spec_helper"
 require "active_support/all"
 
 FIELDS = {
-  name: :string,
   color: :string,
   price: :integer,
   published: { data_type: :boolean, store_key: "p" },
   weight: { data_type: :float, store_key: "w" },
   popular: :boolean,
   build_timestamp: :datetime,
-  tags: :array,
-  reviews: :hash,
   released_at: :date,
-  likes: :integer,
   miles: :decimal
 }
 
@@ -20,15 +16,9 @@ DATA_FIELDS = {
   color_data: :string
 }
 
-class ProductCategory < ActiveRecord::Base
-  hstore_accessor :options, name: :string, likes: :integer
-  has_many :products
-end
-
 class Product < ActiveRecord::Base
   hstore_accessor :options, FIELDS
   hstore_accessor :data, DATA_FIELDS
-  belongs_to :product_category
 end
 
 class SuperProduct < Product
@@ -85,7 +75,7 @@ describe HstoreAccessor do
     let!(:timestamp) { Time.now }
     let!(:datestamp) { Date.today }
     let(:product) { Product.new }
-    let(:persisted_product) { Product.create!(color: "green", price: 10, weight: 10.1, tags: %w(tag1 tag2 tag3), popular: true, build_timestamp: (timestamp - 10.days), released_at: (datestamp - 8.days), miles: BigDecimal.new("9.133790001")) }
+    let(:persisted_product) { Product.create!(color: "green", price: 10, weight: 10.1, popular: true, build_timestamp: (timestamp - 10.days), released_at: (datestamp - 8.days), miles: BigDecimal.new("9.133790001")) }
 
     FIELDS.keys.each do |field|
       it "responds with nil when #{field} is not set" do
@@ -155,35 +145,9 @@ describe HstoreAccessor do
   describe "scopes" do
     let!(:timestamp) { Time.now }
     let!(:datestamp) { Date.today }
-    let!(:product_a) { Product.create(likes: 3, name: "widget", color: "green", price: 10, weight: 10.1, tags: %w(tag1 tag2 tag3), popular: true, build_timestamp: (timestamp - 10.days), released_at: (datestamp - 8.days), miles: BigDecimal.new("10.113379001")) }
-    let!(:product_b) { Product.create(color: "orange", price: 20, weight: 20.2, tags: %w(tag2 tag3 tag4), popular: false, build_timestamp: (timestamp - 5.days), released_at: (datestamp - 4.days), miles: BigDecimal.new("20.213379001")) }
-    let!(:product_c) { Product.create(color: "blue", price: 30, weight: 30.3, tags: %w(tag3 tag4 tag5), popular: true, build_timestamp: timestamp, released_at: datestamp, miles: BigDecimal.new("30.313379001")) }
-
-    context "ambiguous column names" do
-      let!(:product_category) { ProductCategory.create!(name: "widget", likes: 2) }
-
-      before do
-        Product.all.to_a.each do |product|
-          product_category.products << product
-        end
-      end
-
-      context "eq query" do
-        let!(:query) { Product.all.joins(:product_category).merge(ProductCategory.with_name("widget")).with_name("widget") }
-
-        it "qualifies the table name to prevent ambiguous column name references" do
-          expect { query.to_a }.to_not raise_error
-        end
-      end
-
-      context "query" do
-        let!(:query) { Product.all.joins(:product_category).merge(ProductCategory.likes_lt(4)).likes_lt(4) }
-
-        it "qualifies the table name to prevent ambiguous column name references" do
-          expect { query.to_a }.to_not raise_error
-        end
-      end
-    end
+    let!(:product_a) { Product.create(color: "green", price: 10, weight: 10.1, popular: true, build_timestamp: (timestamp - 10.days), released_at: (datestamp - 8.days), miles: BigDecimal.new("10.113379001")) }
+    let!(:product_b) { Product.create(color: "orange", price: 20, weight: 20.2, popular: false, build_timestamp: (timestamp - 5.days), released_at: (datestamp - 4.days), miles: BigDecimal.new("20.213379001")) }
+    let!(:product_c) { Product.create(color: "blue", price: 30, weight: 30.3, popular: true, build_timestamp: timestamp, released_at: datestamp, miles: BigDecimal.new("30.313379001")) }
 
     context "for string fields support" do
       it "equality" do
@@ -257,20 +221,7 @@ describe HstoreAccessor do
       end
     end
 
-    context "for array fields support" do
-      it "equality" do
-        expect(Product.tags_eq(%w(tag1 tag2 tag3)).to_a).to eq [product_a]
-      end
-
-      it "contains" do
-        expect(Product.tags_contains("tag2").to_a).to eq [product_a, product_b]
-        expect(Product.tags_contains(%w(tag2 tag3)).to_a).to eq [product_a, product_b]
-        expect(Product.tags_contains(%w(tag1 tag2 tag3)).to_a).to eq [product_a]
-        expect(Product.tags_contains(%w(tag1 tag2 tag3 tag4)).to_a).to eq []
-      end
-    end
-
-    context "for time fields support" do
+    context "for datetime fields support" do
       it "before" do
         expect(Product.build_timestamp_before(timestamp)).to eq [product_a, product_b]
       end
@@ -357,8 +308,6 @@ describe HstoreAccessor do
       it_returns_the_properly_typed_column :datetime, :build_timestamp, ActiveRecord::Type::DateTime
       it_returns_the_properly_typed_column :date, :released_at, ActiveRecord::Type::Date
       it_returns_the_properly_typed_column :decimal, :miles, ActiveRecord::Type::Decimal
-      it_returns_the_properly_typed_column :array, :tags, ActiveRecord::Type::Value
-      it_returns_the_properly_typed_column :hash, :reviews, ActiveRecord::Type::Value
     else
       def self.it_returns_the_properly_typed_column(hstore_type, attribute_name, active_record_type)
         context "#{hstore_type}" do
@@ -422,39 +371,6 @@ describe HstoreAccessor do
       expect(product.weight).to eq 93.45
     end
 
-    context "array values" do
-      it "correctly stores nothing" do
-        product.tags = nil
-        product.save
-        product.reload
-        expect(product.tags).to be_nil
-      end
-
-      it "correctly stores strings" do
-        product.tags = ["household", "living room", "kitchen"]
-        product.save
-        product.reload
-        expect(product.tags).to eq ["household", "living room", "kitchen"]
-      end
-    end
-
-    context "hash values" do
-      it "correctly stores nothing" do
-        product.reviews = nil
-        product.save
-        product.reload
-        expect(product.reviews).to be_nil
-      end
-
-      it "correctly stores hash values as json" do
-        hash = product.reviews = { "user_123" => "4 stars", "user_994" => "3 stars" }
-        product.save
-        product.reload
-        expect(product.reviews).to eq("user_123" => "4 stars", "user_994" => "3 stars")
-        expect(product.options["reviews"]).to eq(hash.to_json)
-      end
-    end
-
     context "multipart values" do
       it "stores multipart dates correctly" do
         product.update_attributes!(
@@ -493,7 +409,7 @@ describe HstoreAccessor do
         product.save!
         product.reload
         Time.use_zone(new_york_timezone) do
-          expect(product.build_timestamp.to_s).to eq timestamp.in_time_zone(new_york_timezone).to_s
+          expect(product.build_timestamp.utc_offset).to eq new_york_timezone.utc_offset
         end
       end
     end
@@ -676,14 +592,12 @@ describe HstoreAccessor do
         product.color = "GREEN"
         expect(product.color_change).to eq %w(ORANGE GREEN)
       end
-
       context "when store_key differs from key" do
         it "returns the old and new values" do
           product.weight = 100.01
           expect(product.weight_change[1]).to eq "100.01"
         end
       end
-
       context "hstore attribute was nil" do
         it "returns old and new values" do
           product.options = nil
@@ -700,18 +614,6 @@ describe HstoreAccessor do
           product.price = 6
           expect(product.color_change).to be_nil
         end
-
-        it "returns nil when other attributes were changed" do
-          product.price = 5
-          product.save!
-          product = Product.first
-
-          expect(product.price_change).to be_nil
-
-          product.color = "red"
-
-          expect(product.price_change).to be_nil
-        end
       end
 
       context "not persisted" do

data/spec/spec_helper.rb

@@ -26,7 +26,6 @@ def create_database
 
   ActiveRecord::Base.connection.execute("CREATE EXTENSION hstore;") rescue ActiveRecord::StatementInvalid
   ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS products;")
-  ActiveRecord::Base.connection.execute("DROP TABLE IF EXISTS product_categories;")
 
   ActiveRecord::Base.connection.create_table(:products) do |t|
     t.hstore :options
@@ -34,18 +33,11 @@ def create_database
 
     t.string :string_type
     t.integer :integer_type
-    t.integer :product_category_id
     t.boolean :boolean_type
     t.float :float_type
     t.time :time_type
-    t.string :array_type, array: true
     t.date :date_type
     t.datetime :datetime_type
     t.decimal :decimal_type
-    t.hstore :hash_type
-  end
-
-  ActiveRecord::Base.connection.create_table(:product_categories) do |t|
-    t.hstore :options
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hstore_accessor
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Joe Hirn
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -181,7 +181,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
-- ".ruby-version"
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -193,8 +192,8 @@ files:
 - hstore_accessor.gemspec
 - lib/hstore_accessor.rb
 - lib/hstore_accessor/active_record_4.2/type_helpers.rb
-- lib/hstore_accessor/active_record_pre_4.2/time_helper.rb
-- lib/hstore_accessor/active_record_pre_4.2/type_helpers.rb
+- lib/hstore_accessor/active_record_<_4.2/time_helper.rb
+- lib/hstore_accessor/active_record_<_4.2/type_helpers.rb
 - lib/hstore_accessor/macro.rb
 - lib/hstore_accessor/serialization.rb
 - lib/hstore_accessor/version.rb
@@ -204,8 +203,8 @@ homepage: http://github.com/devmynd/hstore_accessor
 licenses:
 - MIT
 metadata: {}
-post_install_message: Please note that the `array` and `hash` types will no longer
-  be supported in version 1.0.0
+post_install_message: Please note that the `array` and `hash` types are no longer
+  supported in version 1.0.0
 rdoc_options: []
 require_paths:
 - lib

data/.ruby-version

@@ -1 +0,0 @@
-2.1.5