administrate 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11c705312ca68f68a80830fbe9088602b2d495fb4a4ee75ad86997a3ddb86c42
-  data.tar.gz: 8f56b485d373c66777ef5d535916953a57b0d5416019504ddc45d4a0d5fc37fa
+  metadata.gz: 901108f5715bed268b4395d6edadf3738b127425910dc365390847710f19c98f
+  data.tar.gz: 6b61113c5c116250f2e46eaa5dbf77972473b16a6aae8042a6bcaef74f45308e
 SHA512:
-  metadata.gz: 3eefe2c7ff3dd30bcf5f58ee2bdfe8ad86645f6e34f1b8d0a6fd74094bedaff76c96c0526b839dca435a4e1acda2f71c8687aaae27b62be301a1d087420bdcb2
-  data.tar.gz: 5fb275186d046fd0daa165b994f84df4d4f944c56128e7c9309c9070e4d1e4a9ebecaf2d1c22b8d5677c8493bfcffda9414ecb819673ed8216bc9d74c745bd09
+  metadata.gz: ac4790d3bca102b4a27cc73f154e7167620f4589088b1207008f0915521735cfed483fbf085d24e7844e7b092f9f1a7d198ec6113cbc4be877758886c192f097
+  data.tar.gz: da2c64204adee3b43a566c67cf2aa42f37a0a38ea5f35b9988f704491f2b15dcd76210fb2f56f57de1576e77da71f429fe6572493e65933877b29f9eb9e5920f

data/app/assets/stylesheets/administrate/base/_typography.scss

