godmin 1.3.1 → 2.2.0

data/Rakefile

@@ -36,14 +36,14 @@ namespace :sandbox do
   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__)
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       Dir.mktmpdir do |dir|
         Dir.chdir(dir)
         system("git clone git@github.com:varvet/godmin-sandbox.git")
         if $CHILD_STATUS.success?
           Dir.chdir("godmin-sandbox")
           system("rm -rf *")
-          system("rails new . -d postgresql -m #{template_path} --without-engine")
+          system("rails _5.2.5_ new . -d postgresql -m #{template_path} --without-engine --skip-spring")
           if $CHILD_STATUS.success?
             system("git add --all")
             system("git commit -m '#{message}'")

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

@@ -1,12 +1,22 @@
 <div id="breadcrumb">
   <ol class="breadcrumb">
+    <% if @resource_parents %>
+      <% @resource_parents.each do |parent| %>
+        <li>
+          <%= link_to parent.class.model_name.human(count: 2), parent.class %>
+        </li>
+        <li>
+          <%= link_to parent.to_s, parent %>
+        </li>
+      <% end %>
+    <% end %>
     <% if action_name == "index" %>
       <li class="active">
         <%= @resource_class.model_name.human(count: 2) %>
       </li>
     <% else %>
       <li>
-        <%= link_to @resource_class.model_name.human(count: 2), @resource_class %>
+        <%= link_to @resource_class.model_name.human(count: 2), [*@resource_parents, @resource_class] %>
       </li>
       <li class="active">
         <% if @resource.new_record? %>
@@ -16,29 +26,7 @@
         <% end %>
       </li>
       <% if @resource.persisted? %>
-        <li class="dropdown pull-right">
-          <a href="#" data-toggle="dropdown" role="button">
-            <%= translate_scoped("actions.label") %> <span class="caret"></span>
-          </a>
-          <ul class="dropdown-menu">
-            <% if policy(@resource).show? && action_name != "show" %>
-              <li>
-                <%= link_to translate_scoped("actions.show"), @resource %>
-              </li>
-            <% end %>
-            <% if policy(@resource).edit? && action_name != "edit" %>
-              <li>
-                <%= link_to translate_scoped("actions.edit"), [:edit, @resource]  %>
-              </li>
-            <% end %>
-            <% if policy(@resource).destroy? %>
-              <li>
-                <%= link_to translate_scoped("actions.destroy"), @resource, method: :delete,
-                  data: { confirm: translate_scoped("actions.confirm_message") } %>
-              </li>
-            <% end %>
-          </ul>
-        </li>
+        <%= render partial: "breadcrumb_actions" %>
       <% end %>
     <% end %>
   </ol>

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

@@ -0,0 +1,41 @@
+<li class="dropdown pull-right">
+  <a href="#" data-toggle="dropdown">
+    <%= translate_scoped("actions.label") %> <span class="caret"></span>
+  </a>
+  <ul class="dropdown-menu">
+    <% if policy(@resource).show? && action_name != "show" %>
+      <li>
+        <%= link_to translate_scoped("actions.show"), [*@resource_parents, @resource] %>
+      </li>
+    <% end %>
+    <% if policy(@resource).edit? && action_name != "edit" %>
+      <li>
+        <%= link_to translate_scoped("actions.edit"), [:edit, *@resource_parents, @resource]  %>
+      </li>
+    <% end %>
+    <% if policy(@resource).destroy? %>
+      <li>
+        <%= link_to translate_scoped("actions.destroy"), [*@resource_parents, @resource], method: :delete,
+          data: { confirm: translate_scoped("actions.confirm_message") } %>
+      </li>
+    <% end %>
+  </ul>
+</li>
+
+<% if @resource_service.has_many_map.present? %>
+  <li class="dropdown pull-right">
+    <a href="#" data-toggle="dropdown">
+      <%= translate_scoped("associations.label") %> <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+      <% @resource_service.has_many_map.each do |name, options| %>
+        <% if policy(options[:class_name].constantize).index? %>
+          <li>
+            <%= link_to(options[:class_name].constantize.model_name.human(count: 2),
+              send("#{@resource_class.name.underscore}_#{name}_path", @resource)) %>
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
+  </li>
+<% end %>

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

@@ -1,3 +1,3 @@
 <% 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" %>
+  <%= link_to t("helpers.submit.create", model: @resource_class.model_name.human), [:new, *@resource_parents, @resource_class.model_name.singular_route_key.to_sym], class: "btn btn-default" %>
 <% end %>

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

@@ -27,14 +27,14 @@
 </div>
 <div class="pagination-entries pull-right hidden-xs">
   <% if @resources.length == 0 %>
-    <%= translate_scoped("pagination.entries.zero", {
+    <%= translate_scoped("pagination.entries.zero",
       resource: @resource_class.model_name.human(count: @resources.length).downcase
-    }) %>
+    ) %>
   <% else %>
