activeadmin-rb 1.5.1 → 1.5.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yaml +42 -0
- data/.github/workflows/daily.yaml +42 -0
- data/CHANGELOG.md +10 -0
- data/Gemfile +1 -1
- data/README.md +3 -3
- data/activeadmin-rb.gemspec +2 -2
- data/features/index/format_as_csv.feature +33 -1
- data/gemfiles/rails_52.gemfile +1 -1
- data/gemfiles/rails_60.gemfile +2 -2
- data/gemfiles/rails_61.gemfile +16 -0
- data/lib/active_admin/batch_actions/views/batch_action_selector.rb +1 -1
- data/lib/active_admin/csv_builder.rb +10 -5
- data/lib/active_admin/filters/resource_extension.rb +4 -4
- data/lib/active_admin/localizers/resource_localizer.rb +1 -1
- data/lib/active_admin/resource/naming.rb +3 -3
- data/lib/active_admin/version.rb +1 -1
- data/lib/active_admin/views/components/dropdown_menu.rb +2 -2
- data/lib/active_admin/views/components/index_list.rb +1 -1
- data/lib/active_admin/views/components/menu_item.rb +1 -1
- data/lib/active_admin/views/components/paginated_collection.rb +1 -1
- data/lib/active_admin/views/index_as_table.rb +2 -2
- data/spec/support/active_admin_integration_spec_helper.rb +4 -0
- data/spec/unit/csv_builder_spec.rb +2 -2
- data/spec/unit/filters/filter_form_builder_spec.rb +1 -1
- data/spec/unit/views/components/tabs_spec.rb +1 -1
- metadata +14 -15
- data/.travis.yml +0 -53
- data/gemfiles/rails_50.gemfile +0 -14
- data/gemfiles/rails_51.gemfile +0 -14
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 16c418b00684a2594838518e317b5be1842f91c2d7f86862c5177bb7646ac00d
|
4
|
+
data.tar.gz: a58b8f8f1168ed57fca7bc000e30c883d643dbbb06a9d5d32021f5b428feff75
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5529e188e3f1973fed618e82d36067f8bf70a38ce1f6ce3c5f7d70aef5794636bcbbe4d1c231d510cbabd989a75aaf8e63622a10cf9099c242e7a8866d47e915
|
7
|
+
data.tar.gz: 6cbd6dd46a6a44f8075f901a497e6b15b23e305b9d84c0cb333ed4d241f9a087289fa37d9c14429a1c6495e398bfac0da30d4e5f353bb0f462230843c592e7fe
|
@@ -0,0 +1,42 @@
|
|
1
|
+
---
|
2
|
+
|
3
|
+
name: ci
|
4
|
+
|
5
|
+
on: [push]
|
6
|
+
|
7
|
+
jobs:
|
8
|
+
test:
|
9
|
+
name: test (${{ matrix.ruby.name }}, ${{ matrix.deps }})
|
10
|
+
runs-on: ${{ matrix.os }}
|
11
|
+
|
12
|
+
timeout-minutes: 15
|
13
|
+
|
14
|
+
strategy:
|
15
|
+
fail-fast: false
|
16
|
+
|
17
|
+
matrix:
|
18
|
+
ruby: [{ name: 3.0, value: 3.0.1 }, { name: 2.7, value: 2.7.2 }]
|
19
|
+
|
20
|
+
os: [ubuntu-20.04]
|
21
|
+
|
22
|
+
deps: [rails_61, rails_60]
|
23
|
+
|
24
|
+
env:
|
25
|
+
COVERAGE: false
|
26
|
+
SUPPRESS_JASMINE_DEPRECATION: true
|
27
|
+
|
28
|
+
steps:
|
29
|
+
- uses: actions/checkout@v2
|
30
|
+
|
31
|
+
- name: Configure bundler
|
32
|
+
run: |
|
33
|
+
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.deps }}.gemfile" >> $GITHUB_ENV
|
34
|
+
echo "BUNDLE_PATH=$(pwd)/gemfiles/${{ matrix.deps }}/vendor/bundle" >> $GITHUB_ENV
|
35
|
+
|
36
|
+
- uses: ruby/setup-ruby@v1
|
37
|
+
with:
|
38
|
+
ruby-version: ${{ matrix.ruby.value }}
|
39
|
+
bundler-cache: true
|
40
|
+
|
41
|
+
- name: Run tests
|
42
|
+
run: bundle exec rake
|
@@ -0,0 +1,42 @@
|
|
1
|
+
name: daily
|
2
|
+
|
3
|
+
on:
|
4
|
+
schedule:
|
5
|
+
- cron: '1 1 * * *'
|
6
|
+
|
7
|
+
jobs:
|
8
|
+
test:
|
9
|
+
name: test (${{ matrix.ruby.name }}, ${{ matrix.deps }})
|
10
|
+
runs-on: ${{ matrix.os }}
|
11
|
+
|
12
|
+
timeout-minutes: 15
|
13
|
+
|
14
|
+
strategy:
|
15
|
+
fail-fast: false
|
16
|
+
|
17
|
+
matrix:
|
18
|
+
ruby: [{ name: 3.0, value: 3.0.1 }, { name: 2.7, value: 2.7.2 }]
|
19
|
+
|
20
|
+
os: [ubuntu-20.04]
|
21
|
+
|
22
|
+
deps: [rails_61, rails_60]
|
23
|
+
|
24
|
+
env:
|
25
|
+
COVERAGE: false
|
26
|
+
SUPPRESS_JASMINE_DEPRECATION: true
|
27
|
+
|
28
|
+
steps:
|
29
|
+
- uses: actions/checkout@v2
|
30
|
+
|
31
|
+
- name: Configure bundler
|
32
|
+
run: |
|
33
|
+
echo "BUNDLE_GEMFILE=gemfiles/${{ matrix.deps }}.gemfile" >> $GITHUB_ENV
|
34
|
+
echo "BUNDLE_PATH=$(pwd)/gemfiles/${{ matrix.deps }}/vendor/bundle" >> $GITHUB_ENV
|
35
|
+
|
36
|
+
- uses: ruby/setup-ruby@v1
|
37
|
+
with:
|
38
|
+
ruby-version: ${{ matrix.ruby.value }}
|
39
|
+
bundler-cache: true
|
40
|
+
|
41
|
+
- name: Run tests
|
42
|
+
run: bundle exec rake
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,10 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## 1.5.2 [☰](https://github.com/varyonic/activeadmin-rb/compare/v1.5.1...v1.5.2)
|
4
|
+
|
5
|
+
* Fix Ruby 2.7 warnings about keyword args. [#6000], [#6237] by [@vcsjones] and [@deivid-rodriguez]
|
6
|
+
* Fix CSVBuilder not respecting `ActiveAdmin.application.csv_options = { humanize_name: false }` setting. [#5800] by [@HappyKadaver]
|
7
|
+
|
3
8
|
## 1.5.1 [☰](https://github.com/varyonic/activeadmin-rb/compare/v1.5.0...v1.5.1)
|
4
9
|
|
5
10
|
* More fixes to support final release of Rails 6.0.
|
@@ -346,6 +351,9 @@ Please check [0-6-stable] for previous changes.
|
|
346
351
|
[#5516]: https://github.com/activeadmin/activeadmin/pull/5516
|
347
352
|
[#5583]: https://github.com/activeadmin/activeadmin/pull/5583
|
348
353
|
[#5702]: https://github.com/activeadmin/activeadmin/pull/5702
|
354
|
+
[#5800]: https://github.com/activeadmin/activeadmin/pull/5800
|
355
|
+
[#6000]: https://github.com/activeadmin/activeadmin/pull/6000
|
356
|
+
[#6237]: https://github.com/activeadmin/activeadmin/pull/6237
|
349
357
|
|
350
358
|
[@5t111111]: https://github.com/5t111111
|
351
359
|
[@aarek]: https://github.com/aarek
|
@@ -371,6 +379,7 @@ Please check [0-6-stable] for previous changes.
|
|
371
379
|
[@Fivell]: https://github.com/Fivell
|
372
380
|
[@glebtv]: https://github.com/glebtv
|
373
381
|
[@gonzedge]: https://github.com/gonzedge
|
382
|
+
[@HappyKadaver]: https://github.com/HappyKadaver
|
374
383
|
[@innparusu95]: https://github.com/innparusu95
|
375
384
|
[@ionut998]: https://github.com/ionut998
|
376
385
|
[@jasl]: https://github.com/jasl
|
@@ -401,6 +410,7 @@ Please check [0-6-stable] for previous changes.
|
|
401
410
|
[@timoschilling]: https://github.com/timoschilling
|
402
411
|
[@TimPetricola]: https://github.com/TimPetricola
|
403
412
|
[@varyonic]: https://github.com/varyonic
|
413
|
+
[@vcsjones]: https://github.com/vcsjones
|
404
414
|
[@wasifhossain]: https://github.com/wasifhossain
|
405
415
|
[@Wowu]: https://github.com/Wowu
|
406
416
|
[@wspurgin]: https://github.com/wspurgin
|
data/Gemfile
CHANGED
@@ -38,7 +38,7 @@ group :test do
|
|
38
38
|
gem 'capybara'
|
39
39
|
gem 'simplecov', require: false # Test coverage generator. Go to /coverage/ after running tests
|
40
40
|
gem 'codecov', require: false # Test coverage website. Go to https://codecov.io
|
41
|
-
gem 'cucumber-rails',
|
41
|
+
gem 'cucumber-rails', require: false
|
42
42
|
gem 'cucumber'
|
43
43
|
gem 'database_cleaner'
|
44
44
|
gem 'jasmine'
|
data/README.md
CHANGED
@@ -6,7 +6,7 @@ Google 'why fork open source' for relevant articles.
|
|
6
6
|
[Active Admin](https://www.activeadmin.info) is a Ruby on Rails framework for creating elegant backends for website administration.
|
7
7
|
|
8
8
|
[![Version ][rubygems_badge]][rubygems]
|
9
|
-
[![
|
9
|
+
[![Github Actions ][actions_badge]][actions]
|
10
10
|
[![Quality ][codeclimate_badge]][codeclimate]
|
11
11
|
[![Coverage ][codecov_badge]][codecov]
|
12
12
|
[![Inch CI ][inch_badge]][inch]
|
@@ -59,8 +59,8 @@ Tool | Description
|
|
59
59
|
|
60
60
|
[rubygems_badge]: http://img.shields.io/gem/v/activeadmin-rb.svg
|
61
61
|
[rubygems]: https://rubygems.org/gems/activeadmin-rb
|
62
|
-
[
|
63
|
-
[
|
62
|
+
[actions_badge]: https://github.com/varyonic/activeadmin/workflows/ci/badge.svg
|
63
|
+
[actions]: https://github.com/varyonic/activeadmin/actions
|
64
64
|
[codeclimate_badge]: https://api.codeclimate.com/v1/badges/779e407d22bacff19733/maintainability
|
65
65
|
[codeclimate]: https://codeclimate.com/github/varyonic/activeadmin/maintainability
|
66
66
|
[codecov_badge]: https://codecov.io/gh/varyonic/activeadmin/branch/master/graph/badge.svg
|
data/activeadmin-rb.gemspec
CHANGED
@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
|
|
16
16
|
|
17
17
|
s.test_files = `git ls-files -- {spec,features}/*`.split("\n")
|
18
18
|
|
19
|
-
s.required_ruby_version = '>= 2.
|
19
|
+
s.required_ruby_version = '>= 2.5'
|
20
20
|
|
21
21
|
s.add_dependency 'arbre', '>= 1.1.1'
|
22
22
|
s.add_dependency 'coffee-rails'
|
23
|
-
s.add_dependency 'formtastic'
|
23
|
+
s.add_dependency 'formtastic'
|
24
24
|
s.add_dependency 'formtastic_i18n'
|
25
25
|
s.add_dependency 'inherited_resources', '>= 1.9.0'
|
26
26
|
s.add_dependency 'jquery-rails', '>= 4.2.0'
|
@@ -78,7 +78,39 @@ Feature: Format as CSV
|
|
78
78
|
And I should download a CSV file with "," separator for "posts" containing:
|
79
79
|
| title | body |
|
80
80
|
| Hello, World | (.*) |
|
81
|
-
|
81
|
+
|
82
|
+
Scenario: With humanize_name option turned off globally
|
83
|
+
Given a configuration of:
|
84
|
+
"""
|
85
|
+
ActiveAdmin.application.csv_options = { humanize_name: false }
|
86
|
+
ActiveAdmin.register Post do
|
87
|
+
end
|
88
|
+
"""
|
89
|
+
And a post exists
|
90
|
+
When I am on the index page for posts
|
91
|
+
And I follow "CSV"
|
92
|
+
Then I should download a CSV file with "," separator for "posts" containing:
|
93
|
+
| id | title | body | published_date | position | starred | foo | created_at | updated_at |
|
94
|
+
| (.*)| (.*) | (.*) | (.*) | (.*) | (.*) | (.*) | (.*) | (.*) |
|
95
|
+
|
96
|
+
Scenario: With humanize_name option turned off globally and enabled locally
|
97
|
+
Given a configuration of:
|
98
|
+
"""
|
99
|
+
ActiveAdmin.application.csv_options = { humanize_name: false }
|
100
|
+
ActiveAdmin.register Post do
|
101
|
+
csv humanize_name: true do
|
102
|
+
column :title
|
103
|
+
column :body
|
104
|
+
end
|
105
|
+
end
|
106
|
+
"""
|
107
|
+
And a post exists
|
108
|
+
When I am on the index page for posts
|
109
|
+
And I follow "CSV"
|
110
|
+
Then I should download a CSV file with "," separator for "posts" containing:
|
111
|
+
| Title | Body |
|
112
|
+
| (.*) | (.*) |
|
113
|
+
|
82
114
|
Scenario: With CSV option customization
|
83
115
|
Given a configuration of:
|
84
116
|
"""
|
data/gemfiles/rails_52.gemfile
CHANGED
data/gemfiles/rails_60.gemfile
CHANGED
@@ -2,13 +2,13 @@ source "https://rubygems.org"
|
|
2
2
|
|
3
3
|
eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
|
4
4
|
|
5
|
-
gem "rails", "
|
5
|
+
gem "rails", "~> 6.0.0"
|
6
6
|
gem "rails-i18n", ">= 6.0.x"
|
7
7
|
gem "sass-rails", ">= 6.0.x"
|
8
8
|
gem "sprockets", ">= 4.0.x"
|
9
9
|
gem "bootsnap"
|
10
10
|
gem "devise", "~> 4.4"
|
11
|
-
gem "draper"
|
11
|
+
gem "draper"
|
12
12
|
gem "ransack", ">= 2.0" # 2.x for Rails 5.2+ only.
|
13
13
|
gem 'sqlite3', platforms: :mri
|
14
14
|
gem "activerecord-jdbcsqlite3-adapter", ">= 60.0.x", platform: :jruby
|
@@ -0,0 +1,16 @@
|
|
1
|
+
source "https://rubygems.org"
|
2
|
+
|
3
|
+
eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
|
4
|
+
|
5
|
+
gem "rails", ">= 6.0.x"
|
6
|
+
gem "rails-i18n", ">= 6.0.x"
|
7
|
+
gem "sass-rails", ">= 6.0.x"
|
8
|
+
gem "sprockets", ">= 4.0.x"
|
9
|
+
gem "bootsnap"
|
10
|
+
gem "devise", "~> 4.4"
|
11
|
+
gem "draper"
|
12
|
+
gem "ransack", ">= 2.0" # 2.x for Rails 5.2+ only.
|
13
|
+
gem 'sqlite3', platforms: :mri
|
14
|
+
gem "activerecord-jdbcsqlite3-adapter", ">= 60.0.x", platform: :jruby
|
15
|
+
|
16
|
+
gemspec path: "../"
|
@@ -41,7 +41,7 @@ module ActiveAdmin
|
|
41
41
|
title = I18n.t("active_admin.batch_actions.labels.#{batch_action.sym}", default: default_title)
|
42
42
|
label = I18n.t("active_admin.batch_actions.action_label", title: title)
|
43
43
|
|
44
|
-
item label, "#", options
|
44
|
+
item label, "#", **options
|
45
45
|
end
|
46
46
|
end
|
47
47
|
end
|
@@ -32,7 +32,9 @@ module ActiveAdmin
|
|
32
32
|
|
33
33
|
def initialize(options = {}, &block)
|
34
34
|
@resource = options.delete(:resource)
|
35
|
-
@columns
|
35
|
+
@columns = []
|
36
|
+
@options = ActiveAdmin.application.csv_options.merge options
|
37
|
+
@block = block
|
36
38
|
end
|
37
39
|
|
38
40
|
def column(name, options = {}, &block)
|
@@ -42,7 +44,6 @@ module ActiveAdmin
|
|
42
44
|
def build(controller, csv)
|
43
45
|
@collection = controller.send :find_collection, except: :pagination
|
44
46
|
columns = exec_columns controller.view_context
|
45
|
-
options = ActiveAdmin.application.csv_options.merge self.options
|
46
47
|
bom = options.delete :byte_order_mark
|
47
48
|
column_names = options.delete(:column_names) { true }
|
48
49
|
csv_options = options.except :encoding_options, :humanize_name
|
@@ -50,14 +51,14 @@ module ActiveAdmin
|
|
50
51
|
csv << bom if bom
|
51
52
|
|
52
53
|
if column_names
|
53
|
-
csv << CSV.generate_line(columns.map{ |c| encode c.name, options }, csv_options)
|
54
|
+
csv << CSV.generate_line(columns.map { |c| encode c.name, options }, **csv_options)
|
54
55
|
end
|
55
56
|
|
56
57
|
ActiveRecord::Base.uncached do
|
57
58
|
(1..paginated_collection.total_pages).each do |page|
|
58
59
|
paginated_collection(page).each do |resource|
|
59
60
|
resource = controller.send :apply_decorator, resource
|
60
|
-
csv << CSV.generate_line(build_row(resource, columns, options), csv_options)
|
61
|
+
csv << CSV.generate_line(build_row(resource, columns, options), **csv_options)
|
61
62
|
end
|
62
63
|
end
|
63
64
|
end
|
@@ -80,7 +81,11 @@ module ActiveAdmin
|
|
80
81
|
|
81
82
|
def encode(content, options)
|
82
83
|
if options[:encoding]
|
83
|
-
|
84
|
+
if options[:encoding_options]
|
85
|
+
content.to_s.encode options[:encoding], **options[:encoding_options]
|
86
|
+
else
|
87
|
+
content.to_s.encode options[:encoding]
|
88
|
+
end
|
84
89
|
else
|
85
90
|
content
|
86
91
|
end
|
@@ -123,10 +123,10 @@ module ActiveAdmin
|
|
123
123
|
# Returns a default set of filters for the associations
|
124
124
|
def default_association_filters
|
125
125
|
if resource_class.respond_to?(:reflect_on_all_associations)
|
126
|
-
poly, not_poly = resource_class.reflect_on_all_associations.partition{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
|
126
|
+
poly, not_poly = resource_class.reflect_on_all_associations.partition { |r| r.macro == :belongs_to && r.options[:polymorphic] }
|
127
127
|
|
128
128
|
# remove deeply nested associations
|
129
|
-
not_poly.reject!{ |r| r.chain.length > 2 }
|
129
|
+
not_poly.reject! { |r| r.chain.length > 2 }
|
130
130
|
|
131
131
|
filters = poly.map(&:foreign_type) + not_poly.map(&:name)
|
132
132
|
filters.map &:to_sym
|
@@ -140,8 +140,8 @@ module ActiveAdmin
|
|
140
140
|
end
|
141
141
|
|
142
142
|
def filters_sidebar_section
|
143
|
-
ActiveAdmin::SidebarSection.new :filters, only: :index, if: ->{ active_admin_config.filters.any? } do
|
144
|
-
active_admin_filters_form_for assigns[:search], active_admin_config.filters
|
143
|
+
ActiveAdmin::SidebarSection.new :filters, only: :index, if: -> { active_admin_config.filters.any? } do
|
144
|
+
active_admin_filters_form_for assigns[:search], **active_admin_config.filters
|
145
145
|
end
|
146
146
|
end
|
147
147
|
|
@@ -21,7 +21,7 @@ module ActiveAdmin
|
|
21
21
|
scope = options.delete(:scope)
|
22
22
|
specific_key = array_to_key('resources', @model_name, scope, key)
|
23
23
|
defaults = [array_to_key(scope, key), key.to_s.titleize]
|
24
|
-
::I18n.t specific_key, options.reverse_merge(model: @model, default: defaults, scope: 'active_admin')
|
24
|
+
::I18n.t specific_key, **options.reverse_merge(model: @model, default: defaults, scope: 'active_admin')
|
25
25
|
end
|
26
26
|
alias_method :t, :translate
|
27
27
|
|
@@ -22,8 +22,8 @@ module ActiveAdmin
|
|
22
22
|
|
23
23
|
# Returns the plural version of this resource such as "Bank Accounts"
|
24
24
|
def plural_resource_label(options = {})
|
25
|
-
defaults = {count: Helpers::I18n::PLURAL_MANY_COUNT,
|
26
|
-
default: resource_label.pluralize.titleize}
|
25
|
+
defaults = { count: Helpers::I18n::PLURAL_MANY_COUNT,
|
26
|
+
default: resource_label.pluralize.titleize }
|
27
27
|
resource_name.translate defaults.merge options
|
28
28
|
end
|
29
29
|
|
@@ -46,7 +46,7 @@ module ActiveAdmin
|
|
46
46
|
end
|
47
47
|
|
48
48
|
def translate(options = {})
|
49
|
-
I18n.t i18n_key, {scope: [:activerecord, :models]}.merge(options)
|
49
|
+
I18n.t i18n_key, **{ scope: [:activerecord, :models] }.merge(options)
|
50
50
|
end
|
51
51
|
|
52
52
|
def route_key
|
data/lib/active_admin/version.rb
CHANGED
@@ -37,7 +37,7 @@ module ActiveAdmin
|
|
37
37
|
def build_index_list(index_class)
|
38
38
|
li class: classes_for_index(index_class) do
|
39
39
|
params = request.query_parameters.except :page, :commit, :format
|
40
|
-
url_with_params = url_for(params.merge(as: index_class.index_name.to_sym))
|
40
|
+
url_with_params = url_for(**params.merge(as: index_class.index_name.to_sym).symbolize_keys)
|
41
41
|
|
42
42
|
a href: url_with_params, class: "table_tools_button" do
|
43
43
|
name = index_class.index_name
|
@@ -378,8 +378,8 @@ module ActiveAdmin
|
|
378
378
|
class TableActions < ActiveAdmin::Component
|
379
379
|
builder_method :table_actions
|
380
380
|
|
381
|
-
def item *args
|
382
|
-
text_node link_to
|
381
|
+
def item *args, **kwargs
|
382
|
+
text_node link_to(*args, **kwargs)
|
383
383
|
end
|
384
384
|
end
|
385
385
|
end # IndexTableFor
|
@@ -47,6 +47,10 @@ module ActiveAdminIntegrationSpecHelper
|
|
47
47
|
class MockActionView < ::ActionView::Base
|
48
48
|
include ActiveAdmin::ViewHelpers
|
49
49
|
include Rails.application.routes.url_helpers
|
50
|
+
|
51
|
+
def compiled_method_container
|
52
|
+
self.class
|
53
|
+
end
|
50
54
|
end
|
51
55
|
|
52
56
|
# Returns a fake action view instance to use with our renderers
|
@@ -137,7 +137,7 @@ RSpec.describe ActiveAdmin::CSVBuilder do
|
|
137
137
|
end
|
138
138
|
|
139
139
|
it "should have proper separator" do
|
140
|
-
expect(builder.options).to
|
140
|
+
expect(builder.options).to include(col_sep: ";")
|
141
141
|
end
|
142
142
|
end
|
143
143
|
|
@@ -167,7 +167,7 @@ RSpec.describe ActiveAdmin::CSVBuilder do
|
|
167
167
|
end
|
168
168
|
|
169
169
|
it "should have proper separator" do
|
170
|
-
expect(builder.options).to
|
170
|
+
expect(builder.options).to include(force_quotes: true)
|
171
171
|
end
|
172
172
|
end
|
173
173
|
|
@@ -354,7 +354,7 @@ RSpec.describe ActiveAdmin::Filters::ViewHelper do
|
|
354
354
|
let(:scope) { Post.ransack }
|
355
355
|
let(:body) { Capybara.string(filter :category) }
|
356
356
|
it "should ignore that foreign key and let Ransack handle it" do
|
357
|
-
expect(Post.reflect_on_association(:category).foreign_key).to eq :custom_category_id
|
357
|
+
expect(Post.reflect_on_association(:category).foreign_key.to_sym).to eq :custom_category_id
|
358
358
|
expect(body).to have_selector("select[name='q[category_id_eq]']")
|
359
359
|
end
|
360
360
|
end
|
@@ -11,7 +11,7 @@ RSpec.describe ActiveAdmin::Views::Tabs do
|
|
11
11
|
render_arbre_component do
|
12
12
|
tabs do
|
13
13
|
tab :overview
|
14
|
-
tab I18n.t(:tab_key),
|
14
|
+
tab I18n.t(:tab_key), id: :something_unique, html_options: { class: :some_css_class }
|
15
15
|
end
|
16
16
|
end
|
17
17
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: activeadmin-rb
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.
|
4
|
+
version: 1.5.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Greg Bell
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-11-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: arbre
|
@@ -42,16 +42,16 @@ dependencies:
|
|
42
42
|
name: formtastic
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
|
-
- - "
|
45
|
+
- - ">="
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: '
|
47
|
+
version: '0'
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
|
-
- - "
|
52
|
+
- - ">="
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: '
|
54
|
+
version: '0'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: formtastic_i18n
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -187,11 +187,12 @@ extra_rdoc_files: []
|
|
187
187
|
files:
|
188
188
|
- ".codeclimate.yml"
|
189
189
|
- ".github/ISSUE_TEMPLATE.md"
|
190
|
+
- ".github/workflows/ci.yaml"
|
191
|
+
- ".github/workflows/daily.yaml"
|
190
192
|
- ".gitignore"
|
191
193
|
- ".mdlrc"
|
192
194
|
- ".rubocop.yml"
|
193
195
|
- ".simplecov"
|
194
|
-
- ".travis.yml"
|
195
196
|
- ".yardopts"
|
196
197
|
- CHANGELOG.md
|
197
198
|
- CODE_OF_CONDUCT.md
|
@@ -458,10 +459,9 @@ files:
|
|
458
459
|
- features/users/logging_out.feature
|
459
460
|
- features/users/resetting_password.feature
|
460
461
|
- gemfiles/rails_42.gemfile
|
461
|
-
- gemfiles/rails_50.gemfile
|
462
|
-
- gemfiles/rails_51.gemfile
|
463
462
|
- gemfiles/rails_52.gemfile
|
464
463
|
- gemfiles/rails_60.gemfile
|
464
|
+
- gemfiles/rails_61.gemfile
|
465
465
|
- lib/active_admin.rb
|
466
466
|
- lib/active_admin/abstract_view_factory.rb
|
467
467
|
- lib/active_admin/application.rb
|
@@ -775,7 +775,7 @@ homepage: http://activeadmin.info
|
|
775
775
|
licenses:
|
776
776
|
- MIT
|
777
777
|
metadata: {}
|
778
|
-
post_install_message:
|
778
|
+
post_install_message:
|
779
779
|
rdoc_options: []
|
780
780
|
require_paths:
|
781
781
|
- lib
|
@@ -783,16 +783,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
783
783
|
requirements:
|
784
784
|
- - ">="
|
785
785
|
- !ruby/object:Gem::Version
|
786
|
-
version: '2.
|
786
|
+
version: '2.5'
|
787
787
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
788
788
|
requirements:
|
789
789
|
- - ">="
|
790
790
|
- !ruby/object:Gem::Version
|
791
791
|
version: '0'
|
792
792
|
requirements: []
|
793
|
-
|
794
|
-
|
795
|
-
signing_key:
|
793
|
+
rubygems_version: 3.2.29
|
794
|
+
signing_key:
|
796
795
|
specification_version: 4
|
797
796
|
summary: The administration framework for Ruby on Rails.
|
798
797
|
test_files:
|
data/.travis.yml
DELETED
@@ -1,53 +0,0 @@
|
|
1
|
-
---
|
2
|
-
|
3
|
-
language: ruby
|
4
|
-
|
5
|
-
sudo: false
|
6
|
-
|
7
|
-
dist: trusty
|
8
|
-
|
9
|
-
bundler_args: --without development
|
10
|
-
|
11
|
-
cache: bundler
|
12
|
-
|
13
|
-
before_script:
|
14
|
-
- unset _JAVA_OPTIONS
|
15
|
-
|
16
|
-
before_install:
|
17
|
-
- PATH=$(npm bin):$PATH # needed to install phantomjs via npm
|
18
|
-
- if [ $(phantomjs --version) != '2.1.1' ]; then npm install phantomjs-prebuilt@2.1; fi
|
19
|
-
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
|
20
|
-
- gem install bundler -v '< 2'
|
21
|
-
|
22
|
-
script:
|
23
|
-
- bundle exec rake
|
24
|
-
- bundle exec rake docs:build
|
25
|
-
|
26
|
-
rvm:
|
27
|
-
- jruby-9.2.0.0
|
28
|
-
- 2.4
|
29
|
-
- 2.5.5
|
30
|
-
- 2.6
|
31
|
-
|
32
|
-
gemfile:
|
33
|
-
- gemfiles/rails_60.gemfile
|
34
|
-
- gemfiles/rails_50.gemfile
|
35
|
-
- gemfiles/rails_51.gemfile
|
36
|
-
- gemfiles/rails_52.gemfile
|
37
|
-
|
38
|
-
env:
|
39
|
-
global:
|
40
|
-
- JRUBY_OPTS="-J-Xmx1024m --dev --debug"
|
41
|
-
- COVERAGE=true
|
42
|
-
|
43
|
-
matrix:
|
44
|
-
fast_finish: true
|
45
|
-
|
46
|
-
exclude:
|
47
|
-
- rvm: 2.4
|
48
|
-
gemfile: gemfiles/rails_60.gemfile
|
49
|
-
- rvm: 2.6
|
50
|
-
gemfile: gemfiles/rails_42.gemfile
|
51
|
-
|
52
|
-
allow_failures:
|
53
|
-
- rvm: jruby-9.2.0.0
|
data/gemfiles/rails_50.gemfile
DELETED
@@ -1,14 +0,0 @@
|
|
1
|
-
source "https://rubygems.org"
|
2
|
-
|
3
|
-
eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
|
4
|
-
|
5
|
-
gem "rails", "5.0.7"
|
6
|
-
gem "sprockets", "< 4"
|
7
|
-
gem "devise", "~> 4.0"
|
8
|
-
gem "draper", "~> 3.0"
|
9
|
-
gem "ransack", "~> 1.8.7" # 2.x for Rails 5.2+ only.
|
10
|
-
gem "rails-i18n"
|
11
|
-
gem 'sqlite3', '< 1.4', platforms: :mri
|
12
|
-
gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platforms: :jruby
|
13
|
-
|
14
|
-
gemspec path: "../"
|
data/gemfiles/rails_51.gemfile
DELETED
@@ -1,14 +0,0 @@
|
|
1
|
-
source "https://rubygems.org"
|
2
|
-
|
3
|
-
eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
|
4
|
-
|
5
|
-
gem "rails", "5.1.6"
|
6
|
-
gem "sprockets", "< 4"
|
7
|
-
gem "devise", "~> 4.3"
|
8
|
-
gem "draper", "~> 3.0"
|
9
|
-
gem "ransack", "~> 1.8.7" # 2.x for Rails 5.2+ only.
|
10
|
-
gem "rails-i18n"
|
11
|
-
gem 'sqlite3', '< 1.4', platforms: :mri
|
12
|
-
gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platforms: :jruby
|
13
|
-
|
14
|
-
gemspec path: "../"
|