wallaby 4.1.6 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7937875c96f6ecc708f03cc9a71b40b06958bf3
-  data.tar.gz: dd4f53a8a16d8e8a8e0ce2ebbf49379a89653cc7
+  metadata.gz: 97bd9fc25767069f94fd6d5dd0a594bfd068a8bf
+  data.tar.gz: 5462ca0cd790f6bfc5d01d13a4e3da7d5c72cd15
 SHA512:
-  metadata.gz: ab1541f97dd55962b4fa24d6747f0e2e9d5ceb76c8cc4f23931cb4593ab8d67bfc221dfd0f603d75550d8d3367bd66945c5f1f72139d40f96f59d3aa0e11c687
-  data.tar.gz: 1a8465bdbd6d6ed4b003a8ae8ded2a000f4a24b634fb872e236c24cee6edff5de5b76b910209fdf7e0c2f7c2b2933a4f2017dba54b2f6068a46f8dfcfd63d8b6
+  metadata.gz: f105ad40cbaa96f3f143a0f8c7aa4075e55f1b1fe2e38a0b99d2cd4e811d83aeafff524e934dd3f377b7b7cba9cadbf76751d1d37febb2389ae7b84f7f51ecde
+  data.tar.gz: 7f0f06a3c6291364a99e68a81b7f5d59d6dd560126205c4f999fe018c34566fffe57cbdabd5f638cd652ca06c6d5e86e43efd8b566ac2e2a4881c195fdc4cf62

data/app/controllers/wallaby/core_controller.rb

@@ -5,7 +5,7 @@ module Wallaby
     before_action :authenticate_user!, except: [ :status ]
 
     def status
-      render text: 'healthy'
+      render plain: 'healthy'
     end
 
     protected

data/app/controllers/wallaby/resources_controller.rb

@@ -65,7 +65,7 @@ module Wallaby
     protected
     def _prefixes
       @_prefixes ||= begin
-        current_script    = env['SCRIPT_NAME'].try(:[], 1..-1).presence
+        current_script    = request.env['SCRIPT_NAME'].try(:[], 1..-1).presence
         resource_path     = current_resources_name.gsub '::', '/'
         script_prefix     = [ current_script, resource_path ].compact.join '/'
 

data/app/routes/wallaby/resources_router.rb

@@ -30,7 +30,7 @@ class Wallaby::ResourcesRouter
   def call(env)
     params          = env['action_dispatch.request.path_parameters']
     controller      = find_controller_by params[:resources]
-    params[:action] = check_action_name_by controller, params
+    params[:action] = find_action_by params
 
     controller.action(params[:action]).call env
   rescue AbstractController::ActionNotFound, Wallaby::ModelNotFound => e
@@ -44,9 +44,7 @@ class Wallaby::ResourcesRouter
     Wallaby::Map.controller_map[model_class] || DEFAULT_CONTROLLER
   end
 
-  def check_action_name_by(controller, params)
-    params[:id].try do |id_action|
-      id_action if controller.public_method_defined? id_action
-    end || params[:action]
+  def find_action_by(params)
+    (params.delete(:defaults) || params)[:action]
   end
 end

data/app/views/wallaby/resources/form/_point.html.erb

@@ -4,13 +4,13 @@
     <div class="col-xs-6 col-sm-3">
       <div class="input-group">
         <span class="input-group-addon">X</span>
-        <%= form.number_field field_name, value: value.try(:first), multiple: true, class: 'form-control' %>
+        <%= form.number_field field_name, value: value.try(:[], 0), multiple: true, class: 'form-control' %>
       </div>
     </div>
     <div class="col-xs-6 col-sm-3">
       <div class="input-group">
         <span class="input-group-addon">Y</span>
-        <%= form.number_field field_name, value: value.try(:last), multiple: true, class: 'form-control' %>
+        <%= form.number_field field_name, value: value.try(:[], 1), multiple: true, class: 'form-control' %>
       </div>
     </div>
   </div>

data/app/views/wallaby/resources/index/_point.html.erb

@@ -1,6 +1,6 @@
 <% if value.nil? %>
   <%= null %>
 <% else %>
-  (<span class="x"><%= value.first %></span>,
-  <span class="y"><%= value.last %></span>)
+  (<span class="x"><%= value[0] %></span>,
+  <span class="y"><%= value[1] %></span>)
 <% end %>

data/app/views/wallaby/resources/show/_point.html.erb

@@ -1,6 +1,6 @@
 <% if value.nil? %>
   <%= null %>
 <% else %>
-  (<span class="x"><%= value.first %></span>,
-  <span class="y"><%= value.last %></span>)
+  (<span class="x"><%= value[0] %></span>,
+  <span class="y"><%= value[1] %></span>)
 <% end %>

data/config/routes.rb

@@ -22,13 +22,11 @@ Wallaby::Engine.routes.draw do
         route.post '',
           defaults: { action: 'create' }
         route.match ':id',
-          via: %i(  patch put ),
+          via: %i( patch put ),
           defaults: { action: 'update' }
         route.delete ':id',
           defaults: { action: 'destroy' }
       end
-      route.match ':id/:action', via: :all, as: :member
-      route.match ':action', via: :all, as: :collection
     end
   end
 end

data/lib/adaptors/wallaby/active_record/model_finder.rb

@@ -1,7 +1,17 @@
 class Wallaby::ActiveRecord::ModelFinder < Wallaby::ModelFinder
+  def base
+    Rails.cache.fetch 'wallaby/active_record/model_finder/base' do
+      if defined? ::ApplicationRecord
+        ::ApplicationRecord
+      else
+        ::ActiveRecord::Base
+      end
+    end
+  end
+
   def all
     Rails.cache.fetch 'wallaby/active_record/model_finder' do
-      ActiveRecord::Base.subclasses.reject do |model_class|
+      base.subclasses.reject do |model_class|
         model_class.abstract_class? ||
         model_class.to_s.start_with?('#<') ||
         model_class.name == 'ActiveRecord::SchemaMigration' ||

data/lib/helpers/wallaby/sorting_helper.rb

@@ -4,7 +4,7 @@ module Wallaby::SortingHelper
 
     if metadata[:is_origin] && !metadata[:is_association] || metadata[:sort_field_name]
       sort_field_name = metadata[:sort_field_name] || field_name
-      extra_params = next_sort_param sort_field_name
+      extra_params = next_sort_param(sort_field_name).permit!.to_h
       index_link(model_decorator.model_class, extra_params: extra_params) { metadata[:label] }
     else
       metadata[:label]

data/lib/wallaby/version.rb

@@ -1,3 +1,3 @@
 module Wallaby
-  VERSION = '4.1.6'
+  VERSION = '5.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wallaby
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 5.0.1
 platform: ruby
 authors:
 - Tianwen Chen
@@ -15,9 +15,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
@@ -25,9 +22,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -36,20 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement