wallaby 5.0.1 → 5.1.3

data/app/controllers/wallaby/resources_controller.rb

@@ -1,134 +1,5 @@
 module Wallaby
-  class ResourcesController < CoreController
-    helper Wallaby::ResourcesHelper
-
-    def self.resources_name
-      if self < Wallaby::ResourcesController
-        Wallaby::Utils.to_resources_name name.gsub('Controller', '')
-      end
-    end
-
-    def self.model_class
-      if self < Wallaby::ResourcesController
-        Wallaby::Utils.to_model_class name.gsub('Controller', ''), name
-      end
-    end
-
-    def index
-      authorize! :index, current_model_class
-      collection
-    end
-
-    def new
-      authorize! :new, new_resource
-    end
-
-    def create
-      authorize! :create, current_model_class
-      @resource, is_success = current_model_service.create params, current_ability
-      if is_success
-        redirect_to resources_index_path, notice: 'successfully created'
-      else
-        flash.now[:error] = 'failed to create'
-        render :new
-      end
-    end
-
-    def show
-      authorize! :show, resource
-    end
-
-    def edit
-      authorize! :edit, resource
-    end
-
-    def update
-      authorize! :update, resource
-      @resource, is_success = current_model_service.update resource, params, current_ability
-      if is_success
-        redirect_to resources_show_path, notice: 'successfully updated'
-      else
-        flash.now[:error] = 'failed to update'
-        render :edit
-      end
-    end
-
-    def destroy
-      authorize! :destroy, resource
-      if current_model_service.destroy resource, params
-        redirect_to resources_index_path, notice: 'successfully destroyed'
-      else
-        redirect_to resources_show_path, error: 'failed to destroy'
-      end
-    end
-
-    protected
-    def _prefixes
-      @_prefixes ||= begin
-        current_script    = request.env['SCRIPT_NAME'].try(:[], 1..-1).presence
-        resource_path     = current_resources_name.gsub '::', '/'
-        script_prefix     = [ current_script, resource_path ].compact.join '/'
-
-        wallaby_path      = Wallaby::ResourcesController.controller_path
-        suffix            = %w( new create edit update ).include?(params[:action]) ? 'form' : params[:action]
-
-        minimal_prefixes  = super[0..super.index(wallaby_path)]
-        if resource_path != controller_path
-          minimal_prefixes.unshift script_prefix
-        end
-
-        minimal_prefixes.map do |prefix|
-          [ "#{ prefix }/#{ suffix }", prefix ]
-        end.flatten
-      end
-    end
-
-    def lookup_context
-      @_lookup_context ||= Wallaby::LookupContextWrapper.new super
-    end
-
-    def resources_index_path(name = current_resources_name)
-      wallaby_engine.resources_path name
-    end
-
-    def resources_show_path(name = current_resources_name, id = resource_id)
-      wallaby_engine.resource_path name, id
-    end
-
-    def current_model_service
-      @current_model_service ||= Wallaby::ServicerFinder.find(current_model_class).new current_model_class, current_model_decorator
-    end
-
-    def new_resource
-      @resource ||= current_model_service.new params
-    end
-
-    begin # helper methods
-      helper_method :resource_id, :resource, :collection, :current_model_decorator
-
-      def resource_id
-        params[:id]
-      end
-
-      def collection
-        @collection ||= begin
-          page_number = params.delete :page
-          per_number  = params.delete(:per) || 50
-
-          query = current_model_service.collection params, current_ability
-          query = query.page page_number if query.respond_to? :page
-          query = query.per per_number if query.respond_to? :per
-          query
-        end
-      end
-
-      def resource
-        @resource ||= current_model_service.find resource_id, params
-      end
-
-      def current_model_decorator
-        @current_model_decorator ||= Wallaby::DecoratorFinder.find_model current_model_class
-      end
-    end
+  # Resources controller, superclass for all customized controllers
+  class ResourcesController < Wallaby::AbstractResourcesController
   end
 end

data/app/controllers/wallaby/secure_controller.rb

@@ -1,42 +1,56 @@
 module Wallaby
-  class SecureController < ApplicationController
-    helper Wallaby::SecureHelper
-
-    rescue_from Wallaby::NotAuthenticated, with: :not_authenticated
-    rescue_from CanCan::AccessDenied, with: :access_denied
+  # This controller only contains authentication logics
+  class SecureController < ::Wallaby::ApplicationController
+    helper SecureHelper
     helper_method :current_user
 
-    protected
-    def not_authenticated(exception)
-      @exception = exception
-      render 'wallaby/errors/not_authenticated', status: 401, layout: 'wallaby/error'
+    rescue_from NotAuthenticated, with: :unauthorized
+    rescue_from ::CanCan::AccessDenied, with: :forbidden
+
+    # Unauthorized page
+    def unauthorized(exception = nil)
+      error_rendering(exception, __callee__)
     end
 
-    def access_denied(exception)
-      @exception = exception
-      render 'wallaby/errors/access_denied', status: 403
+    # Forbidden page
+    def forbidden(exception = nil)
+      error_rendering(exception, __callee__)
     end
 
+    protected
+
+    # Precedence of current_user:
+    # - [Security] @see Wallaby::SecureController#security_config
+    # - super
+    # - do nothing
+    # @see Devise::Controllers::Helpers#define_helpers
     def current_user
-      @current_user ||= if security_config.current_user? || !defined? super
-        instance_exec &security_config.current_user
-      else
-        super
-      end
+      @current_user ||=
+        if security_config.current_user? || !defined? super
+          instance_exec(&security_config.current_user)
+        else
+          super
+        end
     end
 
+    # Precedence of authenticate_user!:
+    # - [Security] @see Wallaby::SecureController#security_config
+    # - super
+    # - do nothing
+    # @see Devise::Controllers::Helpers#define_helpers
     def authenticate_user!
-      authenticated = if security_config.authenticate? || !defined? super
-        instance_exec &security_config.authenticate
-      else
-        super
-      end
-      fail Wallaby::NotAuthenticated if !authenticated
+      authenticated =
+        if security_config.authenticate? || !defined? super
+          instance_exec(&security_config.authenticate)
+        else
+          super
+        end
+      raise NotAuthenticated unless authenticated
       true
     end
 
     def security_config
-      Wallaby.configuration.security
+      configuration.security
     end
   end
 end

data/app/routes/wallaby/resources_router.rb

@@ -1,50 +1,47 @@
-if Rails.env.development?
-  # NOTE: Rails reload! will hit here
-  Rails.logger.debug '--> [ Wallaby ] Ready to preload and clear cache on reload. <--'
-  GC.start
-  Rails.cache.delete_matched 'wallaby/*'
-
-  # NOTE: we search for subclasses of Wallaby::ResourcesController and Wallaby::ResourceDecorator.
-  # therefore, under development environment, we need to preload all classes under /app folder in main_app
-  # using `require` is not working for preloading, we need to constantize the class names to make Rails reload classes properly
-  Wallaby::ApplicationController
-
-  def preload(file_pattern)
-    Dir[ file_pattern ].each do |file_path|
-      begin
-        name = file_path[ %r(app/[^/]+/(.+)\.rb), 1 ].gsub('concerns/', '')
-        name.classify.constantize
-      rescue NameError, LoadError => e
-        Rails.logger.debug "PRELOAD ERROR: #{ e.message }"
-      end
+module Wallaby
+  # This is the core of wallaby that dynamically dispatches request to
+  # appropriate controller and action.
+  class ResourcesRouter
+    # @see http://edgeguides.rubyonrails.org/routing.html#routing-to-rack-applications
+    # It tries to find out the controller that has the same model class from
+    # converted resources name. Otherwise, it falls back to generic controller
+    # `Wallaby::ResourcesController`.
+    # @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]
+      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
     end
-  end
-
-  preload 'app/models/**.rb'
-  preload 'app/**/*.rb'
-end
-
-class Wallaby::ResourcesRouter
-  DEFAULT_CONTROLLER = Wallaby::ResourcesController
 
-  def call(env)
-    params          = env['action_dispatch.request.path_parameters']
-    controller      = find_controller_by params[:resources]
-    params[:action] = find_action_by params
+    private
 
-    controller.action(params[:action]).call env
-  rescue AbstractController::ActionNotFound, Wallaby::ModelNotFound => e
-    params[:error] = e
-    DEFAULT_CONTROLLER.action(:not_found).call env
-  end
+    def find_controller_by(resources_name)
+      model_class = Map.model_class_map resources_name
+      Map.controller_map model_class
+    end
 
-  private
-  def find_controller_by(resources_name)
-    model_class = Wallaby::Utils.to_model_class resources_name
-    Wallaby::Map.controller_map[model_class] || DEFAULT_CONTROLLER
+    def find_action_by(params)
+      # Action name comes from either the defaults or :action param
+      # @see Wallaby::Engine.routes
+      (params.delete(:defaults) || params)[:action]
+    end
   end
+end
 
-  def find_action_by(params)
-    (params.delete(:defaults) || params)[:action]
-  end
+# NOTE: please keep this block at the end.
+# otherwise, it might go into a endless reloading loop
+# NOTE: Rails reload! will hit here
+if Rails.env.development?
+  puts <<-DEBUG
+  [ WALLABY ] reload! triggered
+    1. Clear all the maps
+    2. Preload all files under folder `app` (instead of eager load)
+  DEBUG
+  Wallaby::Map.clear
+  Wallaby::Utils.preload_all
 end

data/app/security/ability.rb

@@ -1,33 +1,9 @@
+# Defualt ability for wallaby
+# If main app has defined `ability.rb`, this file will not be loaded/used.
 class Ability
-  include CanCan::Ability
+  include ::CanCan::Ability
 
-  def initialize(user)
-    # Define abilities for the passed in user here. For example:
-    #
-    #   user ||= User.new # guest user (not logged in)
-    #   if user.admin?
-    #     can :manage, :all
-    #   else
-    #     can :read, :all
-    #   end
-    #
-    # The first argument to `can` is the action you are giving the user
-    # permission to do.
-    # If you pass :manage it will apply to every action. Other common actions
-    # here are :read, :create, :update and :destroy.
-    #
-    # The second argument is the resource the user can perform the action on.
-    # If you pass :all it will apply to every resource. Otherwise pass a Ruby
-    # class of the resource.
-    #
-    # The third argument is an optional hash of conditions to further filter the
-    # objects.
-    # For example, here the user can only update published articles.
-    #
-    #   can :update, Article, :published => true
-    #
-    # See the wiki for details:
-    # https://github.com/CanCanCommunity/cancancan/wiki/Defining-Abilities
+  def initialize(_user)
     can :manage, :all
   end
 end

data/app/views/layouts/wallaby/application.html.erb

@@ -3,20 +3,25 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <% if Wallaby.configuration.features.turbolinks_enabled %>
+      <meta name="turbolinks-cache-control" content="no-cache">
+    <% end %>
+    <%= csrf_meta_tags %>
 
-    <title><%= page_title %></title>
+    <title><%= render 'title' %></title>
 
-    <%= stylesheet_link_tag 'wallaby/application', media: 'all', 'data-turbolinks-track' => true %>
+    <%= stylesheet_link_tag 'wallaby/application', media: 'all' %>
     <%= yield :custom_stylesheet %>
-    <%= csrf_meta_tags %>
+    <%= javascript_include_tag 'turbolinks' if Wallaby.configuration.features.turbolinks_enabled %>
+    <%= javascript_include_tag 'wallaby/application' %>
   </head>
   <body class="application <%= body_class %>">
-    <%= render 'layouts/wallaby/header' %>
+    <%= render 'header' %>
     <main>
       <%= yield %>
     </main>
-    <%= render 'layouts/wallaby/footer' %>
-    <%= javascript_include_tag 'wallaby/application', 'data-turbolinks-track' => true %>
+    <%= render 'footer' %>
+    <%= render 'imodal' %>
     <%= yield :custom_javascript %>
   </body>
 </html>

data/app/views/layouts/wallaby/error.html.erb

@@ -3,18 +3,40 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <% if Wallaby.configuration.features.turbolinks_enabled %>
+      <meta name="turbolinks-cache-control" content="no-cache">
+    <% end %>
+    <%= csrf_meta_tags %>
 
-    <title><%= page_title %></title>
+    <title><%= render 'title' %></title>
 
-    <%= stylesheet_link_tag 'wallaby/application', media: 'all', 'data-turbolinks-track' => true %>
+    <%= stylesheet_link_tag 'wallaby/application', media: 'all' %>
     <%= yield :custom_stylesheet %>
-    <%= csrf_meta_tags %>
+    <%= javascript_include_tag 'turbolinks' if Wallaby.configuration.features.turbolinks_enabled %>
+    <%= javascript_include_tag 'wallaby/application' %>
   </head>
   <body class="error <%= body_class %>">
+    <header>
+      <nav class="navbar">
+        <div class="container-fluid">
+          <%# Brand %>
+          <div class="navbar-header">
+            <%# Mobile Menu Toggler %>
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-menu" aria-expanded="false">
+              <span class="fa fa-bars"></span>
+            </button>
+            <%# //Mobile Menu Toggler %>
+            <a class="navbar-brand" href="<%= wallaby_engine.root_path %>"><span>Wallaby</span> Admin</a>
+          </div>
+          <%# //Brand %>
+        </div>
+      </nav>
+    </header>
+
     <main>
       <%= yield %>
     </main>
-    <%= javascript_include_tag 'wallaby/application', 'data-turbolinks-track' => true %>
+    <%= render 'footer' %>
     <%= yield :custom_javascript %>
   </body>
 </html>

