shippo 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e9b3dad7e28707246b571507602d3ba35099f2e
-  data.tar.gz: 9cb5e1856dfc29c5b422af3329f41c85206a1aa8
+  metadata.gz: 61372142180e7a1c28f2b3153ecf2e164f17750d
+  data.tar.gz: 288cd677e69cb653cd1fef7f613238d7460bf647
 SHA512:
-  metadata.gz: d42eeb2c390da517adf5b2fbd7303cd9a93b2404d8109e8b86048a797418e35a3bc06e4379f365c20e4eaa04aade647095141cbc7b14738b76935c8091e2e8aa
-  data.tar.gz: 2b3ac47863a604ed0cfd4766893262b145fe2ec57ff9406f6b995891ba363d9a20fc2facbbc983436da10c968109ebd5693639d8160930bdc0505f078137b0de
+  metadata.gz: 686fff2de127307d1d1f4beb9f4f7ad479b824c44fe4fa0b8c35982d28c47266ef795cac646ec1ec5a0f0bb58997cb3536c87cd09a24ef7d53f3035e8d4689bb
+  data.tar.gz: 7deb3a6c77c6b0faba3f6639b4e1acc8b11efd334aacf4303a14ca9b2fc9a708152ebc29c5685d3f7b6f29ca5874aee04e37060d03500a1ef6808935eebf1beb

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+#### 3.1.0 release, Sep 11th, 2017
+- Removed deprecated methods
+- Removed hash payload in GET
+- Made RestClient timeouts configurable
+- Suppressed Hashie warnings
+
 #### 3.0.1 release, Jul 14th, 2017
 - Updated rest client dependency
 

data/lib/shippo/api.rb

@@ -11,14 +11,16 @@ require 'shippo/api/resource'
 
 module Shippo
   module API
-    @base     = 'https://api.goshippo.com'
-    @version  = ''
-    @token    = ''
-    @debug    = Integer(ENV['SHIPPO_DEBUG'] || 0) > 0 ? true : false
-    @warnings = true
+    @base         = 'https://api.goshippo.com'
+    @version      = ''
+    @token        = ''
+    @debug        = Integer(ENV['SHIPPO_DEBUG'] || 0) > 0 ? true : false
+    @warnings     = true
+    @open_timeout = 15
+    @read_timeout = 30
 
     class << self
-      attr_accessor :base, :version, :token, :debug, :warnings
+      attr_accessor :base, :version, :token, :debug, :warnings, :open_timeout, :read_timeout
       # @param [Symbol] method One of :get, :put, :post
       # @param [String] uri the URL component after the first slash but before params
       # @param [Hash] params hash of optional parameters to add to the URL

data/lib/shippo/api/api_hash.rb

@@ -0,0 +1,11 @@
+require 'hashie/mash'
+require 'hashie/extensions/stringify_keys'
+
+module Shippo
+  module API
+    class ApiHash < Hashie::Mash
+      include Hashie::Extensions::StringifyKeys
+      disable_warnings
+    end
+  end
+end

data/lib/shippo/api/request.rb

@@ -89,7 +89,7 @@ module Shippo
       private
 
       def shippo_phone_home
-        payload     = {}
+        payload     = nil
         request_url = url
         (method == :get) ? request_url = params_to_url(params, url) : payload = params.to_json
         setup_headers!(headers)
@@ -118,8 +118,8 @@ module Shippo
           :method       => method,
           :payload      => payload,
           :url          => url,
-          :open_timeout => 15,
-          :timeout      => 30,
+          :open_timeout => ::Shippo::API.open_timeout,
+          :timeout      => ::Shippo::API.read_timeout,
           :user         => username,
           :password     => password,
           :user_agent   => 'Shippo/v2.0 RubyBindings'

data/lib/shippo/api/resource.rb

@@ -1,10 +1,10 @@
 require 'forwardable'
 
-require 'hashie/mash'
 require 'active_support/inflector'
 
 require 'shippo/exceptions'
 
+require_relative 'api_hash'
 require_relative 'api_object'
 require_relative 'category/status'
 require_relative 'transformers/list'
@@ -14,19 +14,11 @@ require_relative 'extend/url'
 
 module Shippo
   module API
-    class Resource < Hashie::Mash
-      include Hashie::Extensions::StringifyKeys
+    class Resource < ApiHash
       include Enumerable
       extend Forwardable
 
-      disable_warnings
-
-      def self.object_properties
-        Shippo::API::ApiObject::PROPS
-      end
-
       attr_accessor :object
-      def_delegators :@object, *object_properties
 
       # Creates a possibly recursive chain (map of lists, etc) of Resource
       # instances based on whether each value is a scalar, array or a hash.
@@ -45,15 +37,6 @@ module Shippo
         name.split('::')[-1]
       end
 
-      # Generate object_ accessors.
-      object_properties.each do |property|
-        method_name = ApiObject.field_name(property)
-        define_method method_name do
-          STDOUT.puts "#{method_name} style accessors are deprecated in favor of #resource.object.#{property}" if Shippo::API.warnings
-          self.object.send(property)
-        end
-      end
-
       # allows resources to use default or a custom url
       include Shippo::API::Extend::Url
       # allows resources to set supported operations
@@ -68,7 +51,7 @@ module Shippo
           (args.first.is_a?(String) && args.first =~ /^[0-9A-Fa-f]+$/)
           self.id = args.first
         elsif args.first.respond_to?(:keys)
-          h = Hashie::Mash.new(args.first)
+          h = ApiHash.new(args.first)
           self.deep_merge!(h)
           self.object = ApiObject.create_object(self)
           transformers.each do |transformer|

data/lib/shippo/api/version.rb

@@ -1,5 +1,5 @@
 module Shippo
   module API
-    VERSION = '3.0.1'
+    VERSION = '3.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shippo
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Shippo & Contributors
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -236,6 +236,7 @@ files:
 - bin/track_example
 - lib/shippo.rb
 - lib/shippo/api.rb
+- lib/shippo/api/api_hash.rb
 - lib/shippo/api/api_object.rb
 - lib/shippo/api/category.rb
 - lib/shippo/api/category/base.rb