whiplash-app 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 216d093d7f7c804c1f6b7563a429e7d0ed70cf31e90eb56266e03c086107863a
-  data.tar.gz: bd62a9c2da9f0a603c13c7c40e99a0bfd1e6b48b958cd20f9c74f02613d3dd70
+  metadata.gz: 38965dd5a29730aa36f70c5b685aa575aef968b6b6fb8f81efd4e4defb6c8b56
+  data.tar.gz: 0d42efa6c4d541f49d8fcc0b67d09e06ab25dc585fe4abf9c0ac8058c1ddf24c
 SHA512:
-  metadata.gz: f3ee8b0c5c9817ddbc3231889abe2d4edd95873234674c8a2da66e418cc262810a5424813f8144439a43fdc40765bc6e0fab10dfcb540cf9d6e2a1896393ae58
-  data.tar.gz: a2281f059a7d4c227d7d6a89cedeb75e082dcdaa2fb2799e9a3f36f205881f07813530ac120718035d702476c176a11e1f58a0a084e736790ede55f7991ef00c
+  metadata.gz: e2a65da32cf144d8e5c22f6c4efce8f9b3109cb484398bdb65ad4a17fb3a3b4ae85b9a29d28919055e0a597d16fd907dea9847ff8054e5bb5c353c9877f1433a
+  data.tar.gz: 3b7c40b3da5a6bb4dd3e7bf4e4fd9e1c29587f870853c3c8df3f706d2aa35e030151de3759abc1c6170deb7af92e443a4377e4761f9a4851f7b607259c64fbbd

data/.github/workflows/ci.yml

@@ -0,0 +1,41 @@
+name: "Whiplash App CI Workflow"
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+  workflow_dispatch:
+  
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+      
+      - name: Install ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.6.7'
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          
+      - run: gem install bundler -v 2.2.25
+      
+      - run: bundle exec rake
+        
+      - name: Slack Notification
+        uses: 8398a7/action-slack@v3
+        with:
+          status: ${{ job.status }}
+          fields: repo,message,pullRequest,author
+          custom_payload: |
+            {
+              attachments: [{
+                color: '${{ job.status }}' === 'success' ? 'good' : '${{ job.status }}' === 'failure' ? 'danger' : 'warning',
+                text: `${process.env.AS_WORKFLOW}\n${process.env.AS_JOB} for (${process.env.AS_COMMIT}) of ${process.env.AS_REPO}@${process.env.AS_REF} by ${process.env.AS_AUTHOR} ${{ job.status }} in ${process.env.AS_TOOK}`,
+              }]
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{secrets.SLACK_WEBHOOK_URL}}
+        if: always() #Pick up events even if the job fails or is canceled.

data/lib/whiplash/app/connections.rb

@@ -45,16 +45,16 @@ module Whiplash
           case e.message
           when 'end of file reached'
             store_whiplash_error!(:eof, options)
-            Rails.logger.error "[Whiplash][EOF] Failed to connect to #{url}"
-            raise ProviderError::InternalServerError, e.message
+            Rails.logger.error "[Whiplash][EOF] Failed to connect with options: #{options.inspect}"
+            raise WhiplashApiError::InternalServerError, e.message
           when 'Net::OpenTimeout'
             store_whiplash_error!(:timeout, options)
-            Rails.logger.error "[Whiplash][Timeout] Request to #{url} timed out"
-            raise ProviderError::Timeout, e.message
+            Rails.logger.error "[Whiplash][Timeout] Request with options: #{options.inspect} timed out"
+            raise WhiplashApiError::Timeout, e.message
           else
             store_whiplash_error!(:connection, options)
-            Rails.logger.error "[Whiplash] Request to #{url} failed"
-            raise ProviderError::InternalServerError, e.message
+            Rails.logger.error "[Whiplash] Request with options: #{options.inspect} failed"
+            raise WhiplashApiError::InternalServerError, e.message
           end
         end
       end