-    <%= translate_scoped("pagination.entries.other", {
+    <%= translate_scoped("pagination.entries.other",
       resource: @resource_class.model_name.human(count: @resources.length).downcase,
       count: @resources.length,
       total: @resource_service.paginator.total_resources
-    }) %>
+    ) %>
   <% end %>
 </div>

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

@@ -1,5 +1,8 @@
 <div id="table" class="table-responsive">
   <table class="table table-bordered table-hover">
+    <caption class="hide">
+      <%= @resource_class.model_name.human(count: 2) %>
+    </caption>
     <thead>
       <tr>
         <% if @resource_service.include_batch_actions? %>

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

@@ -2,7 +2,7 @@
   <% if policy(resource).show? %>
     <%= link_to(
       translate_scoped("actions.show"),
-      resource,
+      [*@resource_parents, resource],
       class: "btn btn-default",
       title: translate_scoped("actions.show_title", resource: resource)
     ) %>
@@ -10,7 +10,7 @@
   <% if policy(resource).edit? %>
     <%= link_to(
       translate_scoped("actions.edit"),
-      [:edit, resource],
+      [:edit, *@resource_parents, resource],
       class: "btn btn-default",
       title: translate_scoped("actions.edit_title", resource: resource)
     ) %>
@@ -18,9 +18,9 @@
   <% if policy(resource).destroy? %>
     <%= link_to(
       translate_scoped("actions.destroy"),
-      resource,
+      [*@resource_parents, resource],
       method: :delete,
-      class: "btn btn-danger",
+      class: "btn btn-default",
       title: translate_scoped("actions.destroy_title", resource: resource),
       data: { confirm: translate_scoped("actions.confirm_message") }
     ) %>

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

@@ -1,6 +1,6 @@
 <%= render partial: "breadcrumb" %>
 
-<table class="table table-striped">
+<table class="table">
   <% @resource_service.attrs_for_show.each do |attr| %>
     <tr>
       <th><%= @resource_class.human_attribute_name(attr) %></th>

data/config/locales/en.yml

@@ -25,6 +25,8 @@ en:
       confirm_message: Are you sure?
       export: Export
       export_as: As
+    associations:
+      label: Nested resources
     sessions:
       sign_in: Sign in
       sign_out: Sign out

data/config/locales/pt-BR.yml

@@ -25,6 +25,8 @@ pt-BR:
       confirm_message: Você tem certeza?
       export: Exportar
       export_as: Como
+    associations:
+      label: Nested resources
     sessions:
       sign_in: Entrar
       sign_out: Sair

data/config/locales/sv.yml

@@ -25,6 +25,8 @@ sv:
       confirm_message: Är du säker?
       export: Exportera
       export_as: Som
+    associations:
+      label: Nästlade resurser
     sessions:
       sign_in: Logga in
       sign_out: Logga ut

data/gemfiles/rails_5.gemfile

@@ -2,8 +2,7 @@
 
 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"
+gem "admin", path: "../test/dummy/admin", group: [:test, :development]
+gem "rails", "~> 5.2"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_6.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "admin", path: "../test/dummy/admin", group: [:test, :development]
+gem "rails", "~> 6.1"
+
+gemspec path: "../"

data/godmin.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |gem|
   gem.authors     = ["Jens Ljungblad", "Linus Pettersson", "Varvet"]
   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+. Use it to build dedicated admin sections for your apps, or stand alone admin apps such as internal tools."
+  gem.summary     = "Godmin is an admin framework for Rails 5+"
+  gem.description = "Godmin is an admin framework for Rails 5+. 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,23 +19,25 @@ 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"
-  gem.add_dependency "bootstrap_form", "~> 2.4"
+  gem.add_dependency "bcrypt", [">= 3.0", "< 4.0"]
   gem.add_dependency "bootstrap-sass", "~> 3.3"
-  gem.add_dependency "coffee-rails", [">= 4.0", "< 6.0"]
+  gem.add_dependency "bootstrap_form", "~> 2.4"
   gem.add_dependency "csv_builder", "~> 2.1"
