activeadmin 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ad68985cf893a7bfc01a87ca8d4e9941beeb44c
-  data.tar.gz: 741933e1ad50389a45df1b376d8288dfdd5eec81
+  metadata.gz: 4a84a106c0900650dea61f07201b5917cd693955
+  data.tar.gz: cd12642360eba01bdd56347eca1afb8b7faf4b9f
 SHA512:
-  metadata.gz: c3f01d37b8a53e5953e72d0d411789a05f47a4347fd05f42cbb02c911d4d03b7917bc05dddbc1772eff6b2985584387bc655b53a69a39b61e09803be69d185ed
-  data.tar.gz: 8d62234059cc7662c37c79fd18cc6b59dc3e39ee4602d95cc16d21f1737cbfbd1fb40707a1fdfde3e58028ef10974f80e3bb02a80ac4795be894f0254fcb49a9
+  metadata.gz: 65e3bd10aeeba694b950408dea2e8cd2dc45cd498ab408094a091ec32212cf285fb80f7f4f897d8906e90ae084b0011cf17f02beb16312ce2ce241e0f1865417
+  data.tar.gz: 83d974c9f52817a78db747973fa862b9b203ae6ef7ab1c7df3e4c1b2a76b2a6dec1235e9428750571731e983bc7ccedf994270b3b75cf500594bd77776769d1f

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,20 @@
+[Please follow the guidelines for creating a bug report](https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md#4-did-you-find-a-bug).
+
+The issue tracker is only for bugs and feature requests. If you need general
+help please post to
+[StackOverflow](http://stackoverflow.com/questions/tagged/activeadmin).
+
+### Expected behavior
+
+What do you think should happen?
+
+### Actual behavior
+
+What actually happens?
+
+### How to reproduce
+
+Your best chance of getting this bug looked at quickly is to provide an
+**executable test case** demonstrating the expected behavior that is not
+occurring. [Please follow the guidelines for creating a bug
+report](https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md#4-did-you-find-a-bug).

data/.mdlrc

@@ -0,0 +1 @@
+style "config/mdl_style.rb"

data/.rubocop.yml

@@ -2,7 +2,8 @@
 
 AllCops:
   DisabledByDefault: true
-
+  TargetRubyVersion: 2.2
+  
   Exclude:
     - spec/rails/**/*
     - gemfiles/vendor/bundle/**/*
@@ -17,11 +18,59 @@ AllCops:
 
   StyleGuideCopsOnly: false
 
+Lint/EndAlignment:
+  Enabled: true
+
+Layout/CaseIndentation:
+  Enabled: true
+
+Layout/ElseAlignment:
+  Enabled: true
+
+Layout/EmptyLines:
+  Enabled: true
+
+Layout/EndOfLine:
+  Enabled: true
+
+Layout/ExtraSpacing:
+  Enabled: true
+
+Style/Encoding:
+  EnforcedStyle: never
+  Enabled: true
+
 Style/HashSyntax:
   Enabled: true
 
-Style/TrailingWhitespace:
+Layout/IndentationConsistency:
+  Enabled: true
+
+Layout/IndentationWidth:
+  Enabled: true
+
+Style/PredicateName:
+  Enabled: true
+
+  NamePrefixBlacklist:
+    - is_
+    - have_
+
+  NameWhitelist:
+    - has_many
+    - has_many_actions
+
+Layout/TrailingBlankLines:
+  Enabled: true
+
+Layout/TrailingWhitespace:
+  Enabled: true
+
+Layout/SpaceAfterComma:
+  Enabled: true
+
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: true
 
-Style/SpaceAfterComma:
+Layout/SpaceInsideParens:
   Enabled: true

data/.simplecov

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# TODO: Always run simplecov again once
+# https://github.com/colszowka/simplecov/issues/404,
+# https://github.com/glebm/i18n-tasks/issues/221 are fixed
+SimpleCov.start do
+  add_filter 'spec/rails/'
+end
+
+if ENV['CI'] == 'true'
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end

data/.travis.yml

@@ -4,6 +4,8 @@ language: ruby
 
 sudo: false
 
+dist: trusty
+
 bundler_args: --without development
 
 branches:
@@ -16,15 +18,14 @@ before_install:
   - PATH=$(npm bin):$PATH # needed to install phantomjs via npm
   - if [ $(phantomjs --version) != '2.1.1' ]; then npm install phantomjs-prebuilt@2.1; fi
   - gem update --system # use the very latest Rubygems
-  - rvm @global do gem uninstall bundler -a -x
-  - rvm @global do gem install bundler -v 1.14.6 # latest version known to work
+  - gem install bundler # use the very latest Bundler
 
 script:
   - bundle exec rake
+  - bundle exec rake docs:build
 
 rvm:
-  - jruby-9.1.8.0
-  - 2.1.10
+  - jruby-9.1.12.0
   - 2.2.7
   - 2.3.4
   - 2.4.1
@@ -37,30 +38,14 @@ gemfile:
 env:
   global:
     - JRUBY_OPTS="-J-Xmx1024m --dev --debug"
+    - JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom"
+    - COVERAGE=true
 
 matrix:
   fast_finish: true
 
-  exclude:
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_50.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_51.gemfile
-
   allow_failures:
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails_50.gemfile
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.1.12.0
       gemfile: gemfiles/rails_51.gemfile
-
-notifications:
-  irc:
-    channels:
-      - irc.freenode.org#activeadmin
-
-    on_success: change
-    on_failure: always
-    skip_join: true
-
-    template:
-      - "(%{branch}/%{commit} by %{author}): %{message} (%{build_url})"

data/.yardopts

@@ -1,7 +1,6 @@
 lib/**/*.rb
 --protected
 --no-private
---exclude (features|lib\/generators\/active_admin\/.*\/templates)
 -
 README.md
 CHANGELOG.md

data/CHANGELOG.md

@@ -1,4 +1,60 @@
 # Changelog
+
+## ## 1.1.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.0.0...v1.1.0)
+
+### Bug Fixes
+
+* Fixed [#5093][] Handle table prefix & table suffix for `ActiveAdminComment` model
+* Fixed [#4173][] by including the default Kaminari templates [#5069][] by [@javierjulio][]
+* Fixed [#5043][]. Do not crash in sidebar rendering when a default scope is not
+  specified. [#5044] by [@Fivell][].
+* Fixed [#3894][]. Make tab's component work with non-ascii titles. [#5046] by
+  [@Fivell][].
+
+### Removals
+
+* Ruby 2.1 support has been dropped [#5002][] by [@deivid-rodriguez][]
+* Replaced `sass-rails` with `sass` dependency [#5037][] by [@javierjulio][]
+
+### Deprecations
+
+* Deprecated `config.register_stylesheet` and `config.register_javascript`. Import
+  your CSS and JS files in `active_admin.scss` or `active_admin.js`. [#5060][] by [@javierjulio][]
+* Deprecated `type` param from `status_tag` and related CSS classes [#4989][] by [@javierjulio][]
+  * The method signature has changed from:
+
+    ```ruby
+    status_tag(status, :ok, class: 'completed', label: 'on')
+    ```
+
+    to:
+
+    ```ruby
+    status_tag(status, class: 'completed ok', label: 'on')
+    ```
+
+  * The following CSS classes have been deprecated and will be removed in the future:
+
+    ```css
+    .status_tag {
+      &.ok, &.published, &.complete, &.completed, &.green { background: #8daa92; }
+      &.warn, &.warning, &.orange { background: #e29b20; }
+      &.error, &.errored, &.red { background: #d45f53; }
+    }
+    ```
+
+### Enhancements
+
+#### Minor
+
+* Support proc as an input_html option value when declaring filters [#5029][] by [@Fivell][]
+* Base localization support, better associations handling for active filters sidebar [#4951][] by [@Fivell][]
+* Allow AA scopes to return paginated collections [#4996][] by [@Fivell][]
+* Added `scopes_show_count` configuration to  setup show_count attribute for scopes globally [#4950][] by [@Fivell][]
+* Allow custom panel title given with `attributes_table` [#4940][] by [@ajw725][]
+* Allow passing a class to `action_item` block [#4997][] by [@Fivell][]
+* Add pagination to the comments section [#5088][] by [@alex-bogomolov][]
+
 ## 1.0.0 [☰](https://github.com/activeadmin/activeadmin/compare/v0.6.3...master)
 
 ### Breaking Changes
@@ -17,7 +73,7 @@
 #### Major
 
 * Migration from Metasearch to Ransack [#1979][] by [@seanlinsley][]
-* Rails 4 support [#2326][] by many people <3
+* Rails 4 support [#2326][] by many people :heart:
 * Rails 4.2 support [#3731][] by [@gonzedge][] and [@timoschilling][]
 * Rails 5 support [#4254][] by [@seanlinsley][]
 * Rails 5.1 support [#4882][] by [@varyonic][]
@@ -41,6 +97,7 @@
 * Add multi-record support to `attributes_table_for` [#2544][] by [@zorab47][]
 * Table CSS classes are now prefixed to prevent clashes [#2532][] by [@TimPetricola][]
 * Allow Inherited Resources shorthand for redirection [#2001][] by [@seanlinsley][]
+
 ```ruby
     controller do
       # Redirects to index page instead of rendering updated resource
@@ -51,15 +108,17 @@
 ```
 
 * Accept block for download links [#2040][] by [@potatosalad][]
+
 ```ruby
 index download_links: ->{ can?(:view_all_download_links) || [:pdf] }
 ```
+
 * Comments menu can be customized via configuration passed to `config.comments_menu` [#4187][] by [@drn][]
 * Added `config.route_options` to namespace to customize routes [#4467][] by [@stereoscott[]]
 
 ### Security Fixes
 
-* Prevents access to formats that the user not permitted to see [#4867][] by [@Fivell][] and [@timoschilling][] 
+* Prevents access to formats that the user not permitted to see [#4867][] by [@Fivell][] and [@timoschilling][]
 * Prevents potential DOS attack via Ruby symbols [#1926][] by [@seanlinsley][]
   * [this isn't an issue for those using Ruby >= 2.2](http://rubykaigi.org/2014/presentation/S-NarihiroNakamura)
 
@@ -76,6 +135,7 @@ index download_links: ->{ can?(:view_all_download_links) || [:pdf] }
   `ActiveAdmin::Event` will be removed in a future version, ActiveAdmin switched
   to use `ActiveSupport::Notifications`.
   NOTE: The blog parameters has changed:
+
 ```ruby
 ActiveSupport::Notifications.subscribe ActiveAdmin::Application::BeforeLoadEvent do |event, *args|
   # some code
@@ -88,7 +148,6 @@ ActiveSupport::Notifications.publish ActiveAdmin::Application::BeforeLoadEvent,
 
 Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-stable/CHANGELOG.md) for previous changes.
 
-<!--- The following link definition list is generated by PimpMyChangelog --->
 [#1926]: https://github.com/activeadmin/activeadmin/issues/1926
 [#1979]: https://github.com/activeadmin/activeadmin/issues/1979
 [#2001]: https://github.com/activeadmin/activeadmin/issues/2001
@@ -112,8 +171,12 @@ Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-st
 [#3695]: https://github.com/activeadmin/activeadmin/issues/3695
 [#3731]: https://github.com/activeadmin/activeadmin/issues/3731
 [#3783]: https://github.com/activeadmin/activeadmin/issues/3783
+[#3894]: https://github.com/activeadmin/activeadmin/issues/3894
 [#4187]: https://github.com/activeadmin/activeadmin/issues/4187
+[#4173]: https://github.com/activeadmin/activeadmin/issues/4173
 [#4254]: https://github.com/activeadmin/activeadmin/issues/4254
+[#5043]: https://github.com/activeadmin/activeadmin/issues/5043
+
 [#4477]: https://github.com/activeadmin/activeadmin/pull/4477
 [#4759]: https://github.com/activeadmin/activeadmin/pull/4759
 [#4768]: https://github.com/activeadmin/activeadmin/pull/4768
@@ -121,7 +184,23 @@ Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-st
 [#4851]: https://github.com/activeadmin/activeadmin/pull/4851
 [#4867]: https://github.com/activeadmin/activeadmin/pull/4867
 [#4882]: https://github.com/activeadmin/activeadmin/pull/4882
-
+[#4940]: https://github.com/activeadmin/activeadmin/pull/4940
+[#4950]: https://github.com/activeadmin/activeadmin/pull/4950
+[#4951]: https://github.com/activeadmin/activeadmin/pull/4951
+[#4989]: https://github.com/activeadmin/activeadmin/pull/4989
+[#4996]: https://github.com/activeadmin/activeadmin/pull/4996
+[#4997]: https://github.com/activeadmin/activeadmin/pull/4997
+[#5029]: https://github.com/activeadmin/activeadmin/pull/5029
+[#5002]: https://github.com/activeadmin/activeadmin/pull/5002
+[#5037]: https://github.com/activeadmin/activeadmin/pull/5037
+[#5044]: https://github.com/activeadmin/activeadmin/pull/5044
+[#5046]: https://github.com/activeadmin/activeadmin/pull/5046
+[#5060]: https://github.com/activeadmin/activeadmin/pull/5060
+[#5069]: https://github.com/activeadmin/activeadmin/pull/5069
+[#5088]: https://github.com/activeadmin/activeadmin/pull/5088
+[#5093]: https://github.com/activeadmin/activeadmin/pull/5093 
+
+[@ajw725]: https://github.com/ajw725
 [@bolshakov]: https://github.com/bolshakov
 [@chancancode]: https://github.com/chancancode
 [@craigmcnamara]: https://github.com/craigmcnamara
@@ -130,6 +209,7 @@ Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-st
 [@drn]: https://github.com/drn
 [@Fivell]: https://github.com/Fivell
 [@gonzedge]: https://github.com/gonzedge
+[@javierjulio]: https://github.com/javierjulio
 [@johnnyshields]: https://github.com/johnnyshields
 [@PChambino]: https://github.com/PChambino
 [@potatosalad]: https://github.com/potatosalad
@@ -140,3 +220,4 @@ Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-st
 [@TimPetricola]: https://github.com/TimPetricola
 [@varyonic]: https://github.com/varyonic
 [@zorab47]: https://github.com/zorab47
+[@alex-bogomolov]: https://github.com/alex-bogomolov

data/CONTRIBUTING.md

@@ -27,40 +27,24 @@ git checkout -b 325-add-japanese-translations
 ### 3. Get the test suite running
 
 Make sure you're using a recent ruby and have the `bundler` gem installed, at
-least version `1.14.3`. The most reliable `bundler` version to use is the same
-Travis is using.
+least version `1.14.3`.
 
-Install `appraisal` and the other common development dependencies:
+Select the Gemfile for your preferred Rails version, preferably the latest:
 
 ```sh
-bundle install
+export BUNDLE_GEMFILE=gemfiles/rails_51.gemfile
 ```
 
-Install the development dependencies:
+Now install the development dependencies:
 
 ```sh
-bundle exec appraisal install
+bundle install
 ```
 
 Now you should be able to run the entire suite using:
 
 ```sh
-bundle exec rake test
-```
-
-This will automatically run the tests against Rails 5.0. But you can easily run
-tests against older versions of Rails too.
-
-For example, you can run all tests against Rails 4.2:
-
-```sh
-bundle exec appraisal rails_42 rake test
-```
-
-or even just run specific tests. For example:
-
-```sh
-bundle exec appraisal rails_42 rspec spec/unit/belongs_to_spec.rb
+bundle exec rake
 ```
 
 The test run will generate a sample Rails application in `spec/rails` to run the
@@ -70,26 +54,26 @@ If your tests are passing locally but they're failing on Travis, reset your test
 environment:
 
 ```sh
-rm -rf spec/rails && bundle exec appraisal update
+rm -rf spec/rails && bundle update
 ```
 
-If you want to stick with a specific older Rails version for a while, you can
-also do `export BUNDLE_GEMFILE=gemfiles/rails_42.gemfile` and then run all
-commands directly (`bundle exec rake test`, `bundle exec rake setup`) without
-Appraisal.
+### 4. Did you find a bug?
 
-#### 4. Did you find a bug?
+* **Ensure the bug was not already reported** by [searching all
+  issues](https://github.com/activeadmin/activeadmin/issues?q=).
 
-* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/activeadmin/activeadmin/issues).
+* If you're unable to find an open issue addressing the problem, [open a new
+  one](https://github.com/activeadmin/activeadmin/issues/new).  Be sure to
+  include a **title and clear description**, as much relevant information as
+  possible, and a **code sample** or an **executable test case** demonstrating
+  the expected behavior that is not occurring.
 
-* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/activeadmin/activeadmin/issues/new). 
-Be sure to include a **title and clear description**, as much relevant information as possible, 
-and a **code sample** or an **executable test case** demonstrating the expected behavior that is not occurring.
-
-* If possible, use the relevant bug report templates to create the issue. 
-Simply copy the content of the appropriate template into a .rb file, make the necessary changes to demonstrate the issue, 
-and **paste the content into the issue description**:
-  * [**Rails 5** issues](https://github.com/activeadmin/activeadmin/blob/master/lib/bug_report_templates/rails_5_master.rb)
+* If possible, use the relevant bug report templates to create the issue.
+  Simply copy the content of the appropriate template into a .rb file, make the
+  necessary changes to demonstrate the issue, and **paste the content into the
+  issue description**:
+  * [**ActiveAdmin** master
+    issues](https://github.com/activeadmin/activeadmin/blob/master/lib/bug_report_templates/active_admin_master.rb)
 
 ### 5. Implement your fix or feature
 
@@ -113,10 +97,8 @@ in the `.test-rails-apps` folder.
 You should now be able to open <http://localhost:3000/admin> in your browser.
 You can log in using:
 
-```
-User: admin@example.com
-Password: password
-```
+*User*: admin@example.com
+*Password*: password
 
 If you need to perform any other commands on the test application, just pass
 them to the `local` rake task. For example, to boot the rails console:
@@ -131,20 +113,7 @@ Or to migrate the database:
 bundle exec rake local db:migrate
 ```
 
-### 7. Run tests against major supported Rails versions
-
-Once you've implemented your code, got the tests passing, previewed it in a
-browser, you're ready to test it against multiple versions of Rails.
-
-```sh
-bundle exec appraisal rake test
-```
-
-This runs our test suite against a couple of major versions of Rails.
-Travis does essentially the same thing when you open a Pull Request.
-We care about quality, so your PR won't be merged until all tests pass.
-
-### 8. Make a Pull Request
+### 7. Make a Pull Request
 
 At this point, you should switch back to your master branch and make sure it's
 up to date with Active Admin's master branch:
@@ -167,7 +136,14 @@ Finally, go to GitHub and
 [make a Pull Request](https://help.github.com/articles/creating-a-pull-request)
 :D
 
-### 9. Keeping your Pull Request updated
+Travis CI will run our test suite against all supported Rails versions. We care
+about quality, so your PR won't be merged until all tests pass. It's unlikely,
+but it's possible that your changes pass tests in one Rails version but fail in
+another. In that case, you'll have to setup your development environment (as
+explained in step 3) to use the problematic Rails version, and investigate
+what's going on!
+
+### 8. Keeping your Pull Request updated
 
 If a maintainer asks you to "rebase" your PR, they're saying that a lot of code
 has changed, and that you need to update your branch so it's easier to merge.
@@ -183,7 +159,7 @@ git pull --rebase upstream master
 git push --force-with-lease 325-add-japanese-translations
 ```
 
-### 10. Merging a PR (maintainers only)
+### 9. Merging a PR (maintainers only)
 
 A PR can only be merged into master by a maintainer if: