godmin 0.10.3 → 0.11.0

data/app/assets/javascripts/godmin/batch-actions.js

@@ -1,23 +1,23 @@
 window.Godmin = window.Godmin || {};
 
 Godmin.BatchActions = (function() {
-  var $form;
+  var $container;
   var $selectAll;
   var $selectNone;
 
   function initialize() {
-    $form       = $('form[data-behavior~=batch-actions-form]');
-    $selectAll  = $form.find('[data-behavior~=batch-actions-select-all]');
-    $selectNone = $form.find('[data-behavior~=batch-actions-select-none]');
+    $container  = $('[data-behavior~=batch-actions-container]');
+    $selectAll  = $container.find('[data-behavior~=batch-actions-select-all]');
+    $selectNone = $container.find('[data-behavior~=batch-actions-select-none]');
 
     initializeEvents();
     initializeState();
   }
 
   function initializeEvents() {
-    $form.find('[data-behavior~=batch-actions-select]').on('click', toggleCheckboxes);
-    $form.find('[data-behavior~=batch-actions-checkbox]').on('change', toggleActions);
-    $(document).delegate('[data-behavior~=batch-actions-action-link]', 'click', triggerAction);
+    $container.find('[data-behavior~=batch-actions-select]').on('click', toggleCheckboxes);
+    $container.find('[data-behavior~=batch-actions-checkbox]').on('change', toggleActions);
+    $(document).delegate('[data-behavior~=batch-actions-action-link]', 'mousedown', triggerAction);
   }
 
   function initializeState() {}
@@ -32,18 +32,24 @@ Godmin.BatchActions = (function() {
     $selectNone.removeClass('hidden');
   }
 
+  function checkedCheckboxes() {
+    return $container.find('[data-behavior~=batch-actions-checkbox]:checked').map(function() {
+      return this.id.match(/\d+/);
+    }).toArray().join(',');
+  }
+
   function toggleCheckboxes() {
-    if ($form.find('[data-behavior~=batch-actions-checkbox]:checked').length > 0) {
-      $form.find('[data-behavior~=batch-actions-checkbox]').prop('checked', false).trigger('change');
+    if (checkedCheckboxes().length > 0) {
+      $container.find('[data-behavior~=batch-actions-checkbox]').prop('checked', false).trigger('change');
       setSelectToAll();
     } else {
-      $form.find('[data-behavior~=batch-actions-checkbox]').prop('checked', true).trigger('change');
+      $container.find('[data-behavior~=batch-actions-checkbox]').prop('checked', true).trigger('change');
       setSelectToNone();
     }
   }
 
   function toggleActions() {
-    if ($form.find('[data-behavior~=batch-actions-checkbox]:checked').length) {
+    if (checkedCheckboxes().length) {
       $('[data-behavior~=batch-actions-action-link]').removeClass('hidden');
       setSelectToNone();
     } else {
@@ -53,8 +59,7 @@ Godmin.BatchActions = (function() {
   }
 
   function triggerAction() {
-    $form.find('[data-behavior~=batch-actions-action]').val($(this).data('value'));
-    $form.submit();
+    $(this).attr('href', $(this).attr('href') + '/' + checkedCheckboxes() + '?batch_action=' + $(this).data('value'));
   }
 
   return {

data/app/assets/stylesheets/godmin/index.css.scss

@@ -29,9 +29,18 @@ body {
 }
 
 #filters {
+  .filter .control-label {
+    display: block;
+  }
   .filter .form-control {
     min-width: 170px;
   }
+  .filter .form-control.selectize-control {
+    height: 34px;
+  }
+  .filter .form-control.selectize-control.single .item {
+    padding-right: 25px;
+  }
 }
 
 #actions {
@@ -43,6 +52,9 @@ body {
   td {
     vertical-align: middle;
   }
+  td .btn-group {
+    display: flex;
+  }
 }
 
 .pagination {
@@ -54,14 +66,9 @@ body {
 }
 
 .highlight {
+  -moz-animation: highlight 3s;
   -webkit-animation: highlight 3s;
 }
 
-@-webkit-keyframes highlight {
-  from {
-    background: #fffbcc;
-  }
-  to {
-    background: none;
-  }
-}
+@-moz-keyframes highlight { from { background: #fffbcc; } to { background: none; } }
+@-webkit-keyframes highlight { from { background: #fffbcc; } to { background: none; } }

data/app/views/godmin/resource/_batch_actions.html.erb

@@ -1,14 +1,12 @@
-<% if batch_action_map.present? %>
+<% if @resource_service.batch_action_map.present? %>
   <%= link_to translate_scoped("batch_actions.buttons.select_all"), "#", class: "btn btn-default",
     data: { behavior: "batch-actions-select batch-actions-select-all" } %>
   <%= link_to translate_scoped("batch_actions.buttons.deselect_all"), "#", class: "btn btn-default hidden",
     data: { behavior: "batch-actions-select batch-actions-select-none" } %>
 
   <div class="btn-group">
-    <% batch_action_map.each do |name, options| %>
+    <% @resource_service.batch_action_map.each do |name, options| %>
       <%= batch_action_link(name, options) %>
     <% end %>
   </div>
-
-  <%= hidden_field_tag "batch_action[action]", nil, data: { behavior: "batch-actions-action" } %>
 <% end %>

data/app/views/godmin/resource/_breadcrumb.html.erb

@@ -7,9 +7,6 @@
     <li>
       <%= link_to @resource_class.model_name.human(count: 2), @resource_class %>
     </li>
-  <% end %>
-  </li>
-  <% unless index %>
     <li class="active">
       <% if @resource.new_record? %>
         <%= t("helpers.submit.create", model: @resource_class.model_name.human) %>

data/app/views/godmin/resource/_button_actions.html.erb

@@ -1,3 +1,3 @@
-<% if policy(@resources).create? %>
-  <%= link_to t("helpers.submit.create", model: @resource_class.model_name.human), [:new, @resource_class.to_s.underscore], class: "btn btn-default" %>
+<% if policy(@resource_service.build_resource({})).new? %>
+  <%= link_to t("helpers.submit.create", model: @resource_class.model_name.human), [:new, @resource_class.model_name.singular_route_key], class: "btn btn-default" %>
 <% end %>

data/app/views/godmin/resource/_filters.html.erb

@@ -1,23 +1,22 @@
-<div id="filters" class="panel panel-default">
-  <div class="panel-body">
-    <%= form_tag params, method: :get, class: "form-inline" do %>
+<% if @resource_service.filter_map.present? %>
+  <div id="filters" class="panel panel-default">
+    <div class="panel-body">
+      <%= filter_form do |f| %>
+        <%= f.hidden_field :scope, value: params[:scope] %>
+        <%= f.hidden_field :order, value: params[:order] %>
 
-      <%= hidden_field_tag :scope, nil, value: params[:scope] %>
-      <%= hidden_field_tag :order, nil, value: params[:order] %>
+        <% @resource_service.filter_map.each do |name, options| %>
+          <%= partial_override "filters/#{name}", f: f, name: name, options: options do %>
+            <%= f.filter_field(name, options) %>
+          <% end %>
+        <% end %>
 
-      <% filter_map.each do |name, options| %>
-        <div class="filter form-group">
-          <%= label_tag name, translate_scoped("filters.labels.#{name}", default: name.to_s.titleize) %><br>
-          <%= filter_input_tag name, options %>
+        <div class="form-group pull-right">
+          <label class="control-label">&nbsp;</label><br>
+          <%= f.apply_filters_button %>
+          <%= f.clear_filters_button %>
         </div>
       <% end %>
-
-      <div class="pull-right">
-        <label>&nbsp;</label><br>
-        <%= button_tag translate_scoped("filters.buttons.apply"), class: "btn btn-default" %>
-        <%= link_to translate_scoped("filters.buttons.clear"), polymorphic_path(@resource_class, scope: params[:scope], order: params[:order]), class: "btn btn-default" %>
-      </div>
-
-    <% end %>
+    </div>
   </div>
-</div>
+<% end %>

data/app/views/godmin/resource/_form.html.erb

@@ -1,5 +1,5 @@
 <%= form_for @resource do |f| %>
-  <% attrs_for_form.each do |attribute| %>
+  <% @resource_service.attrs_for_form.each do |attribute| %>
     <% if f.object.class.reflect_on_association(attribute) %>
       <%= f.association attribute %>
     <% else %>

data/app/views/godmin/resource/_pagination.html.erb

@@ -1,25 +1,25 @@
 <div class="pull-left">
-  <% if total_pages > 1 %>
+  <% if @resource_service.paginator.total_pages > 1 %>
     <nav>
       <ul class="pagination">
-        <% unless pages.first == 1 && current_page == pages.first %>
+        <% unless @resource_service.paginator.pages.first == 1 && @resource_service.paginator.current_page == @resource_service.paginator.pages.first %>
           <li><%= link_to translate_scoped("pagination.first"), params.merge(page: 1) %></li>
-          <li><%= link_to "«", params.merge(page: current_page - 1) %></li>
+          <li><%= link_to "«", params.merge(page: @resource_service.paginator.current_page - 1) %></li>
         <% end %>
-        <% unless pages.first == 1 %>
+        <% unless @resource_service.paginator.pages.first == 1 %>
           <li class="disabled"><%= link_to "…" %></li>
         <% end %>
-        <% pages.each do |page| %>
-          <li class="<%= "active" if page == current_page %>">
+        <% @resource_service.paginator.pages.each do |page| %>
+          <li class="<%= "active" if page == @resource_service.paginator.current_page %>">
             <%= link_to page, params.merge(page: page) %>
           </li>
         <% end %>
-        <% unless pages.last == total_pages %>
+        <% unless @resource_service.paginator.pages.last == @resource_service.paginator.total_pages %>
           <li class="disabled"><%= link_to "…" %></li>
         <% end %>
-        <% unless pages.last == total_pages && current_page == pages.last %>
-          <li><%= link_to "»", params.merge(page: current_page + 1) %></li>
-          <li><%= link_to translate_scoped("pagination.last"), params.merge(page: total_pages) %></li>
+        <% unless @resource_service.paginator.pages.last == @resource_service.paginator.total_pages && @resource_service.paginator.current_page == @resource_service.paginator.pages.last %>
+          <li><%= link_to "»", params.merge(page: @resource_service.paginator.current_page + 1) %></li>
+          <li><%= link_to translate_scoped("pagination.last"), params.merge(page: @resource_service.paginator.total_pages) %></li>
         <% end %>
       </ul>
     </nav>
@@ -34,7 +34,7 @@
     <%= translate_scoped("pagination.entries.other", {
       resource: @resource_class.model_name.human(count: @resources.length).downcase,
       count: @resources.length,
-      total: total_resources
+      total: @resource_service.paginator.total_resources
     }) %>
   <% end %>
 </div>

data/app/views/godmin/resource/_scopes.html.erb

@@ -1,11 +1,11 @@
-<% unless scope_map.empty? %>
+<% unless @resource_service.scope_map.empty? %>
   <div id="scopes">
     <ul class="nav nav-tabs">
-      <% scope_map.each do |name, options| %>
-        <li class="<%= "active" if params[:scope] == name.to_s %>">
+      <% @resource_service.scope_map.each do |name, options| %>
+        <li class="<%= "active" if @resource_service.scoped_by?(name) %>">
           <%= link_to url_for(params.merge(scope: name, only_path: true).except(:page)) do %>
             <%= translate_scoped("scopes.labels.#{name.to_s.underscore}", default: name.to_s.titleize) %>
-            <span class="text-muted"> (<%= scope_count(name) %>)</span>
+            <span class="text-muted"> (<%= @resource_service.scope_count(name) %>)</span>
           <% end %>
         </li>
       <% end %>

data/app/views/godmin/resource/_table.html.erb

@@ -1,37 +1,37 @@
 <div id="table" class="table-responsive">
   <table class="table table-bordered table-hover">
-    <tr>
-      <% if batch_action_map.present? %>
-        <th></th>
-      <% end %>
-      <% attrs_for_index.each do |attr| %>
-        <th>
-          <%= column_header attr %>
-        </th>
-      <% end %>
-      <th></th>
-    </tr>
-    <% @resources.each do |resource| %>
-      <% if flash[:batch_actioned_ids] && flash[:batch_actioned_ids].include?(resource.id) %>
-        <tr class="highlight">
-      <% else %>
-        <tr>
-      <% end %>
-        <% if batch_action_map.present? %>
-          <td align="center">
-            <%= check_box_tag "batch_action[items][#{resource.id}]", nil, nil,
-              data: { behavior: "batch-actions-checkbox" } %>
-          </td>
+    <thead>
+      <tr>
+        <% if @resource_service.batch_action_map.present? %>
+          <th></th>
         <% end %>
-        <% attrs_for_index.each do |attr| %>
-          <td>
-            <%= column_value(resource, attr) %>
-          </td>
+        <% @resource_service.attrs_for_index.each do |attr| %>
+          <th>
+            <%= column_header attr %>
+          </th>
         <% end %>
-        <td>
-          <%= render partial: "columns/actions", locals: { resource: resource } %>
-        </td>
+        <th></th>
       </tr>
-    <% end %>
+    </thead>
+    <tbody>
+      <% @resources.each do |resource| %>
+        <tr data-resource-id="<%= resource.id %>" class="<%= "highlight" if flash[:updated_ids] && flash[:updated_ids].include?(resource.id) %>">
+          <% if @resource_service.batch_action_map.present? %>
+            <td align="center">
+              <%= check_box_tag "batch_action[items][#{resource.id}]", nil, nil,
+                data: { behavior: "batch-actions-checkbox" } %>
+            </td>
+          <% end %>
+          <% @resource_service.attrs_for_index.each do |attr| %>
+            <td>
+              <%= column_value(resource, attr) %>
+            </td>
+          <% end %>
+          <td>
+            <%= render partial: "columns/actions", locals: { resource: resource } %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
   </table>
 </div>

data/app/views/godmin/resource/index.html.erb

@@ -1,17 +1,10 @@
 <%= render partial: "breadcrumb", locals: { index: true } %>
-
 <%= render partial: "scopes" %>
+<%= render partial: "filters" %>
 
-<% if filter_map.present? %>
-  <%= render partial: "filters" %>
-<% end %>
-
-<%= form_tag [:batch_action, @resource_class], data: { behavior: "batch-actions-form" } do %>
-
+<div data-behavior="batch-actions-container">
   <%= render partial: "actions" %>
-
   <%= render partial: "table" %>
-
-<% end %>
+</div>
 
 <%= render partial: "pagination" %>

data/godmin.gemspec

@@ -26,7 +26,10 @@ Gem::Specification.new do |gem|
   gem.add_dependency "momentjs-rails", ">= 2.8.1"
   gem.add_dependency "rails", "~> 4.0"
   gem.add_dependency "sass-rails", ">= 4.0"
-  gem.add_dependency "selectize-rails", "~> 0.11.2"
+  gem.add_dependency "selectize-rails", "~> 0.12.0"
 
   gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "minitest"
+  gem.add_development_dependency "minitest-reporters"
+  gem.add_development_dependency "pry"
 end

data/lib/generators/godmin/authentication/templates/sessions_controller.rb

@@ -4,6 +4,6 @@ require_dependency "<%= File.join(namespaced_path, "application_controller") %>"
 <% end -%>
 <% module_namespacing do -%>
 class SessionsController < ApplicationController
-  include Godmin::Authentication::Sessions
+  include Godmin::Authentication::SessionsController
 end
 <% end -%>

data/lib/generators/godmin/install/install_generator.rb

@@ -23,7 +23,7 @@ class Godmin::InstallGenerator < Godmin::Generators::Base
   def modify_application_controller
     inject_into_file File.join("app/controllers", namespaced_path, "application_controller.rb"), after: "ActionController::Base\n" do
       <<-END.strip_heredoc.indent(namespace ? 4 : 2)
-        include Godmin::Application
+        include Godmin::ApplicationController
       END
     end
   end

data/lib/generators/godmin/resource/resource_generator.rb

@@ -14,4 +14,8 @@ class Godmin::ResourceGenerator < Godmin::Generators::NamedBase
   def create_controller
     template "resource_controller.rb", File.join("app/controllers", class_path, "#{file_name.pluralize}_controller.rb")
   end
+
+  def create_service
+    template "resource_service.rb", File.join("app/services", class_path, "#{file_name}_service.rb")
+  end
 end

data/lib/generators/godmin/resource/templates/resource_controller.rb

@@ -4,14 +4,6 @@ require_dependency "<%= File.join(namespaced_path, "application_controller") %>"
 <% end -%>
 <% module_namespacing do -%>
 class <%= class_name.pluralize %>Controller < ApplicationController
-  include Godmin::Resource
-
-  def attrs_for_index
-    <%= @attributes.map(&:to_sym) %>
-  end
-
-  def attrs_for_form
-    <%= @attributes.map(&:to_sym) %>
-  end
+  include Godmin::Resources::ResourceController
 end
 <% end -%>

data/lib/generators/godmin/resource/templates/resource_service.rb

@@ -0,0 +1,8 @@
+<% module_namespacing do -%>
+class <%= class_name %>Service
+  include Godmin::Resources::ResourceService
+
+  attrs_for_index <%= @attributes.map { |x| ":#{x}" }.join(", ") %>
+  attrs_for_form <%= @attributes.map { |x| ":#{x}" }.join(", ") %>
+end
+<% end -%>

data/lib/godmin.rb

@@ -2,13 +2,15 @@ require "bootstrap-sass"
 require "bootstrap_form"
 require "momentjs-rails"
 require "selectize-rails"
-require "godmin/application"
+require "godmin/application_controller"
 require "godmin/authentication"
 require "godmin/authorization"
 require "godmin/engine"
+require "godmin/paginator"
 require "godmin/rails"
 require "godmin/resolver"
-require "godmin/resource"
+require "godmin/resources/resource_controller"
+require "godmin/resources/resource_service"
 require "godmin/version"
 
 module Godmin

data/lib/godmin/{application.rb → application_controller.rb}

@@ -3,7 +3,7 @@ require "godmin/helpers/forms"
 require "godmin/helpers/translations"
 
 module Godmin
-  module Application
+  module ApplicationController
     extend ActiveSupport::Concern
 
     included do