administrate 0.20.1 → 1.0.0.beta1

data/app/assets/builds/administrate-internal/docs.css

@@ -0,0 +1,89 @@
+html,
+body {
+  font-family: "Lato", serif;
+  font-size: 18px;
+  line-height: 1.62em;
+  margin: 0;
+}
+
+img {
+  max-width: 100%;
+}
+
+h1,
+h2,
+h3 {
+  font-family: "Fjalla One", sans-serif;
+  margin-top: 2em;
+}
+
+a {
+  color: #53adc6;
+  text-decoration: none;
+}
+
+.content {
+  margin-bottom: 2em;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 2em;
+  width: 60em;
+}
+.content .sidebar {
+  float: left;
+  width: 20em;
+}
+.content .sidebar-links {
+  list-style: none;
+  padding-left: 0;
+}
+.content .main {
+  float: right;
+  width: 40em;
+}
+
+.flash-wrapper {
+  background-color: #cf726e;
+  color: #f0f0f0;
+  padding: 1em;
+}
+.flash-wrapper .flash {
+  margin-left: auto;
+  margin-right: auto;
+  width: 40em;
+}
+
+code {
+  font-family: "Source Code Pro";
+  font-size: 0.8rem;
+  padding: 0.4em 0.2em 0;
+}
+code.hljs {
+  background-color: #202020;
+  color: #e0e0dc;
+  padding-left: 1rem;
+}
+code.hljs .hljs-string {
+  color: #b0bf82;
+}
+code.hljs .hljs-subst {
+  color: #e0e0dc;
+}
+code.hljs .hljs-constant {
+  color: #8fbdcc;
+}
+code.hljs .hljs-symbol {
+  color: #b95c56;
+}
+code.hljs .hljs-keyword {
+  color: #f8d29d;
+}
+code.hljs .hljs-title,
+code.hljs .hljs-parent {
+  color: #8fbdcc;
+}
+code.hljs .hljs-tag {
+  color: #f8d29d;
+}
+
+/*# sourceMappingURL=docs.css.map */

data/app/assets/builds/administrate-internal/docs.css.map

@@ -0,0 +1 @@
+{"version":3,"sourceRoot":"","sources":["../../stylesheets/administrate-internal/docs.scss"],"names":[],"mappings":"AAYA;AAAA;EAEE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;AAAA;AAAA;EAGE;EACA;;;AAGF;EACE,OAhCK;EAiCL;;;AAGF;EACE;EACA;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAEA;EACE;EACA;;AAIJ;EACE;EACA;;;AAIJ;EACE,kBA3DI;EA4DJ,OA1DM;EA2DN;;AAEA;EACE;EACA;EACA;;;AAIJ;EACE;EACA;EACA;;AAEA;EACE,kBAxES;EAyET,OAxES;EAyET;;AAEA;EAAe,OA1EN;;AA2ET;EAAc,OA5EL;;AA6ET;EAAiB,OA3ET;;AA4ER;EAAe,OA1ER;;AA2EP;EAAgB,OA5EN;;AA8EV;AAAA;EACe,OAhFP;;AAkFR;EAAY,OAjFF","file":"docs.css"}

data/app/assets/config/administrate_manifest.js

@@ -0,0 +1,2 @@
+//= link_tree ../images
+//= link_tree ../builds

data/app/assets/javascripts/administrate/add_jquery.js

@@ -0,0 +1,4 @@
+import jquery from "jquery";
+
+window.jQuery = jquery;
+window.$ = jquery;

data/app/assets/javascripts/administrate/application.js

@@ -1,4 +1,8 @@
-//= require jquery
-//= require jquery_ujs
-//= require selectize
-//= require_tree .
+import "./add_jquery";
+
+import {} from "jquery-ujs";
+import "selectize/dist/js/selectize.min.js";
+
+import "./components/associative";
+import "./components/select";
+import "./components/table";

data/app/assets/stylesheets/administrate/application.scss

@@ -2,7 +2,8 @@
 
 @import "reset/normalize";
 
-@import "selectize";
+@import "selectize/dist/css/selectize";
+@import "selectize/dist/css/selectize.default";
 
 @import "library/clearfix";
 @import "library/data-label";

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

@@ -32,6 +32,10 @@ textarea {
   font-size: 16px;
 }
 
+textarea {
+  resize: vertical;
+}
+
 [type="color"],
 [type="date"],
 [type="datetime-local"],
@@ -78,10 +82,6 @@ textarea {
   }
 }
 
-textarea {
-  resize: vertical;
-}
-
 [type="checkbox"],
 [type="radio"] {
   display: inline;

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

@@ -23,7 +23,7 @@ tbody tr {
     background-color: $base-background-color;
   }
 
-  [role=link] {
+  [role="link"] {
     cursor: pointer;
   }
 

data/app/assets/stylesheets/administrate/components/_attributes.scss

@@ -1,5 +1,6 @@
 .attribute-label {
   @include data-label;
+
   clear: left;
   float: left;
   margin-bottom: $base-spacing;

data/app/assets/stylesheets/administrate/components/_buttons.scss

@@ -1,7 +1,5 @@
 button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
+input,
 .button {
   appearance: none;
   background-color: $action-color;

data/app/assets/stylesheets/administrate/components/_cells.scss

@@ -1,6 +1,25 @@
+.cell-label__sort-indicator {
+  float: right;
+  margin-left: 5px;
+
+  svg {
+    fill: $hint-grey;
+    height: 13px;
+    transition: transform $base-duration $base-timing;
+    width: 13px;
+  }
+}
+
 .cell-label {
   padding-top: 0.15em;
 
+  a {
+    color: inherit;
+    display: inline-block;
+    transition: color $base-duration $base-timing;
+    width: 100%;
+  }
+
   &:hover {
     a {
       color: $action-color;
@@ -11,13 +30,6 @@
       transform: rotate(180deg);
     }
   }
-
-  a {
-    color: inherit;
-    display: inline-block;
-    transition: color $base-duration $base-timing;
-    width: 100%;
-  }
 }
 
 .cell-label--asc,
@@ -25,18 +37,6 @@
   font-weight: $bold-font-weight;
 }
 
-.cell-label__sort-indicator {
-  float: right;
-  margin-left: 5px;
-
-  svg {
-    fill: $hint-grey;
-    height: 13px;
-    transition: transform $base-duration $base-timing;
-    width: 13px;
-  }
-}
-
 .cell-label__sort-indicator--desc {
   transform: rotate(180deg);
 }

data/app/assets/stylesheets/administrate/components/_field-unit.scss

@@ -1,5 +1,6 @@
 .field-unit {
   @include administrate-clearfix;
+
   align-items: center;
   display: flex;
   flex-wrap: wrap;

data/app/assets/stylesheets/administrate/components/_main-content.scss

@@ -4,8 +4,8 @@
   box-shadow: 0 0 6px 0 rgba($black, 0.12),
               0 2px 2px rgba($black, 0.2);
   flex: 1 1 100%;
-  padding-bottom: 10vh;
   min-width: 800px;
+  padding-bottom: 10vh;
 }
 
 .main-content__header,

data/app/assets/stylesheets/administrate/components/_navigation.scss

@@ -1,4 +1,4 @@
-$_navigation-link-padding: 0.6em;
+$navigation-link-padding: 0.6em;
 
 .navigation {
   flex: 1 0 10rem;
@@ -11,8 +11,8 @@ $_navigation-link-padding: 0.6em;
   color: $base-font-color;
   display: block;
   line-height: 1;
-  margin-left: -($_navigation-link-padding);
-  padding: $_navigation-link-padding;
+  margin-left: -($navigation-link-padding);
+  padding: $navigation-link-padding;
   transition: background-color $base-duration $base-timing,
               color $base-duration $base-timing;
 

data/app/assets/stylesheets/administrate/components/_search.scss

@@ -1,4 +1,4 @@
-$_search-icon-size: 1rem;
+$search-icon-size: 1rem;
 
 .search {
   margin-left: auto;
@@ -10,35 +10,35 @@ $_search-icon-size: 1rem;
 
 .search__input {
   border-radius: 100rem;
-  padding-left: $_search-icon-size * 2.5;
-  padding-right: $_search-icon-size * 2.5;
+  padding-left: $search-icon-size * 2.5;
+  padding-right: $search-icon-size * 2.5;
 }
 
 .search__eyeglass-icon {
   fill: $grey-7;
-  height: $_search-icon-size;
-  left: $_search-icon-size;
+  height: $search-icon-size;
+  left: $search-icon-size;
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
-  width: $_search-icon-size;
+  width: $search-icon-size;
 }
 
 .search__clear-link {
-  height: $_search-icon-size;
+  height: $search-icon-size;
   position: absolute;
-  right: $_search-icon-size * 0.75;
+  right: $search-icon-size * 0.75;
   top: 50%;
   transform: translateY(-50%);
-  width: $_search-icon-size;
+  width: $search-icon-size;
 }
 
 .search__clear-icon {
   fill: $grey-5;
-  height: $_search-icon-size;
+  height: $search-icon-size;
   position: absolute;
   transition: fill $base-duration $base-timing;
-  width: $_search-icon-size;
+  width: $search-icon-size;
 
   &:hover {
     fill: $action-color;

data/app/assets/stylesheets/administrate/library/_variables.scss

@@ -1,5 +1,7 @@
+/* stylelint-disable scss/dollar-variable-empty-line-before */
+
 // Typography
-$base-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto",
+$base-font-family: -apple-system, blinkmacsystemfont, "Segoe UI", "Roboto",
   "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
   sans-serif !default;
 $heading-font-family: $base-font-family !default;
@@ -17,8 +19,8 @@ $base-spacing: $base-line-height * 1em !default;
 $small-spacing: $base-spacing * 0.5 !default;
 
 // Colors
-$white: #fff !default;
-$black: #000 !default;
+$white: #ffffff !default;
+$black: #000000 !default;
 
 $blue: #1976d2 !default;
 $red: #d32f2f !default;
@@ -63,3 +65,5 @@ $base-border: 1px solid $base-border-color !default;
 // Transitions
 $base-duration: 250ms !default;
 $base-timing: ease-in-out !default;
+
+/* stylelint-enable scss/dollar-variable-empty-line-before */

data/app/controllers/administrate/application_controller.rb

@@ -15,13 +15,13 @@ module Administrate
         resources: resources,
         search_term: search_term,
         page: page,
-        show_search_bar: show_search_bar?,
+        show_search_bar: show_search_bar?
       }
     end
 
     def show
       render locals: {
-        page: Administrate::Page::Show.new(dashboard, requested_resource),
+        page: Administrate::Page::Show.new(dashboard, requested_resource)
       }
     end
 
@@ -29,13 +29,13 @@ module Administrate
       resource = new_resource
       authorize_resource(resource)
       render locals: {
-        page: Administrate::Page::Form.new(dashboard, resource),
+        page: Administrate::Page::Form.new(dashboard, resource)
       }
     end
 
     def edit
       render locals: {
-        page: Administrate::Page::Form.new(dashboard, requested_resource),
+        page: Administrate::Page::Form.new(dashboard, requested_resource)
       }
     end
 
@@ -47,11 +47,11 @@ module Administrate
         yield(resource) if block_given?
         redirect_to(
           after_resource_created_path(resource),
-          notice: translate_with_resource("create.success"),
+          notice: translate_with_resource("create.success")
         )
       else
         render :new, locals: {
-          page: Administrate::Page::Form.new(dashboard, resource),
+          page: Administrate::Page::Form.new(dashboard, resource)
         }, status: :unprocessable_entity
       end
     end
@@ -60,11 +60,11 @@ module Administrate
       if requested_resource.update(resource_params)
         redirect_to(
           after_resource_updated_path(requested_resource),
-          notice: translate_with_resource("update.success"),
+          notice: translate_with_resource("update.success")
         )
       else
         render :edit, locals: {
-          page: Administrate::Page::Form.new(dashboard, requested_resource),
+          page: Administrate::Page::Form.new(dashboard, requested_resource)
         }, status: :unprocessable_entity
       end
     end
@@ -84,12 +84,12 @@ module Administrate
       Administrate::Search.new(
         resources,
         dashboard,
-        search_term,
+        search_term
       ).run
     end
 
     def after_resource_destroyed_path(_requested_resource)
-      { action: :index }
+      {action: :index}
     end
 
     def after_resource_created_path(requested_resource)
@@ -103,7 +103,7 @@ module Administrate
     helper_method :nav_link_state
     def nav_link_state(resource)
       underscore_resource = resource.to_s.split("/").join("__")
-      resource_name.to_s.pluralize == underscore_resource ? :active : :inactive
+      (resource_name.to_s.pluralize == underscore_resource) ? :active : :inactive
     end
 
     # Whether the named action route exists for the resource class.
@@ -141,8 +141,8 @@ module Administrate
         sorting_attribute,
         sorting_direction,
         association_attribute: order_by_field(
-          dashboard_attribute(sorting_attribute),
-        ),
+          dashboard_attribute(sorting_attribute)
+        )
       )
     end
 
@@ -201,9 +201,9 @@ module Administrate
     end
 
     def resource_params
-      params.require(resource_class.model_name.param_key).
-        permit(dashboard.permitted_attributes(action_name)).
-        transform_values { |v| read_param_value(v) }
+      params.require(resource_class.model_name.param_key)
+        .permit(dashboard.permitted_attributes(action_name))
+        .transform_values { |v| read_param_value(v) }
     end
 
     def read_param_value(data)
@@ -236,13 +236,13 @@ module Administrate
     def translate_with_resource(key)
       t(
         "administrate.controller.#{key}",
-        resource: resource_resolver.resource_title,
+        resource: resource_resolver.resource_title
       )
     end
 
     def show_search_bar?
       dashboard.attribute_types_for(
-        dashboard.all_attributes,
+        dashboard.all_attributes
       ).any? { |_name, attribute| attribute.searchable? }
     end
 
@@ -279,7 +279,7 @@ module Administrate
       else
         raise Administrate::NotAuthorizedError.new(
           action: action_name,
-          resource: resource,
+          resource: resource
         )
       end
     end

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

@@ -1,6 +1,6 @@
 module Administrate
   module Punditize
-    if Object.const_defined?("Pundit")
+    if Object.const_defined?(:Pundit)
       extend ActiveSupport::Concern
 
       if Pundit.const_defined?(:Authorization)
@@ -28,7 +28,7 @@ module Administrate
       def authorized_action?(resource, action)
         namespaced_resource = policy_namespace + [resource]
         policy = Pundit.policy!(pundit_user, namespaced_resource)
-        policy.send("#{action}?".to_sym)
+        policy.send(:"#{action}?")
       end
 
       def policy_scope!(user, scope)
@@ -38,13 +38,13 @@ module Administrate
           policy_scope = policy_scope_class.new(user, pundit_model(scope))
         rescue ArgumentError
           raise(Pundit::InvalidConstructorError,
-                "Invalid #<#{policy_scope_class}> constructor is called")
+            "Invalid #<#{policy_scope_class}> constructor is called")
         end
 
         if policy_scope.respond_to? :resolve_admin
           Administrate.deprecator.warn(
-            "Pundit policy scope `resolve_admin` method is deprecated. " +
-            "Please use a namespaced pundit policy instead.",
+            "Pundit policy scope `resolve_admin` method is deprecated. " \
+            "Please use a namespaced pundit policy instead."
           )
           policy_scope.resolve_admin
         else

data/app/helpers/administrate/application_helper.rb

@@ -50,7 +50,7 @@ module Administrate
     def display_resource_name(resource_name, opts = {})
       dashboard_from_resource(resource_name).resource_name(
         count: opts[:singular] ? SINGULAR_COUNT : PLURAL_MANY_COUNT,
-        default: default_resource_name(resource_name, opts),
+        default: default_resource_name(resource_name, opts)
       )
     end
 
@@ -65,14 +65,14 @@ module Administrate
     def resource_index_route(resource_name)
       url_for(
         action: "index",
-        controller: "/#{namespace}/#{resource_name}",
+        controller: "/#{namespace}/#{resource_name}"
       )
     end
 
     def sanitized_order_params(page, current_field_name)
       collection_names = page.item_associations + [current_field_name]
       association_params = collection_names.map do |assoc_name|
-        { assoc_name => %i[order direction page per_page] }
+        {assoc_name => %i[order direction page per_page]}
       end
       params.permit(:search, :id, :_page, :per_page, association_params)
     end
@@ -87,7 +87,7 @@ module Administrate
 
     def default_resource_name(name, opts = {})
       resource_name = (opts[:singular] ? name.to_s : name.to_s.pluralize)
-      resource_name.gsub("/", "_").titleize
+      resource_name.tr("/", "_").titleize
     end
   end
 end

data/lib/administrate/base_dashboard.rb

@@ -79,7 +79,7 @@ module Administrate
         attribute_types[attr].permitted_attribute(
           attr,
           resource_class: self.class.model,
-          action: action,
+          action: action
         )
       end.uniq
     end
@@ -118,10 +118,10 @@ module Administrate
 
     def item_associations
       attributes = if show_page_attributes.is_a?(Hash)
-                     show_page_attributes.values.flatten
-                   else
-                     show_page_attributes
-                   end
+        show_page_attributes.values.flatten
+      else
+        show_page_attributes
+      end
       attribute_associated attributes
     end
 

data/lib/administrate/engine.rb

@@ -1,8 +1,4 @@
-require "jquery-rails"
 require "kaminari"
-require "sassc-rails"
-require "selectize-rails"
-require "sprockets/railtie"
 
 require "administrate/namespace/resource"
 require "administrate/not_authorized_error"
@@ -13,7 +9,6 @@ require "administrate/order"
 require "administrate/resource_resolver"
 require "administrate/search"
 require "administrate/namespace"
-require "administrate/namespace/resource"
 
 module Administrate
   class Engine < ::Rails::Engine
@@ -25,7 +20,7 @@ module Administrate
     initializer "administrate.assets.precompile" do |app|
       app.config.assets.precompile += [
         "administrate/application.js",
-        "administrate/application.css",
+        "administrate/application.css"
       ]
     end
 

data/lib/administrate/field/associative.rb

@@ -41,7 +41,7 @@ module Administrate
         else
           self.class.associated_class_name(
             resource.class,
-            attribute,
+            attribute
           )
         end
       end

data/lib/administrate/field/base.rb

@@ -56,13 +56,13 @@ module Administrate
         return false unless resource.class.respond_to?(:validators_on)
 
         resource.class.validators_on(attribute).any? do |v|
-          next false unless v.class == ActiveRecord::Validations::PresenceValidator
+          next false unless v.instance_of?(ActiveRecord::Validations::PresenceValidator)
 
           options = v.options
           next false if options.include?(:if)
           next false if options.include?(:unless)
 
-          if on_option = options[:on]
+          if (on_option = options[:on])
             if on_option == :create && !resource.persisted?
               next true
             end

data/lib/administrate/field/belongs_to.rb

@@ -25,7 +25,7 @@ module Administrate
         candidate_resources.map do |resource|
           [
             display_candidate_resource(resource),
-            resource.send(association_primary_key),
+            resource.send(association_primary_key)
           ]
         end
       end

data/lib/administrate/field/date.rb

@@ -6,7 +6,7 @@ module Administrate
       def date
         I18n.localize(
           data.to_date,
-          format: format,
+          format: format
         )
       end
 

data/lib/administrate/field/date_time.rb

@@ -6,7 +6,7 @@ module Administrate
       def date
         I18n.localize(
           data.in_time_zone(timezone).to_date,
-          format: format,
+          format: format
         )
       end
 
@@ -14,7 +14,7 @@ module Administrate
         I18n.localize(
           data.in_time_zone(timezone),
           format: format,
-          default: data,
+          default: data
         )
       end
 

data/lib/administrate/field/deferred.rb

@@ -35,7 +35,7 @@ module Administrate
 
       def searchable_field
         Administrate.deprecator.warn(
-          "searchable_field is deprecated, use searchable_fields instead",
+          "searchable_field is deprecated, use searchable_fields instead"
         )
         options.fetch(:searchable_field)
       end