hal_api-rails 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4d1af91c55bf42a53d4ecfe0c6ed673bd2856a57
-  data.tar.gz: 0f0dac6e3b4e33821d9c20b0efe5fa1ead07b30e
+SHA256:
+  metadata.gz: e4a383f7f5a7b49036f2f1bf9d213da2577984ef069bb9167f3ac01e7f439403
+  data.tar.gz: f8439a6fedd8b7d50cdda86eac60ec58e71380354cc2d02be7804c9964bc30d4
 SHA512:
-  metadata.gz: 9bdfb40d56cfac300c5b2263ab25eec3b6162420cb417897c558b3e4bdfbd556acefe32da9387939ced5cb35046ad9295a6c7889881f385d996621914c0f5f3a
-  data.tar.gz: 5c0745b9303bae2e66046fbda5ded266b0b642350968e5bbaf409a55d6c49186770217c22a2f80813e85f4f3e4b9e58b69c6a548689e44f55dba6c8def4b3e02
+  metadata.gz: 66af2d5541debb9174aedb920a52db996d792474722e9d1aca0c7dda083023dbec5332364dac991de00f54aa10e04b51c76da9bec32aeb6343af920e734225aa
+  data.tar.gz: e405ea5770a85801b2bd1cf5c5110ad7cc6a6c7b56940866dbfc2aaeec6a82cb4d4afb483d2794a9fd13f6fa01ca98f22179e87c0db82e8f19d362ba301414f8

data/.ruby-version

@@ -1 +1 @@
-2.4.9
+2.7.2

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in hal_api-rails.gemspec

data/Rakefile

@@ -1,10 +1,13 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
+  t.libs << 'test'
+  t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
+  t.warning = false
 end
 
-task :default => :test
+task default: :test

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "hal_api/rails"
+require 'bundler/setup'
+require 'hal_api/rails'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "hal_api/rails"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/hal_api-rails.gemspec

@@ -1,36 +1,35 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'hal_api/rails/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "hal_api-rails"
+  spec.name          = 'hal_api-rails'
   spec.version       = HalApi::Rails::VERSION
-  spec.authors       = ["Chris Rhoden", "Andrew Kuklewicz"]
-  spec.email         = ["carhoden@gmail.com", "andrew@beginsinwonder.com"]
+  spec.authors       = ['Chris Rhoden', 'Andrew Kuklewicz']
+  spec.email         = ['carhoden@gmail.com', 'andrew@beginsinwonder.com']
 
-  spec.summary       = %q{JSON HAL APIs on Rails in the style of PRX}
-  spec.description   = %q{JSON HAL APIs on Rails in the style of PRX v4. Uses ROAR}
-  spec.homepage      = "https://www.github.com/PRX/"
-  spec.license       = "MIT"
+  spec.summary       = 'JSON HAL APIs on Rails in the style of PRX'
+  spec.description   = 'JSON HAL APIs on Rails in the style of PRX v4. Uses ROAR'
+  spec.homepage      = 'https://www.github.com/PRX/'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activemodel", ">= 3.0.0"
-  spec.add_dependency "actionpack", ">= 3.0.0"
-  spec.add_dependency "rack-test"
-  spec.add_dependency "activesupport", ">= 3.0.0"
-  spec.add_dependency "responders", "~> 3.0"
-  spec.add_dependency "roar-rails", "~> 1.1.0"
-  spec.add_dependency "multi_json"
+  spec.add_dependency 'activemodel'
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'multi_json'
+  spec.add_dependency 'roar-rails'
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rails", "~> 5.2.4"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "kaminari"
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'kaminari'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rails', '~> 5.2.4'
+  spec.add_development_dependency 'rake',  '>= 12.3.3'
 end

data/lib/hal_api/controller/actions.rb

@@ -74,8 +74,7 @@ module HalApi::Controller::Actions
       if zoom_param
         p[:user_options] = (p[:user_options] || {}).merge(zoom: zoom_param)
       end
-    end.
-    to_h
+    end.to_h
   end
 
   def zoom_param
@@ -91,7 +90,7 @@ module HalApi::Controller::Actions
   end
 
   def hal_authorize(resource)
-    if !respond_to?(:authorize)
+    unless respond_to?(:authorize, true)
       define_singleton_method(:authorize) do |_resource|
         true
       end
@@ -101,7 +100,6 @@ module HalApi::Controller::Actions
     authorize(resource)
   end
 
-
   module ClassMethods
     def allow_params(action, *params)
       self.valid_params ||= {}

data/lib/hal_api/controller/exceptions.rb

@@ -7,23 +7,27 @@ module HalApi::Controller::Exceptions
   extend ActiveSupport::Concern
 
   def respond_with_error(exception)
-    wrapper = case HalApi.rails_major_version
-              when 5
-                ::ActionDispatch::ExceptionWrapper.new(ActiveSupport::BacktraceCleaner.new, exception)
-              else
-                ::ActionDispatch::ExceptionWrapper.new(request.env, exception)
-              end
-
-    log_error(request.env, wrapper)
-
-    error = exception
-    if !error.is_a?(HalApi::Errors::ApiError)
-      error = HalApi::Errors::ApiError.new(error.message).tap do |e|
-        e.set_backtrace(error.backtrace)
+    wrapper =
+      if HalApi.rails_major_version >= 5
+        ::ActionDispatch::ExceptionWrapper.new(ActiveSupport::BacktraceCleaner.new, exception)
+      else
+        ::ActionDispatch::ExceptionWrapper.new(request.env, exception)
       end
-    end
 
-    notice_error(exception) if error.status >= 500
+    error =
+      if exception.is_a?(HalApi::Errors::ApiError) && exception.status >= 500
+        log_error(request.env, wrapper)
+        notice_error(exception)
+        exception
+      elsif exception.is_a?(HalApi::Errors::ApiError)
+        exception
+      else
+        log_error(request.env, wrapper)
+        notice_error(exception)
+        HalApi::Errors::ApiError.new(exception.message).tap do |e|
+          e.set_backtrace(exception.backtrace)
+        end
+      end
 
     respond_with(
       error,

data/lib/hal_api/controller.rb

@@ -36,8 +36,7 @@ module HalApi::Controller
   private
 
   def set_accepts
-    mime_comparator = case HalApi::rails_major_version
-                      when 5
+    mime_comparator = if HalApi::rails_major_version >= 5
                         Mime[:html]
                       else
                         Mime::HTML
@@ -46,8 +45,7 @@ module HalApi::Controller
   end
 
   def env
-    case HalApi.rails_major_version
-    when 5
+    if HalApi.rails_major_version >= 5
       request.env
     else
       super

data/lib/hal_api/paged_collection.rb

@@ -72,9 +72,10 @@ class HalApi::PagedCollection
   # If this is an embedded collection, the parent will be set here for use in urls
   def parent
     rep = options[:parent]
-    return rep unless rep.respond_to?(:becomes)
+    return rep unless rep.respond_to?(:becomes, true)
+
     klass = rep.class.try(:base_class)
-    (klass && (klass != rep.class)) ? rep.becomes(klass) : rep
+    klass && (klass != rep.class) ? rep.becomes(klass) : rep
   end
 
   def count

data/lib/hal_api/rails/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module HalApi
   module Rails
-    VERSION = '1.1.4'
+    VERSION = '1.2.0'
   end
 end

data/lib/hal_api/representer/collection_paging.rb

@@ -64,10 +64,10 @@ module HalApi::Representer::CollectionPaging
       return result
     end
 
-    if represented_url.respond_to?(:call)
-      self.instance_exec(options, &represented_url)
-    elsif self.respond_to?(represented_url)
-      self.send(represented_url, options)
+    if represented_url.respond_to?(:call, true)
+      instance_exec(options, &represented_url)
+    elsif respond_to?(represented_url, true)
+      send(represented_url, options)
     else
       represented_url.to_s
     end

data/lib/hal_api/representer/uri_methods.rb

@@ -68,9 +68,10 @@ module HalApi::Representer::UriMethods
   end
 
   def becomes_represented_class(rep)
-    return rep unless rep.respond_to?(:becomes)
+    return rep unless rep.respond_to?(:becomes, true)
+
     klass = rep.try(:item_class) || rep.class.try(:base_class)
-    (klass && (klass != rep.class)) ? rep.becomes(klass) : rep
+    klass && (klass != rep.class) ? rep.becomes(klass) : rep
   end
 
   def alternate_url(*path)
@@ -103,9 +104,9 @@ module HalApi::Representer::UriMethods
       part.to_s.dasherize
     else
       klass = part.is_a?(Class) ? part : (part.try(:item_class) || part.class)
-      if klass.respond_to?(:base_class) && !klass.superclass.name.demodulize.starts_with?('Base')
+      if klass.respond_to?(:base_class, true) && !klass.superclass.name.demodulize.starts_with?('Base')
         parent = klass.superclass.name.underscore.dasherize
-        child = klass.name.underscore.gsub(/_#{parent}$/, "").dasherize
+        child = klass.name.underscore.gsub(/_#{parent}$/, '').dasherize
         [parent, child]
       else
         klass.name.underscore.dasherize

data/lib/hal_api.rb

@@ -6,6 +6,6 @@ module HalApi
   require 'hal_api/responders/api_responder'
 
   def self.rails_major_version
-    ::Rails.version.split('.')[0].to_i
+    ::Rails::VERSION::MAJOR
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal_api-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Rhoden
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -17,30 +17,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,55 +54,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: roar-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: responders
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: roar-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -110,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,35 +96,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -166,33 +138,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 description: JSON HAL APIs on Rails in the style of PRX v4. Uses ROAR
 email:
 - carhoden@gmail.com
@@ -255,8 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: JSON HAL APIs on Rails in the style of PRX