pager_duty-connection 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 888b568573fb527b4a30f4d87eea9717c5f6b830
-  data.tar.gz: ff435a108de8e6e7bb5fc00a02773a2de0ea4801
+  metadata.gz: 023f927c20d23f46e093121970baec2c6bd7d7b9
+  data.tar.gz: 3199758e3e1c97a4133a2a4df7c1baddf0291776
 SHA512:
-  metadata.gz: 2c907052ec333a9a7665d6aa6575e8ba4199203ea4c62dc44cd5a2b5793fca9e369302fa9ab394752dc257467d528b0550bdbba845cd38e3bd3b557a7a6b8586
-  data.tar.gz: ce2965873258d77ce6f6b3cc4bbbd7fde41773f30a9209f0da8a3adc58e5a5e4f80a08b1e2877398ca56410bf64dc5cc8beca43b2e318cb4ffdb5fe66205ea9a
+  metadata.gz: 43d990dd1d1f56cdb81cc634912c3a2ad568dd9b2d89dcfec49377984a83fc60a46d03a6958fa754d02e9f151a52e7a1d2d7f28ac9d8b3ff0109e5842263e5ba
+  data.tar.gz: 7eced22a214afcb5cb46afbe94734942bcfa40a9066e057ce0525d889a6e26eb371be4fe5374572af6d5d7b97a19f71f282f17ab7338d7a3eab86a7de14b9293

data/lib/pager_duty/connection.rb

@@ -31,12 +31,13 @@ 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']
             # TODO May Need to check error.errors too
-            raise ApiError, "Got HTTP #{response['status']} back for #{url}. Error code #{error['code']}: #{error['message']}"
-          else
-            raise ApiError, "Got HTTP #{response['status']} back for #{url}."
+            message += "\n#{error.to_hash}"
           end
+
+          raise ApiError, message
         else
           response
         end
@@ -60,7 +61,7 @@ module PagerDuty
 
     end
 
-    class ParseTimeStrings < Faraday::Middleware
+    class ParseTimeStrings < Faraday::Response::Middleware
       TIME_KEYS = %w(
         created_at
         created_on
@@ -84,21 +85,22 @@ module PagerDuty
         service
       )
 
-      def call(env)
-        response = @app.call env
-
-        if env[:body]
+      def parse(body)
+        case body
+        when Hash, ::Hashie::Mash
           OBJECT_KEYS.each do |key|
-            object = env[:body][key]
+            object = body[key]
             parse_object_times(object) if object
 
             collection_key = key.pluralize
-            collection = env[:body][collection_key]
+            collection = body[collection_key]
             parse_collection_times(collection) if collection
           end
-        end
 
-        response
+          body
+        else
+          raise "Can't parse times of #{body.class}: #{body}"
+        end
       end
 
       def parse_collection_times(collection)
@@ -111,7 +113,9 @@ module PagerDuty
         time = Time.zone ? Time.zone : Time
 
         TIME_KEYS.each do |key|
-          object[key] = time.parse(object[key]) if object.has_key?(key)
+          if object.has_key?(key) && object[key].present?
+            object[key] = time.parse(object[key])
+          end
         end
       end
     end
@@ -124,18 +128,19 @@ module PagerDuty
         # use token authentication: http://developer.pagerduty.com/documentation/rest/authentication
         conn.token_auth token
 
-
-        conn.use ParseTimeStrings
         conn.use RaiseApiErrorOnNon200
-        # json back, mashify it
-        conn.response :mashify
-        conn.response :json, :content_type => /\bjson$/
         conn.use RaiseFileNotFoundOn404
 
         conn.use ConvertTimesParametersToISO8601 
+
         # use json
         conn.request :json
 
+        # json back, mashify it
+        conn.use ParseTimeStrings
+        conn.response :mashify
+        conn.response :json
+
         conn.adapter  Faraday.default_adapter
       end
     end

data/lib/pager_duty/connection/version.rb

@@ -1,5 +1,5 @@
 module PagerDuty
   class Connection
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/pager_duty-connection.gemspec

@@ -17,8 +17,8 @@ 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.6"
+  gem.add_dependency "faraday", "~> 0.8", "< 0.10"
   gem.add_dependency "faraday_middleware", "~> 0.9.0"
-  gem.add_dependency "activesupport", "~> 3.2"
+  gem.add_dependency "activesupport", ">= 3.2", "< 5.0"
   gem.add_dependency "hashie", ">= 1.2", "< 2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pager_duty-connection
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Josh Nichols
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: '0.8'
+    - - "<"
+      - !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.6
+        version: '0.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +48,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement