pager_duty-connection 1.4.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c392576dc99307e392b659a3bcdc08a71e93b7a9d1e4d1c1f2d0d1757c78cec
-  data.tar.gz: 710475fc120cf3d3ae18f4eeaeebfbc78d878c80aacc612acbc72fc759405fe5
+  metadata.gz: 6ec4e78b2def787e07a82a8dfb19838dcace837e98647e386209af24003f26e9
+  data.tar.gz: 7d0885571bbf8e088de58ec22a12bff3354935b5c036017c0548babf8422e933
 SHA512:
-  metadata.gz: 22907cfe9371c5767c9341037a14a0df90e5d410faa2302973295a70a8a10d9453f565c3f5d10986d96976d11a6e0d59598e3a8035b2ef391ced4e2f5ef13722
-  data.tar.gz: f0e3c25d24760085ebdaa6dc0c3838e85cc7ead08a12e75e1aa113f8f2be0aa0a2de5e736348a5faf249339cb5cf0759fc5abc492062f287599d2030f0509767
+  metadata.gz: e30277c8080331cd8ae89dcf520d7d9df945a5ed5456f4b0acba12a40d43fa9ca038a5860650091762d47a08cd46c1149bbc5f93000d13b68f2fd793490e43c2
+  data.tar.gz: d47249fc1dab34ed3100177c81d13fc15b83f60201cbad4c9b1516f295da6cb156a723a54afbd753448e1cdfb1e7e2d6ba33c72eeffc53fb72ee9e87ae1e87db

data/.ruby-version

@@ -0,0 +1 @@
+2.7.5

data/README.md

@@ -53,6 +53,9 @@ pagerduty = PagerDuty::Connection.new(token)
 # setup the connection with OAuth2 token
 pagerduty = PagerDuty::Connection.new(token, token_type: :Bearer)
 
+# setup to use a custom domain
+pagerduty = PagerDuty::Connection.new(token, token_type: :Bearer, url: 'https://custom.domain.com')
+
 # 4 main methods: `get`, `post`, `put`, and `delete`:
 
 response = pagerduty.get('some/relative/path', params)

data/lib/pager_duty/connection/version.rb

@@ -1,5 +1,5 @@
 module PagerDuty
   class Connection
-    VERSION = "1.4.0"
+    VERSION = "2.1.0"
   end
 end

data/lib/pager_duty/connection.rb

@@ -10,6 +10,7 @@ module PagerDuty
     attr_accessor :connection
 
     API_VERSION = 2
+    API_PREFIX = "https://api.pagerduty.com/"
 
     class FileNotFoundError < RuntimeError
     end
@@ -36,10 +37,11 @@ module PagerDuty
         response = @app.call env
         unless [200, 201, 204].include?(response.status)
           url = response.env[:url].to_s
-          message = "Got HTTP #{response['status']} back for #{url}"
-          if error = response.body['error']
+          message = "Got HTTP #{response.status}: #{response.reason_phrase}\nFrom #{url}"
+
+          if error = response.body
             # TODO May Need to check error.errors too
-            message += "\n#{error.to_hash}"
+            message += "\n#{JSON.parse(error)}"
           end
 
           raise ApiError, message
@@ -119,6 +121,8 @@ module PagerDuty
           end
 
           body
+        when Array
+          body.map! { |element| parse(element) }
         else
           raise "Can't parse times of #{body.class}: #{body}"
         end
@@ -146,9 +150,9 @@ module PagerDuty
       end
     end
 
-    def initialize(token, token_type: :Token, debug: false)
+    def initialize(token, token_type: :Token, url: API_PREFIX, debug: false)
       @connection = Faraday.new do |conn|
-        conn.url_prefix = "https://api.pagerduty.com/"
+        conn.url_prefix = url
 
         token_arg =
           case token_type
@@ -158,10 +162,6 @@ module PagerDuty
           end
         conn.authorization(token_type, token_arg)
 
-        conn.use RaiseApiErrorOnNon200
-        conn.use RaiseFileNotFoundOn404
-        conn.use RaiseRateLimitOn429
-
         conn.use ConvertTimesParametersToISO8601
 
         # use json
@@ -174,6 +174,13 @@ module PagerDuty
         conn.response :json
         conn.response :logger, ::Logger.new(STDOUT), bodies: true if debug
 
+        # Because Faraday::Middleware executes in reverse order of
+        # calls to conn.use, status code error handling goes at the
+        # end of the block so that it runs first
+        conn.use RaiseApiErrorOnNon200
+        conn.use RaiseFileNotFoundOn404
+        conn.use RaiseRateLimitOn429
+
         conn.adapter  Faraday.default_adapter
       end
     end
@@ -181,12 +188,13 @@ module PagerDuty
     def get(path, request = {})
       # paginate anything being 'get'ed, because the offset/limit isn't intuitive
       request[:query_params] = {} if !request[:query_params]
-      page = (request[:query_params].delete(:page) || 1).to_i
-      limit = (request[:query_params].delete(:limit) || 100).to_i
+      page = request[:query_params].fetch(:page, 1).to_i
+      limit = request[:query_params].fetch(:limit, 100).to_i
       offset = (page - 1) * limit
-      request[:query_params] = request[:query_params].merge(offset: offset, limit: limit)
 
-      run_request(:get, path, **request)
+      query_params = request[:query_params].merge(offset: offset, limit: limit)
+
+      run_request(:get, path, **request.merge(query_params: query_params))
     end
 
     def put(path, request = {})

data/pager_duty-connection.gemspec

@@ -17,8 +17,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "faraday", "~> 0.8", "< 1.0"
-  gem.add_dependency "faraday_middleware", "~> 0.8", "< 1.0"
-  gem.add_dependency "activesupport", ">= 3.2", "< 7.0"
+  gem.add_dependency "faraday", "~> 1.0"
+  gem.add_dependency "faraday_middleware", "~> 1.0"
+  gem.add_dependency "activesupport", ">= 3.2", "< 8.0"
   gem.add_dependency "hashie", ">= 1.2"
+
+  gem.add_development_dependency "rake"
 end

metadata

@@ -1,23 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: pager_duty-connection
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Josh Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
@@ -25,9 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -35,9 +29,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
@@ -45,9 +36,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -59,7 +47,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +57,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby API wrapper for the PagerDuty REST API
 email:
 - josh@technicalpickles.com
@@ -92,6 +94,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -121,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.10
 signing_key: 
 specification_version: 4
 summary: Written with the power of faraday, pager_duty-connection tries to be a simple