@@ -63,6 +63,7 @@ module Whiplash
         results = []
         page = 1
         params[:per_page] = PER_PAGE_REQUEST_LIMIT
+        response = nil
 
         loop do
           partial_results_request = app_request!(
@@ -70,19 +71,33 @@ module Whiplash
             endpoint: endpoint,
             params: params,
             headers: headers
-          ).body
+          )
+
+          if !partial_results_request.success?
+            response = Faraday::Response.new(
+              body: partial_results_request.body,
+              status: partial_results_request.status,
+              method: :get
+            )
+            break
+          end
 
-          results << partial_results_request
+          results << partial_results_request.body
           results.flatten!
 
           page += 1
           params[:page] = page
 
-          break if partial_results_request.size == 0
-          break if partial_results_request.size < PER_PAGE_REQUEST_LIMIT
+          break if partial_results_request.body.size == 0
+          break if partial_results_request.body.size < PER_PAGE_REQUEST_LIMIT
         end
 
-        results
+        response ||= Faraday::Response.new(
+          body: results,
+          status: 200,
+          method: :get
+        )
+
       end
 
       def delete(endpoint, params = {}, headers = nil)
@@ -146,7 +161,8 @@ module Whiplash
         if !response.success?
           case response.status
           when 500
-            Appsignal.send_error(WhiplashApiError::InternalServerError.new(response.body), {raised: false})
+            # Do we want to replace this with anything?
+            # Appsignal.send_error(WhiplashApiError::InternalServerError.new(response.body), {raised: false})
           else
           end
 

data/lib/whiplash/app/version.rb

@@ -1,5 +1,5 @@
 module Whiplash
   class App
-    VERSION = "0.7.0"
+    VERSION = "0.9.0"
   end
 end

data/lib/whiplash/app.rb

@@ -1,37 +1,28 @@
 require "whiplash/app/api_config"
-require "whiplash/app/caching"
 require "whiplash/app/connections"
 require "whiplash/app/finder_methods"
 require "whiplash/app/signing"
 require "whiplash/app/version"
 require "errors/whiplash_api_error"
 require "oauth2"
-require "faraday_middleware"
+require "faraday"
 
 module Whiplash
   class App
     include Whiplash::App::ApiConfig
-    include Whiplash::App::Caching
     include Whiplash::App::Connections
     include Whiplash::App::FinderMethods
     extend Whiplash::App::Signing
 
     attr_accessor :customer_id, :shop_id, :token
 
-    def initialize(token=nil, options={})
-      token ||= cache_store["whiplash_api_token"]
-      @token = format_token(token) unless token.nil?
+    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
     end
 
-    def self.whiplash_api_token
-      store = Moneta.new(:Redis, host: ENV["REDIS_HOST"], port: ENV["REDIS_PORT"], password: ENV["REDIS_PASSWORD"], expires: 7200)
-      cache_store = Moneta::Namespace.new store, Whiplash::App::Caching.namespace_value
-      cache_store["whiplash_api_token"]
-    end
-
     def client
       OAuth2::Client.new(ENV["WHIPLASH_CLIENT_ID"], ENV["WHIPLASH_CLIENT_SECRET"], site: api_url)
     end
@@ -41,14 +32,11 @@ module Whiplash
     end
 
     def connection
-      out = Faraday.new [api_url, versioned_api_url].join("/") do |conn|
-        conn.request :oauth2, token.token, token_type: "bearer"
+      Faraday.new [api_url, versioned_api_url].join("/") do |conn|
+        conn.request :authorization, 'Bearer', token.token
         conn.request :json
         conn.response :json, :content_type => /\bjson$/
-        conn.use :instrumentation
-        conn.adapter Faraday.default_adapter
       end
-      return out
     end
 
     def token=(oauth_token)
@@ -60,8 +48,6 @@ module Whiplash
       when /app_(manage|read)/
         begin
           access_token = client.client_credentials.get_token(scope: ENV["WHIPLASH_CLIENT_SCOPE"])
-          new_token = access_token.to_hash
-          cache_store["whiplash_api_token"] = new_token
         rescue URI::InvalidURIError => e
           raise StandardError, "The provide URL (#{ENV["WHIPLASH_API_URL"]}) is not valid"
         end
@@ -75,9 +61,6 @@ module Whiplash
 
     def token_expired?
       return token.expired? unless token.nil?
-      return true unless cache_store.key?("whiplash_api_token")
-      return true if cache_store["whiplash_api_token"].nil?
-      return true if cache_store["whiplash_api_token"].empty?
       false
     end
 

data/whiplash-app.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "oauth2", "~> 1.2.0"
-  spec.add_dependency "faraday_middleware", "~> 0.11.0"
-  spec.add_dependency "moneta", "~> 0.8.0"
+  spec.add_dependency "oauth2", "~> 2.0.4"
+  spec.add_dependency "faraday", "~> 2.7"
 
   spec.add_development_dependency "bundler", ">= 2.2"
   spec.add_development_dependency "rake", ">= 12.3.3"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: whiplash-app
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Don Sullivan, Mark Dickson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2023-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: moneta
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".idea/.gitignore"
 - ".rspec"
@@ -128,17 +115,15 @@ files:
 - lib/errors/whiplash_api_error.rb
 - lib/whiplash/app.rb
 - lib/whiplash/app/api_config.rb
-- lib/whiplash/app/caching.rb
 - lib/whiplash/app/connections.rb
 - lib/whiplash/app/finder_methods.rb
-- lib/whiplash/app/moneta/namespace.rb
 - lib/whiplash/app/signing.rb
 - lib/whiplash/app/version.rb
 - whiplash-app.gemspec
 homepage: https://github.com/whiplashmerch/whiplash-app
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -153,8 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: this gem provides connectivity to the Whiplash API for authentication and
   REST requests.

data/lib/whiplash/app/caching.rb

@@ -1,22 +0,0 @@
-require "moneta"
-require "whiplash/app/moneta/namespace"
-module Whiplash
-  class App
-    module Caching
-
-      def cache_store
-        if ENV["REDIS_HOST"]
-          store = Moneta.new(:Redis, host: ENV["REDIS_HOST"], port: ENV["REDIS_PORT"], password: ENV["REDIS_PASSWORD"], expires: 7200)
-          Moneta::Namespace.new store, Whiplash::App::Caching.namespace_value
-        else
-          Moneta.new(:File, dir: "tmp", expires: 7200)
-        end
-      end
-
-      def self.namespace_value
-        ENV["REDIS_NAMESPACE"] || ENV["WHIPLASH_CLIENT_ID"]
-      end
-
-    end
-  end
-end

data/lib/whiplash/app/moneta/namespace.rb

@@ -1,45 +0,0 @@
-module Moneta
-  class Namespace
-    attr_reader :moneta_store
-
-    def initialize store, ns
-      @moneta_store, @ns = store, ns
-    end
-
-    def [] key
-      @moneta_store["#{@ns}:#{key}"]
-    end
-
-    def []= key, value
-      @moneta_store["#{@ns}:#{key}"] = value
-    end
-
-    def delete key
-      @moneta_store.delete "#{@ns}:#{key}"
-    end
-
-    def key? key
-      @moneta_store.key? "#{@ns}:#{key}"
-    end
-
-    def has_key? key
-      @moneta_store.has_key? "#{@ns}:#{key}"
-    end
-
-    def store key, value, options
-      @moneta_store.store "#{@ns}:#{key}", value, options
-    end
-
-    def update_key key, options
-      @moneta_store.update_key "#{@ns}:#{key}", options
-    end
-
-    def clear
-      @moneta_store.clear
-    end
-
-    def method_missing method, args
-      @moneta_store.call method, *args
-    end
-  end
-end