whiplash-app 0.9.6 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed3192117f026dce179a249afae7d1dd8e887883f4272ce9a8ceeff2f9ae9429
-  data.tar.gz: 2b3626ec34d6d3fe8bfd4111c3578235ae129321b090501cd0881917506aafe8
+  metadata.gz: adc068051a8e2ecbb9ae56496bda52be1e358e668189b9cfe27ccda7d9712229
+  data.tar.gz: 9de47bfcf86b123b1b02fce2c629352cc19eacc77658b870da838f3babb9afe5
 SHA512:
-  metadata.gz: 8a2ad62e4666d538fed3ecefb03bd675196c4c2612255f84e38e5865d5abca52a2bbe1c026b6e52cc14c16a9c409719c4cd404f60d7d0cbbfdc0e477232ae8c2
-  data.tar.gz: cee2a29068bf4ca7e200085539738a902c72c096bc01af699cb8a2330e1c2511a86715fc4d2aefd15487d603f31d0011972cdf1bd6ddefc2678b0a6ec5560db5
+  metadata.gz: 593790e085faa0b104658e23204c3ced561c5a497cadab695e737b3eff7e194e8d5a636c3f4d0048b8ba15e2ff41a3d0d88b8671216a7ffabcc3bc522006af83
+  data.tar.gz: 9b9852b80909ce8d8a561f5167472792e0f25e9bb3c7a7b7d7e583a6a3f50b7670acd0087943a6dc03b9eb908d0fa2bfbfd4a27f323aa4349574911dc57a8599

data/.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: "Whiplash App CI Workflow"
 on:
-  pull_request_target:
+  pull_request:
     types: [opened, synchronize, reopened]
   workflow_dispatch:
   

data/lib/whiplash/app/canonical_host.rb

@@ -9,7 +9,8 @@ module Whiplash
       def require_canonical_host!
         canonical_host = ENV.fetch('CANONICAL_HOST', false).in?([true, 'true', 1, '1'])
         return unless canonical_host
-        application_host = URI.parse(Rails.configuration.app_url).host
+        return unless Rails.configuration.respond_to?(:application_url)
+        application_host = URI.parse(Rails.configuration.application_url).host
         return if application_host == request.host
         return unless request.method_symbol == :get # can't redirect PUT, POST, DELETE
     
@@ -17,7 +18,7 @@ module Whiplash
       end
     
       def redirect_to_canonical_host(query_params, status=301)
-        redirect_to "#{Rails.configuration.app_url}#{request.path}#{'?' if query_params.to_query.present?}#{query_params.to_query}", status: status
+        redirect_to "#{Rails.configuration.application_url}#{request.path}#{'?' if query_params.to_query.present?}#{query_params.to_query}", status: status
       end
 
     end

data/lib/whiplash/app/controller_helpers.rb

@@ -15,16 +15,49 @@ module Whiplash
 
       private
 
+      def application_domain
+        return nil if Rails.configuration.application_url.blank?
+        host = URI.parse(Rails.configuration.application_url).host
+        '.' + host
+      end
+
+      def clear_application_cookies!
+        return if application_domain.blank?
+        cookie_keys_we_care_about.each { |k| cookies.delete(k, domain: application_domain) }
+      end
+
+      def clear_domain_cookies!
+        cookie_keys_we_care_about.each { |k| cookies.delete(k, domain: cookie_domain) }
+      end
+
       def cookie_domain
-        '.' + URI.parse(core_url).host
+        host = URI.parse(core_url).host
+        host.gsub!('www.', '')
+        '.' + host
+      end
+
+      def cookie_keys_we_care_about
+        %i(
+            _session
+            customer
+            customer_id
+            oauth_token
+            partner_id 
+            user
+            user_id
+            warehouse
+            warehouse_id
+          )
       end
 
       def core_url
-        ENV['WHIPLASH_API_URL']
+        ENV['CORE_URL'] || ENV['WHIPLASH_API_URL']
       end
 
-      def core_url_for(path)
-        [core_url, path].join('/')
+      def core_url_for(path, query_params = {})
+        out = [core_url, path].join('/')
+        out = [out, query_params.to_query].join('?') if query_params.present?
+        return out
       end
 
       def current_customer
@@ -86,7 +119,10 @@ module Whiplash
       end
 
       def init_whiplash_api(options = {})
-        return redirect_to core_url_for('login') if cookies[:oauth_token].blank?
+        if cookies[:oauth_token].blank?
+          clear_application_cookies!
+          return redirect_to core_url_for('login', redirect_url: request.original_url)
+        end
         token = {access_token: cookies[:oauth_token]}
         begin 
           @whiplash_api = Whiplash::App.new(token, options)