@@ -23,7 +23,7 @@ p {
 
 a {
   color: $action-color;
-  text-decoration-skip: ink;
+  text-decoration-skip-ink: auto;
   transition: color $base-duration $base-timing;
 
   &:hover {

data/app/controllers/administrate/application_controller.rb

@@ -7,7 +7,7 @@ module Administrate
       resources = Administrate::Search.new(scoped_resource,
                                            dashboard_class,
                                            search_term).run
-      resources = apply_resource_includes(resources)
+      resources = apply_collection_includes(resources)
       resources = order.apply(resources)
       resources = resources.page(params[:page]).per(records_per_page)
       page = Administrate::Page::Collection.new(dashboard, order: order)
@@ -125,8 +125,8 @@ module Administrate
       resource_class.default_scoped
     end
 
-    def apply_resource_includes(relation)
-      resource_includes = dashboard.association_includes
+    def apply_collection_includes(relation)
+      resource_includes = dashboard.collection_includes
       return relation if resource_includes.empty?
       relation.includes(*resource_includes)
     end

data/app/controllers/concerns/administrate/punditize.rb

@@ -1,6 +1,6 @@
-if Object.const_defined?("Pundit")
-  module Administrate
-    module Punditize
+module Administrate
+  module Punditize
+    if Object.const_defined?("Pundit")
       extend ActiveSupport::Concern
       include Pundit
 

data/app/helpers/administrate/application_helper.rb

@@ -2,6 +2,14 @@ module Administrate
   module ApplicationHelper
     PLURAL_MANY_COUNT = 2.1
 
+    def application_title
+      if Rails::VERSION::MAJOR <= 5
+        Rails.application.class.parent_name.titlecase
+      else
+        Rails.application.class.module_parent_name.titlecase
+      end
+    end
+
     def render_field(field, locals = {})
       locals.merge!(field: field)
       render locals: locals, partial: field.to_partial_path
@@ -33,7 +41,7 @@ module Administrate
     end
 
     def sanitized_order_params(page, current_field_name)
-      collection_names = page.association_includes + [current_field_name]
+      collection_names = page.item_includes + [current_field_name]
       association_params = collection_names.map do |assoc_name|
         { assoc_name => %i[order direction page per_page] }
       end

data/app/views/fields/select/_form.html.erb

@@ -1,5 +1,5 @@
 <%#
-# Select Index Partial
+# Select Form Partial
 
 This partial renders a selectable text attribute,
 to be displayed on a resource's edit form page.

data/app/views/fields/url/_form.html.erb

@@ -0,0 +1,23 @@
+<%#
+# Url Form Partial
+
+This partial renders an input element for URL.
+By default, the input is a text box.
+
+## Local variables:
+
+- `f`:
+  A Rails form generator, used to help create the appropriate input fields.
+- `field`:
+  An instance of [Administrate::Field::Url][1].
+  A wrapper around the URL pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Url
+%>
+
+<div class="field-unit__label">
+  <%= f.label field.attribute %>
+</div>
+<div class="field-unit__field">
+  <%= f.url_field field.attribute %>
+</div>

data/app/views/fields/url/_index.html.erb

@@ -0,0 +1,20 @@
+<%#
+# Url Index Partial
+
+This partial renders an email address,
+to be displayed on a resource's index page.
+
+By default, the value is rendered as an `a` element.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Url][1].
+  A wrapper around the email pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Url
+%>
+
+<%= content_tag :a, href: field.data do %>
+  <%= field.data %>
+<% end %>

data/app/views/fields/url/_show.html.erb

@@ -0,0 +1,20 @@
+<%#
+# Url Show Partial
+
+This partial renders an email address,
+to be displayed on a resource's show page.
+
+By default, the value is rendered as an `a` element.
+
+## Local variables:
+
+- `field`:
+  An instance of [Administrate::Field::Url][1].
+  A wrapper around the email pulled from the database.
+
+[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Url
+%>
+
+<%= content_tag :a, href: field.data do %>
+  <%= field.data %>
+<% end %>

data/app/views/layouts/administrate/application.html.erb

@@ -19,7 +19,7 @@ By default, it renders:
   <meta name="ROBOTS" content="NOODP">
   <meta name="viewport" content="initial-scale=1">
   <title>
-    <%= content_for(:title) %> - <%= Rails.application.class.parent_name.titlecase %>
+    <%= content_for(:title) %> - <%= application_title %>
   </title>
   <%= render "stylesheet" %>
   <%= csrf_meta_tags %>

data/config/locales/administrate.es.yml

@@ -22,7 +22,7 @@ es:
         none: Ninguno
     form:
       error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      errors: "%{pluralized_errors} no permitieron guardar este %{resource_name}:"
     search:
       clear: Borrar búsqueda
       label: Buscar %{resource}

data/config/locales/administrate.ko.yml

@@ -4,25 +4,25 @@ ko:
     actions:
       confirm: 괜찮습니까?
       destroy: 삭제
-      edit: 편집
-      edit_resource: 편집 %{name}
-      show_resource: 보여주기 %{name}
-      new_resource: 새로운 %{name}
+      edit: 수정
+      edit_resource: 수정 %{name}
+      show_resource: "%{name}"
+      new_resource: 새 %{name}
       back: 뒤로
     controller:
       create:
-        success: "%{resource} 가 성공적으로 생성되었습니다."
+        success: "%{resource}가 성공적으로 생성되었습니다."
       destroy:
-        success: "%{resource} 가 성공적으로 삭제되었습니다."
+        success: "%{resource}가 성공적으로 삭제되었습니다."
       update:
-        success: "%{resource} 가 성공적으로 갱신되었습니다."
+        success: "%{resource}가 성공적으로 수정되었습니다."
     fields:
       has_many:
-        more: "%{total_count} 개 중에서 %{count} 개"
+        more: "%{total_count}개 중에서 %{count}개"
         none: 없음
     form:
-      error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      error: 에러
+      errors: "%{pluralized_errors}로 인하여 %{resource_name}을(를) 저장하는데 실패하였습니다."
     search:
       clear: 검색 초기화
       label: "%{resource} 검색"

data/config/locales/administrate.zh-CN.yml

@@ -21,8 +21,8 @@ zh-CN:
         more: 显示所有 %{total_count} 中 %{count} 条
         none: 无
     form:
-      error: error
-      errors: "%{pluralized_errors} prohibited this %{resource_name} from being saved:"
+      error: 错误
+      errors: "%{resource_name} 保存前出现了 %{pluralized_errors} 个错误："
     search:
       clear: 清除搜索
       label: 搜索 %{resource}

data/docs/customizing_attribute_partials.md

@@ -10,7 +10,7 @@ across all dashboards. You can customize the following built in field types:
 - `has_many`
 - `has_one`
 - `number`
-- `polymporphic`
+- `polymorphic`
 - `select`
 - `string`
 - `text`

data/docs/customizing_controller_actions.md

@@ -28,9 +28,10 @@ class Admin::FoosController < Admin::ApplicationController
   # def find_resource(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

data/docs/customizing_dashboards.md

@@ -98,7 +98,7 @@ For example:
 ```ruby
   country: Field::BelongsTo.with_options(
     searchable: true,
-    seachable_field: 'name',
+    searchable_field: 'name',
   )
 ```
 
@@ -277,3 +277,31 @@ end
 ```
 
 Action is one of `new`, `edit`, `show`, `destroy`.
+
+## Collection Filters
+
+Resources can be filtered with pre-set filters. For example if we added:
+
+```ruby
+COLLECTION_FILTERS = {
+  inactive: ->(resources) { resources.where("login_at < ?", 1.week.ago) }
+}
+```
+
+…to a dashboard, we can query the resources of that dashboard with:
+
+```ruby
+bob inactive:
+```
+
+…to find users named "bob" who hasn't logged in the last week.
+
+If you already had the `inactive` scope you could define the filter like so to
+take advantage of existing ActiveRecord scopes (and other class methods on the
+resource class).
+
+```ruby
+COLLECTION_FILTERS = {
+  inactive: ->(resources) { resources.inactive }
+}
+```

data/docs/getting_started.md

@@ -37,11 +37,11 @@ Rails.application.routes.draw do
     # Add dashboard for your models here
     resources :customers,
     resources :orders
-  
+
     root to: "customers#index" # <--- Root route
   end
  end
- ```
+```
 
 The routes can be customized to show or hide
 different models on the dashboard.
@@ -73,6 +73,15 @@ namespace :admin do
 end
 ```
 
+## Using a Custom Namespace
+
+Administrate supports using a namespace other than `Admin`, such as
+`Supervisor`. This will also change the route it's using:
+
+```sh
+rails generate administrate:install --namespace=supervisor
+```
+
 ## Keep Dashboards Updated as Model Attributes Change
 
 If you've installed Administrate and generated dashboards and _then_ 
@@ -112,46 +121,6 @@ Example:
 It's recommended that you make this change at the same time as you add the 
 attribute to the model.
 
-The alternative way to handle this is to re-run `rails g administrate:install` and 
-carefully pick through the diffs. This latter method is probably more cumbersome.
-
-## Rails API
-
-Since Rails 5.0, we've been able to have API only applications. Yet, sometimes
-we still want to have an admin. 
-
-To get this working, we recommend updating this config:
-
-```ruby
-# config/application.rb
-config.api_only = false
-```
-
-That means, when your app _boots_, we'll have access to flashes and such. We
-also don't use your `ApplicationController`. Instead, Administrate provides its
-own. Meaning you're free to specify `ActionController::API` as your parent
-controller to make sure no flash, session, or cookie middleware is used by your
-API.
-
-Alternatively, if your application needs to have `config.api_only = true`, we recommend you add the following lines to your `config/application.rb`
-
-```ruby
-# Enable Flash, Cookies, MethodOverride for Administrate Gem
-config.middleware.use ActionDispatch::Flash
-config.session_store :cookie_store
-config.middleware.use ActionDispatch::Cookies
-config.middleware.use ActionDispatch::Session::CookieStore, config.session_options
-config.middleware.use ::Rack::MethodOverride
-```
-
-You must also ensure that the all the required controller actions are available and accessible as routes since generators in API-only applications only generate some of the required actions. Here is an example:
-
-```ruby
-# routes.rb
-namespace :admin do
-  resources name, only: %i(index show new create edit update destroy)
-end
-
-# names_controller.rb
-# Ensure each of those methods are defined
-```
+The alternative way to handle this is to re-run `rails g administrate:install`
+and carefully pick through the diffs. This latter method is probably more
+cumbersome.

data/docs/rails_api.md

@@ -0,0 +1,43 @@
+## Rails API
+
+Since Rails 5.0, we've been able to have API only applications. Yet, sometimes
+we still want to have an admin. 
+
+To get this working, we recommend updating this config:
+
+```ruby
+# config/application.rb
+config.api_only = false
+```
+
+That means, when your app _boots_, we'll have access to flashes and such. We
+also don't use your `ApplicationController`. Instead, Administrate provides its
+own. Meaning you're free to specify `ActionController::API` as your parent
+controller to make sure no flash, session, or cookie middleware is used by your
+API.
+
+Alternatively, if your application needs to have `config.api_only = true`, we
+recommend you add the following lines to your `config/application.rb`
+
+```ruby
+# Enable Flash, Cookies, MethodOverride for Administrate Gem
+config.middleware.use ActionDispatch::Flash
+config.session_store :cookie_store
+config.middleware.use ActionDispatch::Cookies
+config.middleware.use ActionDispatch::Session::CookieStore, config.session_options
+config.middleware.use ::Rack::MethodOverride
+```
+
+You must also ensure that all the required controller actions are available
+and accessible as routes since generators in API-only applications only 
+generate some of the required actions. Here is an example:
+
+```ruby
+# routes.rb
+namespace :admin do
+  resources :name, only: %i(index show new create edit update destroy)
+end
+
+# names_controller.rb
+# Ensure each of those methods are defined
+```

data/lib/administrate/base_dashboard.rb

@@ -10,6 +10,7 @@ require "administrate/field/select"
 require "administrate/field/string"
 require "administrate/field/text"
 require "administrate/field/time"
+require "administrate/field/url"
 require "administrate/field/password"
 
 module Administrate
@@ -58,15 +59,12 @@ module Administrate
       "#{resource.class} ##{resource.id}"
     end
 
-    def association_includes
-      association_classes = [Field::HasMany, Field::HasOne, Field::BelongsTo]
-
-      collection_attributes.map do |key|
-        field = self.class::ATTRIBUTE_TYPES[key]
+    def collection_includes
+      attribute_includes(collection_attributes)
+    end
 
-        next key if association_classes.include?(field)
-        key if association_classes.include?(field.try(:deferred_class))
-      end.compact
+    def item_includes
+      attribute_includes(show_page_attributes)
     end
 
     private
@@ -74,5 +72,20 @@ module Administrate
     def attribute_not_found_message(attr)
       "Attribute #{attr} could not be found in #{self.class}::ATTRIBUTE_TYPES"
     end
+
+    def association_classes
+      @association_classes ||=
+        ObjectSpace.each_object(Class).
+          select { |klass| klass < Administrate::Field::Associative }
+    end
+
+    def attribute_includes(attributes)
+      attributes.map do |key|
+        field = self.class::ATTRIBUTE_TYPES[key]
+
+        next key if association_classes.include?(field)
+        key if association_classes.include?(field.try(:deferred_class))
+      end.compact
+    end
   end
 end

data/lib/administrate/engine.rb

@@ -2,7 +2,7 @@ require "datetime_picker_rails"
 require "jquery-rails"
 require "kaminari"
 require "momentjs-rails"
-require "sass-rails"
+require "sassc-rails"
 require "selectize-rails"
 require "sprockets/railtie"
 

data/lib/administrate/field/has_many.rb

@@ -66,7 +66,7 @@ module Administrate
       private
 
       def includes
-        associated_dashboard.association_includes
+        associated_dashboard.collection_includes
       end
 
       def candidate_resources

data/lib/administrate/field/url.rb

@@ -0,0 +1,21 @@
+require_relative "base"
+
+module Administrate
+  module Field
+    class Url < Field::Base
+      def self.searchable?
+        true
+      end
+
+      def truncate
+        data.to_s[0...truncation_length]
+      end
+
+      private
+
+      def truncation_length
+        options.fetch(:truncate, 50)
+      end
+    end
+  end
+end

data/lib/administrate/page/base.rb

@@ -15,8 +15,12 @@ module Administrate
         @resource_path ||= resource_name.gsub("/", "_")
       end
 
-      def association_includes
-        dashboard.try(:association_includes) || []
+      def collection_includes
+        dashboard.try(:collection_includes) || []
+      end
+
+      def item_includes
+        dashboard.try(:item_includes) || []
       end
 
       protected

data/lib/administrate/search.rb

@@ -3,23 +3,82 @@ require "active_support/core_ext/object/blank"
 
 module Administrate
   class Search
+    class Query
+      attr_reader :filters
+
+      def blank?
+        terms.blank? && filters.empty?
+      end
+
+      def initialize(original_query)
+        @original_query = original_query
+        @filters, @terms = parse_query(original_query)
+      end
+
+      def original
+        @original_query
+      end
+
+      def terms
+        @terms.join(" ")
+      end
+
+      def to_s
+        original
+      end
+
+      private
+
+      def filter?(word)
+        word.match?(/^\w+:$/)
+      end
+
+      def parse_query(query)
+        filters = []
+        terms = []
+        query.to_s.split.each do |word|
+          if filter?(word)
+            filters << word.split(":").first
+          else
+            terms << word
+          end
+        end
+        [filters, terms]
+      end
+    end
+
     def initialize(scoped_resource, dashboard_class, term)
       @dashboard_class = dashboard_class
       @scoped_resource = scoped_resource
-      @term = term
+      @query = Query.new(term)
     end
 
     def run
-      if @term.blank?
+      if query.blank?
         @scoped_resource.all
       else
-        @scoped_resource.joins(tables_to_join).where(query, *search_terms)
+        results = search_results(@scoped_resource)
+        results = filter_results(results)
+        results
       end
     end
 
     private
 
-    def query
+    def apply_filter(filter, resources)
+      return resources unless filter
+      filter.call(resources)
+    end
+
+    def filter_results(resources)
+      query.filters.each do |filter_name|
+        filter = valid_filters[filter_name]
+        resources = apply_filter(filter, resources)
+      end
+      resources
+    end
+
+    def query_template
       search_attributes.map do |attr|
         table_name = query_table_name(attr)
         attr_name = column_to_query(attr)
@@ -28,7 +87,7 @@ module Administrate
       end.join(" OR ")
     end
 
-    def search_terms
+    def query_values
       ["%#{term.mb_chars.downcase}%"] * search_attributes.count
     end
 
@@ -38,6 +97,20 @@ module Administrate
       end
     end
 
+    def search_results(resources)
+      resources.
+        joins(tables_to_join).
+        where(query_template, *query_values)
+    end
+
+    def valid_filters
+      if @dashboard_class.const_defined?(:COLLECTION_FILTERS)
+        @dashboard_class.const_get(:COLLECTION_FILTERS).stringify_keys
+      else
+        {}
+      end
+    end
+
     def attribute_types
       @dashboard_class::ATTRIBUTE_TYPES
     end
@@ -76,6 +149,10 @@ module Administrate
       ].include?(attribute_types[attribute].deferred_class)
     end
 
-    attr_reader :resolver, :term
+    def term
+      query.terms
+    end
+
+    attr_reader :resolver, :query
   end
 end

data/lib/administrate/version.rb

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

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

@@ -50,7 +50,9 @@ module Administrate
       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 <%= namespace.classify %>
   class <%= class_name.pluralize %>Controller < <%= namespace.classify %>::ApplicationController
-    # To customize the behavior of this controller,
-    # you can overwrite any of the RESTful actions. For example:
+    # 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/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"
 

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.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Nick Charlton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-17 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: '6.0'
   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: '6.0'
 - !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: '6.0'
   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: '6.0'
 - !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: '6.0'
   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: '6.0'
 - !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,
@@ -223,7 +219,7 @@ files:
 - 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
@@ -271,6 +267,9 @@ files:
 - 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
@@ -297,7 +296,6 @@ 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
@@ -307,6 +305,7 @@ files:
 - 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
@@ -326,6 +325,7 @@ files:
 - 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
@@ -384,8 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+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