action_args 2.7.1 → 2.7.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/main.yml +19 -49
  3. data/Gemfile +23 -0
  4. data/README.md +1 -1
  5. data/lib/action_args/version.rb +1 -1
  6. data/lib/generators/rails/templates/api_controller.rb +51 -0
  7. data/lib/generators/rails/templates/controller.rb +3 -3
  8. metadata +4 -12
  9. data/gemfiles/rails_41.gemfile +0 -16
  10. data/gemfiles/rails_42.gemfile +0 -16
  11. data/gemfiles/rails_50.gemfile +0 -15
  12. data/gemfiles/rails_51.gemfile +0 -15
  13. data/gemfiles/rails_52.gemfile +0 -15
  14. data/gemfiles/rails_60.gemfile +0 -16
  15. data/gemfiles/rails_61.gemfile +0 -16
  16. data/gemfiles/rails_70.gemfile +0 -17
  17. data/gemfiles/rails_edge.gemfile +0 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 375a2da95a1f6a2d7b141a4e17cd057b534e03069211772ea803f5eb8a47f603
4
- data.tar.gz: 50bfa937f5ea30b756de264837b8d63aaae5031a4018f09a2a521b5739be9c29
3
+ metadata.gz: 0f39ce97090f0a421ac97075c9282d1dd644bd6bf3b065ac79ae5ad3c6900793
4
+ data.tar.gz: 6ae6f79d371088a28d87e06ccf3ee5ef8c77e75e87f4ba81953f1c9c9f381d27
5
5
  SHA512:
6
- metadata.gz: 8a0178f695e91ac00887b006201023d1cbdc11777bce68485f6b7b118cba8900763031112762f57660a2407efbb808b839edda36f03a3a2ba7ffeb81c4d5f90a
7
- data.tar.gz: 6ab9fde7062e2160611e2b7860ad6f308fdbf3944900ef324d41257592316146c0a1766eff95a1686837708fc4239038e2bc53d6324ae4553509ef3f55ccc24a
6
+ metadata.gz: 2e6b7373af88aea4dd76f04e97fdae2b84761d46a212f3738499beac00ccd1e24a1bf639a370c28381fa52ebf7d21d926088e2726a0ecb65ede0bb9d5823e512
7
+ data.tar.gz: b310e7647093de316c5eeeee0464d29306531f1211eb14d79709b84a51da79ea953f02d234b2af8422026ce923868a54c710db5f4c618c553fd5e983c6b3fd58
data/.github/workflows/main.yml CHANGED
@@ -6,74 +6,44 @@ jobs:
6
6
  build:
7
7
  strategy:
8
8
  matrix:
9
- include:
10
- - ruby_version: ruby-head
11
- gemfile: gemfiles/rails_edge.gemfile
12
- allow_failures: 'true'
13
- - ruby_version: '3.0'
14
- gemfile: gemfiles/rails_70.gemfile
15
- allow_failures: 'true'
16
- - ruby_version: '3.0'
17
- gemfile: gemfiles/rails_61.gemfile
18
- allow_failures: 'true'
19
-
20
- - ruby_version: '3.0'
21
- gemfile: gemfiles/rails_edge.gemfile
22
- allow_failures: 'true'
23
- - ruby_version: '3.0'
24
- gemfile: gemfiles/rails_70.gemfile
25
- - ruby_version: '3.0'
26
- gemfile: gemfiles/rails_61.gemfile
27
- - ruby_version: '3.0'
28
- gemfile: gemfiles/rails_60.gemfile
29
-
30
- - ruby_version: jruby
31
- gemfile: gemfiles/rails_61.gemfile
32
- allow_failures: 'true'
33
- - ruby_version: jruby
34
- gemfile: gemfiles/rails_70.gemfile
35
- allow_failures: 'true'
36
-
37
- - ruby_version: '2.7'
38
- gemfile: gemfiles/rails_edge.gemfile
39
- allow_failures: 'true'
40
- - ruby_version: '2.7'
41
- gemfile: gemfiles/rails_70.gemfile
42
- - ruby_version: '2.7'
43
- gemfile: gemfiles/rails_61.gemfile
9
+ ruby_version: [ruby-head, '3.1', '3.0', '2.7', 'jruby']
10
+ rails_version: [edge, '7.0', '6.1', '6.0']
44
11
 
12
+ include:
13
+ - ruby_version: '2.6'
14
+ rails_version: '6.1'
45
15
  - ruby_version: '2.6'
46
- gemfile: gemfiles/rails_61.gemfile
16
+ rails_version: '6.0'
47
17
  - ruby_version: '2.6'
48
- gemfile: gemfiles/rails_52.gemfile
18
+ rails_version: '5.2'
49
19
  - ruby_version: '2.6'
50
- gemfile: gemfiles/rails_51.gemfile
20
+ rails_version: '5.1'
51
21
  - ruby_version: '2.6'
52
- gemfile: gemfiles/rails_50.gemfile
22
+ rails_version: '5.0'
53
23
 
54
24
  - ruby_version: '2.5'
55
- gemfile: gemfiles/rails_61.gemfile
25
+ rails_version: '6.1'
56
26
  - ruby_version: '2.5'
57
- gemfile: gemfiles/rails_52.gemfile
27
+ rails_version: '5.2'
58
28
 
59
29
  - ruby_version: '2.4'
60
- gemfile: gemfiles/rails_52.gemfile
30
+ rails_version: '5.2'
61
31
 
62
32
  - ruby_version: '2.3'
63
- gemfile: gemfiles/rails_52.gemfile
33
+ rails_version: '5.2'
64
34
 
65
35
  - ruby_version: '2.2'
66
- gemfile: gemfiles/rails_42.gemfile
36
+ rails_version: '4.2'
67
37
  - ruby_version: '2.2'
68
- gemfile: gemfiles/rails_41.gemfile
38
+ rails_version: '4.1'
69
39
 
70
40
  - ruby_version: '2.1'
71
- gemfile: gemfiles/rails_42.gemfile
41
+ rails_version: '4.2'
72
42
 
73
43
  runs-on: ubuntu-latest
74
44
 
75
45
  env:
76
- BUNDLE_GEMFILE: ${{ matrix.gemfile }}
46
+ RAILS_VERSION: ${{ matrix.rails_version }}
77
47
 
78
48
  steps:
79
49
  - uses: actions/checkout@v2
@@ -82,7 +52,7 @@ jobs:
82
52
  with:
83
53
  ruby-version: ${{ matrix.ruby_version }}
84
54
  bundler-cache: true
85
- continue-on-error: ${{ matrix.allow_failures == 'true' }}
55
+ continue-on-error: ${{ (matrix.ruby_version == 'ruby-head') || (matrix.ruby_version == 'jruby') || (matrix.rails_version == 'edge') }}
86
56
 
87
57
  - run: bundle exec rake
88
- continue-on-error: ${{ matrix.allow_failures == 'true' }}
58
+ continue-on-error: ${{ (matrix.ruby_version == 'ruby-head') || (matrix.ruby_version == 'jruby') || (matrix.rails_version == 'edge') }}
data/Gemfile CHANGED
@@ -4,3 +4,26 @@ source 'https://rubygems.org'
4
4
 
5
5
  # Specify your gem's dependencies in action_args.gemspec
6
6
  gemspec
7
+
8
+ if ENV['RAILS_VERSION'] == 'edge'
9
+ gem 'rails', git: 'https://github.com/rails/rails.git'
10
+ elsif ENV['RAILS_VERSION']
11
+ gem 'rails', "~> #{ENV['RAILS_VERSION']}.0"
12
+ else
13
+ gem 'rails'
14
+ end
15
+
16
+ rails_version = ENV['RAILS_VERSION'] || '∞'
17
+
18
+ platforms :ruby do
19
+ gem 'sqlite3', rails_version >= '5.1' ? '>= 1.4' : '< 1.4'
20
+ end
21
+ platforms :jruby do
22
+ gem 'activerecord-jdbcsqlite3-adapter'
23
+ end
24
+
25
+ gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
26
+
27
+ gem 'selenium-webdriver' if rails_version >= '6.1'
28
+
29
+ gem 'net-smtp' if RUBY_VERSION >= '3.1'
data/README.md CHANGED
@@ -1,5 +1,5 @@
1
1
  # action_args
