administrate-base_controller 0.3.0 → 0.7.0

data/LICENSE.txt

@@ -1,21 +1,21 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Derk-Jan Karrenbeld
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2019 Derk-Jan Karrenbeld
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -24,7 +24,9 @@ Or install it yourself as:
 
 ## Usage
 
-When you require this gem, the base controller functionality will be added to the `administrate/application_controller`.
+When you require this gem, you can `include Administrate::BaseController` in your admin `ApplicationController`. 
+Alternatively require `administrate/base_controller/engine` instead (e.g. in your Gemfile). The base controller 
+functionality will be added to the `administrate/application_controller`.
 
 You get the following _protected_ methods for free, which you may override:
 

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
-end
-
-task :default => :test
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
+
+task :default => :test

data/administrate-base_controller.gemspec

@@ -1,42 +1,42 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'administrate/base_controller/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'administrate-base_controller'
-  spec.version       = Administrate::BaseController::VERSION
-  spec.authors       = ['Derk-Jan Karrenbeld']
-  spec.email         = ['derk-jan@xpbytes.com']
-
-  spec.summary       = 'Extends the ApplicationController in Administrate'
-  spec.homepage      = 'https://github.com/XPBytes/administrate-base_controller'
-  spec.license       = 'MIT'
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    # spec.metadata['allowed_push_host'] = 'TODO: Set to 'http://mygemserver.com''
-
-    spec.metadata['homepage_uri'] = spec.homepage
-    spec.metadata['source_code_uri'] = spec.homepage
-    spec.metadata['changelog_uri'] = spec.homepage + '/CHANGELOG.md'
-  else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
-  end
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'administrate', '>= 0.11.0', '< 1'
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rails'
-end
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'administrate/base_controller/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'administrate-base_controller'
+  spec.version       = Administrate::BaseController::VERSION
+  spec.authors       = ['Derk-Jan Karrenbeld']
+  spec.email         = ['derk-jan@xpbytes.com']
+
+  spec.summary       = 'Extends the ApplicationController in Administrate'
+  spec.homepage      = 'https://github.com/XPBytes/administrate-base_controller'
+  spec.license       = 'MIT'
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    # spec.metadata['allowed_push_host'] = 'TODO: Set to 'http://mygemserver.com''
+
+    spec.metadata['homepage_uri'] = spec.homepage
+    spec.metadata['source_code_uri'] = spec.homepage
+    spec.metadata['changelog_uri'] = spec.homepage + '/CHANGELOG.md'
+  else
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+      'public gem pushes.'
+  end
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_development_dependency 'administrate', '~> 0.13.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rails', '~> 6.0'
+end

data/bin/console

@@ -1,14 +1,14 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "administrate/default_order"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "administrate/default_order"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/administrate/base_controller.rb

@@ -1,119 +1,141 @@
 require 'administrate/base_controller/version'
-require 'administrate/engine'
 
 module Administrate
-  class Engine < Rails::Engine
-    config.after_initialize do
-      ::Administrate::ApplicationController.class_eval do
-        def index
-          resources = index_resources
-          resources = apply_resource_includes(resources)
-          resources = order.apply(resources)
-          resources = resources.page(params[:page]).per(records_per_page)
-
-          respond_to do |format|
-            format.json { render_index_json(resources) }
-            format.any { render_index_any(resources, format: format) }
-          end
-        end
-
-        def new
-          resource = new_resource
-          authorize_resource(resource)
-          render locals: { page: new_page(resource) }
-        end
-
-        def edit
-          render locals: { page: edit_page(requested_resource) }
-        end
+  module BaseController
+    def index
+      resources = index_resources
+      resources = apply_collection_includes(resources)
+      resources = order.apply(resources)
+      resources = resources.page(params[:_page]).per(records_per_page)
+
+      respond_to do |format|
+        format.json { render_index_json(resources) }
+        format.any { render_index_any(resources, format: format) }
+      end
+    end
 
-        def show
-          respond_to do |format|
-            format.json { render_show_json(requested_resource) }
-            format.any { render_show_any(requested_resource, format: format) }
-          end
-        end
+    def new
+      resource = new_resource
+      authorize_resource(resource)
+      render locals: { page: new_page(resource) }
+    end
 
-        protected
+    def edit
+      render locals: { page: edit_page(requested_resource) }
+    end
 
-        def search_term
-          @search_term ||= params[:search].to_s.strip
-        end
+    def show
+      respond_to do |format|
+        format.json { render_show_json(requested_resource) }
+        format.any { render_show_any(requested_resource, format: format) }
+      end
+    end
 
-        def index_scoped_resource
-          scoped_resource
-        end
+    protected
 
-        def index_resources
-          Administrate::Search.new(index_scoped_resource, dashboard_class, search_term).run
-        end
+    def search_term
+      @search_term ||= params[:search].to_s.strip
+    end
 
-        def index_page
-          Administrate::Page::Collection.new(dashboard, order: order)
-        end
+    ##
+    # The resource scope only used for +index+.
+    #
+    # By default this calls +scoped_resource+ but it's common to overwrite this in controllers that would like a scoped
+    # view on the index page only. This way a subset of resources is shown, based on some state such as the path or a
+    # cookie or the current user, but +find_resource+ still works as intended when accessing the show path.
+    #
+    def index_scoped_resource
+      scoped_resource
+    end
 
-        def show_page(resource = requested_resource)
-          Administrate::Page::Show.new(dashboard, resource)
-        end
+    ##
+    # Wraps the +index_scoped_resource+.
+    #
+    # By default this constructs the +Administrate::Search+ decorator, wraps the resources and runs it with the
+    # +dashboard_class+ and +search_term+. Overwrite this to turn off search.
+    #
+    def index_resources
+      Administrate::Search.new(index_scoped_resource, dashboard_class, search_term).run
+    end
 
-        def new_page(resource)
-          Administrate::Page::Form.new(dashboard, resource)
-        end
+    ##
+    # The page used for +index+.
+    #
+    def index_page
+      Administrate::Page::Collection.new(dashboard, order: order)
+    end
 
-        def edit_page(resource)
-          new_page(resource)
-        end
+    ##
+    # The page used for +show+
+    #
+    def show_page(resource = requested_resource)
+      Administrate::Page::Show.new(dashboard, resource)
+    end
 
-        def authorize_resource(resource)
-          return if show_action?(action_name.to_sym, resource)
-          raise "That's not a valid action."
-        end
+    ##
+    # The page used for +new+
+    #
+    def new_page(resource)
+      Administrate::Page::Form.new(dashboard, resource)
+    end
 
-        def resource_params
-          permitted = params.require(resource_class.model_name.param_key)
-                          .permit(dashboard.permitted_attributes)
-                          .to_h
+    ##
+    # The page used for +edit+
+    #
+    def edit_page(resource)
+      new_page(resource)
+    end
 
-          permitted.each_with_object(permitted) do |(k, v), result|
-            result[k] = read_param(k, v)
-          end
-        end
+    def authorize_resource(resource)
+      return if show_action?(action_name.to_sym, resource)
+      raise "That's not a valid action."
+    end
 
-        def read_param(_, data)
-          if data.is_a?(ActionController::Parameters) && data[:type]
-            return read_param_value(data)
-          end
+    def resource_params
+      permitted = params.require(resource_class.model_name.param_key)
+                      .permit(dashboard.permitted_attributes)
+                      .to_h
 
-          data
-        end
+      permitted.each_with_object(permitted) do |(k, v), result|
+        result[k] = read_param(k, v)
+      end
+    end
 
-        def render_index_json(resources)
-          render json: resources
+    def read_param(_, data)
+      if data.is_a?(Hash) && data[:type]
+        if data[:type] == Administrate::Field::Polymorphic.to_s
+          return GlobalID::Locator.locate(data[:value])
         end
+      end
 
-        def render_index_any(resources, format:)
-          page = index_page
+      data
+    end
 
-          render locals: {
-            resources: resources,
-            search_term: search_term,
-            page: page,
-            show_search_bar: show_search_bar?,
-          }
-        end
+    def render_index_json(resources)
+      render json: resources
+    end
 
-        def render_show_json(resource = requested_resource)
-          render json: resource
-        end
+    def render_index_any(resources, format:)
+      page = index_page
 
-        def render_show_any(resource = requested_resource, format:)
-          render locals: { page: show_page(resource) }
-        end
+      render locals: {
+        resources: resources,
+        search_term: search_term,
+        page: page,
+        show_search_bar: show_search_bar?,
+      }
+    end
 
-        private
+    def render_show_json(resource = requested_resource)
+      render json: resource
+    end
 
-        attr_writer :search_term
-      end
+    def render_show_any(resource = requested_resource, format:)
+      render locals: { page: show_page(resource) }
     end
+
+    private
+
+    attr_writer :search_term
   end
 end

data/lib/administrate/base_controller/engine.rb

@@ -0,0 +1,14 @@
+require 'administrate/base_controller/version'
+require 'administrate/engine'
+
+require_relative '../base_controller'
+
+module Administrate
+  class Engine < Rails::Engine
+    config.after_initialize do
+      ::Administrate::ApplicationController.class_eval do
+        include BaseController
+      end
+    end
+  end
+end