wallaby 5.1.6 → 5.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad9fb3be960036fe7cb2726cd9fd30a9ee111aaa
-  data.tar.gz: f49cb2db9f22cfb9022624b30f0a718fabd2e93e
+  metadata.gz: 04e4d77dd4f0c389084731a11677f20d1642110c
+  data.tar.gz: 73de158010b2874fcfe05aaf97124a5d74242c05
 SHA512:
-  metadata.gz: 54a406b351d36c99269a644db761d88198379204832ab17aef026353d5b0f06d6ec0f3ca63290f23cb5fda5e1d68adca32ee9a63c146db5b1bfcef3d8ed28cf2
-  data.tar.gz: 0c5011125fc765c9a1d1a8b064cc1cf9665f220df1130232f6b8ee6cad3cbb928ecbedeff1ded060943a144421ec6aaf222d60b8b7ce12335f5c0703cddaaa39
+  metadata.gz: 1466a5835767aa9c31ade8afa89fd04d5a28e78550f95ca70d086344adc756a6df54c362cc5f90da04ca05728b56f13d62251344f68c924eae01f3f48d8f8195
+  data.tar.gz: ed032ac4752e3c61567126a501b9b012be88c8e77aa3d0deffb76e4760ca352d7ce97fa15ddc5c74d11a69b71aef8640cf63c6177ad37ffaf1333f51ad8dc65d

data/app/controllers/wallaby/application_controller.rb

@@ -15,6 +15,11 @@ module Wallaby
 
     layout 'wallaby/application'
 
+    # Health check page
+    def healthy
+      render plain: 'healthy'
+    end
+
     # Not found page
     # @param exception [Exception]
     def not_found(exception = nil)

data/app/controllers/wallaby/base_controller.rb

@@ -8,11 +8,6 @@ module Wallaby
 
     before_action :authenticate_user!, except: [:status]
 
-    # Health check page
-    def healthy
-      render plain: 'healthy'
-    end
-
     # @return [String] the resources name coming from params
     def current_resources_name
       @current_resources_name ||= params[:resources]

data/config/routes.rb

@@ -1,23 +1,21 @@
 Wallaby::Engine.routes.draw do
-  root to: 'wallaby/resources#home'
-
   # NOTE: For health check if needed
   # @see Wallaby::BaseController#healthy
-  get 'status', to: 'wallaby/resources#healthy'
+  get 'status', to: 'wallaby/application#healthy'
 
-  # To generate error pages for all HTTP status
-  Wallaby::ERRORS.each do |status|
-    code = Rack::Utils::SYMBOL_TO_STATUS_CODE[status]
-    get status, to: "wallaby/resources##{status}"
-    get code.to_s, to: "wallaby/resources##{status}"
-  end
+  with_options to: Wallaby::ResourcesRouter.new do |route|
+    route.root defaults: { action: 'home' }
+
+    # To generate error pages for all supported HTTP status
+    Wallaby::ERRORS.each do |status|
+      code = Rack::Utils::SYMBOL_TO_STATUS_CODE[status]
+      route.get status, defaults: { action: status }
+      route.get code.to_s, defaults: { action: status }
+    end
 
-  # This is to pass :resources and :action params onto
-  # `Wallaby::ResourcesRouter`.
-  # So that it could handle the request dispatching.
-  # Currently, it has implemented general CRUD resourceful routes
-  scope path: ':resources' do
-    with_options to: Wallaby::ResourcesRouter.new do |route|
+    # To generate general CRUD resourceful routes
+    # @see Wallaby::ResourcesRouter
+    scope path: ':resources' do
       # @see Wallaby::AbstractResourcesController#index
       route.get '', defaults: { action: 'index' }, as: :resources
       # @see Wallaby::AbstractResourcesController#new

data/lib/routes/wallaby/resources_router.rb

@@ -10,13 +10,13 @@ module Wallaby
     # @param env [Hash] @see http://www.rubydoc.info/github/rack/rack/master/file/SPEC
     def call(env)
       params = env[ActionDispatch::Http::Parameters::PARAMETERS_KEY]
-      controller = find_controller_by params[:resources]
+      controller = find_controller_by(params[:resources]) || default_controller
       params[:action] = find_action_by params
 
       controller.action(params[:action]).call env
     rescue ::AbstractController::ActionNotFound, ModelNotFound => e
       params[:error] = e
-      ResourcesController.action(:not_found).call env
+      default_controller.action(:not_found).call env
     end
 
     private
@@ -35,5 +35,11 @@ module Wallaby
       # @see Wallaby::Engine.routes
       (params.delete(:defaults) || params)[:action]
     end
+
+    # TODO: change to reflect the mount path changes
+    # @return [Class] controller class from configuration
+    def default_controller
+      Wallaby.configuration.mapping.resources_controller
+    end
   end
 end

data/lib/wallaby/version.rb

@@ -1,3 +1,3 @@
 module Wallaby
-  VERSION = '5.1.6'.freeze
+  VERSION = '5.1.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wallaby
 version: !ruby/object:Gem::Version
-  version: 5.1.6
+  version: 5.1.7
 platform: ruby
 authors:
 - Tianwen Chen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass