oktakit 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fa09f58e951595b1e743df9a7fa8584254ec16c81444a4b961ae2c0f3cdfd4f
-  data.tar.gz: 04b21c8abfd412194f11ed3fbf5798e9de7cdda4bf878a51cb742c126d930f2f
+  metadata.gz: b4d2b1dd5d6eee741338e02a62ea9cb64ae2782fd3663a4ee29a31a9b134bfce
+  data.tar.gz: b603e424a30b4940c6d957738c4873542f0a197f48552f5e914e92265b871033
 SHA512:
-  metadata.gz: '0997c60e8dc44671eaa2422dc8863b4cb0441191829d1c012c7fc1c9fbbb943f59546cc027eef4dda2af774829cc5056950f072fdf5ef3f667a6b2810ce1836c'
-  data.tar.gz: 23e3a86d6bf5c928fa1d480b54340be3384722d7904ddd8df4885891b85a7ce52a48906dc39614e7b385ee939623cd34a71f825d49e1f50879f1c0f59a5e7476
+  metadata.gz: 831cfddb2979a460730e874e37bccc9d1299daa48f2d41c3f6b8e7023d2183691565b5766d6b4062ec9f6e12baf143d66386ca66d62d49983c2ed6fdc8b44226
+  data.tar.gz: d49f7e8f455c5dbc642daa70609dfa4a352dfb88dd788d4ae62c882e434085cb961c2eb5ac13b4fc555cef00922f64bd367411e4c9a8330f5fe1d48ce84de6e5

data/.github/workflows/cla.yml

@@ -0,0 +1,22 @@
+name: Contributor License Agreement (CLA)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize]
+  issue_comment:
+    types: [created]
+
+jobs:
+  cla:
+    runs-on: ubuntu-latest
+    if: |
+      (github.event.issue.pull_request 
+        && !github.event.issue.pull_request.merged_at
+        && contains(github.event.comment.body, 'signed')
+      ) 
+      || (github.event.pull_request && !github.event.pull_request.merged)
+    steps:
+      - uses: Shopify/shopify-cla-action@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          cla-token: ${{ secrets.CLA_TOKEN }}

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+2.7.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [v1.0.0] - 2023-07-12
+- [Upgrade to Faraday 2.x](https://github.com/Shopify/oktakit/pull/68)
+
+## [v0.3.3] - 2022-07-20
+- [Loosen sawyer dependency to allow 0.9.1](https://github.com/Shopify/oktakit/pull/61)
+
 ## [v0.3.2] - 2022-06-30
 - [Fix 'Faraday::Connection#authorization' deprecation warning](https://github.com/Shopify/oktakit/pull/56)
 

data/Gemfile.lock

@@ -1,45 +1,26 @@
 PATH
   remote: .
   specs:
-    oktakit (0.3.2)
-      sawyer (~> 0.8.1)
+    oktakit (1.0.0)
+      faraday (>= 2.0.1, < 3)
+      sawyer (>= 0.8.1, < 0.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     byebug (11.1.3)
     diff-lcs (1.4.4)
-    faraday (1.9.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    multipart-post (2.1.1)
+    faraday-net_http (3.0.2)
     parallel (1.21.0)
     parser (3.0.3.2)
       ast (~> 2.4.1)
-    public_suffix (4.0.6)
+    public_suffix (5.0.3)
     rainbow (3.0.0)
     rake (13.0.6)
     regexp_parser (2.2.0)
@@ -72,9 +53,9 @@ GEM
       rubocop (~> 1.22)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
-    sawyer (0.8.2)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     unicode-display_width (2.1.0)
     vcr (6.0.0)
     webrick (1.7.0)
@@ -98,4 +79,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.2.22
+   2.3.24

data/dev.yml

@@ -3,7 +3,7 @@
 name: oktakit
 
 up:
-  - ruby: 2.6.6
+  - ruby: 2.7.2
   - bundler
 
 commands:

data/lib/oktakit/client.rb

@@ -24,13 +24,10 @@ module Oktakit
     include Templates
     include Users
 
-    # In Faraday 0.9, Faraday::Builder was renamed to Faraday::RackBuilder
-    RACK_BUILDER_CLASS = defined?(Faraday::RackBuilder) ? Faraday::RackBuilder : Faraday::Builder
-
     # Default Faraday middleware stack
-    MIDDLEWARE = RACK_BUILDER_CLASS.new do |builder|
+    MIDDLEWARE = Faraday::RackBuilder.new do |builder|
       builder.use(Oktakit::Response::RaiseError)
-      builder.adapter(Faraday.default_adapter)
+      builder.adapter(:net_http)
     end
 
     def initialize(token: nil, access_token: nil, organization: nil, api_endpoint: nil)

data/lib/oktakit/response/raise_error.rb

@@ -6,7 +6,7 @@ module Oktakit
   module Response
     # This class raises an Oktakit-flavored exception based
     # HTTP status codes returned by the API
-    class RaiseError < Faraday::Response::Middleware
+    class RaiseError < Faraday::Middleware
       private
 
       def on_complete(response)

data/lib/oktakit/version.rb

@@ -1,3 +1,3 @@
 module Oktakit
-  VERSION = '0.3.2'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/oktakit.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency('sawyer', '~> 0.8.1')
+  spec.add_dependency('sawyer', '>= 0.8.1', '< 0.10')
+  spec.add_dependency('faraday', '>= 2.0.1', '< 3')
   spec.add_development_dependency('bundler')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oktakit
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Graeme Johnson
@@ -9,22 +9,48 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2023-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sawyer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -47,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/probots.yml"
 - ".github/workflows/ci.yml"
+- ".github/workflows/cla.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"

data/.github/probots.yml

@@ -1,2 +0,0 @@
-enabled:
-  - cla