-  gem.add_dependency "jquery-rails", [">= 3.0", "< 5.0"]
+  gem.add_dependency "jquery-rails", [">= 4.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 "pundit", [">= 1.1", "< 2.0"]
+  gem.add_dependency "rails", [">= 5.0", "< 7.0"]
+  gem.add_dependency "sass-rails", [">= 5.0", "< 7.0"]
   gem.add_dependency "selectize-rails", "~> 0.12"
 
-  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"
+  gem.add_development_dependency "appraisal"
+  gem.add_development_dependency "bootsnap"
+  gem.add_development_dependency "byebug"
+  gem.add_development_dependency "capybara"
+  gem.add_development_dependency "minitest"
+  gem.add_development_dependency "minitest-reporters"
+  gem.add_development_dependency "poltergeist"
+  gem.add_development_dependency "pry"
+  gem.add_development_dependency "puma"
+  gem.add_development_dependency "sqlite3"
 end

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

@@ -4,7 +4,7 @@ class Godmin::ResourceGenerator < Godmin::Generators::NamedBase
   argument :attributes, type: :array, default: [], banner: "attribute attribute"
 
   def add_route
-    route "resources :#{file_name.pluralize}"
+    invoke "resource_route"
   end
 
   def add_navigation
@@ -15,6 +15,12 @@ class Godmin::ResourceGenerator < Godmin::Generators::NamedBase
     end
   end
 
+  def create_model
+    if namespaced?
+      template "resource_model.rb", File.join("app/models", class_path, "#{file_name}.rb")
+    end
+  end
+
   def create_controller
     template "resource_controller.rb", File.join("app/controllers", class_path, "#{file_name.pluralize}_controller.rb")
   end

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

@@ -0,0 +1,4 @@
+<% module_namespacing do -%>
+class <%= class_name %> < ::<%= class_name %>
+end
+<% end -%>

data/lib/godmin/application_controller.rb

@@ -28,15 +28,6 @@ module Godmin
 
     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
@@ -47,12 +38,20 @@ module Godmin
       append_view_path Godmin::Resolver.resolvers(controller_path, engine_wrapper)
     end
 
+    def disable_authentication
+      @_disable_authentication = true
+    end
+
+    def disable_authorization
+      @_disable_authorization = true
+    end
+
     def authentication_enabled?
-      singleton_class.include?(Godmin::Authentication)
+      !@_disable_authentication && singleton_class.include?(Godmin::Authentication)
     end
 
     def authorization_enabled?
-      singleton_class.include?(Godmin::Authorization)
+      !@_disable_authorization && singleton_class.include?(Godmin::Authorization)
     end
   end
 end

data/lib/godmin/authentication.rb

@@ -6,26 +6,26 @@ module Godmin
     extend ActiveSupport::Concern
 
     included do
-      before_action :authenticate_admin_user
+      before_action :authenticate
 
       helper_method :admin_user
       helper_method :admin_user_signed_in?
     end
 
-    def authenticate_admin_user
-      unless admin_user_signed_in? || controller_name == "sessions"
-        redirect_to new_session_path, alert: "Authentication needed"
-      end
-    end
+    def authenticate
+      return unless authentication_enabled?
+      return if admin_user_signed_in?
 
-    def admin_user_class
-      raise NotImplementedError, "Must define the admin user class"
+      redirect_to new_session_path
     end
 
+    def admin_user_class; end
+
     def admin_user
-      if session[:admin_user_id]
-        @admin_user ||= admin_user_class.find_by(id: session[:admin_user_id])
-      end
+      return unless admin_user_class
+      return unless session[:admin_user_id]
+
+      @_admin_user ||= admin_user_class.find_by(id: session[:admin_user_id])
     end
 
     def admin_user_signed_in?

data/lib/godmin/authentication/sessions_controller.rb

@@ -5,6 +5,7 @@ module Godmin
 
       included do
         layout "godmin/login"
+        prepend_before_action :disable_authentication
       end
 
       def new
@@ -34,7 +35,7 @@ module Godmin
       end
 
       def admin_user_params
-        params.require(:admin_user).permit(
+        params.require(admin_user_class.model_name.param_key.to_sym).permit(
           admin_user_class.login_column,
           :password,
           :password_confirm

data/lib/godmin/authorization.rb

@@ -1,34 +1,54 @@
+require "pundit"
 require "godmin/authorization/policy"
-require "godmin/authorization/policy_finder"
 
 module Godmin
   module Authorization
     extend ActiveSupport::Concern
 
-    included do
-      helper_method :policy
+    include Pundit
 
-      rescue_from NotAuthorizedError do
+    included do
+      rescue_from Pundit::NotAuthorizedError do
         render plain: "You are not authorized to do this", status: 403, layout: "godmin/login"
       end
     end
 
-    def authorize(record, query = nil)
-      policy = policy(record)
+    def policy(record)
+      policies[record] ||= Pundit.policy!(pundit_user, namespaced_record(record))
+    end
 
-      unless policy.public_send(query || action_name + "?")
-        fail NotAuthorizedError
-      end
+    def pundit_user
+      admin_user
     end
 
-    def policy(record)
-      policies[record] ||= PolicyFinder.find(record, engine_wrapper.namespace).new(admin_user, record)
+    def namespaced_record(record)
+      return record unless engine_wrapper.namespaced?
+
+      class_name = find_class_name(record)
+      if already_namespaced?(class_name)
+        record
+      else
+        engine_wrapper.namespaced_path.map(&:to_sym) << record
+      end
     end
 
-    def policies
-      @_policies ||= {}
+    # Borrowed from Pundit::PolicyFinder
+    def find_class_name(subject)
+      if subject.respond_to?(:model_name)
+        subject.model_name
+      elsif subject.class.respond_to?(:model_name)
+        subject.class.model_name
+      elsif subject.is_a?(Class)
+        subject
+      elsif subject.is_a?(Symbol)
+        subject.to_s.camelize
+      else
+        subject.class
+      end
     end
 
-    class NotAuthorizedError < StandardError; end
+    def already_namespaced?(subject)
+      subject.to_s.start_with?("#{engine_wrapper.namespace.name}::")
+    end
   end
 end