activeadmin 1.0.0.pre4 → 1.0.0.pre5

data/Gemfile

@@ -1,75 +1,50 @@
 source 'https://rubygems.org'
 
-gemspec
-
-require File.expand_path 'spec/support/detect_rails_version', File.dirname(__FILE__)
-
-rails_version = detect_rails_version
-gem 'rails', rails_version
-
-gem 'jquery-ui-rails', rails_version[0] == '3' ? '~> 4.0' : '~> 5.0'
-
-gem 'test-unit', '~> 3.0' if rails_version[0] == '3'
-
-if rails_version == '> 5.x'
-  # Note: when updating this list, be sure to also update the README
-  gem 'ransack',    github: 'activerecord-hackery/ransack'
-  gem 'kaminari',   github: 'amatsuda/kaminari', branch: '0-17-stable'
-  gem 'draper',     github: 'audionerd/draper', branch: 'rails5', ref: 'e816e0e587'
-  gem 'formtastic', github: 'justinfrench/formtastic'
-  gem 'activemodel-serializers-xml', github: 'rails/activemodel-serializers-xml' # drapergem/draper#697
-  gem 'rack-mini-profiler', github: 'MiniProfiler/rack-mini-profiler'
-  gem 'database_cleaner',  github: 'DatabaseCleaner/database_cleaner'
-  gem 'activerecord-jdbc-adapter', github: 'jruby/activerecord-jdbc-adapter', platforms: :jruby
-end
-
-gem 'mime-types', '< 3' # Remove this line when we drop support for Ruby 1.9
-
 # Optional dependencies
 gem 'cancan'
-gem 'devise', rails_version == '> 5.x' ? '> 4.x' : '~> 3.5'
-gem 'draper' if rails_version != '> 5.x'
 gem 'pundit'
 
+# Until https://github.com/erikhuda/thor/issues/538 fixed
+gem 'thor', '<= 0.19.1'
+
 # Utility gems used in both development & test environments
-gem 'rake', require: false
-gem 'parallel_tests'
+gem 'rake'
+gem 'parallel_tests', '< 2.10' #2.10 requires ruby '>= 2.0.0'
 
 # Debugging
 gem 'pry'                                   # Easily debug from your console with `binding.pry`
 
 group :development do
   # Debugging
-  gem 'better_errors'                       # Web UI to debug exceptions. Go to /__better_errors to access the latest one
+  gem 'better_errors',                      # Web UI to debug exceptions. Go to /__better_errors to access the latest one
+      platforms: [:ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24]
+
   gem 'binding_of_caller', platforms: :mri  # Retrieve the binding of a method's caller in MRI Ruby >= 1.9.2
 
   # Performance
-  gem 'rack-mini-profiler' if rails_version != '> 5.x' # Inline app profiler. See ?pp=help for options.
-  gem 'flamegraph', platforms: :mri         # Flamegraph visualiztion: ?pp=flamegraph
+  gem 'rack-mini-profiler'                  # Inline app profiler. See ?pp=help for options.
 
   # Documentation
   gem 'yard'                                # Documentation generator
   gem 'redcarpet', platforms: :mri          # Markdown implementation (for yard)
   gem 'kramdown', platforms: :jruby         # Markdown implementation (for yard)
+  gem 'appraisal', require: false
 end
 
 group :test do
   gem 'capybara'
   gem 'simplecov', require: false           # Test coverage generator. Go to /coverage/ after running tests
-  gem 'coveralls', require: false           # Test coverage website. Go to https://coveralls.io
+  gem 'codecov', require: false             # Test coverage website. Go to https://codecov.io
   gem 'cucumber-rails', require: false
   gem 'cucumber', '1.3.20'
-  gem 'database_cleaner' if rails_version != '> 5.x'
-  gem 'guard-rspec', require: false
-  gem 'listen', '~> 2.7', platforms: :ruby_19
+  gem 'database_cleaner'
   gem 'jasmine'
   gem 'jslint_on_rails'
   gem 'launchy'
   gem 'rails-i18n'                          # Provides default i18n for many languages
-  gem 'rspec-rails', '>= 3.5.0.beta1'
+  gem 'rspec-rails'
   gem 'i18n-spec'
   gem 'shoulda-matchers', '<= 2.8.0'
   gem 'sqlite3', platforms: :mri
-  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby if rails_version != '> 5.x'
   gem 'poltergeist'
 end

data/README.md

@@ -5,7 +5,7 @@ Active Admin is a Ruby on Rails framework for creating elegant backends for webs
 [![Version         ](http://img.shields.io/gem/v/activeadmin.svg)                               ](https://rubygems.org/gems/activeadmin)
 [![Travis CI       ](http://img.shields.io/travis/activeadmin/activeadmin/master.svg)           ](https://travis-ci.org/activeadmin/activeadmin)
 [![Quality         ](http://img.shields.io/codeclimate/github/activeadmin/activeadmin.svg)      ](https://codeclimate.com/github/activeadmin/activeadmin)
-[![Coverage        ](http://img.shields.io/coveralls/activeadmin/activeadmin.svg)               ](https://coveralls.io/r/activeadmin/activeadmin)
+[![Coverage        ](https://codecov.io/gh/activeadmin/activeadmin/branch/master/graph/badge.svg)](https://codecov.io/gh/activeadmin/activeadmin)
 [![Inch CI         ](http://inch-ci.org/github/activeadmin/activeadmin.svg?branch=master)       ](http://inch-ci.org/github/activeadmin/activeadmin)
 
 ## State of the project
@@ -17,12 +17,12 @@ which as far as dependencies, moves us from meta_search to Ransack and adds Rail
 
 You can get it by tracking master:
 ```ruby
-gem 'activeadmin', github: 'activeadmin'
+gem 'activeadmin', git: 'https://github.com/activeadmin/activeadmin'
 ```
 
 Or you can using rubygems:
 ```ruby
-gem 'activeadmin', '~> 1.0.0.pre4'
+gem 'activeadmin', '~> 1.0.0.pre5'
 ```
 
 *Keep in mind that during the time where we use `pre`-release label, things can break in each release!*
@@ -32,23 +32,9 @@ gem 'activeadmin', '~> 1.0.0.pre4'
 Active Admin master has preliminary support for Rails 5. To give it a try, these Gemfile changes may be needed:
 
 ```ruby
-gem 'devise',      '> 4.x'
-gem 'rspec-rails', '>= 3.5.0.beta1'
-gem 'ransack',    github: 'activerecord-hackery/ransack'
-gem 'kaminari',   github: 'amatsuda/kaminari', branch: '0-17-stable'
-gem 'formtastic', github: 'justinfrench/formtastic'
-gem 'draper',     github: 'audionerd/draper', branch: 'rails5', ref: 'e816e0e587'
-# To fix a Draper deprecation error
-gem 'activemodel-serializers-xml', github: 'rails/activemodel-serializers-xml'
-# Optional -- only if you already include these gems
-gem 'rack-mini-profiler',          github: 'MiniProfiler/rack-mini-profiler'
-gem 'database_cleaner',            github: 'pschambacher/database_cleaner', branch: 'rails5.0', ref: '8dd9fa4'
-# Only for JRuby:
-gem 'activerecord-jdbc-adapter',   github: 'jruby/activerecord-jdbc-adapter', platforms: :jruby
+gem 'inherited_resources', git: 'https://github.com/activeadmin/inherited_resources'
 ```
 
-If something isn't working for you please report it on [#4177](https://github.com/activeadmin/activeadmin/issues/4177).
-
 ### 0.6.x
 
 The plan is to follow [semantic versioning](http://semver.org/) as of 1.0.0. The 0.6.x line will
@@ -56,17 +42,16 @@ still be maintained, and we will backport bug fixes into future 0.6.x releases.
 to have to wait for a release, you can track the branch instead:
 
 ```ruby
-gem 'activeadmin', github: 'activeadmin', branch: '0-6-stable'
+gem 'activeadmin', git: 'https://github.com/activeadmin/activeadmin', branch: '0-6-stable'
 ```
 
 ## Documentation
 
-Please note that <http://activeadmin.info> is out of date. For the latest docs, check out the
-Github [docs](https://github.com/activeadmin/activeadmin/tree/master/docs#activeadmin-documentation) and the [wiki](https://github.com/activeadmin/activeadmin/wiki).
+For the latest docs, check out the Github <http://activeadmin.info> and the [wiki](https://github.com/activeadmin/activeadmin/wiki).
 
 ## Links
 
-* Website: <http://www.activeadmin.info> (out of date)
+* Website: <http://activeadmin.info>
 * Live demo: <http://demo.activeadmin.info/admin>
 * Documentation
   * Guides: <https://github.com/activeadmin/activeadmin/tree/master/docs>
@@ -81,7 +66,7 @@ Github [docs](https://github.com/activeadmin/activeadmin/tree/master/docs#active
 
 ## Getting started
 
-Check out [the docs](https://github.com/activeadmin/activeadmin/blob/master/docs/0-installation.md)!
+Check out [the docs](http://activeadmin.info/0-installation.html)!
 
 ## Need help?
 
@@ -92,8 +77,7 @@ Ask us in IRC ([#activeadmin](https://webchat.freenode.net/?channels=activeadmin
 ## Want to contribute?
 
 The [contributing guide](https://github.com/activeadmin/activeadmin/blob/master/CONTRIBUTING.md)
-is a good place to start. If you have questions, feel free to ask
-[@seanlinsley](https://twitter.com/seanlinsley) or [@captainhagbard](https://twitter.com/captainhagbard).
+is a good place to start. If you have questions, feel free to ask.
 
 ## Dependencies
 
@@ -112,5 +96,5 @@ Tool                  | Description
 [Devise]: https://github.com/plataformatec/devise
 [Formtastic]: https://github.com/justinfrench/formtastic
 [Inherited Resources]: https://github.com/josevalim/inherited_resources
-[Kaminari]: https://github.com/amatsuda/kaminari
+[Kaminari]: https://github.com/kaminari/kaminari
 [Ransack]: https://github.com/activerecord-hackery/ransack

data/Rakefile

@@ -1,14 +1,46 @@
-require 'bundler'
-require 'rake'
-Bundler.setup
-Bundler::GemHelper.install_tasks
-
-def cmd(command)
-  puts command
-  fail unless system command
+require 'bundler/gem_tasks'
+
+task :enforce_version do
+  if ENV['BUNDLE_GEMFILE'] == File.expand_path('../Gemfile', __FILE__)
+    gemfile_path = File.expand_path('../gemfiles/rails_50.gemfile', __FILE__)
+
+    command = ['bundle', 'exec', 'rake', *ARGV].join(' ')
+    env = { 'BUNDLE_GEMFILE' => gemfile_path }
+
+    Bundler.with_clean_env { Kernel.exec(env, command) }
+  end
 end
 
-require File.expand_path('../spec/support/detect_rails_version', __FILE__)
+desc 'Creates a test rails app for the specs to run against'
+task :setup, [:parallel, :dir, :template] => [:enforce_version] do |_t, opts|
+  require 'rails/version'
+
+  base_dir = opts[:dir] || 'spec/rails'
+  app_dir = "#{base_dir}/rails-#{Rails::VERSION::STRING}"
+  template = opts[:template] || 'rails_template'
+
+  if File.exist? app_dir
+    puts "test app #{app_dir} already exists; skipping"
+  else
+    system "mkdir -p #{base_dir}"
+    args = %W(
+      -m spec/support/#{template}.rb
+      --skip-bundle
+      --skip-listen
+      --skip-turbolinks
+      --skip-test-unit
+    )
+
+    command = ['bundle', 'exec', 'rails', 'new', app_dir, *args].join(' ')
+
+    env = { 'BUNDLE_GEMFILE' => ENV['BUNDLE_GEMFILE'] }
+    env['INSTALL_PARALLEL'] = 'yes' if opts[:parallel]
+
+    Bundler.with_clean_env { Kernel.exec(env, command) }
+
+    Rake::Task['parallel:after_setup_hook'].invoke if opts[:parallel]
+  end
+end
 
 # Import all our rake tasks
 FileList['tasks/**/*.rake'].each { |task| import task }

data/activeadmin.gemspec

@@ -10,7 +10,10 @@ Gem::Specification.new do |s|
   s.description   = 'The administration framework for Ruby on Rails.'
   s.summary       = 'The administration framework for Ruby on Rails.'
 
-  s.files         = `git ls-files`.split("\n").sort
+  s.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(spec|features)/})
+  end
+
   s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
 
   s.required_ruby_version = '>= 1.9.3'
@@ -23,9 +26,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'inherited_resources', '~> 1.6'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails'
-  s.add_dependency 'kaminari',            '~> 0.15'
-  s.add_dependency 'rails',               '>= 3.2', '< 5.1'
+  s.add_dependency 'kaminari',            '>= 0.15', '< 2.0'
+  s.add_dependency 'railties',            '>= 3.2', '< 5.1'
   s.add_dependency 'ransack',             '~> 1.3'
   s.add_dependency 'sass-rails'
-  s.add_dependency 'sprockets',           '< 4'
+  s.add_dependency 'sprockets',           '< 4.1'
 end

data/app/assets/javascripts/active_admin/initializers/filters.js.coffee

@@ -1,13 +1,20 @@
 $(document).on 'ready page:load turbolinks:load', ->
   # Clear Filters button
-  $('.clear_filters_btn').click ->
+  $('.clear_filters_btn').click (e) ->
     params = window.location.search.slice(1).split('&')
     regex = /^(q\[|q%5B|q%5b|page|commit)/
-    window.location.search = (param for param in params when not param.match(regex)).join('&')
+    if typeof Turbolinks != 'undefined'
+      Turbolinks.visit(window.location.href.split('?')[0] + '?' + (param for param in params when not param.match(regex)).join('&'))
+      e.preventDefault()
+    else
+      window.location.search = (param for param in params when not param.match(regex)).join('&')
 
   # Filter form: don't send any inputs that are empty
-  $('.filter_form').submit ->
+  $('.filter_form').submit (e) ->
     $(@).find(':input').filter(-> @value is '').prop 'disabled', true
+    if typeof Turbolinks != 'undefined'
+      Turbolinks.visit(window.location.href.split('?')[0] + '?' + $( this ).serialize())
+      e.preventDefault()
 
   # Filter form: for filters that let you choose the query method from
   # a dropdown, apply that choice to the filter input field.

data/app/assets/javascripts/active_admin/jquery_ui.js.erb

@@ -4,8 +4,15 @@
                       "jquery.ui."
                     end
 %>
-<% require_asset "#{jquery_ui_path}datepicker" %>
-<% require_asset "#{jquery_ui_path}dialog" %>
-<% require_asset "#{jquery_ui_path}sortable" %>
+<% jquery_ui_widgets_path =
+                    if Jquery::Ui::Rails::VERSION >= "6"
+                      jquery_ui_path + "widgets/"
+                    else
+                      jquery_ui_path
+                    end
+%>
+<% require_asset "#{jquery_ui_widgets_path}datepicker" %>
+<% require_asset "#{jquery_ui_widgets_path}dialog" %>
+<% require_asset "#{jquery_ui_widgets_path}sortable" %>
+<% require_asset "#{jquery_ui_widgets_path}tabs" %>
 <% require_asset "#{jquery_ui_path}widget" %>
-<% require_asset "#{jquery_ui_path}tabs" %>

data/app/assets/javascripts/active_admin/lib/checkbox-toggler.js.coffee

@@ -33,4 +33,12 @@ class ActiveAdmin.CheckboxToggler
       $(el).prop checked: setting
       @_didChangeCheckbox(el)
 
+  option: (key, value) ->
+    if $.isPlainObject(key)
+      @options = $.extend(true, @options, key)
+    else if key?
+      @options[key]
+    else
+      @options[key] = value
+
 $.widget.bridge 'checkboxToggler', ActiveAdmin.CheckboxToggler

data/app/assets/javascripts/active_admin/lib/modal_dialog.js.coffee

@@ -1,7 +1,7 @@
 ActiveAdmin.modal_dialog = (message, inputs, callback)->
   html = """<form id="dialog_confirm" title="#{message}"><ul>"""
   for name, type of inputs
-    if /^(datepicker|checkbox|text)$/.test type
+    if /^(datepicker|checkbox|text|number)$/.test type
       wrapper = 'input'
     else if type is 'textarea'
       wrapper = 'textarea'

data/app/assets/javascripts/active_admin/lib/per_page.js.coffee

@@ -11,7 +11,10 @@ class ActiveAdmin.PerPage
     @$element.change =>
       @$params['per_page'] = @$element.val()
       delete @$params['page']
-      location.search = $.param(@$params)
+      if typeof Turbolinks != 'undefined'
+        Turbolinks.visit(window.location.href.split('?')[0] + '?' + $.param(@$params))
+      else
+        location.search = $.param(@$params)
 
   _queryParams: ->
     query = window.location.search.substring(1)
@@ -23,9 +26,17 @@ class ActiveAdmin.PerPage
    
   _decode: (value) ->
     #replace "+" before decodeURIComponent
-    decodeURIComponent(value.replace(/\+/g, '%20')) 
+    decodeURIComponent(value.replace(/\+/g, '%20'))
+
+  option: (key, value) ->
+    if $.isPlainObject(key)
+      @options = $.extend(true, @options, key)
+    else if key?
+      @options[key]
+    else
+      @options[key] = value
 
 $.widget.bridge 'perPage', ActiveAdmin.PerPage
 
-$ ->
+$(document).on 'ready page:load turbolinks:load', ->
   $('.pagination_per_page select').perPage()

data/app/assets/stylesheets/active_admin/_forms.scss

@@ -125,6 +125,7 @@ form {
   input[type=url],
   input[type=tel],
   input[type=date],
+  input[type=time],
   textarea {
     width: calc(80% - #{$text-input-total-padding});
     border: $border-width solid #c9d0d6;

data/app/views/active_admin/devise/registrations/new.html.erb

@@ -9,7 +9,7 @@
         f.input key, label: t('active_admin.devise.'+key.to_s+'.title'), input_html: { autofocus: index.zero? }
       }
       f.input :password, label: t('active_admin.devise.password.title')
-      f.input :password_confirmation, lable: t('active_admin.devise.password_confirmation.title')
+      f.input :password_confirmation, label: t('active_admin.devise.password_confirmation.title')
     end
     f.actions do
       f.action :submit, label: t('active_admin.devise.login.submit'), button_html: { value: t('active_admin.devise.sign_up.submit') }

data/codecov.yml

@@ -0,0 +1,23 @@
+codecov:
+  notify:
+    require_ci_to_pass: true
+comment: off
+coverage:
+  precision: 2
+  range:
+  - 70.0
+  - 100.0
+  round: down
+  status:
+    changes: false
+    patch: true
+    project: true
+parsers:
+  gcov:
+    branch_detection:
+      conditional: true
+      loop: true
+      macro: false
+      method: false
+  javascript:
+    enable_partials: false

data/config/locales/es-MX.yml

@@ -59,7 +59,7 @@ es-MX:
         other: "Se han destruido %{count} %{plural_model} con éxito"
       selection_toggle_explanation: "(Cambiar selección)"
       link: "Añadir"
-      action_label: "%{title} seleccionado"
+      action_label: "%{title} seleccionados"
       labels:
         destroy: "Borrar"
     comments:

data/config/locales/es.yml

@@ -69,7 +69,7 @@ es:
         other: "Se han destruido %{count} %{plural_model} con éxito"
       selection_toggle_explanation: "(Cambiar selección)"
       link: "Añadir"
-      action_label: "%{title} seleccionado"
+      action_label: "%{title} seleccionados"
       labels:
         destroy: "Borrar"
     comments:

data/config/locales/ru.yml

@@ -77,6 +77,7 @@ ru:
       labels:
         destroy: "Удалить"
     comments:
+      created_at: "Дата создания"
       resource_type: "Тип ресурса"
       author_type: "Тип автора"
       body: "Текст"

data/config/locales/sk.yml

@@ -0,0 +1,110 @@
+sk:
+  active_admin:
+    dashboard: Úvod
+    dashboard_welcome:
+      welcome: "Vitajte v Active Admin. Toto je nástenka."
+      call_to_action: "Pre pridanie sekcie na nástenku se pozrite do súboru 'app/admin/dashboard.rb'"
+    view: "Zobraziť"
+    edit: "Upraviť"
+    delete: "Zmazať"
+    delete_confirmation: "Ste si istí, že chcete túto položku zmazať?"
+    new_model: "Vytvoriť"
+    edit_model: "Upraviť"
+    delete_model: "Zmazať"
+    details: "Detaily"
+    cancel: "Zrušiť"
+    empty: "Prázdne"
+    previous: "Predchádzajúce"
+    next: "Nasledujúce"
+    download: "Stiahnúť:"
+    has_many_new: "Pridať nový"
+    has_many_delete: "Zmazať"
+    has_many_remove: "Odstrániť"
+    filters:
+      buttons:
+        filter: "Filtrovať"
+        clear: "Vyčistiť filtre"
+      predicates:
+        contains: "Obsahuje"
+        equals: "Je presne"
+        starts_with: "Začína na"
+        ends_with: "Končí na"
+        greater_than: "Väčší ako"
+        less_than: "Menší ako"
+    status_tag:
+      "yes": "Áno"
+      "no": "Nie"
+    main_content: "Implementujte prosím %{model}#main_content pre zobrazenie obsahu."
+    logout: "Odhlásiť"
+    powered_by: "%{active_admin} %{version}"
+    sidebars:
+      filters: "Filtre"
+    pagination:
+      empty: "Nenájdený."
+      one: "Zobrazená  <b>1</b> položka"
+      one_page: "Počet zobrazených položiek %{n}"
+      multiple: "<b>%{from}&nbsp;-&nbsp;%{to}</b> z <b>%{total}</b>"
+      multiple_without_total: "<b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      entry:
+        one: "položka"
+        few: "položky"
+        other: "položky"
+    any: "Akákoľvek"
+    blank_slate:
+      content: "Zatiaľ tu nie je žiadny obsah."
+      link: "Vytvoriť"
+    dropdown_actions:
+      button_label: "Akcie"
+    batch_actions:
+      button_label: "Hromadné akcie"
+      default_confirmation: "Ste si istí, že to chcete spraviť?"
+      delete_confirmation: "Ste si istí, že chcete zmazať tieto %{plural_model}?"
+      succesfully_destroyed:
+        zero: "Nebol zmazaný žiaden %{model}"
+        one: "Úspešne zmazaný %{model}"
+        few: "Úspešne zmazané %{count} %{plural_model}"
+        other: "Úspešne zmazaných %{count} %{plural_model}"
+      selection_toggle_explanation: "(Zmeniť výber)"
+      link: "Vytvoriť"
+      action_label: "%{title}"
+      labels:
+        destroy: "Vymazať"
+    comments:
+      resource_type: "Typ zdroja"
+      author_type: "Typ autora"
+      body: "Telo"
+      author: "Autor"
+      title: "Komentár"
+      add: "Pridať komentár"
+      resource: "Zdroj"
+      no_comments_yet: "Žiadny komentár"
+      author_missing: "Anonymný"
+      title_content: "Komentáre administrátorov (%{count})"
+      errors:
+        empty_text: "Komentár nebol uložený, je prázdny."
+    devise:
+      login:
+        title: "Prihlásenie"
+        remember_me: "Zapamätať si ma"
+        submit: "Prihlásiť"
+      reset_password:
+        title: "Zabudli ste heslo?"
+        submit: "Obnoviť heslo"
+      change_password:
+        title: "Zmeniť heslo"
+        submit: "Zmeniť svoje heslo"
+      unlock:
+        title: "Zaslanie inštrukcií k odomknutiu účtu"
+        submit: "Zaslať inštrukcií k odomknutiu účtu"
+      links:
+        sign_in: "Prihlásiť sa"
+        sign_up: "Registrovať sa"
+        forgot_your_password: "Zabudli ste heslo?"
+        sign_in_with_omniauth_provider: "Prihlásiť sa cez %{provider}"
+    access_denied:
+      message: "Nemáte oprávnenie k vykonaniu tejto akcie."
+    index_list:
+      table: "Tabuľka"
+      block: "Zoznam"
+      grid: "Tabuľka"
+      blog: "Blog"