administrate 0.8.1 → 0.12.0

data/lib/administrate/version.rb

@@ -1,3 +1,3 @@
 module Administrate
-  VERSION = "0.8.1".freeze
+  VERSION = "0.12.0".freeze
 end

data/lib/generators/administrate/dashboard/USAGE

@@ -3,7 +3,7 @@ Description:
     pulling the attributes from database columns.
 
 Example:
-    rails generate administrate:dashboard FooBar
+    rails generate administrate:dashboard FooBar [--namespace admin]
 
     This will create:
         app/dashboards/foo_bar_dashboard.rb

data/lib/generators/administrate/dashboard/dashboard_generator.rb

@@ -10,7 +10,7 @@ module Administrate
         enum: "Field::String",
         float: "Field::Number",
         integer: "Field::Number",
-        time: "Field::DateTime",
+        time: "Field::Time",
         text: "Field::Text",
         string: "Field::String",
       }
@@ -24,6 +24,8 @@ module Administrate
       COLLECTION_ATTRIBUTE_LIMIT = 4
       READ_ONLY_ATTRIBUTES = %w[id created_at updated_at]
 
+      class_option :namespace, type: :string, default: "admin"
+
       source_root File.expand_path("../templates", __FILE__)
 
       def create_dashboard_definition
@@ -35,7 +37,7 @@ module Administrate
 
       def create_resource_controller
         destination = Rails.root.join(
-          "app/controllers/admin/#{file_name.pluralize}_controller.rb",
+          "app/controllers/#{namespace}/#{file_name.pluralize}_controller.rb",
         )
 
         template("controller.rb.erb", destination)
@@ -43,8 +45,14 @@ module Administrate
 
       private
 
+      def namespace
+        options[:namespace]
+      end
+
       def attributes
-        klass.reflections.keys + klass.attribute_names - redundant_attributes
+        klass.reflections.keys +
+          klass.columns.map(&:name) -
+          redundant_attributes
       end
 
       def form_attributes

data/lib/generators/administrate/dashboard/templates/controller.rb.erb

@@ -1,18 +1,31 @@
-module Admin
-  class <%= class_name.pluralize %>Controller < Admin::ApplicationController
-    # To customize the behavior of this controller,
-    # you can overwrite any of the RESTful actions. For example:
+module <%= namespace.classify %>
+  class <%= class_name.pluralize %>Controller < <%= namespace.classify %>::ApplicationController
+    # Overwrite any of the RESTful controller actions to implement custom behavior
+    # For example, you may want to send an email after a foo is updated.
     #
-    # def index
-    #   super
-    #   @resources = <%= class_name %>.
-    #     page(params[:page]).
-    #     per(10)
+    # def update
+    #   foo = Foo.find(params[:id])
+    #   foo.update(params[:foo])
+    #   send_foo_updated_email
     # end
 
-    # Define a custom finder by overriding the `find_resource` method:
+    # Override this method to specify custom lookup behavior.
+    # This will be used to set the resource for the `show`, `edit`, and `update`
+    # actions.
+    #
     # def find_resource(param)
-    #   <%= class_name %>.find_by!(slug: param)
+    #   Foo.find_by!(slug: param)
+    # end
+
+    # Override this if you have certain roles that require a subset
+    # this will be used to set the records shown on the `index` action.
+    #
+    # def scoped_resource
+    #  if current_user.super_admin?
+    #    resource_class
+    #  else
+    #    resource_class.with_less_stuff
+    #  end
     # end
 
     # See https://administrate-prototype.herokuapp.com/customizing_controller_actions

data/lib/generators/administrate/dashboard/templates/dashboard.rb.erb

@@ -18,20 +18,20 @@ class <%= class_name %>Dashboard < Administrate::BaseDashboard
   #
   # By default, it's limited to four items to reduce clutter on index pages.
   # Feel free to add, remove, or rearrange items.
-  COLLECTION_ATTRIBUTES = [
+  COLLECTION_ATTRIBUTES = %i[
 <%=
   attributes.first(COLLECTION_ATTRIBUTE_LIMIT).map do |attr|
-    "    :#{attr},"
+    "  #{attr}"
   end.join("\n")
 %>
   ].freeze
 
   # SHOW_PAGE_ATTRIBUTES
   # an array of attributes that will be displayed on the model's show page.
-  SHOW_PAGE_ATTRIBUTES = [
+  SHOW_PAGE_ATTRIBUTES = %i[
 <%=
   attributes.map do |attr|
-    "    :#{attr},"
+    "  #{attr}"
   end.join("\n")
 %>
   ].freeze
@@ -39,14 +39,26 @@ class <%= class_name %>Dashboard < Administrate::BaseDashboard
   # FORM_ATTRIBUTES
   # an array of attributes that will be displayed
   # on the model's form (`new` and `edit`) pages.
-  FORM_ATTRIBUTES = [
+  FORM_ATTRIBUTES = %i[
 <%=
   form_attributes.map do |attr|
-    "    :#{attr},"
+    "  #{attr}"
   end.join("\n")
 %>
   ].freeze
 
+  # COLLECTION_FILTERS
+  # a hash that defines filters that can be used while searching via the search
+  # field of the dashboard.
+  #
+  # For example to add an option to search for open resources by typing "open:"
+  # in the search field:
+  #
+  #   COLLECTION_FILTERS = {
+  #     open: ->(resources) { where(open: true) }
+  #   }.freeze
+  COLLECTION_FILTERS = {}.freeze
+
   # Overwrite this method to customize how <%= file_name.pluralize.humanize.downcase %> are displayed
   # across all pages of the admin dashboard.
   #

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

@@ -8,34 +8,41 @@ module Administrate
       include Administrate::GeneratorHelpers
       source_root File.expand_path("../templates", __FILE__)
 
+      class_option :namespace, type: :string, default: "admin"
+
       def run_routes_generator
         if dashboard_resources.none?
-          call_generator("administrate:routes")
+          call_generator("administrate:routes", "--namespace", namespace)
           load Rails.root.join("config/routes.rb")
         end
       end
 
       def create_dashboard_controller
-        copy_file(
-          "application_controller.rb",
-          "app/controllers/admin/application_controller.rb"
+        template(
+          "application_controller.rb.erb",
+          "app/controllers/#{namespace}/application_controller.rb",
         )
       end
 
       def run_dashboard_generators
         singular_dashboard_resources.each do |resource|
-          call_generator("administrate:dashboard", resource)
+          call_generator "administrate:dashboard", resource,
+            "--namespace", namespace
         end
       end
 
       private
 
+      def namespace
+        options[:namespace]
+      end
+
       def singular_dashboard_resources
         dashboard_resources.map(&:to_s).map(&:singularize)
       end
 
       def dashboard_resources
-        Administrate::Namespace.new(:admin).resources
+        Administrate::Namespace.new(namespace).resources
       end
     end
   end

data/lib/generators/administrate/install/templates/{application_controller.rb → application_controller.rb.erb}

@@ -4,7 +4,7 @@
 #
 # If you want to add pagination or other controller-level concerns,
 # you're free to overwrite the RESTful controller actions.
-module Admin
+module <%= namespace.classify %>
   class ApplicationController < Administrate::ApplicationController
     before_action :authenticate_admin
 

data/lib/generators/administrate/routes/routes_generator.rb

@@ -1,4 +1,9 @@
-Rails.application.eager_load!
+if defined?(Zeitwerk)
+  Zeitwerk::Loader.eager_load_all
+else
+  Rails.application.eager_load!
+end
+
 require "rails/generators/base"
 require "administrate/namespace"
 
@@ -6,6 +11,7 @@ module Administrate
   module Generators
     class RoutesGenerator < Rails::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
+      class_option :namespace, type: :string, default: "admin"
 
       def insert_dashboard_routes
         if should_route_dashboard?
@@ -32,6 +38,10 @@ module Administrate
 
       private
 
+      def namespace
+        options[:namespace]
+      end
+
       def dashboard_resources
         valid_dashboard_models.map do |model|
           model.to_s.pluralize.underscore

data/lib/generators/administrate/routes/templates/routes.rb.erb

@@ -1,4 +1,4 @@
-namespace :admin do
+namespace :<%= namespace %> do
 <% dashboard_resources.each do |resource| %>    resources :<%= resource %>
 <%end%>
     root to: "<%= dashboard_resources.first %>#index"

data/lib/generators/administrate/views/field_generator.rb

@@ -14,15 +14,29 @@ module Administrate
         source_root template_source_path
 
         def copy_partials
-          copy_field_partial(:index)
-          copy_field_partial(:show)
-          copy_field_partial(:form)
+          resource_path = args.first.try(:underscore)
+
+          if resource_path == "all"
+            entries = Dir.entries(self.class.template_source_path)
+            field_types = entries.reject { |name| name[0] == "." }
+
+            field_types.each do |field_type|
+              copy_field_partials(field_type)
+            end
+          else
+            copy_field_partials(resource_path)
+          end
         end
 
         private
 
-        def copy_field_partial(partial_name)
-          resource_path = args.first.try(:underscore)
+        def copy_field_partials(resource_path)
+          copy_field_partial(resource_path, :index)
+          copy_field_partial(resource_path, :show)
+          copy_field_partial(resource_path, :form)
+        end
+
+        def copy_field_partial(resource_path, partial_name)
           template_file = "#{resource_path}/_#{partial_name}.html.erb"
 
           copy_file(

data/lib/generators/administrate/views/layout_generator.rb

@@ -16,6 +16,7 @@ module Administrate
           copy_resource_template("_stylesheet")
           copy_resource_template("_javascript")
           copy_resource_template("_flashes")
+          copy_resource_template("_icons")
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -18,9 +18,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -38,9 +32,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,9 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -58,9 +46,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -68,9 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -142,19 +124,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: selectize-rails
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +151,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Administrate is heavily inspired by projects like Rails Admin and ActiveAdmin,
   but aims to provide a better user experience for site admins,
@@ -218,11 +214,12 @@ files:
 - app/assets/stylesheets/administrate/utilities/_text-color.scss
 - app/assets/stylesheets/docs.scss
 - app/controllers/administrate/application_controller.rb
+- app/controllers/concerns/administrate/punditize.rb
 - app/helpers/administrate/application_helper.rb
 - app/views/administrate/application/_collection.html.erb
 - app/views/administrate/application/_flashes.html.erb
 - app/views/administrate/application/_form.html.erb
-- app/views/administrate/application/_icons.erb
+- app/views/administrate/application/_icons.html.erb
 - app/views/administrate/application/_javascript.html.erb
 - app/views/administrate/application/_navigation.html.erb
 - app/views/administrate/application/_search.html.erb
@@ -252,6 +249,9 @@ files:
 - app/views/fields/number/_form.html.erb
 - app/views/fields/number/_index.html.erb
 - app/views/fields/number/_show.html.erb
+- app/views/fields/password/_form.html.erb
+- app/views/fields/password/_index.html.erb
+- app/views/fields/password/_show.html.erb
 - app/views/fields/polymorphic/_form.html.erb
 - app/views/fields/polymorphic/_index.html.erb
 - app/views/fields/polymorphic/_show.html.erb
@@ -264,14 +264,24 @@ files:
 - app/views/fields/text/_form.html.erb
 - app/views/fields/text/_index.html.erb
 - app/views/fields/text/_show.html.erb
+- app/views/fields/time/_form.html.erb
+- app/views/fields/time/_index.html.erb
+- app/views/fields/time/_show.html.erb
+- app/views/fields/url/_form.html.erb
+- app/views/fields/url/_index.html.erb
+- app/views/fields/url/_show.html.erb
 - app/views/layouts/administrate/application.html.erb
 - config/i18n-tasks.yml
+- config/locales/administrate.al.yml
 - config/locales/administrate.ar.yml
+- config/locales/administrate.bs.yml
+- config/locales/administrate.ca.yml
 - config/locales/administrate.da.yml
 - config/locales/administrate.de.yml
 - config/locales/administrate.en.yml
 - config/locales/administrate.es.yml
 - config/locales/administrate.fr.yml
+- config/locales/administrate.id.yml
 - config/locales/administrate.it.yml
 - config/locales/administrate.ja.yml
 - config/locales/administrate.ko.yml
@@ -286,15 +296,16 @@ files:
 - config/locales/administrate.zh-CN.yml
 - config/locales/administrate.zh-TW.yml
 - config/routes.rb
-- config/secrets.yml
 - config/unicorn.rb
 - docs/adding_custom_field_types.md
 - docs/authentication.md
+- docs/authorization.md
 - docs/customizing_attribute_partials.md
 - docs/customizing_controller_actions.md
 - docs/customizing_dashboards.md
 - docs/customizing_page_views.md
 - docs/getting_started.md
+- docs/rails_api.md
 - lib/administrate.rb
 - lib/administrate/base_dashboard.rb
 - lib/administrate/engine.rb
@@ -308,10 +319,13 @@ files:
 - lib/administrate/field/has_many.rb
 - lib/administrate/field/has_one.rb
 - lib/administrate/field/number.rb
+- lib/administrate/field/password.rb
 - lib/administrate/field/polymorphic.rb
 - lib/administrate/field/select.rb
 - lib/administrate/field/string.rb
 - lib/administrate/field/text.rb
+- lib/administrate/field/time.rb
+- lib/administrate/field/url.rb
 - lib/administrate/generator_helpers.rb
 - lib/administrate/namespace.rb
 - lib/administrate/namespace/resource.rb
@@ -338,7 +352,7 @@ files:
 - lib/generators/administrate/field/templates/_show.html.erb
 - lib/generators/administrate/field/templates/field_object.rb.erb
 - lib/generators/administrate/install/install_generator.rb
-- lib/generators/administrate/install/templates/application_controller.rb
+- lib/generators/administrate/install/templates/application_controller.rb.erb
 - lib/generators/administrate/routes/routes_generator.rb
 - lib/generators/administrate/routes/templates/routes.rb.erb
 - lib/generators/administrate/views/edit_generator.rb
@@ -370,8 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Rails engine for creating super-flexible admin dashboards

data/config/secrets.yml

@@ -1,14 +0,0 @@
-default: &default
-  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
-
-development:
-  <<: *default
-
-test:
-  <<: *default
-
-staging:
-  <<: *default
-
-production:
-  <<: *default