data/app/views/wallaby/error.html.erb

@@ -0,0 +1,11 @@
+<article class="<%= @symbol %>">
+  <h1>
+    <em><%= @code %></em>
+    <span><%= t "http_errors.#{@symbol}" %></span>
+  </h1>
+  <% if @code >= 500 %>
+    <%= t "http_errors.report_error_html" %>
+  <% else %>
+    <p><%= @exception.try :message %></p>
+  <% end %>
+</article>

data/app/views/wallaby/error.json.jbuilder

@@ -0,0 +1,8 @@
+json.error do
+  json.code @code
+  if @code < 500 && @exception.present?
+    json.message @exception.message
+  else
+    json.message t("json_errors.#{@symbol}")
+  end
+end

data/app/views/wallaby/resources/_footer.html.erb

@@ -0,0 +1 @@
+<footer></footer>

data/app/views/wallaby/resources/_form.html.erb

@@ -6,7 +6,7 @@
   <% end %>
 <% end %>
 <% decorated.form_field_names.each do |field_name| %>
-  <%= form_type_partial_render decorated.form_type_of(field_name).to_s, field_name: field_name, form: form %>
+  <%= form_type_partial_render decorated.form_type_of(field_name), field_name: field_name, form: form %>
 <% end %>
-<%= form.submit class: 'btn btn-primary' %>
+<%= form.button t('buttons.save'), class: 'btn btn-primary' %>
 <%= cancel_link class: 'btn btn-default' %>

data/app/views/wallaby/resources/_header.html.erb

@@ -0,0 +1,38 @@
+<header>
+  <nav class="navbar">
+    <div class="container-fluid">
+      <%# Brand %>
+      <div class="navbar-header">
+        <%# Mobile Menu Toggler %>
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-menu" aria-expanded="false">
+          <span class="fa fa-bars"></span>
+        </button>
+        <%# //Mobile Menu Toggler %>
+        <%= render 'logo' %>
+      </div>
+      <%# //Brand %>
+
+      <div id="top-menu" class="collapse navbar-collapse">
+        <%# Resources navigation %>
+        <%= render 'navs' %>
+        <%# //Resources navigation %>
+        <%# User account %>
+        <ul class="nav navbar-nav navbar-right">
+          <li><span class=""></span></li>
+          <% if current_user.present? %>
+            <li role="separator" class="divider"></li>
+            <li>
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                <%= user_portrait %>
+                <span class="visible-xs-inline-block">User</span>
+                <span class="caret"></span>
+              </a>
+              <%= render 'user_menu' %>
+            </li>
+          <% end %>
+        </ul>
+        <%# //User account %>
+      </div>
+    </div>
+  </nav>
+</header>

data/app/views/wallaby/resources/_imodal.html.erb

@@ -0,0 +1,13 @@
+<div id="imodal" class="modal fade" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button class="close" type="button" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+        <h4 class="modal-title"></h4>
+      </div>
+      <div class="modal-body"></div>
+    </div>
+  </div>
+</div>

data/app/views/wallaby/resources/_index_actions.html.erb

@@ -1 +1,4 @@
-<%= new_link(current_model_class, class: 'btn btn-primary') { ct 'link.new' } %>
+<% # can be overriden %>
+<ul aria-labelledby="actions_list">
+  <li><%= export_link current_model_class %></li>
+</ul>

data/app/views/wallaby/resources/_index_filters.html.erb

@@ -0,0 +1,23 @@
+<%
+filters = current_model_decorator.filters
+filter = ::Wallaby::Utils.find_filter_name index_params[:filter], filters
+html_options = proc do |filter_name|
+  { class: filter.to_s == filter_name.to_s ? 'filters--current' : '' }
+end
+%>
+<nav class="filters">
+  <% if filters.present? %>
+    <a role="button" data-target="#" data-toggle="dropdown"
+      aria-haspopup="true" aria-expanded="true">
+      <%= filter_label(filter, filters) || all_label %>
+    </a>
+    <ul>
+      <li><em><%= t 'filters.title' %></em></li>
+      <% filters.keys.unshift(:all).each do |filter_name| %>
+        <%= content_tag :li, filter_link(current_model_class, filter_name, filters), html_options.call(filter_name) %>
+      <% end %>
+    </ul>
+  <% else %>
+    <%= all_label %>
+  <% end %>
+</nav>

data/app/views/wallaby/resources/_index_pagination.html.erb

@@ -0,0 +1,63 @@
+<%
+paginator = paginate(current_model_class, collection, index_params)
+%>
+<% if paginator.paginatable? %>
+  <%
+  active_per = proc do |per|
+    paginator.page_size == per && 'pagination__pers--current'
+  end
+  from_to = t 'pagination.from_to', from: paginator.from, to: paginator.to
+  of = t 'pagination.of'
+  total_count = t 'pagination.total_count', total: paginator.total
+  pers_title = t 'pagination.pers'
+  pages_title = t 'pagination.pages'
+  %>
+  <nav class="pagination">
+    <span class="pagination__metadata">
+      <% if paginator.number_of_pages > 1 # more than one page%>
+        <span class="pagination__pers">
+          <a role="button" data-target="#" data-toggle="dropdown"
+            aria-haspopup="true" aria-expanded="true">
+            <%= from_to %>
+          </a>
+          <ul aria-labelledby="all_pers">
+            <li><em><%= t 'pagination.pers' %></em></li>
+            <% Wallaby::PERS.each do |per| %>
+              <%= content_tag :li, class: active_per.call(per) do %>
+                <%= index_link(current_model_class, url_params: index_params.merge(per: per)) { per.to_s } %>
+              <% end %>
+            <% end %>
+          </ul>
+        </span>
+        <%= t 'pagination.of' %>
+        <span class="pagination__pages">
+          <a role="button" data-target="#" data-toggle="dropdown"
+            aria-haspopup="true" aria-expanded="true">
+            <%= total_count %>
+          </a>
+          <%= content_tag :form, action: index_path(current_model_class), method: :get, aria: { labelledby: 'all_pages' } do %>
+            <% index_params.except(:page).each do |permitted, value| %>
+              <%= hidden_field_tag permitted, value %>
+            <% end %>
+            <label for="page_number">
+              <%= t 'pagination.pages' %>
+            </label>
+            <%= number_field_tag 'page', paginator.page_number, id: 'page_number' %>
+          <% end %>
+        </span>
+      <% else # only one page %>
+        <%= from_to + of + total_count %>
+      <% end %>
+    </span>
+    <% if paginator.prev_page? # has prev page %>
+      <span>
+        <%= index_link(current_model_class, url_params: index_params.merge(page: paginator.prev_page_number)) { t 'pagination.prev' } %>
+      </span>
+    <% end %>
+    <% if paginator.next_page? # has next page %>
+      <span>
+        <%= index_link(current_model_class, url_params: index_params.merge(page: paginator.next_page_number)) { t 'pagination.next' } %>
+      </span>
+    <% end %>
+  </nav>
+<% end %>

data/app/views/wallaby/resources/_index_query.html.erb

@@ -0,0 +1,23 @@
+<%
+query_classes = proc do
+  classes = %w(query)
+  classes.push 'query--filtered' if index_params.present?
+  classes
+end
+%>
+<%= content_tag :div, class: query_classes.call do %>
+  <nav class="query__actions">
+    <%= index_link(current_model_class, html_classes('query__clear')) {} if index_params.present? %>
+    <%= new_link(current_model_class, html_classes('query__create')) {} %>
+    <a id="actions_list" class="query__more"
+      role="button" data-target="#" data-toggle="dropdown"
+      aria-haspopup="true" aria-expanded="true"></a>
+    <%= render 'index_actions' %>
+  </nav>
+  <%= form_tag index_path(current_model_class), method: :get, class: 'query__search' do %>
+    <%= hidden_field_tag :sort, index_params[:sort] %>
+    <label for="q">
+      <%= text_field_tag :q, index_params[:q], placeholder: t('search.hint') %>
+    </label>
+  <% end %>
+<% end %>

data/app/views/wallaby/resources/_logo.html.erb

@@ -0,0 +1 @@
+<a class="navbar-brand" href="<%= wallaby_engine.root_path %>"><span>Wallaby</span> Admin</a>

data/app/views/wallaby/resources/_navs.html.erb

@@ -0,0 +1,9 @@
+<% # can be overriden %>
+<ul class="nav navbar-nav">
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+      Data <span class="caret"></span>
+    </a>
+    <%= model_tree model_classes %>
+  </li>
+</ul>

data/app/views/wallaby/resources/_resource_actions.html.erb

@@ -1,3 +1,3 @@
-<%= show_link(decorated, class: 'text-info') { itooltip ct('link.show'), 'link' } %>
-<%= edit_link(decorated) { itooltip ct('link.edit'), 'pencil' } %>
-<%= delete_link(decorated) { itooltip ct('link.delete'), 'trash' } %>
+<%= show_link(decorated) {} %>
+<%= edit_link(decorated) {} %>
+<%= delete_link(decorated) {} %>