2
- [![Build Status](https://github.com/asakusarb/action_args/actions/workflows/main.yml/badge.svg)](https://github.com/asakusarb/action_args/actions/actions)
2
+ [![Build Status](https://github.com/asakusarb/action_args/actions/workflows/main.yml/badge.svg)](https://github.com/asakusarb/action_args/actions)
3
3
 
4
4
  Controller action arguments parameterizer for Rails
5
5
 
data/lib/action_args/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module ActionArgs
4
- VERSION = '2.7.1'
4
+ VERSION = '2.7.2'
5
5
  end
data/lib/generators/rails/templates/api_controller.rb ADDED
@@ -0,0 +1,51 @@
1
+ class <%= controller_class_name %>Controller < ApplicationController
2
+ <% if defined? ActionController::StrongParameters -%>
3
+ permits <%= attributes.map {|a| ":#{a.name}" }.join(', ') %>
4
+
5
+ <% end -%>
6
+ # GET <%= route_url %>
7
+ def index
8
+ @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
9
+
10
+ render json: <%= "@#{plural_table_name}" %>
11
+ end
12
+
13
+ # GET <%= route_url %>/1
14
+ def show(id)
15
+ @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
16
+
17
+ render json: <%= "@#{singular_table_name}" %>
18
+ end
19
+
20
+ # POST <%= route_url %>
21
+ def create(<%= singular_table_name %>)
22
+ @<%= singular_table_name %> = <%= orm_class.build(class_name, singular_table_name) %>
23
+
24
+ if @<%= orm_instance.save %>
25
+ render json: <%= "@#{singular_table_name}" %>, status: :created, location: <%= "@#{singular_table_name}" %>
26
+ else
27
+ render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
28
+ end
29
+ end
30
+
31
+ # PATCH/PUT <%= route_url %>/1
32
+ def update(id, <%= singular_table_name %>)
33
+ @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
34
+
35
+ <% if orm_instance.respond_to? :update -%>
36
+ if @<%= orm_instance.update(singular_table_name) %>
37
+ <% else -%>
38
+ if @<%= orm_instance.update_attributes(singular_table_name) %>
39
+ <% end -%>
40
+ render json: <%= "@#{singular_table_name}" %>
41
+ else
42
+ render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
43
+ end
44
+ end
45
+
46
+ # DELETE <%= route_url %>/1
47
+ def destroy(id)
48
+ @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
49
+ @<%= orm_instance.destroy %>
50
+ end
51
+ end
data/lib/generators/rails/templates/controller.rb CHANGED
@@ -30,11 +30,11 @@ class <%= controller_class_name %>Controller < ApplicationController
30
30
  if @<%= orm_instance.save %>
31
31
  redirect_to @<%= singular_table_name %>, notice: '<%= human_name %> was successfully created.'
32
32
  else
33
- render :new
33
+ render :new, status: :unprocessable_entity
34
34
  end
35
35
  end
36
36
 
37
- # PUT <%= route_url %>/1
37
+ # PATCH/PUT <%= route_url %>/1
38
38
  def update(id, <%= singular_table_name %>)
39
39
  @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
40
40
 
@@ -45,7 +45,7 @@ class <%= controller_class_name %>Controller < ApplicationController
45
45
  <% end -%>
46
46
  redirect_to @<%= singular_table_name %>, notice: '<%= human_name %> was successfully updated.'
47
47
  else
48
- render :edit
48
+ render :edit, status: :unprocessable_entity
49
49
  end
50
50
  end
51
51
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: action_args
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.7.1
4
+ version: 2.7.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Akira Matsuda
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-12-25 00:00:00.000000000 Z
11
+ date: 2022-03-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -67,21 +67,13 @@ files:
67
67
  - README.md
68
68
  - Rakefile
69
69
  - action_args.gemspec
70
- - gemfiles/rails_41.gemfile
71
- - gemfiles/rails_42.gemfile
72
- - gemfiles/rails_50.gemfile
73
- - gemfiles/rails_51.gemfile
74
- - gemfiles/rails_52.gemfile
75
- - gemfiles/rails_60.gemfile
76
- - gemfiles/rails_61.gemfile
77
- - gemfiles/rails_70.gemfile
78
- - gemfiles/rails_edge.gemfile
79
70
  - lib/action_args.rb
80
71
  - lib/action_args/abstract_controller.rb
81
72
  - lib/action_args/callbacks.rb
82
73
  - lib/action_args/params_handler.rb
83
74
  - lib/action_args/version.rb
84
75
  - lib/generators/rails/action_args_scaffold_controller_generator.rb
76
+ - lib/generators/rails/templates/api_controller.rb
85
77
  - lib/generators/rails/templates/controller.rb
86
78
  homepage: http://asakusa.rubyist.net/
87
79
  licenses:
@@ -103,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
103
95
  - !ruby/object:Gem::Version
104
96
  version: '0'
105
97
  requirements: []
106
- rubygems_version: 3.3.0.dev
98
+ rubygems_version: 3.4.0.dev
107
99
  signing_key:
108
100
  specification_version: 4
109
101
  summary: Controller action arguments parameterizer for Rails 4+ & Ruby 2.0+
data/gemfiles/rails_41.gemfile DELETED
@@ -1,16 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- source 'https://rubygems.org'
4
-
5
- gem 'rails', '~> 4.1.0'
6
- gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
7
-
8
- gemspec :path => '../'
9
-
10
- platforms :ruby do
11
- gem 'sqlite3', '~> 1.3.6'
12
- end
13
-
14
- platforms :jruby do
15
- gem 'activerecord-jdbcsqlite3-adapter'
16
- end
data/gemfiles/rails_42.gemfile DELETED
@@ -1,16 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- source 'https://rubygems.org'
4
-
5
- gem 'rails', '~> 4.2.0'
6
- gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
7
-
8
- gemspec :path => '../'
9
-
10
- platforms :ruby do
11
- gem 'sqlite3', '~> 1.3.6'
12
- end
13
-
14
- platforms :jruby do
15
- gem 'activerecord-jdbcsqlite3-adapter'
16
- end
data/gemfiles/rails_50.gemfile DELETED
@@ -1,15 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- source 'https://rubygems.org'
4
-
5
- gem 'rails', '~> 5.0.1'
6
-
7
- gemspec :path => '../'
8
-
9
- platforms :ruby do
10
- gem 'sqlite3', '~> 1.3.6'
11
- end
12
-
13
- platforms :jruby do
14
- gem 'activerecord-jdbcsqlite3-adapter'
15
- end
data/gemfiles/rails_51.gemfile DELETED
@@ -1,15 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- source 'https://rubygems.org'
4
-
5
- gem 'rails', '~> 5.1.0'
6
-
7
- gemspec :path => '../'
8
-
9
- platforms :ruby do
10
- gem 'sqlite3', '~> 1.3.6'
11
- end
12
-
13
- platforms :jruby do
14
- gem 'activerecord-jdbcsqlite3-adapter'
15
- end
data/gemfiles/rails_52.gemfile DELETED
@@ -1,15 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- source 'https://rubygems.org'
4
-
5
- gem 'rails', '~> 5.2.0'
6
-
7
- gemspec :path => '../'
8
-
9
- platforms :ruby do
10
- gem 'sqlite3', '~> 1.3.6'
11
- end
12
-
13
- platforms :jruby do
14
- gem 'activerecord-jdbcsqlite3-adapter'
15
- end
data/gemfiles/rails_60.gemfile DELETED
@@ -1,16 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- source 'https://rubygems.org'
4
-
5
- gem 'rails', '~> 6.0.0'
6
- gem 'selenium-webdriver'
7
-
8
- gemspec path: '../'
9
-
10
- platforms :ruby do
11
- gem 'sqlite3'
12
- end
13
-
14
- platforms :jruby do
15
- gem 'activerecord-jdbcsqlite3-adapter'
16
- end
data/gemfiles/rails_61.gemfile DELETED
@@ -1,16 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- source 'https://rubygems.org'
4
-
5
- gem 'rails', '~> 6.1.0'
6
- gem 'selenium-webdriver'
7
-
8
- gemspec path: '../'
9
-
10
- platforms :ruby do
11
- gem 'sqlite3'
12
- end
13
-
14
- platforms :jruby do
15
- gem 'activerecord-jdbcsqlite3-adapter'
16
- end
data/gemfiles/rails_70.gemfile DELETED
@@ -1,17 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- source 'https://rubygems.org'
4
-
5
- gem 'rails', '~> 7.0.0'
6
- gem 'net-smtp'
7
- gem 'selenium-webdriver'
8
-
9
- gemspec path: '../'
10
-
11
- platforms :ruby do
12
- gem 'sqlite3'
13
- end
14
-
15
- platforms :jruby do
16
- gem 'activerecord-jdbcsqlite3-adapter'
17
- end
data/gemfiles/rails_edge.gemfile DELETED
@@ -1,21 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- source 'https://rubygems.org'
4
- git_source(:github) do |repo_name|
5
- repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
6
- "https://github.com/#{repo_name}.git"
7
- end
8
-
9
- gem 'rails', github: 'rails/rails'
10
- gem 'net-smtp'
11
- gem 'selenium-webdriver'
12
-
13
- gemspec :path => '../'
14
-
15
- platforms :ruby do
16
- gem 'sqlite3'
17
- end
18
-
19
- platforms :jruby do
20
- gem 'activerecord-jdbcsqlite3-adapter'
21
- end