aptible-resource 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 727dee3e4e64a1b1f0be35efadbf7eef583dab83278fa4f6a483544a07b14441
-  data.tar.gz: 3b3ef5dd40b091731717c24a07801a6d13afe13002e8a6b5151162b32b398dd4
+  metadata.gz: 4eeb9d01868528de4be4cb015abbb22c9710086bf2d880c075997a60475f06ba
+  data.tar.gz: 6b1f04a38239649c91bc77f930c4d862ea7d068c7c4f77c36684699fed726925
 SHA512:
-  metadata.gz: 151cc9b90202b1fa61612ab5d290453c70152dbc357687a95b5d762cb0e9fc1a1289e6ac40cb6bb21e2859faa4597fbe65b5d73c84e0a22690552a4e38ba609e
-  data.tar.gz: db7c8f257b5b0cd5af179247b4a8b48ee353f4b713b2130c61aae166a69eb215166c8871434ea3fff20ae39d136a119a7c395adb8e7f1f89f08f9e8b9c11f56c
+  metadata.gz: 87b33183877986d2b1fc2ae9975a256bd361efb0c95f94a7e8d1cd145c36bebd8e3c185fcff32ed394f46076484c65743861004128a52419a5e7fe7541dd35b0
+  data.tar.gz: 90aaa5a7269f47379ed9e8bf7b23e510a3da41072ad7ad7a16a6f8e8ad9332cc473b367a354f88b5743d671230a317425858f42d63b9da95bb120ac1675d51de

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @dawenster

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 
 rvm:
-  - "2.0"
-  - "2.1"
   - "2.2"
   - "2.3"
+  - "2.6"
+  - "2.7"

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
-gem 'activesupport', '~> 4.0'
-
 # Specify your gem's dependencies in aptible-resource.gemspec
 gemspec

data/README.md

@@ -49,7 +49,5 @@ This gem depends on a vendored version of [HyperResource](https://github.com/gam
 
 MIT License, see [LICENSE](LICENSE.md) for details.
 
-Copyright (c) 2014 [Aptible](https://www.aptible.com) and contributors.
-
-[<img src="https://s.gravatar.com/avatar/9b58236204e844e3181e43e05ddb0809?s=60" style="border-radius: 50%;" alt="@sandersonet" />](https://github.com/sandersonet)
+Copyright (c) 2019 [Aptible](https://www.aptible.com) and contributors.
 

data/aptible-resource.gemspec

@@ -1,5 +1,6 @@
 # encoding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'English'
@@ -20,17 +21,17 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # HyperResource dependencies
-  spec.add_dependency 'uri_template', '>= 0.5.2'
-  spec.add_dependency 'json'
-  spec.add_dependency 'httpclient', '~> 2.8'
+  spec.add_dependency 'activesupport'
   spec.add_dependency 'fridge'
-  spec.add_dependency 'activesupport', '>= 4.0', '< 6.0'
   spec.add_dependency 'gem_config', '~> 0.3.1'
+  spec.add_dependency 'httpclient', '~> 2.8'
+  spec.add_dependency 'json'
+  spec.add_dependency 'uri_template', '>= 0.5.2'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'aptible-tasks'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 2.0'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '< 11.0'
+  spec.add_development_dependency 'rspec', '~> 2.0'
   spec.add_development_dependency 'webmock', '~> 2.3.2'
 end

data/lib/aptible/resource/adapter.rb

@@ -6,6 +6,7 @@ module Aptible
           return nil unless object
 
           return nil unless (type = object['_type'])
+
           if type.respond_to?(:camelize)
             type.camelize
           else

data/lib/aptible/resource/base.rb

@@ -5,7 +5,7 @@ require 'active_support/core_ext'
 require 'date'
 
 # Require vendored HyperResource
-$LOAD_PATH.unshift File.expand_path('../..', __FILE__)
+$LOAD_PATH.unshift File.expand_path('..', __dir__)
 require 'hyper_resource'
 
 require 'aptible/resource/adapter'
@@ -15,12 +15,14 @@ require 'aptible/resource/boolean'
 module Aptible
   module Resource
     # rubocop:disable ClassLength
+    # rubocop:disable DuplicateMethods
     class Base < HyperResource
       attr_accessor :errors
       attr_reader :token
 
       def self.get_data_type_from_response(response)
         return nil unless response && response.body
+
         adapter.get_data_type_from_object(adapter.deserialize(response.body))
       end
 
@@ -79,6 +81,7 @@ module Aptible
         new(options).find_by_url(url)
       rescue HyperResource::ClientError => e
         return nil if e.response.status == 404
+
         raise e
       end
 
@@ -182,6 +185,7 @@ module Aptible
 
         define_method iterator_method do |&block|
           next enum_for(iterator_method) if block.nil?
+
           send(relation).each(&block)
         end
       end
@@ -224,6 +228,7 @@ module Aptible
         end
       end
 
+      # rubocop:disable ReturnInVoidContext
       def initialize(options = {})
         return super(options) unless options.is_a?(Hash)
 
@@ -231,6 +236,7 @@ module Aptible
         super(options)
         self.token = options[:token] if options[:token]
       end
+      # rubocop:enable ReturnInVoidContext
 
       def populate_default_options!(options)
         options[:root] ||= root_url
@@ -317,5 +323,6 @@ module Aptible
       end
     end
     # rubocop:enable ClassLength
+    # rubocop:enable DuplicateMethods
   end
 end

data/lib/aptible/resource/default_retry_coordinator.rb

@@ -35,9 +35,12 @@ module Aptible
       def retry?(method, err)
         # rubocop:disable Style/CaseEquality
         return false unless RETRY_ERRORS.any? { |c| c === err }
+
         return false unless IDEMPOTENT_METHODS.include?(method)
+
         retry_in = retry_schedule.shift
         return false if retry_in.nil?
+
         sleep retry_in
         true
         # rubocop:enable Style/CaseEquality

data/lib/aptible/resource/errors.rb

@@ -1,6 +1,7 @@
 module Aptible
   module Resource
     class Errors
+      # rubocop:disable DuplicateMethods
       attr_accessor :status_code, :messages, :full_messages
 
       def self.from_exception(exception)
@@ -23,6 +24,7 @@ module Aptible
       def any?
         full_messages.any?
       end
+      # rubocop:enable DuplicateMethods
     end
   end
 end

data/lib/aptible/resource/null_retry_coordinator.rb

@@ -1,10 +1,9 @@
 module Aptible
   module Resource
     class NullRetryCoordinator
-      def initialize(_)
-      end
+      def initialize(___); end
 
-      def retry?(_, _)
+      def retry?(___, ____)
         false
       end
     end

data/lib/aptible/resource/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Resource
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

data/lib/aptible/resource.rb

@@ -42,6 +42,7 @@ module Aptible
       def retry_coordinator_class
         override = Thread.current[RETRY_COORDINATOR_OVERRIDE]
         return override if override
+
         configuration.retry_coordinator_class
       end
     end

data/spec/aptible/resource/base_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+# rubocop:disable BlockLength
+# rubocop:disable InterpolationCheck
 describe Aptible::Resource::Base do
   let(:hyperresource_exception) { HyperResource::ResponseError.new('403') }
   let(:error_response) { double 'Faraday::Response' }
@@ -36,6 +38,7 @@ describe Aptible::Resource::Base do
           calls << u
           page = pages[u]
           raise "Accessed unexpected URL #{u}" if page.nil?
+
           page
         end
       end
@@ -87,7 +90,7 @@ describe Aptible::Resource::Base do
 
       before do
         collection.stub(:entries) { [mainframe] }
-        collection.stub(:links) { Hash.new }
+        collection.stub(:links) { {} }
         Api::Mainframe.any_instance.stub(:find_by_url) { collection }
       end
 
@@ -269,7 +272,7 @@ describe Aptible::Resource::Base do
       HyperResource.any_instance.stub(:put) { raise hyperresource_exception }
       begin
         subject.update!({})
-      rescue
+      rescue StandardError
         # Allow errors to be populated and tested
         nil
       end
@@ -743,3 +746,5 @@ describe Aptible::Resource::Base do
     end
   end
 end
+# rubocop:enable InterpolationCheck
+# rubocop:enable BlockLength

data/spec/aptible/resource/retry_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 # With webmock (fake connections), to check how we handle timeouts.
+# rubocop:disable BlockLength
 describe Aptible::Resource::Base do
   let(:body) do
     { 'hello' => '1', '_links' => { 'self' => { 'href' => href } } }
@@ -156,3 +157,4 @@ describe Aptible::Resource::Base do
     end
   end
 end
+# rubocop:enable BlockLength

data/spec/fixtures/mainframe.rb

@@ -3,3 +3,4 @@ require_relative 'api'
 # rubocop:disable ClassAndModuleChildren
 class Api::Mainframe < Api
 end
+# rubocop:enable ClassAndModuleChildren

data/spec/fixtures/token.rb

@@ -3,3 +3,4 @@ require_relative 'api'
 # rubocop:disable ClassAndModuleChildren
 class Api::Token < Api
 end
+# rubocop:enable ClassAndModuleChildren

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: aptible-resource
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Frank Macreery
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: uri_template
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: fridge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,83 +39,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: gem_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: fridge
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem_config
+  name: uri_template
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: aptible-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: aptible-tasks
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,33 +137,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -232,7 +227,7 @@ homepage: https://github.com/aptible/aptible-resource
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -247,9 +242,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: Foundation classes for Aptible resource server gems
 test_files: