activeadmin 1.0.0.pre4 → 1.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ee988d5f426809a9a4cc91e7564b884922fdb18
-  data.tar.gz: 856bc4d81586b8fa8173d875a11f57afaf1512c7
+  metadata.gz: 981348a279011a3812ddeb69db1213f2ff454b8e
+  data.tar.gz: b67a141f87026c494e0e76584d5abd973546dd2a
 SHA512:
-  metadata.gz: f4d213835f0852f05977b284e5992f15b81964497c13e3770453787d6633bedbf9c116898a7b525f387239f649cad418fb350a3ffaee14c577284e5b20a54fa3
-  data.tar.gz: 3ca7947eab970349ea4936e83b2faf558185579199dcdb9c22dc18457c99107d4fd4031aec4f89f51e538d026f8e83eb32c1f0e112ceb96a02ee3ce8adaa5721
+  metadata.gz: 8e3662795d0ff12f6ea668f98163eb2ee596223e0f77dbc1291e42eaba43632e49e922cfb99ed3f7f6f44af372b35897325fdbcfb6912460b427cd45dcbe4564
+  data.tar.gz: 0e960135e5e217c886a3c7c262175bcc2ec3a47141fb611cb16360313db1aaf3803ebe79cdb82f52ca6598bd3d2e616b5338a901d2500bee629c0d96cc4f2714

data/.gitignore

@@ -33,17 +33,17 @@ doc
 pkg
 
 ## Project (specific)
-bin/
 .bundle
 spec/rails
 *.sqlite3-journal
 Gemfile.lock
-Gemfile-*.lock
+gemfiles/rails_[3-5][0-9].gemfile.lock
 capybara*
 viewcumber
-test-rails*
+.test-rails-apps
 public
 .rspec
 .rails-version
 .rbenv-version
 .localeapp/*
+lib/bug_report_templates/tmp

data/.travis.yml

@@ -1,46 +1,68 @@
+---
+
 language: ruby
+
 sudo: false
-install:
-  - ./script/travis_cache download_bundle
-  - gem install bundler # use the very latest Bundler
-  - bundle install --without development --path=./bundle
-  - bundle clean # delete now-outdated gems
-  - ./script/travis_cache download_app
+
+bundler_args: --without development
+
+cache: bundler
+
+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.3 # latest version known to work
+
+before_script:
   - bundle exec rake setup
-  - ./script/travis_cache upload
+
 script:
-  - bundle exec rake test_with_coveralls
+  - bundle exec rake test
+
 rvm:
-  - 1.9
-  - 2.3.0
-  - jruby-9.0.5.0
+  - jruby-9.1.7.0
+  - 1.9.3
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+
+gemfile:
+  - gemfiles/rails_32.gemfile
+  - gemfiles/rails_40.gemfile
+  - gemfiles/rails_41.gemfile
+  - gemfiles/rails_42.gemfile
+  - gemfiles/rails_50.gemfile
+
 env:
-  matrix:
-    - RAILS=3.2.22
-    - RAILS=4.2.5
-    - RAILS="> 5.x"
   global:
     - JRUBY_OPTS="-J-Xmx1024m --debug"
+
 matrix:
   fast_finish: true
+
   exclude:
-    - rvm: 1.9
-      env: RAILS="> 5.x"
-  allow_failures:
-    - rvm: 2.3.0
-      env: RAILS="> 5.x"
-    - rvm: jruby-9.0.5.0
-      env: RAILS="> 5.x"
-branches:
-  only:
-    - master
-    - /\A\d-\d-stable\z/
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_50.gemfile
+
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_32.gemfile
+
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_40.gemfile
+
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_41.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/Appraisals

@@ -0,0 +1,103 @@
+appraise 'rails_32' do
+  gemspec
+
+  gem 'rails', '3.2.22'
+  gem 'jquery-ui-rails', '~> 4.0'
+  gem 'devise', '~> 3.5'
+
+  gem 'inherited_resources'
+
+  gem 'test-unit', '~> 3.0'
+
+  gem 'draper', '~> 2.1'
+
+  platforms :ruby_19 do # Remove this block when we drop support for Ruby 1.9
+    gem 'kaminari', '~> 0.15'
+    gem 'mime-types', '< 3'
+    gem 'nokogiri', '< 1.7'
+    gem 'public_suffix', '< 1.5'
+  end
+
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+end
+
+appraise 'rails_40' do
+  gemspec
+
+  gem 'rails', '4.0.13'
+  gem 'jquery-ui-rails', '~> 5.0'
+  gem 'devise', '~> 3.5'
+
+  gem 'inherited_resources'
+
+  gem 'draper', '~> 2.1'
+
+  platforms :ruby_19 do # Remove this block when we drop support for Ruby 1.9
+    gem 'kaminari', '~> 0.15'
+    gem 'mime-types', '< 3'
+    gem 'nokogiri', '< 1.7'
+    gem 'public_suffix', '< 1.5'
+  end
+
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+end
+
+appraise 'rails_41' do
+  gemspec
+
+  gem 'rails', '4.1.16'
+  gem 'jquery-ui-rails', '~> 5.0'
+  gem 'devise', '~> 3.5'
+
+  gem 'inherited_resources'
+
+  gem 'draper', '~> 2.1'
+
+  platforms :ruby_19 do # Remove this block when we drop support for Ruby 1.9
+    gem 'kaminari', '~> 0.15'
+    gem 'mime-types', '< 3'
+    gem 'nokogiri', '< 1.7'
+    gem 'public_suffix', '< 1.5'
+  end
+
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+end
+
+appraise 'rails_42' do
+  gemspec
+
+  gem 'rails', '4.2.8.rc1'
+  gem 'jquery-ui-rails', '~> 5.0'
+  gem 'devise', '~> 3.5'
+
+  gem 'inherited_resources'
+
+  gem 'draper', '~> 2.1'
+
+  platforms :ruby_19 do # Remove this block when we drop support for Ruby 1.9
+    gem 'kaminari', '~> 0.15'
+    gem 'mime-types', '< 3'
+    gem 'nokogiri', '< 1.7'
+    gem 'public_suffix', '< 1.5'
+  end
+
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+end
+
+appraise 'rails_50' do
+  gemspec
+
+  gem 'rails', '5.0.1'
+  gem 'jquery-ui-rails', '~> 5.0'
+  gem 'devise', '> 4.x'
+
+  # Note: when updating this list, be sure to also update the README
+  gem 'inherited_resources', git: 'https://github.com/activeadmin/inherited_resources'
+
+  gem 'draper', '> 3.x'
+
+  gem 'activerecord-jdbcsqlite3-adapter',
+      git: 'https://github.com/jruby/activerecord-jdbc-adapter',
+      branch: 'rails-5',
+      platforms: :jruby
+end

data/CHANGELOG.md

@@ -7,7 +7,7 @@
 * JavaScript `window.AA` has been removed, use `window.ActiveAdmin` [#3606][] by [@timoschilling][]
 * `f.form_buffers` has been removed [#3486][] by [@varyonic][]
 * Iconic has been removed [#3553][] by [@timoschilling][]
-* `config.show_comments_in_menu` has been removed [#4187][] by [@drn][]
+* `config.show_comments_in_menu` has been removed, see `config.comments_menu` [#4187][] by [@drn][]
 
 ### Enhancements
 
@@ -19,6 +19,8 @@
 
 #### Minor
 
+* Page supports belongs_to [#4759][] by [@Fivell][] and [@zorab47][]
+* Support for custom sorting strategies [#4768][] by [@Fivell][]
 * Stream CSV downloads as they're generated [#3038][] by [@craigmcnamara][]
   * Disable streaming in development for easier debugging [#3535][] by [@seanlinsley][]
 * Improved code reloading [#3783][] by [@chancancode][]
@@ -47,6 +49,7 @@
 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
 
@@ -89,20 +92,27 @@ Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-st
 [#2541]: https://github.com/activeadmin/activeadmin/issues/2541
 [#2544]: https://github.com/activeadmin/activeadmin/issues/2544
 [#2545]: https://github.com/activeadmin/activeadmin/issues/2545
+[#3038]: https://github.com/activeadmin/activeadmin/issues/3038
 [#3075]: https://github.com/activeadmin/activeadmin/issues/3075
 [#3463]: https://github.com/activeadmin/activeadmin/issues/3463
 [#3464]: https://github.com/activeadmin/activeadmin/issues/3464
 [#3486]: https://github.com/activeadmin/activeadmin/issues/3486
 [#3519]: https://github.com/activeadmin/activeadmin/issues/3519
+[#3535]: https://github.com/activeadmin/activeadmin/issues/3535
 [#3553]: https://github.com/activeadmin/activeadmin/issues/3553
 [#3606]: https://github.com/activeadmin/activeadmin/issues/3606
 [#3686]: https://github.com/activeadmin/activeadmin/issues/3686
 [#3695]: https://github.com/activeadmin/activeadmin/issues/3695
 [#3731]: https://github.com/activeadmin/activeadmin/issues/3731
 [#3783]: https://github.com/activeadmin/activeadmin/issues/3783
+[#4187]: https://github.com/activeadmin/activeadmin/issues/4187
+[#4759]: https://github.com/activeadmin/activeadmin/pull/4759
+[#4768]: https://github.com/activeadmin/activeadmin/pull/4768
 [@PChambino]: https://github.com/PChambino
 [@TimPetricola]: https://github.com/TimPetricola
 [@chancancode]: https://github.com/chancancode
+[@craigmcnamara]: https://github.com/craigmcnamara
+[@drn]: https://github.com/drn
 [@dmitry]: https://github.com/dmitry
 [@gonzedge]: https://github.com/gonzedge
 [@johnnyshields]: https://github.com/johnnyshields
@@ -113,3 +123,4 @@ Please check [0-6-stable](https://github.com/activeadmin/activeadmin/blob/0-6-st
 [@timoschilling]: https://github.com/timoschilling
 [@varyonic]: https://github.com/varyonic
 [@zorab47]: https://github.com/zorab47
+[@Fivell]: https://github.com/Fivell

data/CONTRIBUTING.md

@@ -26,32 +26,77 @@ git checkout -b 325-add-japanese-translations
 
 ### 3. Get the test suite running
 
-Install the development dependencies:
+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.
+
+Install `appraisal` and the other common development dependencies:
 
 ```sh
 bundle install
 ```
 
+Install the development dependencies:
+
+```sh
+bundle exec appraisal install
+```
+
 Now you should be able to run the entire suite using:
 
 ```sh
-rake test
+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
 ```
 
-Which will generate a rails application in `spec/rails` to run the tests against.
+The test run will generate a sample rails application in `spec/rails` to run the
+tests against.
 
-If your tests are passing locally but they're failing on Travis, reset your test environment:
+If your tests are passing locally but they're failing on Travis, reset your test
+environment:
 
 ```sh
-rm -rf spec/rails && bundle update
+rm -rf spec/rails && bundle exec appraisal update
 ```
 
-### 4. Implement your fix or feature
+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?
+
+* **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 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)
+
+### 5. Implement your fix or feature
 
 At this point, you're ready to make your changes! Feel free to ask for help;
 everyone is a beginner at first :smile_cat:
 
-### 5. View your changes in a Rails application
+### 6. View your changes in a Rails application
 
 Active Admin is meant to be used by humans, not cucumbers. So make sure to take
 a look at your changes in a browser.
@@ -59,54 +104,47 @@ a look at your changes in a browser.
 To boot up a test Rails app:
 
 ```sh
-script/local server
+bundle exec rake local server
 ```
 
-This will automatically create a Rails app if none already exists, and store it in the
-`.test-rails-apps` folder. The currently active app is symlinked to `test-rails-app`.
+This will automatically create a Rails app if none already exists, and store it
+in the `.test-rails-apps` folder.
 
-If you have any Bundler issues, call the `use_rails` script then prepend
-the version of rails you would like to use in an environment variable:
+You should now be able to open <http://localhost:3000/admin> in your browser.
+You can log in using:
 
-```sh
-script/use_rails 4.0.0
-RAILS=4.0.0 script/local server
+```
+User: admin@example.com
+Password: password
 ```
 
-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
-
-If you need to perform any other commands on the test application, use the
-`local` script. For example:
-
-To boot the rails console:
+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:
 
 ```sh
-script/local console
+bundle exec rake local console
 ```
 
 Or to migrate the database:
 
 ```sh
-script/local rake db:migrate
+bundle exec rake local db:migrate
 ```
 
-### 6. Run tests against major supported rails versions
+### 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
-rake test:major_supported_rails
+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.
 
-### 7. Make a Pull Request
+### 8. 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:
@@ -125,9 +163,11 @@ git rebase master
 git push --set-upstream origin 325-add-japanese-translations
 ```
 
-Finally, go to GitHub and [make a Pull Request](https://help.github.com/articles/creating-a-pull-request) :D
+Finally, go to GitHub and
+[make a Pull Request](https://help.github.com/articles/creating-a-pull-request)
+:D
 
-### 8. Keeping your Pull Request updated
+### 9. 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.
@@ -140,5 +180,18 @@ but here's the suggested workflow:
 ```sh
 git checkout 325-add-japanese-translations
 git pull --rebase upstream master
-git push -f 325-add-japanese-translations
+git push --force-with-lease 325-add-japanese-translations
 ```
+
+### 10. Merging a PR (maintainers only)
+
+A PR can only be merged into master by a maintainer if:
+
+* It is passing CI.
+* It has been approved by at least two maintainers. If it was a maintainer who
+  opened the PR, only one extra approval is needed.
+* It has no requested changes.
+* It is up to date with current master.
+
+Any maintainer is allowed to merge a PR if all of these conditions are
+met.