godmin 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5485225c54b1b8d9dec2a7d5d01aafe12f6109fa
-  data.tar.gz: f9ccde13580100c1134bc45701bd4e06cd4222f7
+  metadata.gz: 43049a2e50fce4f665099b88786fd13cda3d1e58
+  data.tar.gz: 4ddd3cf185bcca97a1d50d37893cf760a5d3ebf7
 SHA512:
-  metadata.gz: f2312da3947f533300714a819f812d1d2bfbffafe20d93fbf6a74c8aff1262e3587218e3116d7edf64d16248ff78022f7fe2addf103adfe6e26c863aada8e297
-  data.tar.gz: 34df58f5528358d065426c1ffae18619b1f431ec341ab9bfc5de4344b2bfdfbd2c3590702674ddb8d3b76d9ccc20742ba71c1b0a4317644a99e955d0adc7205c
+  metadata.gz: b8ed426f1242d6054da877458cd5dd81e25ca8a30133edd0a0e3a44e34db3a616138c01d2c332444dd3f0df716992efc15265f9285ac746581e63f0b1fd0aba4
+  data.tar.gz: 74131a43082434db552085b31fc767610545c36cb7f64f6fc39838f814349b0070bf38fde927d07fc0514f9e998acbcc04e863643f2ff3caf6d24cddd98f658d

data/.gitignore

@@ -25,3 +25,5 @@ config/initializers/secret_token.rb
 /test/dummy/db/*.sqlite3
 Gemfile.lock
 .tags
+gemfiles/.bundle
+gemfiles/*.lock

data/.rubocop.yml

@@ -1,5 +1,5 @@
-AllCops:
-  RunRailsCops: true
+Rails:
+  Enabled: true
 
 Documentation:
   Enabled: false

data/.travis.yml

@@ -1,13 +1,20 @@
 bundler_args: --without debug
-
+cache: bundler
 script: "bundle exec rake test"
 sudo: false
-cache: bundler
 
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.1.0
+  - 2.3.1
+
+gemfile:
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_5.gemfile
+
+matrix:
+  exclude:
+    - rvm: 2.1.0
+      gemfile: gemfiles/rails_5.gemfile
 
 addons:
   code_climate:

data/Appraisals

@@ -0,0 +1,7 @@
+appraise "rails-4" do
+  gem "rails", "~> 4.0"
+end
+
+appraise "rails-5" do
+  gem "rails", "~> 5.0"
+end

data/CHANGELOG.md

@@ -1,11 +1,27 @@
 # Changelog
 
+### 1.3.0 - 2016-07-11
+Features
+- Increased batch action checkbox click area (https://github.com/varvet/godmin/pull/183)
+- Adds titles to action links (https://github.com/varvet/godmin/pull/185)
+- Rails 5 support (https://github.com/varvet/godmin/pull/199)
+
+Bug fixes
+- Use translated title on login page (https://github.com/varvet/godmin/pull/195)
+- Hide batch action toggle when no batch action available (https://github.com/varvet/godmin/pull/197)
+- Remove hidden field for multiselect filters (https://github.com/varvet/godmin/pull/169)
+
+Other
+- Fixes a deprecation warning on Rails 4.2.5.1 (https://github.com/varvet/godmin/pull/188)
+- Adds caching partial overrides to increase table rendering speed (https://github.com/varvet/godmin/pull/184)
+
 ### 1.2.0 - 2016-02-02
 Features
 - Adds support for custom ordering of columns (https://github.com/varvet/godmin/pull/168)
-- Adds passing of html options to association helper (https://github.com/varvet/godmin/pull/176)
+- Adds passing of options to association form helper (https://github.com/varvet/godmin/pull/172)
+- Adds passing of html options to association form helper (https://github.com/varvet/godmin/pull/176)
 
-Bug fixes:
+Bug fixes
 - Fixes an issue with the template resolver and Rails 4.2.5.1 (https://github.com/varvet/godmin/pull/175)
 
 ### 1.1.0 - 2015-12-08

data/README.md

@@ -5,7 +5,7 @@
 [![Code Climate](https://img.shields.io/codeclimate/github/varvet/godmin.svg)](https://codeclimate.com/github/varvet/godmin)
 [![Test Coverage](https://codeclimate.com/github/varvet/godmin/badges/coverage.svg)](https://codeclimate.com/github/varvet/godmin/coverage)
 
-Godmin is an admin framework for Rails 4+. Use it to build dedicated admin sections for your apps, or stand alone admin apps such as internal tools. It has support for common features such as scoping, filtering and performing batch actions on your models. [Try the demo](http://godmin-sandbox.herokuapp.com).
+Godmin is an admin framework for Rails 4+. Use it to build dedicated admin sections for your apps, or stand alone admin apps such as internal tools. It has support for common features such as scoping, filtering and performing batch actions on your models. Check out the [demo app](http://godmin-sandbox.herokuapp.com) and its [source code](https://github.com/varvet/godmin-sandbox) to get a feel for how it works.
 
 Godmin differs from tools like [ActiveAdmin](http://activeadmin.info/) and [RailsAdmin](https://github.com/sferik/rails_admin) in how admin sections are created. Rather than being DSL-based, Godmin is a set of opt-in modules and helpers that can be applied to regular Rails apps and engines. An admin section built with Godmin is just that, a regular Rails app or Rails engine, with regular routes, controllers and views. That means there is less to learn, because you already know most of it, and fewer constraints on what you can do. After all, administrators are users too, and what better way to provide them with a tailor made experience than building them a Rails app?
 
@@ -536,8 +536,8 @@ end
 It's easy to override view templates and partials in Godmin, both globally and per resource. All you have to do is place a file with an identical name in your `app/views` directory. For instance, to override the `godmin/resource/index.html.erb` template for all resources, place a file under `app/views/resource/index.html.erb`. If you only wish to override it for articles, place it instead under `app/views/articles/index.html.erb`.
 
 You can also inherit from the default template as such:
-```ruby
-<%= render template: 'godmin/resource/show' %>
+```erb
+<%= render template: "godmin/resource/show" %>
 
 <p>Append stuff here</p>
 ```

data/Rakefile

@@ -25,13 +25,14 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "lib"
   t.libs << "test"
   t.pattern = "test/**/*_test.rb"
+  t.warning = false
   t.verbose = false
 end
 
 task default: :test
 
 namespace :sandbox do
-  desc "Push the sandbox app to GitHub which deploys it to Heroku"
+  desc "Generate the Sandbox app then push it to GitHub which deploys it to Heroku"
   task :deploy do
     message = "Generated from: https://github.com/varvet/godmin/commit/#{`git rev-parse HEAD`.strip}"
     template_path = File.expand_path("../template.rb", __FILE__)

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

@@ -16,6 +16,7 @@ Godmin.BatchActions = (function() {
 
   function initializeEvents() {
     $container.find('[data-behavior~=batch-actions-select]').on('click', toggleCheckboxes);
+    $container.find('[data-behavior~=batch-actions-checkbox-container]').on('click', toggleCheckbox);
     $container.find('[data-behavior~=batch-actions-checkbox]').on('change', toggleActions);
     $(document).delegate('[data-behavior~=batch-actions-action-link]', 'mousedown', triggerAction);
   }
@@ -38,7 +39,15 @@ Godmin.BatchActions = (function() {
     }).toArray().join(',');
   }
 
-  function toggleCheckboxes() {
+  function toggleCheckbox(e) {
+    if (this == e.target) {
+      $(this).find('[data-behavior~=batch-actions-checkbox]').click();
+    }
+  }
+
+  function toggleCheckboxes(e) {
+    e.preventDefault();
+
     if (checkedCheckboxes().length > 0) {
       $container.find('[data-behavior~=batch-actions-checkbox]').prop('checked', false).trigger('change');
       setSelectToAll();

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

@@ -1,4 +1,4 @@
-<% if @resource_service.batch_action_map.present? %>
+<% if @resource_service.include_batch_actions? %>
   <%= 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/app/views/godmin/resource/_export_actions.html.erb

@@ -5,10 +5,10 @@
     </button>
     <ul class="dropdown-menu" role="menu">
       <li>
-        <%= link_to "#{translate_scoped("actions.export_as")} JSON", url_for(params.merge(only_path: true, format: "json")) %>
+        <%= link_to "#{translate_scoped("actions.export_as")} JSON", url_for(params.to_unsafe_h.merge(only_path: true, format: "json")) %>
       </li>
       <li>
-        <%= link_to "#{translate_scoped("actions.export_as")} CSV", url_for(params.merge(only_path: true, format: "csv")) %>
+        <%= link_to "#{translate_scoped("actions.export_as")} CSV", url_for(params.to_unsafe_h.merge(only_path: true, format: "csv")) %>
       </li>
     </ul>
   </div>

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

@@ -3,23 +3,23 @@
     <nav>
       <ul class="pagination">
         <% 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: @resource_service.paginator.current_page - 1) %></li>
+          <li><%= link_to translate_scoped("pagination.first"), params.to_unsafe_h.merge(page: 1) %></li>
+          <li><%= link_to "«", params.to_unsafe_h.merge(page: @resource_service.paginator.current_page - 1) %></li>
         <% end %>
         <% unless @resource_service.paginator.pages.first == 1 %>
           <li class="disabled"><%= link_to "…" %></li>
         <% end %>
         <% @resource_service.paginator.pages.each do |page| %>
           <li class="<%= "active" if page == @resource_service.paginator.current_page %>">
-            <%= link_to page, params.merge(page: page) %>
+            <%= link_to page, params.to_unsafe_h.merge(page: page) %>
           </li>
         <% end %>
         <% unless @resource_service.paginator.pages.last == @resource_service.paginator.total_pages %>
           <li class="disabled"><%= link_to "…" %></li>
         <% end %>
         <% 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>
+          <li><%= link_to "»", params.to_unsafe_h.merge(page: @resource_service.paginator.current_page + 1) %></li>
+          <li><%= link_to translate_scoped("pagination.last"), params.to_unsafe_h.merge(page: @resource_service.paginator.total_pages) %></li>
         <% end %>
       </ul>
     </nav>

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

@@ -3,7 +3,7 @@
     <ul class="nav nav-tabs">
       <% @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 %>
+          <%= link_to url_for(params.to_unsafe_h.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"> (<%= @resource_service.scope_count(name) %>)</span>
           <% end %>

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

@@ -2,7 +2,7 @@
   <table class="table table-bordered table-hover">
     <thead>
       <tr>
-        <% if @resource_service.batch_action_map.present? %>
+        <% if @resource_service.include_batch_actions? %>
           <th></th>
         <% end %>
         <% @resource_service.attrs_for_index.each do |attr| %>
@@ -16,8 +16,8 @@
     <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">
+          <% if @resource_service.include_batch_actions? %>
+            <td align="center" data-behavior="batch-actions-checkbox-container">
               <%= check_box_tag "batch_action[items][#{resource.id}]", nil, nil,
                 data: { behavior: "batch-actions-checkbox" } %>
             </td>

data/app/views/godmin/resource/columns/_actions.html.erb

@@ -1,12 +1,28 @@
 <div class="btn-group btn-group-sm pull-right">
   <% if policy(resource).show? %>
-    <%= link_to translate_scoped("actions.show"), resource, class: "btn btn-default" %>
+    <%= link_to(
+      translate_scoped("actions.show"),
+      resource,
+      class: "btn btn-default",
+      title: translate_scoped("actions.show_title", resource: resource)
+    ) %>
   <% end %>
   <% if policy(resource).edit? %>
-    <%= link_to translate_scoped("actions.edit"), [:edit, resource], class: "btn btn-default"  %>
+    <%= link_to(
+      translate_scoped("actions.edit"),
+      [:edit, resource],
+      class: "btn btn-default",
+      title: translate_scoped("actions.edit_title", resource: resource)
+    ) %>
   <% end %>
   <% if policy(resource).destroy? %>
-    <%= link_to translate_scoped("actions.destroy"), resource, method: :delete,
-      class: "btn btn-danger", data: { confirm: translate_scoped("actions.confirm_message") } %>
+    <%= link_to(
+      translate_scoped("actions.destroy"),
+      resource,
+      method: :delete,
+      class: "btn btn-danger",
+      title: translate_scoped("actions.destroy_title", resource: resource),
+      data: { confirm: translate_scoped("actions.confirm_message") }
+    ) %>
   <% end %>
 </div>

data/app/views/layouts/godmin/login.html.erb

@@ -4,7 +4,7 @@
       <div class="col-md-4 col-md-offset-4">
         <div class="panel panel-default">
           <div class="panel-heading">
-            <h3 class="panel-title">Godmin</h3>
+            <h3 class="panel-title"><%= t("godmin.title") %></h3>
           </div>
           <div class="panel-body">
             <%= render "layouts/godmin/content" %>

data/config/locales/en.yml

@@ -17,8 +17,11 @@ en:
     actions:
       label: Actions
       show: Show
+      show_title: Show %{resource}
       edit: Edit
+      edit_title: Edit %{resource}
       destroy: Destroy
+      destroy_title: Destroy %{resource}
       confirm_message: Are you sure?
       export: Export
       export_as: As

data/config/locales/pt-BR.yml

@@ -17,8 +17,11 @@ pt-BR:
     actions:
       label: Ações
       show: Exibir
+      show_ttitle: Exibir %{resource}
       edit: Editar
+      edit_title: Editar %{resource}
       destroy: Remover
+      destroy_title: Remover %{resource}
       confirm_message: Você tem certeza?
       export: Exportar
       export_as: Como

data/config/locales/sv.yml

@@ -17,8 +17,11 @@ sv:
     actions:
       label: Alternativ
       show: Visa
+      show_title: Visa %{resource}
       edit: Ändra
+      edit_title: Ändra %{resource}
       destroy: Ta bort
+      destroy_title: Ta bort %{resource}
       confirm_message: Är du säker?
       export: Exportera
       export_as: Som

data/gemfiles/rails_4.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "admin", :path => "../test/dummy/admin", :group => [:test, :development]
+gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "rails", "~> 4.0"
+
+gemspec :path => "../"

data/gemfiles/rails_5.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "admin", :path => "../test/dummy/admin", :group => [:test, :development]
+gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "rails", "~> 5.0"
+
+gemspec :path => "../"

data/godmin.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.email       = ["info@varvet.se"]
   gem.homepage    = "https://github.com/varvet/godmin"
   gem.summary     = "Godmin is an admin framework for Rails 4+"
-  gem.description = "Godmin is an admin framework for Rails 4+"
+  gem.description = "Godmin is an admin framework for Rails 4+. Use it to build dedicated admin sections for your apps, or stand alone admin apps such as internal tools."
   gem.license     = "MIT"
 
   gem.files         = `git ls-files`.split($/)
@@ -19,22 +19,23 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "bcrypt", "~> 3.1.7"
-  gem.add_dependency "bootstrap-sass", "~> 3.3.3"
-  gem.add_dependency "bootstrap_form", "~> 2.2.0"
-  gem.add_dependency "coffee-rails", [">= 4.0", "< 4.2"]
-  gem.add_dependency "csv_builder", "~> 2.1.1"
-  gem.add_dependency "jquery-rails", ">= 3.0"
-  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.12.0"
+  gem.add_dependency "bcrypt", "~> 3.1"
+  gem.add_dependency "bootstrap_form", "~> 2.4"
+  gem.add_dependency "bootstrap-sass", "~> 3.3"
+  gem.add_dependency "coffee-rails", [">= 4.0", "< 6.0"]
+  gem.add_dependency "csv_builder", "~> 2.1"
+  gem.add_dependency "jquery-rails", [">= 3.0", "< 5.0"]
+  gem.add_dependency "momentjs-rails", "~> 2.8"
+  gem.add_dependency "rails", [">= 4.0", "< 6.0"]
+  gem.add_dependency "sass-rails", [">= 4.0", "< 6.0"]
+  gem.add_dependency "selectize-rails", "~> 0.12"
 
-  gem.add_development_dependency "capybara"
-  gem.add_development_dependency "m"
-  gem.add_development_dependency "minitest-reporters"
-  gem.add_development_dependency "minitest"
-  gem.add_development_dependency "poltergeist"
-  gem.add_development_dependency "pry"
-  gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "appraisal", "~> 2.1"
+  gem.add_development_dependency "capybara", "~> 2.4"
+  gem.add_development_dependency "m", "~> 1.3"
+  gem.add_development_dependency "minitest-reporters", "~> 1.0"
+  gem.add_development_dependency "minitest", "~> 5.5"
+  gem.add_development_dependency "poltergeist", "~> 1.7"
+  gem.add_development_dependency "pry", "~> 0.10"
+  gem.add_development_dependency "sqlite3", "~> 1.3"
 end

data/lib/godmin/application_controller.rb

@@ -26,6 +26,17 @@ module Godmin
 
     def welcome; end
 
+    protected
+
+    def redirect_back
+      case Rails::VERSION::MAJOR
+      when 4
+        redirect_to :back
+      when 5
+        super(fallback_location: root_path)
+      end
+    end
+
     private
 
     def engine_wrapper

data/lib/godmin/authorization.rb

@@ -9,7 +9,7 @@ module Godmin
       helper_method :policy
 
       rescue_from NotAuthorizedError do
-        render text: "You are not authorized to do this", status: 403, layout: "godmin/login"
+        render plain: "You are not authorized to do this", status: 403, layout: "godmin/login"
       end
     end
 

data/lib/godmin/helpers/application.rb

@@ -2,9 +2,16 @@ module Godmin
   module Helpers
     module Application
       # Renders the provided partial with locals if it exists, otherwise
-      # yields the given block.
+      # yields the given block. The lookup context call is cached for
+      # each partial.
       def partial_override(partial, locals = {})
-        if lookup_context.exists?(partial, nil, true)
+        @_partial_override ||= {}
+
+        if @_partial_override[partial].nil?
+          @_partial_override[partial] = lookup_context.exists?(partial, nil, true)
+        end
+
+        if @_partial_override[partial]
           render partial: partial, locals: locals
         else
           yield

data/lib/godmin/helpers/batch_actions.rb

@@ -2,7 +2,7 @@ module Godmin
   module Helpers
     module BatchActions
       def batch_action_link(name, options)
-        return unless include_batch_action_link?(options)
+        return unless @resource_service.include_batch_action?(name)
 
         link_to(
           translate_scoped("batch_actions.labels.#{name}", default: name.to_s.titleize),
@@ -16,14 +16,6 @@ module Godmin
           }
         )
       end
-
-      private
-
-      def include_batch_action_link?(options)
-        (options[:only].nil? && options[:except].nil?) ||
-          (options[:only] && options[:only].include?(@resource_service.scope.to_sym)) ||
-          (options[:except] && !options[:except].include?(@resource_service.scope.to_sym))
-      end
     end
   end
 end