solidus_searchkick 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 544ccb542d567a10665a33d0c7ae0536fe63ade5
-  data.tar.gz: 26f09eaffa8fdcf2d4436c510140ac4b4b54d6cf
+  metadata.gz: 8d41ff74254c659a4764941593f5d0844550e09f
+  data.tar.gz: 054de8b8a244bf3c711a84245c951753c76a8e49
 SHA512:
-  metadata.gz: 2d375e3c5641838bcebdc3756d2faef1a8fe2080593508122a540cc4cd319f6df5ef28ea0aa40affb467772e7160f0f4b59a0ce73481bb2f1aa2beeb95babf16
-  data.tar.gz: efaad9b7dbca148e8b903de900e616689625f46e2e982cd04b3bc5c24811687c7b09d54959a4d3a8e5cd322fa90a6b260c4756ecb1fdbdb60b9f9a4540b3d10a
+  metadata.gz: 941aff221b9b8c4eda972a9568db0da12731b75920a9301280a4021163427f97ab79af35becd387ce1889472425ad05409296e026a08ca788792e1ac51a0b4c8
+  data.tar.gz: 6a95a64426eb9e354cb99f43a95cc6a506686de3f37ea261b7aca28dd809b5fb5b5a043572bf1acce2ce6e8eff213cd9eb5463ba39d174120cdf136597b846b4

data/app/helpers/spree/products_helper_decorator.rb

@@ -2,7 +2,7 @@ Spree::ProductsHelper.module_eval do
   def cache_key_for_products
     count = @products.count
     hash = Digest::SHA1.hexdigest(params.to_json)
-    max_updated_at = (@products.maximum(:updated_at) || Date.today).to_s(:number)
+    max_updated_at = (@products.records.maximum(:updated_at) || Date.today).to_s(:number)
     "#{I18n.locale}/#{current_pricing_options.cache_key}/spree/products/all-#{params[:page]}-#{hash}-#{max_updated_at}-#{count}"
   end
 end

data/changelog.md

@@ -1,3 +1,6 @@
+# 0.3.4
+Updated cache_key_for_products (thanks @Sinetheta)
+
 # 0.3.3
 Updates default indexed currency to `Spree::Config.currency` instead of the products `cost_currency`.
 

data/lib/solidus_searchkick/version.rb

@@ -1,3 +1,3 @@
 module SolidusSearchkick
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/helpers/products_helper_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+RSpec.describe Spree::ProductsHelper do
+  include ActiveSupport::Testing::TimeHelpers
+
+  describe 'cache_key_for_products' do
+    helper do
+      # Normally provided by Spree::Core::ControllerHelpers::Pricing
+      def current_pricing_options
+        Spree::Config.pricing_options_class.new(currency: 'USD')
+      end
+
+      # Normally provided by Spree::Core::ControllerHelpers::Search
+      def build_searcher(params)
+        Spree::Config.searcher_class.new(params).tap do |searcher|
+          searcher.current_user = FactoryGirl.create(:user)
+          searcher.pricing_options = current_pricing_options
+        end
+      end
+    end
+
+    # Performed in controller before cache key is used
+    def load_products
+      products
+      Spree::Product.reindex
+      searcher = helper.build_searcher(params)
+      @products = searcher.retrieve_products
+    end
+
+    let(:products) do
+      travel_to(Time.local(1990)) do
+        create_list(:product, 2)
+      end
+    end
+    let(:params) { {} }
+
+    subject { helper.cache_key_for_products }
+
+    after do
+      # Since we're using timecop we need to avoid index collisions
+      Spree::Product.searchkick_index.delete
+    end
+
+    it 'returns a long string' do
+      load_products
+      is_expected.to eq('en/USD/spree/products/all--bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f-19900101000000-2')
+    end
+
+    context 'when products are updated' do
+      before do
+        load_products
+        products.first.update(updated_at: Time.local(1992))
+      end
+
+      it { is_expected.to eq('en/USD/spree/products/all--bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f-19920101000000-2') }
+    end
+
+    context 'when no products are found' do
+      let(:products) { nil }
+
+      it 'uses the current time ' do
+        travel_to(Time.local(1991)) do
+          load_products
+          expect(subject).to eq('en/USD/spree/products/all--bf21a9e8fbc5a3846fb05b4fa0859e0917b2202f-19910101-0')
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_searchkick
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Jim Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
@@ -258,6 +258,7 @@ files:
 - lib/spree/search/searchkick.rb
 - solidus_searchkick.gemspec
 - spec/controllers/spree/products_controller_spec.rb
+- spec/helpers/products_helper_spec.rb
 - spec/lib/spree/search/searchkick_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/models/spree/product_spec.rb
@@ -290,6 +291,7 @@ specification_version: 4
 summary: Add searchkick to Solidus
 test_files:
 - spec/controllers/spree/products_controller_spec.rb
+- spec/helpers/products_helper_spec.rb
 - spec/lib/spree/search/searchkick_spec.rb
 - spec/models/spree/order_spec.rb
 - spec/models/spree/product_spec.rb