paid 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70fd01f1b198131d9ad8dc724f84b2d2ceb8a657
-  data.tar.gz: 1276983666dbd59141b11afaa22f4df492b4288c
+  metadata.gz: c9bad5d3576a96f19db1fbc05ccf224c9c8397de
+  data.tar.gz: 637c1c73672a9ca3122b7a843a63f83581058cac
 SHA512:
-  metadata.gz: 722631a43e1fa30520c084c255502896fbcc9f431c0b94f1826167e13bb3e13c8c80cbe43ad332bc9379cdf76af70764f7e62a195522b111b0823deaec98e920
-  data.tar.gz: 47576c6efc7655a8491ce854e9db9fd71ec1e3662f870f96ea97a7d9204e401be42892cfa38c41b42e5cb51059c1331435dfd31f14f26ff23d06dcaf6148bd5b
+  metadata.gz: 346aa1f1fbd0fa00dfee391c342683d51f4f932d1967d07c30f6010cc07de251458c7932cd13871195246ebd0612bbde20d21a075cfc33ac1f513db732371267
+  data.tar.gz: a9cb615bf5c3ce34deb33b9f4121edee4fe466a37a0be2adac10b05b2eb7ae6b8f8dd3638ded1ed23dc21348e6098176a9e409d2cd99b8b9621e4bf692ae6999

data/.travis.yml

@@ -5,6 +5,9 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.2.2
+  - 2.3.0
+  - 2.4.0
 
 gemfile:
   - gemfiles/default-with-activesupport.gemfile

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 gemspec
 
-if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('1.9.3')
+if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.2.2')
   gem 'i18n', '< 0.7'
   gem 'rest-client', '~> 1.6.8'
   gem 'activesupport', '~> 3.2'

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.2.0

data/gemfiles/default-with-activesupport.gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 gemspec :path => File.join(File.dirname(__FILE__), "..")
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.3')
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
   gem 'i18n', '< 0.7'
   gem 'rest-client', '~> 1.6.8'
   gem 'activesupport', '~> 3.2'

data/gemfiles/json.gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 gemspec :path => File.join(File.dirname(__FILE__), "..")
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.3')
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
   gem 'i18n', '< 0.7'
   gem 'rest-client', '~> 1.6.8'
   gem 'activesupport', '~> 3.2'

data/gemfiles/yajl.gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 gemspec :path => File.join(File.dirname(__FILE__), "..")
 
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.3')
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
   gem 'i18n', '< 0.7'
   gem 'rest-client', '~> 1.6.8'
   gem 'activesupport', '~> 3.2'

data/lib/paid/api_method.rb

@@ -84,15 +84,20 @@ module Paid
 
     # Handle a few common cases.
     def error_with_response(error)
+      message = begin
+        response_json[:error][:message]
+      rescue
+        nil
+      end
+
+      message ||= error.message
+
       case @response_code
-      when 400, 404
-        return APIError.new("Invalid request. Please check the URL and parameters.", self)
       when 401
-        return AuthenticationError.new("Authentication failed. Please check your API key and verify that it is correct.", self)
+        return AuthenticationError.new(message, self)
       else
-        return APIError.new("An error occured while making the API call.", self)
+        return APIError.new(message, self)
       end
     end
-
   end
 end

data/lib/paid/errors/api_error.rb

@@ -2,8 +2,8 @@ module Paid
   class APIError < PaidError
     attr_reader :api_method
 
-    def initialize(message=nil, api_method=nil)
-      @message = message
+    def initialize(message = nil, api_method = nil)
+      @message = message || response_message
       @api_method = api_method
     end
 
@@ -23,10 +23,20 @@ module Paid
       end
     end
 
+    def response_message
+      begin
+        json[:error][:message]
+      rescue
+        nil
+      end
+    end
+
     def to_s
-      prefix = code.nil? ? "" : "(Status #{code}) "
-      suffix = " JSON: #{JSON.pretty_generate(json)}" if json
-      "#{prefix}#{@message}" + (json ? suffix : "")
+      if code.nil?
+        return @message
+      else
+        return "(Status #{code}) #{@message}"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paid
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Jon Calhoun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-12 00:00:00.000000000 Z
+date: 2017-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for Paid API