hal_api-rails 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e8ca09414db3082766a5b86ee83310563af05628
-  data.tar.gz: 002aceca75878356759760d73f5dd68cd6dc03d4
+SHA256:
+  metadata.gz: 35f7ab8e051a6d7132ecf26800670c4e56489c7371539ac92fdcc6e88fb5d280
+  data.tar.gz: 5fd5ecbdd0ba0287c0c01e1e5ed24cd23b5cb10aa157be28224b7ec6c6c25698
 SHA512:
-  metadata.gz: 25f710db7f628fbbd0b708c06e04f4b1f2eb8335ecbb8a48311e68ac4259ad5cfe80d5bbbd02df41d55ea846c8b0d4423055cf1fcbe64f09e37217d1d7c92d33
-  data.tar.gz: df4c7da616d62d01b5dddeb031b2e2c7bd94b61e6399452ab17fbe7a43ffe12c1909e5b138821de4e74dad83ac98295355a1550729a5a4220508f24faaa9f849
+  metadata.gz: 653ca1b7461fd1c3b598904e85e430c4632485f6c390192deaab63dc8e0a13c3970ed4d94486d1cf749d09966edf4055602b00a71e3f54c7b83a08bdc21a57b2
+  data.tar.gz: 11ce89bb941bf1e9f83d377fe1bc7b0da9a6e94cd7d7e93fb8b516348ceb7550e37966c2cbb6b4357f90bed927130a5a44658de12572ac0a37e1a2f270890f05

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.4.9

data/hal_api-rails.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "actionpack", ">= 3.0.0"
   spec.add_dependency "rack-test"
   spec.add_dependency "activesupport", ">= 3.0.0"
-  spec.add_dependency "responders", "~> 2.0"
-  spec.add_dependency "roar-rails", "~> 1.0.2"
+  spec.add_dependency "responders", "~> 3.0"
+  spec.add_dependency "roar-rails", "~> 1.1.0"
   spec.add_dependency "multi_json"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rails", "~> 4.2.1"
+  spec.add_development_dependency "rails", "~> 5.2.4"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "kaminari"

data/lib/hal_api/controller/exceptions.rb

@@ -11,10 +11,10 @@ module HalApi::Controller::Exceptions
               when 5
                 ::ActionDispatch::ExceptionWrapper.new(ActiveSupport::BacktraceCleaner.new, exception)
               else
-                ::ActionDispatch::ExceptionWrapper.new(env, exception)
+                ::ActionDispatch::ExceptionWrapper.new(request.env, exception)
               end
 
-    log_error(env, wrapper)
+    log_error(request.env, wrapper)
 
     error = exception
     if !error.is_a?(HalApi::Errors::ApiError)
@@ -25,12 +25,11 @@ module HalApi::Controller::Exceptions
 
     notice_error(exception) if error.status >= 500
 
-    respond_with(
-      error,
-      status: error.status,
-      location: nil, # for POST requests
-      represent_with: HalApi::Errors::Representer
-    )
+    json = {status: error.status, message: error.message}
+    if Rails.configuration.try(:consider_all_requests_local)
+      json[:backtrace] = error.backtrace
+    end
+    render status: error.status, json: json
   end
 
   def log_error(env, wrapper)

data/lib/hal_api/errors.rb

@@ -48,12 +48,4 @@ module HalApi::Errors
       super(msg, 400, hint)
     end
   end
-
-  module Representer
-    include Roar::JSON::HAL
-
-    property :status
-    property :message
-    property :backtrace, if: -> (*) { Rails.configuration.try(:consider_all_requests_local) }
-  end
 end

data/lib/hal_api/rails/version.rb

@@ -1,5 +1,5 @@
 module HalApi
   module Rails
-    VERSION = "0.7.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/hal_api/representer/embeds.rb

@@ -1,12 +1,13 @@
 require 'active_support/concern'
 require 'hal_api/paged_collection'
+require "representable/pipeline_factories"
 
 # expects underlying model to have filename, class, and id attributes
 module HalApi::Representer::Embeds
   extend ActiveSupport::Concern
 
   included do
-    Representable::Mapper.send(:include, Resources) if !Representable::Mapper.include?(Resources)
+    Representable::Binding.send(:include, HalApiRailsRenderPipeline) if !Representable::Binding.include?(HalApiRailsRenderPipeline)
   end
 
   def normalize_options!(options)
@@ -18,22 +19,36 @@ module HalApi::Representer::Embeds
     [propagated_options, private_options]
   end
 
-  module Resources
+  module HalApiRailsRenderPipeline
 
     def skip_property?(binding, private_options)
       super(binding, private_options) || suppress_embed?(binding, private_options)
     end
 
+    def render_functions
+      funcs = super
+      f = ->(input, options) do
+        if suppress_embed?(input, options)
+          return Representable::Pipeline::Stop
+        end
+      end
+      [f] + funcs
+    end
+
     # embed if zoomed
-    def suppress_embed?(binding, options)
-      name = binding[:as].evaluate(self).to_s || binding.name
-      embedded = !!binding[:embedded]
+    def suppress_embed?(input, options)
+      user_options = options[:options]
+
+      binding = options[:binding]
+
+      name = binding.evaluate_option(:as, input, options)
+
+      embedded = binding[:embedded]
 
-      # not embedded, return false - nothing to suppress
       return false if !embedded
 
-      # check if it should be zoomed, suppress if not
-      !embed_zoomed?(name, binding[:zoom], options[:zoom])
+      ## check if it should be zoomed, suppress if not
+      !embed_zoomed?(name, binding[:zoom], user_options[:zoom])
     end
 
     def embed_zoomed?(name, zoom_def = nil, zoom_param = nil)

data/lib/hal_api/representer/link_serialize.rb

@@ -15,8 +15,9 @@ module HalApi::Representer::LinkSerialize
       if options.is_a?(Hash) && (options.delete(:writeable) || options[:reader])
         name = options[:rel].to_s.split(':').last.split('/').last
         pname = "set_#{name}_uri"
-        reader = options.delete(:reader) || ->(doc, _args) do
+        reader = options.delete(:reader) || ->(represented:, doc:, **) do
           try("#{name}_id=", id_from_url(doc[pname])) if doc[pname]
+          Representable::Pipeline::Stop
         end
 
         property(pname, readable: false, reader: reader)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal_api-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Chris Rhoden
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -73,28 +73,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: roar-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 5.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -254,8 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: JSON HAL APIs on Rails in the style of PRX