spree_cm_commissioner 2.5.3 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e4c3bba39cc1a8f8a2cd7abdf91065bbd8caccfc1f574af9b5de4459822a5b3
-  data.tar.gz: 0abd8b1b6e4c7c83260d6a958039ba59dc8f29284cf62e6ce5769ca8142aef16
+  metadata.gz: de2ded7a346184d8d61336778882795e5b3129f7057eb9b6626042245f580d0c
+  data.tar.gz: e6719bc0d87300189d1c02eca3fc3400985379fdce0c7800c813cbe5d24861ba
 SHA512:
-  metadata.gz: ff309e440231910a83c35e4a70b0086eb21965e28a136952099893007b9ab09acd6a7a623129da5f15182a2edaac0b9a51692c0177036255838299d39600edea
-  data.tar.gz: df15ec71ab9bfe6f9ad4f0bc20016085ffda814a3167758560e79f1f0e1397fa6fbd4202b37d1a8a46f1fd6b725d47440e85bf66fad283dbf80e46f8c4351236
+  metadata.gz: 44c71677f45daa6d92ec91afa436a7bc88798b6931d9a7a75afc40ad5e7691dd7a7ef8c6b7404bcbe3f1875a2a9d321ad918423dda064716bb208f0b0495aa11
+  data.tar.gz: d6bdae499df0757db662bade286df901abf2b3f59d7daecef9140ad8cdf2775a17b35c72159b46f5d813c7ec555b3dc97297b6684f4ddee411e96f74d71961ce

data/.env.example

@@ -31,3 +31,12 @@ ORGANIZER_URL=http://127.0.0.1:4000/organizer
 # Use to sign & verify Distance object:
 # spree_cm_commissioner/distance.rb
 DISTANCE_SIGNING_KEY=hei********************VY
+
+# Cache durations (in seconds) for different content types
+# See: app/controllers/concerns/spree_cm_commissioner/content_cachable.rb
+CACHE_CDN_MAX_AGE=86400 # CDN/server-side cache duration for all responses
+CACHE_STATIC_MAX_AGE=86400 # Static content (countries, provinces, seat layouts, CMS pages) - 1 day
+CACHE_SEMI_STATIC_MAX_AGE=3600 # Semi-static content (menus, homepage backgrounds, routes) - 1 hour
+CACHE_MODERATE_MAX_AGE=1800 # Moderate freshness (products, events, vendors) - 30 minutes
+CACHE_REALTIME_MAX_AGE=300 # High freshness (trips, trip search) - 5 minutes
+CACHE_DEFAULT_MAX_AGE=300 # Default for unlisted controllers - 5 minutes

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.5.3)
+    spree_cm_commissioner (2.5.5)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/concerns/spree_cm_commissioner/content_cachable.rb

@@ -1,3 +1,5 @@
+# Check following file for spec:
+# spec/controllers/application_controller_spec.rb
 module SpreeCmCommissioner
   module ContentCachable
     extend ActiveSupport::Concern
@@ -6,9 +8,64 @@ module SpreeCmCommissioner
       after_action :set_cache_control_for_cdn
     end
 
+    # Cache duration priorities by content type
+    # Priority 1: Static/Rarely Changed (1 day)
+    STATIC_CONTENT_CONTROLLERS = %w[
+      CountriesController
+      ProvincesController
+      GuestCardClassesController
+      SeatLayoutController
+      CmsPagesController
+    ].freeze
+
+    # Priority 2: Semi-Static (1 hour)
+    SEMI_STATIC_CONTROLLERS = %w[
+      MenusController
+      HomepageBackgroundController
+      HomepageDataController
+      PopularRoutesController
+      RoutePlacesController
+    ].freeze
+
+    # Priority 3: Moderate Freshness (30 minutes)
+    MODERATE_FRESHNESS_CONTROLLERS = %w[
+      HomepageSectionsController
+      TaxonsController
+      ProductsController
+      EventsController
+      EventMatchesController
+      AccommodationsController
+      VendorsController
+      VendorPhotosController
+      DynamicFieldsController
+    ].freeze
+
+    # Priority 4: High Freshness (5 minutes)
+    HIGH_FRESHNESS_CONTROLLERS = %w[
+      TripsController
+      TripSearchController
+    ].freeze
+
+    def shared_max_age
+      ENV.fetch('CACHE_CDN_MAX_AGE', 1.day.to_i).to_i
+    end
+
     # Override This Method based on your UseCase
-    def max_age
-      ENV.fetch('CONTENT_CACHE_MAX_AGE', 1.day.to_i).to_i
+    # Or let it auto-detect based on controller name
+    def client_max_age
+      controller_name = self.class.name.demodulize
+
+      if STATIC_CONTENT_CONTROLLERS.include?(controller_name)
+        ENV.fetch('CACHE_STATIC_MAX_AGE', 1.day.to_i).to_i
+      elsif SEMI_STATIC_CONTROLLERS.include?(controller_name)
+        ENV.fetch('CACHE_SEMI_STATIC_MAX_AGE', 1.hour.to_i).to_i
+      elsif MODERATE_FRESHNESS_CONTROLLERS.include?(controller_name)
+        ENV.fetch('CACHE_MODERATE_MAX_AGE', 30.minutes.to_i).to_i
+      elsif HIGH_FRESHNESS_CONTROLLERS.include?(controller_name)
+        ENV.fetch('CACHE_REALTIME_MAX_AGE', 5.minutes.to_i).to_i
+      else
+        ENV.fetch('CACHE_DEFAULT_MAX_AGE', 5.minutes.to_i).to_i
+      end
     end
 
     def set_cache_control_for_cdn
@@ -17,12 +74,7 @@ module SpreeCmCommissioner
 
       # max-age: browser/client cache, s-maxage: CDN/server cache
       # Allow client caching for mobile apps while keeping CDN cache longer
-      client_max_age = [max_age / 2, 300].max # At least 5 minutes, or half of CDN cache
-      response.headers['Cache-Control'] = "public, max-age=#{client_max_age}, s-maxage=#{max_age}"
-
-      # Pragma: HTTP/1.0 cache directive (predates Cache-Control).
-      # 'cache' allows caching.
-      response.headers['Pragma'] = 'cache'
+      response.headers['Cache-Control'] = "public, max-age=#{client_max_age}, s-maxage=#{shared_max_age}"
 
       # Expires: Absolute timestamp when cache becomes stale (HTTP/1.0 fallback)
       response.headers['Expires'] = (Time.zone.now + client_max_age).httpdate

data/app/controllers/spree/admin/inventory_items_controller.rb

@@ -58,6 +58,26 @@ module Spree
         flash[:success] = "Successfully updated stocks for #{inventory_items.count} items"
         redirect_back fallback_location: admin_product_stock_managements_path(@product)
       end
+
+      # PATCH /products/:slug/inventory_items/bulk_reset?inventory_ids=1,2,3
+      def bulk_reset
+        inventory_ids = params[:inventory_ids].to_s.split(',').map(&:to_i)
+        inventory_items = @product.inventory_items.where(id: inventory_ids)
+
+        errors = []
+        inventory_items.each do |inventory_item|
+          result = SpreeCmCommissioner::Stock::InventoryItemResetter.call(inventory_item: inventory_item)
+          errors << result.message unless result.success?
+        end
+
+        if errors.empty?
+          flash[:success] = "Successfully reset inventory items (#{inventory_items.count})"
+        else
+          flash[:error] = errors.join(', ')
+        end
+
+        redirect_back fallback_location: admin_product_stock_managements_path(@product)
+      end
     end
   end
 end

data/app/views/spree/admin/stock_managements/index.html.erb

@@ -37,19 +37,6 @@
               </div>
             <% end if can?(:update, @product) && can?(:update, variant) %>
 
-            <% if defined?(@reserved_stocks) %>
-              <div>
-                <%= svg_icon name: "cart-check.svg", width: '14', height: '14' %>
-                <%= label_tag "reserved_stock#{variant.id}", "Reserved Stock: #{@reserved_stocks[variant.id] || 0}", class: "m-0" %>
-                <%= link_to_with_icon('capture.svg', "Create Inventory Item", admin_product_inventory_items_path(@product.slug, variant_id: variant.id),
-                  method: :post,
-                  remote: false,
-                  class: 'icon_link btn btn-sm btn-outline-primary ml-2',
-                  no_text: true
-                ) unless @inventory_items[variant.id].present? %>
-              </div>
-            <% end %>
-
             <% if variant.permanent_stock? %>
               <div>
                 <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="This product stock will renew every day">
@@ -78,7 +65,7 @@
                     <% end %>
                   </span>
 
-                  <%= link_to_with_icon('arrow-counterclockwise.svg', "Reset Inventory Item", reset_admin_product_inventory_item_path(@product.slug, inventory_item.id),
+                  <%= link_to_with_icon('arrow-counterclockwise.svg', "Reset Inventory Item", bulk_reset_admin_product_inventory_items_path(@product.slug, inventory_item_ids: [inventory_item.id]),
                     method: :patch,
                     remote: false,
                     class: 'icon_link btn btn-sm outline text-dark',

data/config/routes.rb

@@ -155,6 +155,7 @@ Spree::Core::Engine.add_routes do
           get :stocks
           patch :bulk_update_prices
           patch :bulk_update_stocks
+          patch :bulk_reset
         end
       end
 

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.5.3'.freeze
+  VERSION = '2.5.5'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.5
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-30 00:00:00.000000000 Z
+date: 2026-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree