prx_access 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f8b7ef136e13469b08b4eb1c280c39bfc69e7305edb5c94749a255af0db0377
-  data.tar.gz: 6671c40a518f2d37f9e716c7b48996f56a3add10b218180727d5a0af5618ab79
+  metadata.gz: 42e0393e6bd18939c03fbe4d196e1a767b8fd421fc2ada47677b98b7a9aaa0d0
+  data.tar.gz: de13e62e4a9cf58d1975bf7a87a29f39c7646124ff1eca76c095149fbef7d547
 SHA512:
-  metadata.gz: 970721dfc0033d9eb819a7cdf34cc14ddfda5c258528d4b0de389680edb400a744da316d1738a61a680b2c6abc03f2c65fb520a51cd6b16f1e1876a009f189e0
-  data.tar.gz: 604000f9edb872d73c83914bc9f0e637a36d0b3e54d9204c10ebdb1aec411b9529cc53d8d0c1adf55c5f099a96bd53682da38b9c362904893aa404eaa8ce18b7
+  metadata.gz: 342dec3da2d419e58544a17c0e0ffde8d3c4d41fb70668d140e11fde2f3aeb693e51e21956d84eb0a1fe06be9ac47554ddb500f774761d7a97a52f0f45d2d84d
+  data.tar.gz: cae8fe83ad8047b3035e76d1cf9f5ae6c42915adae8e9d2cb7a88f4a752ec3fd4d4e74409c4047e634482c6e1002be4c7b73b56b30938ee19f02363034d87962

data/.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Apply Standard fixes
+8674c73507b6460b6f6a4446c90e677bef6c60c4

data/.github/workflows/lint.yml

@@ -0,0 +1,14 @@
+name: Lint
+on: push
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Lint
+        run: bundle exec standardrb

data/.github/workflows/test.yml

@@ -0,0 +1,14 @@
+name: Test
+on: push
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+      - name: Run the tests
+        run: bundle exec rspec

data/.standard.yml

@@ -0,0 +1,2 @@
+fix: false
+format: simple

data/.tool-versions

@@ -0,0 +1 @@
+ruby 4.0.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in prx_access.gemspec
 gemspec

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "standard/rake"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/prx_access/prx_hyper_resource.rb

@@ -1,9 +1,9 @@
-require 'hyperresource'
-require 'active_support/core_ext/hash'
-require 'oauth2'
+require "hyperresource"
+require "active_support/core_ext/hash"
+require "oauth2"
+require "faraday/excon"
 
 module PRXAccess
-
   class PRXHyperResource < HyperResource
     def incoming_body_filter(hash)
       super(hash.deep_transform_keys { |key| key.to_s.underscore })
@@ -16,104 +16,101 @@ module PRXAccess
     class Link < HyperResource::Link
       attr_accessor :type, :profile
 
-      def initialize(resource, link_spec={})
+      def initialize(resource, link_spec = {})
         super
-        self.type = link_spec['type']
-        self.profile = link_spec['profile']
+        self.type = link_spec["type"]
+        self.profile = link_spec["profile"]
       end
 
       def where(params)
         super.tap do |res|
-          res.type = self.type
-          res.profile = self.profile
+          res.type = type
+          res.profile = profile
         end
       end
 
       def headers(*args)
         super.tap do |res|
           if args.count > 0
-            res.type = self.type
-            res.profile = self.profile
+            res.type = type
+            res.profile = profile
           end
         end
       end
 
-      def post_response(attrs=nil)
-        attrs ||= self.resource.attributes
-        attrs = (self.resource.default_attributes || {}).merge(attrs)
+      def post_response(attrs = nil)
+        attrs ||= resource.attributes
+        attrs = (resource.default_attributes || {}).merge(attrs)
 
         # adding this line to call outgoing_body_filter
         attrs = resource.outgoing_body_filter(attrs)
 
-        response = faraday_connection.post do |req|
-          req.body = self.resource.adapter.serialize(attrs)
+        faraday_connection.post do |req|
+          req.body = resource.adapter.serialize(attrs)
         end
-        response
       end
 
-      def put_response(attrs=nil)
-        attrs ||= self.resource.attributes
-        attrs = (self.resource.default_attributes || {}).merge(attrs)
+      def put_response(attrs = nil)
+        attrs ||= resource.attributes
+        attrs = (resource.default_attributes || {}).merge(attrs)
 
         # adding this line to call outgoing_body_filter
         attrs = resource.outgoing_body_filter(attrs)
 
-        response = faraday_connection.put do |req|
-          req.body = self.resource.adapter.serialize(attrs)
+        faraday_connection.put do |req|
+          req.body = resource.adapter.serialize(attrs)
         end
-        response
       end
 
-      def patch_response(attrs=nil)
-        attrs ||= self.resource.attributes.changed_attributes
-        attrs = (self.resource.default_attributes || {}).merge(attrs)
+      def patch_response(attrs = nil)
+        attrs ||= resource.attributes.changed_attributes
+        attrs = (resource.default_attributes || {}).merge(attrs)
 
         # adding this line to call outgoing_body_filter
         attrs = resource.outgoing_body_filter(attrs)
 
-        response = faraday_connection.patch do |req|
-          req.body = self.resource.adapter.serialize(attrs)
+        faraday_connection.patch do |req|
+          req.body = resource.adapter.serialize(attrs)
         end
-        response
       end
     end
   end
 
   def default_headers
     {
-      'Content-Type' => 'application/json',
-      'Accept' =>  'application/json'
+      "Content-Type" => "application/json",
+      "Accept" => "application/json"
     }
   end
 
   def api(options = {})
-    opts = { root: cms_root, headers: default_headers }.merge(options)
-    if !opts[:headers]['Authorization'] && account = opts.delete(:account)
+    opts = {root: cms_root, headers: default_headers}.merge(options)
+    if !opts[:headers]["Authorization"] && (account = opts.delete(:account))
       token = get_account_token(account, opts.delete(:scope))
-      opts[:headers]['Authorization'] = "Bearer #{token}"
+      opts[:headers]["Authorization"] = "Bearer #{token}"
     end
 
     PRXHyperResource.new(opts)
   end
 
   def api_resource(body, root = cms_root)
-    href = body['_links']['self']['href']
+    href = body["_links"]["self"]["href"]
     resource = api(root: root)
     link = PRXHyperResource::Link.new(resource, href: href)
     PRXHyperResource.new_from(body: body, resource: resource, link: link)
   end
 
   def get_account_token(account, scope = nil)
-    id = ENV['PRX_CLIENT_ID']
-    se = ENV['PRX_SECRET']
+    id = ENV["PRX_CLIENT_ID"]
+    se = ENV["PRX_SECRET"]
 
-    raise 'Missing PRX_CLIENT_ID PRX_SECRET ENV vars' if id.nil? || se.nil?
-    raise 'Missing ID_HOST ENV var' if ENV['ID_HOST'].nil?
+    raise "Missing PRX_CLIENT_ID PRX_SECRET ENV vars" if id.nil? || se.nil?
+    raise "Missing ID_HOST ENV var" if ENV["ID_HOST"].nil?
 
-    oauth_options = { site: id_root, token_url: '/token' }
+    oauth_options = {site: id_root, token_url: "/token"}
     client = OAuth2::Client.new(id, se, oauth_options) do |faraday|
-      faraday.request  :url_encoded
-      faraday.adapter  :excon
+      faraday.request :url_encoded
+      faraday.adapter :excon
     end
     if scope
       client.client_credentials.get_token(account: account, scope: scope).token
@@ -123,25 +120,25 @@ module PRXAccess
   end
 
   def id_root
-    root_uri ENV['ID_HOST']
+    root_uri ENV["ID_HOST"]
   end
 
   private
 
   def method_missing(method, *args)
-    if method =~ /_root$/
-      root_uri ENV[method.to_s.sub(/_root$/, '_HOST').upcase], '/api/v1'
+    if /_root$/.match?(method)
+      root_uri ENV[method.to_s.sub(/_root$/, "_HOST").upcase], "/api/v1"
     else
       super
     end
   end
 
   def respond_to_missing?(method, include_private = false)
-    method.to_s.ends_with?('_root') || super
+    method.to_s.ends_with?("_root") || super
   end
 
-  def root_uri(host, path = '')
-    if host =~ /\.org|\.tech/
+  def root_uri(host, path = "")
+    if /\.org|\.tech/.match?(host)
       URI::HTTPS.build(host: host, path: path).to_s
     else
       URI::HTTP.build(host: host, path: path).to_s

data/lib/prx_access/version.rb

@@ -1,3 +1,3 @@
 module PRXAccess
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/prx_access.gemspec

@@ -3,14 +3,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "prx_access/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "prx_access"
-  spec.version       = PRXAccess::VERSION
-  spec.authors       = ["Sam Vevang"]
-  spec.email         = ["sam.vevang@prx.org"]
+  spec.name = "prx_access"
+  spec.version = PRXAccess::VERSION
+  spec.authors = ["Sam Vevang"]
+  spec.email = ["sam.vevang@prx.org"]
 
-  spec.summary       = %q{PRX Access navigates HAL hypermedia resources on PRX services.}
-  spec.description   = %q{PRX Access is a gem to supply authentication headers and descend the HAL hypermedia link tree on PRX's APIs.}
-  spec.homepage      = "https://github.com/PRX/prx_access"
+  spec.summary = "PRX Access navigates HAL hypermedia resources on PRX services."
+  spec.description = "PRX Access is a gem to supply authentication headers and descend the HAL hypermedia link tree on PRX's APIs."
+  spec.homepage = "https://github.com/PRX/prx_access"
 
   if spec.respond_to?(:metadata)
     spec.metadata["homepage_uri"] = spec.homepage
@@ -22,21 +22,23 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "hyperresource", "~> 0.9.4"
   spec.add_dependency "activesupport", ">= 4.0.0"
-  spec.add_dependency "oauth2", "~> 1.4.1"
-  spec.add_dependency "excon", "~> 0.62.0"
+  spec.add_dependency "oauth2", "~> 2.0", ">= 2.0.22"
+  spec.add_dependency "excon", ">= 1.5.0"
+  spec.add_dependency "faraday-excon"
 
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.26"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "standard"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: prx_access
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sam Vevang
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyperresource
@@ -44,28 +43,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.22
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: faraday-excon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.62.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -98,30 +117,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.26
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.26
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +155,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: PRX Access is a gem to supply authentication headers and descend the
   HAL hypermedia link tree on PRX's APIs.
 email:
@@ -144,9 +177,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".git-blame-ignore-revs"
+- ".github/workflows/lint.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".standard.yml"
+- ".tool-versions"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE
@@ -163,7 +200,6 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/PRX/prx_access
   source_code_uri: https://github.com/PRX/prx_access
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -178,8 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: PRX Access navigates HAL hypermedia resources on PRX services.
 test_files: []

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.3
-before_install: gem install bundler -v 1.17.2