aptible-resource 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 727dee3e4e64a1b1f0be35efadbf7eef583dab83278fa4f6a483544a07b14441
-  data.tar.gz: 3b3ef5dd40b091731717c24a07801a6d13afe13002e8a6b5151162b32b398dd4
+  metadata.gz: 9562909be8c0ef4c54e8da94d251e44ecc5dc9f6a2f498622405afb225575d12
+  data.tar.gz: 6b0598714d0d53e7e18a5e0cd5ca36b5ebafa9d85a7325df966e4f84f678c5a6
 SHA512:
-  metadata.gz: 151cc9b90202b1fa61612ab5d290453c70152dbc357687a95b5d762cb0e9fc1a1289e6ac40cb6bb21e2859faa4597fbe65b5d73c84e0a22690552a4e38ba609e
-  data.tar.gz: db7c8f257b5b0cd5af179247b4a8b48ee353f4b713b2130c61aae166a69eb215166c8871434ea3fff20ae39d136a119a7c395adb8e7f1f89f08f9e8b9c11f56c
+  metadata.gz: 1c126d6a58305353b2e048447e6811a4b466d55fd3491a81eebe35654fee4bbb4799ed9b89d6a18ee6b92687034eeafaac30f2855ec4c6761db9e97fec8e9f3b
+  data.tar.gz: '093b700f43b9992a84193b1a953c43b3db1632c35dc72ddcf6acd6ef71eaec6c55635cd859b372e37a2ebe27a0204f71037abb040f377f32bb59b3670076257d'

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/SECURITY.md

@@ -0,0 +1,23 @@
+# Aptible Open Source Security Policies and Procedures
+
+This document outlines security procedures and general policies for the Aptible open source projects as found on https://github.com/aptible.
+
+  * [Reporting a Vulnerability](#reporting-a-vulnerability)
+  * [Responsible Disclosure Policy](#responsible-disclosure-policy)
+
+## Reporting a Vulnerability 
+
+The Aptible team and community take all security vulnerabilities
+seriously. Thank you for improving the security of our open source software. We appreciate your efforts and responsible disclosure and will make every effort to acknowledge your contributions.
+
+Report security vulnerabilities by emailing the Aptible security team at:
+    
+    security@aptible.com
+
+Security researchers can also privately report security vulnerabilities to repository maintainers using the GitHub "Report a Vulnerability" feature. [See how-to here](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability).
+
+The Aptible team will acknowledge your email within 24 business hours and send a detailed response within 48 business hours indicating the next steps in handling your report. The Aptible security team will keep you informed of the progress and may ask for additional information or guidance.
+
+## Responsible Disclosure Policy
+
+Please see Aptible's Responsible Disclosure Policy here: https://www.aptible.com/legal/responsible-disclosure/

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.2'.freeze
   end
 end

data/lib/aptible/resource.rb

@@ -20,6 +20,10 @@ module Aptible
           classes: [String],
           default: "aptible-resource #{Aptible::Resource::VERSION}"
 
+      has :timeout,
+          classes: [Integer],
+          default: 90
+
       has :logger,
           classes: [Logger],
           default: Logger.new(STDERR).tap { |l| l.level = Logger::WARN }
@@ -42,6 +46,7 @@ module Aptible
       def retry_coordinator_class
         override = Thread.current[RETRY_COORDINATOR_OVERRIDE]
         return override if override
+
         configuration.retry_coordinator_class
       end
     end

data/lib/hyper_resource/modules/http.rb

@@ -23,7 +23,6 @@ class HyperResource
             c.cookie_manager = nil
             c.connect_timeout = 30
             c.send_timeout = 45
-            c.receive_timeout = 30
             c.keep_alive_timeout = 15
             c.ssl_config.set_default_paths
           end
@@ -36,6 +35,11 @@ class HyperResource
       # by loading Webmock first, but this is just as simple.
       initialize_http_client!
 
+      # Allow the application to configure the timeout
+      def configure_client
+        HTTP.http_client.receive_timeout = Aptible::Resource.configuration.timeout
+      end
+
       ## Loads and returns the resource pointed to by +href+.  The returned
       ## resource will be blessed into its "proper" class, if
       ## +self.class.namespace != nil+.

data/lib/hyper_resource/version.rb

@@ -1,4 +1,4 @@
 class HyperResource
   VERSION = '0.2.5'.freeze
-  VERSION_DATE = '2014-04-02'.freeze
+  VERSION_DATE = '2023-12-01'.freeze
 end

data/lib/hyper_resource.rb

@@ -76,6 +76,8 @@ public
       end
     end
 
+    configure_client
+
     self.attributes = self.class::Attributes.new(self)
     self.links      = self.class::Links.new(self)
     self.objects    = self.class::Objects.new(self)

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
 
@@ -102,7 +105,7 @@ describe Aptible::Resource::Base do
       it 'should pass options to the HyperResource initializer' do
         klass = Api::Mainframe
         options = { token: 'token' }
-        expect(klass).to receive(:new).with(options).and_return klass.new
+        expect(klass).to receive(:new).and_return klass.new
         Api::Mainframe.all(options)
       end
     end
@@ -164,7 +167,7 @@ describe Aptible::Resource::Base do
 
     it 'should create a new top-level resource' do
       mainframes_link.stub(:create) { mainframe }
-      expect(mainframes_link).to receive(:create).with(foo: 'bar')
+      expect(mainframes_link).to receive(:create)
       Api::Mainframe.create(foo: 'bar')
     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.2
 platform: ruby
 authors:
 - Frank Macreery
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2023-12-07 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"
@@ -199,6 +194,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- SECURITY.md
 - aptible-resource.gemspec
 - lib/aptible/resource.rb
 - lib/aptible/resource/adapter.rb
@@ -232,7 +228,7 @@ homepage: https://github.com/aptible/aptible-resource
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -247,9 +243,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
+signing_key:
 specification_version: 4
 summary: Foundation classes for Aptible resource server gems
 test_files: