hal_api-rails 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 55bafa6cf18127c04faa8b80bbfddd41bd2a1997
-  data.tar.gz: dc1afcbab0da95248de064ca1eccd3fc05c451e8
+SHA256:
+  metadata.gz: d68594ae3d9d3462393361b4e6786b9feffc6027f87ba0c2dab45b93b13d2a42
+  data.tar.gz: 822071d21ec62886a92db335aa33a04b18098640e6a06df5fc0fc5061056b9b4
 SHA512:
-  metadata.gz: 5ca1e1d019bc0423f27a07e0f62a1aa4985c8004b169c56d006cc4467d224ad804e5c3547ed3d5f1d3a6b02d758c12b3a79ddfd2034475614437b6b2a376953b
-  data.tar.gz: ab611560379b1bb403478c5e8213a7ed2159ea58fab45e8cb0d4265cbf2ca38d5c04a2a4128a855c49ea1e6462112c05dab1bb7961499aba5f80ce15c4b62571
+  metadata.gz: 57eec1594b15f83ded10dc34e521057ba29d894df67086cbabc1bdca786b77475ae95d23ed1ee8d68a79837a9a3ebda815cdfd80fe122baa8aaf3af78e9fd749
+  data.tar.gz: 6c80c27f1e4a9c6e8dc464901224cc1de2a7b95bb65f37045d67e55c44930c3c22dd22144342d9e928be63614e69a286dbb644e02891c70ea77c7fcfebf17a48

data/.travis.yml

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

data/hal_api-rails.gemspec

@@ -21,15 +21,15 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activemodel", ">= 3.0.0"
   spec.add_dependency "actionpack", ">= 3.0.0"
-  spec.add_dependency "rack-test", "~> 0.6.2"
+  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.1"
+  spec.add_dependency "roar-rails", "~> 1.0.2"
   spec.add_dependency "multi_json"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rails", "~> 4.2"
+  spec.add_development_dependency "rails", "~> 4.2.1"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "kaminari"

data/lib/hal_api.rb

@@ -3,4 +3,8 @@ module HalApi
   require 'hal_api/errors'
   require 'hal_api/controller'
   require 'hal_api/represented_model'
+
+  def self.rails_major_version
+    ::Rails.version.split('.')[0].to_i
+  end
 end

data/lib/hal_api/controller.rb

@@ -27,6 +27,21 @@ module HalApi::Controller
   private
 
   def set_accepts
-    request.format = :json if request.format == Mime::HTML
+    mime_comparator = case HalApi::rails_major_version
+                      when 5
+                        Mime[:html]
+                      else
+                        Mime::HTML
+                      end
+    request.format = :json if request.format == mime_comparator
+  end
+
+  def env
+    case HalApi.rails_major_version
+    when 5
+      request.env
+    else
+      super
+    end
   end
 end

data/lib/hal_api/controller/exceptions.rb

@@ -7,7 +7,13 @@ module HalApi::Controller::Exceptions
   extend ActiveSupport::Concern
 
   def respond_with_error(exception)
-    wrapper = ::ActionDispatch::ExceptionWrapper.new(env, exception)
+    wrapper = case HalApi.rails_major_version
+              when 5
+                ::ActionDispatch::ExceptionWrapper.new(ActiveSupport::BacktraceCleaner.new, exception)
+              else
+                ::ActionDispatch::ExceptionWrapper.new(env, exception)
+              end
+
     log_error(env, wrapper)
 
     error = exception

data/lib/hal_api/controller/resources.rb

@@ -98,11 +98,7 @@ module HalApi::Controller::Resources
   end
 
   def paged(arel)
-    if params[:per].to_i <= 0
-      arel.page(params[:page]).per(Kaminari.config.default_per_page)
-    else
-      arel.page(params[:page]).per(params[:per])
-    end
+    arel.page(params[:page]).per(params[:per])
   end
 
   def scoped(res)

data/lib/hal_api/rails/version.rb

@@ -1,5 +1,5 @@
 module HalApi
   module Rails
-    VERSION = "0.3.7"
+    VERSION = "0.4.0"
   end
 end

data/lib/hal_api/representer/collection_paging.rb

@@ -11,11 +11,11 @@ module HalApi::Representer::CollectionPaging
       embeds :items, decorator: lambda{|*| item_decorator }, class: lambda{|*| item_class }, zoom: :always
 
       link :prev do
-        href_url_helper(params.merge(page: represented.prev_page)) if represented.prev_page
+        href_url_helper(params.merge(page: represented.prev_page)) unless represented.first_page?
       end
 
       link :next do
-        href_url_helper(params.merge(page: represented.next_page)) if represented.next_page
+        href_url_helper(params.merge(page: represented.next_page)) unless represented.last_page?
       end
 
       link :first do
@@ -46,7 +46,6 @@ module HalApi::Representer::CollectionPaging
   # if it is a lambda, execute in the context against the represented.parent (if there is one) or represented
   def href_url_helper(options={})
     if represented_url.nil?
-      options = options.except(:format)
       result = url_for(options.merge(only_path: true)) rescue nil
       if represented.parent
         result ||= polymorphic_path([:api, represented.parent, represented.item_class], options) rescue nil

data/lib/hal_api/representer/embeds.rb

@@ -77,9 +77,7 @@ module HalApi::Representer::Embeds
         options[:getter] ||= ->(*) do
           cnt = send(name).count
           per = getter_per == :all ? cnt : getter_per
-          if cnt == 0
-            items = send(name).page(1).per(Kaminari.config.default_per_page)
-          elsif cnt <= per
+          if cnt <= per
             items = Kaminari.paginate_array(send(name)).page(1).per(per)
           else
             items = send(name).page(1).per(per)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal_api-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.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: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -43,16 +43,16 @@ dependencies:
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !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'
+        version: 4.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -253,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: JSON HAL APIs on Rails in the style of PRX

data/.ruby-version

@@ -1 +0,0 @@
-2.4.9