activeadmin 1.4.3 → 2.3.1

data/config/locales/vi.yml

@@ -43,6 +43,7 @@ vi:
     status_tag:
       "yes": "Có"
       "no": "Không Có"
+      "unset": "Không Có"
     main_content: "Xin bổ sung %{model}#main_content để hiển thị nội dung."
     logout: "Đăng xuất"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/zh-CN.yml

@@ -44,6 +44,7 @@
     status_tag:
       "yes": "是"
       "no": "否"
+      "unset": "否"
     main_content: "请执行 %{model}#main_content 来显示内容."
     logout: "退出"
     powered_by: "Powered by %{active_admin} %{version}"

data/config/locales/zh-TW.yml

@@ -39,6 +39,7 @@
     status_tag:
       "yes": "是"
       "no": "否"
+      "unset": "否"
     main_content: "請實作 %{model}#main_content 以顯示內容。"
     logout: "登出"
     powered_by: "Powered by %{active_admin} %{version}"

data/docs/0-installation.md

@@ -11,7 +11,7 @@ gem 'activeadmin'
 
 # Plus integrations with:
 gem 'devise'
-gem 'cancan' # or cancancan
+gem 'cancancan'
 gem 'draper'
 gem 'pundit'
 ```
@@ -44,7 +44,7 @@ After installing the gem, you need to run the generator. Here are your options:
 The generator adds these core files, among others:
 
 * `app/admin/dashboard.rb`
-* `app/assets/javascripts/active_admin.js.coffee`
+* `app/assets/javascripts/active_admin.js`
 * `app/assets/stylesheets/active_admin.scss`
 * `config/initializers/active_admin.rb`
 

data/docs/12-arbre-components.md

@@ -177,6 +177,19 @@ status_tag 'active', class: 'important', id: 'status_123', label: 'on'
 # => <span class='status_tag active important' id='status_123'>on</span>
 ```
 
+When providing a `true` or `false` value, the `status_tag` will display "Yes"
+or "No". This can be configured through the `"en.active_admin.status_tag"`
+locale.
+
+```ruby
+status_tag true
+# => <span class='status_tag yes'>Yes</span>
+```
+
+In the case that a boolean field is `nil`, it will display "No" as a default.
+But using the `"en.active_admin.status_tag.unset"` locale key, it can be
+configured to display something else.
+
 ## Tabs
 
 The Tabs component is helpful for saving page real estate. The first tab will be

data/docs/13-authorization-adapter.md

@@ -180,8 +180,7 @@ end
 
 Sub-classing `ActiveAdmin::AuthorizationAdapter` is fairly low level. Many times
 it's nicer to have a simpler DSL for managing authorization. Active Admin
-provides an adapter out of the box for [CanCan](https://github.com/ryanb/cancan)
-and [CanCanCan](https://github.com/CanCanCommunity/cancancan).
+provides an adapter out of the box for [CanCanCan](https://github.com/CanCanCommunity/cancancan).
 
 To use the CanCan adapter, update the configuration in the Active Admin
 initializer:
@@ -221,7 +220,7 @@ changed from the initializer:
 config.cancan_ability_class = "MyCustomAbility"
 ```
 
-Now you can simply use CanCan or CanCanCan the way that you would expect and
+Now you can simply use CanCanCan the way that you would expect and
 Active Admin will use it for authorization:
 
 ```ruby
@@ -240,13 +239,12 @@ end
 ```
 
 To view more details about the API's, visit project pages of
-[CanCan](https://github.com/ryanb/cancan) and
 [CanCanCan](https://github.com/CanCanCommunity/cancancan).
 
 ## Using the Pundit Adapter
 
 Active Admin also provides an adapter out of the box for
-[Pundit](https://github.com/elabs/pundit).
+[Pundit](https://github.com/varvet/pundit).
 
 To use the Pundit adapter, update the configuration in the Active Admin
 initializer:
@@ -257,7 +255,7 @@ config.authorization_adapter = ActiveAdmin::PunditAdapter
 
 Once that's done, Active Admin will pick up your Pundit policies, and use
 them for authorization. For more information about setting up Pundit, see
-[their documention](https://github.com/elabs/pundit#installation).
+[their documentation](https://github.com/varvet/pundit#installation).
 
 Pundit also has [verify_authorized and/or verify_policy_scoped
 methods](https://github.com/varvet/pundit#ensuring-policies-and-scopes-are-used)
@@ -283,3 +281,5 @@ policy](https://github.com/activeadmin/activeadmin/blob/master/spec/support/temp
 in your application instead of default one generated by Pundit's
 `rails g pundit:install` command.
 
+In addition, there are [example policies](https://github.com/activeadmin/activeadmin/tree/master/spec/support/templates/policies/active_admin)
+for restricting access to ActiveAdmin's pages and comments.

data/docs/2-resource-customization.md

@@ -355,7 +355,7 @@ end
 ```
 
 If you need to completely replace the record retrieving code (e.g., you have a
-custom `to_param` implementation in your models), override the `resource` method
+custom `to_param` implementation in your models), override the `find_resource` method
 on the controller:
 
 ```ruby

data/docs/3-index-pages/index-as-table.md

@@ -193,6 +193,13 @@ controller do
 end
 ```
 
+You can also define associated objects to include outside of the
+`scoped_collection` method:
+
+```ruby
+includes :publisher
+```
+
 Then it's simple to sort by any Publisher attribute from within the index table:
 
 ```ruby

data/docs/CNAME

@@ -1 +1 @@
-github-docs.activeadmin.info
+activeadmin.info

data/docs/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
 gem 'github-pages'
-gem 'jekyll-redirect-from'

data/docs/Gemfile.lock

@@ -198,15 +198,15 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minima (2.5.0)
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
     multipart-post (2.0.0)
-    nokogiri (1.8.5)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
     octokit (4.12.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.1)
@@ -243,7 +243,6 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
-  jekyll-redirect-from
 
 BUNDLED WITH
    1.16.5

data/docs/_config.yml

@@ -1,2 +1,4 @@
 plugins:
+  - jekyll-default-layout
   - jekyll-redirect-from
+  - jekyll-relative-links

data/docs/_includes/top-menu.html

@@ -8,9 +8,9 @@
     </div>
 
     <div id="tidelift">
-        <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=readme" target="_blank">
+        <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=homepage" target="_blank">
             <span class="cta">
-                Get license assurances and timely security notifications
+                Active Admin for enterprise available via Tidelift
             </span>
         </a>
     </div>

data/docs/index.html

@@ -10,81 +10,101 @@
         <p class="intro">
           The <strong>administration framework</strong> for business critical <strong>Ruby on Rails</strong> applications.
         </p>
+
         <p>
           Active Admin is a Ruby on Rails plugin for generating administration style interfaces. It abstracts common business application patterns to make it simple for developers to implement beautiful and elegant interfaces with very little effort.
         </p>
+
         <h2>
           A beautiful interface designed for real people.
         </h2>
+
         <div id="features">
           <div id="features-left">
             <h3 class="first">
               Global Navigation
             </h3>
+
             <p>
               Customizable global navigation allows you to create usable admin interfaces for your business.
             </p>
+
             <h3>
               Scopes
             </h3>
+
             <p>
               Use scopes to create sections of mutually exclusive resources for quick navigation and reporting.
             </p>
+
             <h3>
               Index Styles
             </h3>
+
             <p>
               Index screens are available in many styles. The default, shown here, is a table view, but Active Admin also supports Grids, Blocks and a Blog view.
             </p>
+
             <h3>
               <span class="caps">API</span> &amp; Downloads
             </h3>
+
             <p>
               Each resource that is registered wtih Active Admin becomes available as <span class="caps">JSON</span>, <span class="caps">XML</span> and <span class="caps">CSV</span> download. Customize the output to meet your requirements.
             </p>
           </div>
+
           <div id="features-right">
             <h3 class="first">
               User Authentication
             </h3>
+
             <p>
               Use the bundled Devise configuration or implement your own authorization using the provided hooks.
             </p>
+
             <h3>
               Action Items
             </h3>
+
             <p>
               Add buttons, links or other content in the “Action Items” section on each screen.
             </p>
+
             <h3>
               Filters
             </h3>
+
             <p>
               Allow users to filter resources by searching strings, text fields, dates, and numeric values.
             </p>
+
             <h3>
               Sidebar Sections
             </h3>
+
             <p>
               Customize the sidebar sections with a simple <span class="caps">DSL</span> built in to Active Admin.
             </p>
           </div>
         </div>
+
         <p>
           Active Admin’s interface was designed from the ground up for non-technical users. It makes it easy for developers to build highly usable interfaces that customers will actually enjoy using.
         </p>
+
         <h2>
           An elegant <span class="caps">DSL</span> built for developer productivity.
         </h2>
+
         <p>
           Get started with one line of code or customize the entire interface with the provided <span class="caps">DSL</span>.
         </p>
+
         <div id="dsl">
           <div class="highlight">
-            <pre>
-<code class="ruby"><span class="c1"># app/admin/products.rb</span>
+            <pre><code class="ruby"><span class="c1"># app/admin/products.rb</span>
 <span class="no">ActiveAdmin</span><span class="o">.</span><span class="n">register</span> <span class="no">Product</span> <span class="k">do</span>
-
   <span class="c1"># Create sections on the index screen</span>
   <span class="n">scope</span> <span class="ss">:all</span><span class="p">,</span> <span class="ss">default:</span> <span class="kp">true</span>
   <span class="n">scope</span> <span class="ss">:available</span>
@@ -102,14 +122,95 @@
     <span class="n">column</span> <span class="s2">"Price"</span><span class="p">,</span> <span class="ss">sortable:</span> <span class="ss">:price</span> <span class="k">do</span> <span class="o">|</span><span class="n">product</span><span class="o">|</span>
       <span class="n">number_to_currency</span> <span class="n">product</span><span class="o">.</span><span class="n">price</span>
     <span class="k">end</span>
-    <span class="n">default_actions</span>
+    <span class="n">actions</span>
   <span class="k">end</span>
-
-<span class="k">end</span>
-</code>
-</pre>
+<span class="k">end</span></code></pre>
           </div>
         </div>
+
+        <h2>
+          Active Admin for enterprise
+        </h2>
+
+        <p>
+          <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=homepage">
+            Available as part of the Tidelift Subscription
+          </a>
+        </p>
+
+        <p>
+          Active Admin and the maintainers of thousands of other packages are
+          working with Tidelift to deliver one enterprise subscription that
+          covers all of the open source you use.
+        </p>
+
+        <p>
+          If you want the flexibility of open source and the confidence of
+          commercial-grade software, this is for you.
+        </p>
+
+        <div class="tidelift-buttons">
+          <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral" target="_blank">
+            <span>LEARN MORE</span>
+          </a>
+
+          <a href="https://tidelift.com/subscription/request-a-demo?utm_source=rubygems-activeadmin&utm_medium=referral" target="_blank">
+            <span>REQUEST A DEMO</span>
+          </a>
+        </div>
+
+        <h3>
+          The Tidelift Subscription manages your dependencies for you.
+        </h3>
+
+        <ul>
+          <li>
+            Get the tools you need to continuously catalog and understand the open source software that your application depends on.
+          </li>
+
+          <li>
+            Your subscription helps pay the open source maintainers of the exact
+            packages you use to ensure they meet the standards you require.
+          </li>
+
+          <li>
+            Address issues proactively, with tools that scan for new security,
+            licensing, and maintenance issues, and alert our participating open
+            source maintainers so they can resolve them on your behalf.
+          </li>
+
+          <li>
+            Measure and improve your open source dependencies' health—which
+            improves your app’s health—and get a short list of high-impact steps
+            your team can take to improve them even more.
+          </li>
+
+          <li>
+            Get commercial assurances that don't come for free with open source
+            packages, like intellectual property indemnification and support
+            under a service level agreement. You expect these guarantees from
+            proprietary software, and you can have them when using open source
+            as well.
+          </li>
+        </ul>
+
+        <p>
+          The end result? All of the capabilities you expect from
+          commercial-grade software, for the full breadth of open source you
+          use. That means less time grappling with esoteric open source trivia,
+          and more time building your own applications—and your business.
+        </p>
+
+        <div class="tidelift-buttons">
+          <a href="https://tidelift.com/subscription/pkg/rubygems-activeadmin?utm_source=rubygems-activeadmin&utm_medium=referral" target="_blank">
+            <span>LEARN MORE</span>
+          </a>
+
+          <a href="https://tidelift.com/subscription/request-a-demo?utm_source=rubygems-activeadmin&utm_medium=referral" target="_blank">
+            <span>REQUEST A DEMO</span>
+          </a>
+        </div>
+
         <h2 class="getting-started-heading">
           3 Ways to Get Started:
         </h2>

data/docs/stylesheets/main.css

@@ -615,6 +615,35 @@ body #tidelift a .cta {
   padding-left: 30px;
 }
 
+body .tidelift-buttons a {
+  display: table;
+  width: 200px;
+  border: 2px solid #407985;
+  border-radius: 4px;
+  text-decoration: none;
+  font-family: 'Yanone Kaffeesatz', 'Helvetica Neue', Arial, Helvetica, sans-serif;
+  font-size: 18px;
+  letter-spacing: 1px;
+  margin: 0 10px;
+}
+
+body .tidelift-buttons a:first-child {
+  float: left;
+  color: #407985;
+  background: #FFF;
+}
+
+body .tidelift-buttons a:last-child {
+  color: #FFF;
+  background: #407985;
+}
+
+body .tidelift-buttons a span {
+  display: table-cell;
+  vertical-align: middle;
+  text-align: center;
+}
+
 body .clear {
   clear: both;
 }

data/lib/active_admin.rb

@@ -8,8 +8,9 @@ require 'formtastic'
 require 'formtastic_i18n'
 require 'inherited_resources'
 require 'jquery-rails'
-require 'coffee-rails'
+require 'sassc-rails'
 require 'arbre'
+require 'sprockets/es6'
 
 require 'active_admin/helpers/i18n'
 
@@ -30,7 +31,6 @@ module ActiveAdmin
   autoload :Deprecation,              'active_admin/deprecation'
   autoload :Devise,                   'active_admin/devise'
   autoload :DSL,                      'active_admin/dsl'
-  autoload :Event,                    'active_admin/event'
   autoload :FormBuilder,              'active_admin/form_builder'
   autoload :Inputs,                   'active_admin/inputs'
   autoload :Localizers,               'active_admin/localizers'
@@ -90,7 +90,7 @@ module ActiveAdmin
     #
     # @param [Block] block A block to call each time (before) AA loads resources
     def before_load(&block)
-      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent, &ActiveAdmin::Event.wrap_block_for_active_support_notifications(block)
+      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent, &wrap_block_for_active_support_notifications(block)
     end
 
     # A callback is triggered each time (after) Active Admin loads the configuration files. This
@@ -108,7 +108,13 @@ module ActiveAdmin
     #
     # @param [Block] block A block to call each time (after) AA loads resources
     def after_load(&block)
-      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::AfterLoadEvent, &ActiveAdmin::Event.wrap_block_for_active_support_notifications(block)
+      ActiveSupport::Notifications.subscribe ActiveAdmin::Application::AfterLoadEvent, &wrap_block_for_active_support_notifications(block)
+    end
+
+    private
+
+    def wrap_block_for_active_support_notifications block
+      proc { |event, *args| block.call *args }
     end
 
   end