@@ -97,7 +133,9 @@ module Whiplash
       end
     
       def require_user
-        redirect_to core_url_for('login') if current_user.blank?
+        return if current_user.present?
+        clear_application_cookies!
+        redirect_to core_url_for('login', redirect_url: request.original_url) 
       end
     
       def set_locale!
@@ -139,7 +177,7 @@ module Whiplash
       def set_current_warehouse_cookie!(warehouse_id, expires_at = nil)
         warehouse = @whiplash_api.get!("warehouses/#{warehouse_id}").body
         user = @whiplash_api.get!("me").body
-        fields_we_care_about = %w(id name)
+        fields_we_care_about = %w(id name slug)
         warehouse_hash = warehouse.slice(*fields_we_care_about)
         expires_at ||= user['current_sign_in_expires_at']
 

data/lib/whiplash/app/railtie.rb

@@ -20,7 +20,7 @@ module Whiplash
       end
 
       initializer "whiplash_app.action_controller" do
-        ActiveSupport.on_load(:action_controller) do
+        ActiveSupport.on_load(:action_controller_base) do
           include Whiplash::App::CanonicalHost
           include Whiplash::App::ControllerHelpers
         end

data/lib/whiplash/app/version.rb

@@ -1,5 +1,5 @@
 module Whiplash
   class App
-    VERSION = "0.9.6"
+    VERSION = "0.10.2"
   end
 end

data/lib/whiplash/app.rb

@@ -6,6 +6,8 @@ require "whiplash/app/version"
 require "errors/whiplash_api_error"
 require "oauth2"
 require "faraday"
+require "faraday/retry"
+require 'faraday/net_http_persistent'
 
 # Rails app stuff
 if defined?(Rails::Railtie)
@@ -21,13 +23,14 @@ module Whiplash
     include Whiplash::App::Connections
     include Whiplash::App::FinderMethods
 
-    attr_accessor :customer_id, :shop_id, :token
+    attr_accessor :customer_id, :shop_id, :token, :retry_errors
 
     def initialize(token, options={})
       @token = format_token(token)
       @customer_id = options[:customer_id]
       @shop_id = options[:shop_id]
       @api_version = options[:api_version] || 2 # can be 2_1
+      @retry_errors = options.fetch(:retry_errors, false)
     end
 
     def versioned_api_url
@@ -40,9 +43,37 @@ module Whiplash
 
     def connection
       Faraday.new [self.class.api_url, versioned_api_url].join("/") do |conn|
+        # Authentication
         conn.request :authorization, 'Bearer', token.token
         conn.request :json
+
+        if @retry_errors
+          conn.request :retry, max: 5, 
+            interval: 1, 
+            interval_randomness: 0.5, 
+            backoff_factor: 2,
+            methods: [:get, :post, :put, :delete],
+            exceptions: [
+              'Faraday::TimeoutError', 
+              'Faraday::ConnectionFailed',
+              'Errno::ETIMEDOUT', 
+              'Timeout::Error'
+            ],
+            retry_statuses: [502, 504]
+        end
+
         conn.response :json, :content_type => /\bjson$/
+        conn.options.timeout = 30 # Total request timeout
+        conn.options.open_timeout = 5 # Connection establishment timeout
+        
+        # Use persistent HTTP connections (requires net-http-persistent gem)
+        begin
+          conn.adapter :net_http_persistent
+        rescue LoadError
+          # Fallback to default adapter if net-http-persistent isn't available
+          Rails.logger.warn "[WhiplashApp] net-http-persistent gem not found, using default adapter" if defined?(Rails)
+          conn.adapter Faraday.default_adapter
+        end
       end
     end
 
@@ -112,4 +143,4 @@ module Net
 
     end
   end
-end
+end

data/whiplash-app.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "oauth2", "~> 2.0.4"
   spec.add_dependency "faraday", "~> 2.7"
+  spec.add_dependency 'faraday-net_http_persistent'
+  spec.add_dependency "faraday-retry"
 
   spec.add_development_dependency "bundler", ">= 2.2"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry" , '~> 0.12.2'
+  spec.add_development_dependency "pry", "~> 0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whiplash-app
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.2
 platform: ruby
 authors:
 - Don Sullivan, Mark Dickson
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2026-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: faraday-net_http_persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.14'
 description: this gem provides connectivity to the Whiplash API for authentication
   and REST requests.
 email:
@@ -126,7 +154,7 @@ files:
 homepage: https://github.com/whiplashmerch/whiplash-app
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.4.6
+signing_key: 
 specification_version: 4
 summary: this gem provides connectivity to the Whiplash API for authentication and
   REST requests.