state_machines-activemodel 0.6.0 → 0.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +8 -57
  3. data/Appraisals +8 -12
  4. data/LICENSE.txt +1 -1
  5. data/README.md +6 -7
  6. data/gemfiles/active_model_6.0.gemfile +5 -1
  7. data/gemfiles/{active_model_4.1.gemfile → active_model_6.1.gemfile} +2 -2
  8. data/gemfiles/active_model_edge.gemfile +2 -2
  9. data/lib/state_machines/integrations/active_model/version.rb +1 -1
  10. data/lib/state_machines/integrations/active_model.rb +1 -1
  11. data/state_machines-activemodel.gemspec +2 -2
  12. metadata +10 -18
  13. data/gemfiles/active_model_4.2.gemfile +0 -11
  14. data/gemfiles/active_model_5.0.gemfile +0 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6c0c2ff3f596aa6cef5995e482bcebf703eae4a12b69ab74eab03808bd11c6d6
4
- data.tar.gz: f52f715a48845c350ddb25d84ea7a9e17ec9d95ea333cd57c329175cb9dcf01f
3
+ metadata.gz: 4451c4d642636e3d81d9bb608b8dd78cfbd01bf7340989959e12791ec2fd76e0
4
+ data.tar.gz: a7c86d2041b2e8deefdc809831802b413f1e0a8f7fec7aa867fcd54685262f9d
5
5
  SHA512:
6
- metadata.gz: 8585ea04188c0f058c5ac7673ff9df179222c0419a51b9f82d76bf38bd42a25409def954d0bfc2dbf54c2fb24830f02d13ae0307f2879b56c7c36e7aca27c3dd
7
- data.tar.gz: 06e2b22e4c65b8a0f10052d73891b1f54016cb00952829320e65a4ce9ea1fc8fbb0427bff6fbdfb58cd3095e65f4f9a63a775916957d2fb8ca7b89eabc60608c
6
+ metadata.gz: 2fff7546bfd98859e0a8c5e5eb6e97909a4b5d42a3ade4440c8c21bb7728d4257093532a7b63e140c8418682d0da410f657d8a78db48c1bd13cd5f90ef59ff90
7
+ data.tar.gz: 12bdad22386d96dc415f2eea856c5ca1329cb1fd7f213613102b9cfc0cfcb7da550d1548f633771491cd92b8a8491b390952ec44fb62db7e4cfa1f7e395366cc
data/.travis.yml CHANGED
@@ -1,70 +1,21 @@
1
1
  language: ruby
2
- sudo: false
3
2
  cache: bundler
4
3
 
5
4
  rvm:
6
- - 2.1
7
- - 2.2.9
8
- - 2.3.8
9
- - 2.4.6
10
- - 2.5.5
11
- - 2.6.2
5
+ - 2.5.8
6
+ - 2.6.6
7
+ - 2.7.2
12
8
  - jruby
13
9
  - rbx-2
14
10
 
15
11
  gemfile:
16
- - gemfiles/active_model_4.2.gemfile
12
+ - gemfiles/active_model_5.1.gemfile
13
+ - gemfiles/active_model_5.2.gemfile
14
+ - gemfiles/active_model_6.0.gemfile
15
+ - gemfiles/active_model_6.1.gemfile
16
+ - gemfiles/active_model_edge.gemfile
17
17
 
18
18
  matrix:
19
- include:
20
- - gemfile: gemfiles/active_model_4.1.gemfile
21
- rvm: 2.1
22
- - gemfile: gemfiles/active_model_4.1.gemfile
23
- rvm: 2.2.9
24
- - gemfile: gemfiles/active_model_4.1.gemfile
25
- rvm: 2.3.8
26
- - gemfile: gemfiles/active_model_5.0.gemfile
27
- rvm: 2.2.9
28
- - gemfile: gemfiles/active_model_5.0.gemfile
29
- rvm: 2.3.8
30
- - gemfile: gemfiles/active_model_5.0.gemfile
31
- rvm: 2.4.6
32
- - gemfile: gemfiles/active_model_5.0.gemfile
33
- rvm: 2.5.5
34
- - gemfile: gemfiles/active_model_5.0.gemfile
35
- rvm: 2.6.2
36
- - gemfile: gemfiles/active_model_5.1.gemfile
37
- rvm: 2.2.9
38
- - gemfile: gemfiles/active_model_5.1.gemfile
39
- rvm: 2.3.8
40
- - gemfile: gemfiles/active_model_5.1.gemfile
41
- rvm: 2.4.6
42
- - gemfile: gemfiles/active_model_5.1.gemfile
43
- rvm: 2.5.5
44
- - gemfile: gemfiles/active_model_5.1.gemfile
45
- rvm: 2.6.2
46
- - gemfile: gemfiles/active_model_5.2.gemfile
47
- rvm: 2.2.9
48
- - gemfile: gemfiles/active_model_5.2.gemfile
49
- rvm: 2.3.8
50
- - gemfile: gemfiles/active_model_5.2.gemfile
51
- rvm: 2.4.6
52
- - gemfile: gemfiles/active_model_5.2.gemfile
53
- rvm: 2.5.5
54
- - gemfile: gemfiles/active_model_5.2.gemfile
55
- rvm: 2.6.2
56
- - gemfile: gemfiles/active_model_6.0.gemfile
57
- rvm: 2.5.5
58
- - gemfile: gemfiles/active_model_6.0.gemfile
59
- rvm: 2.6.2
60
- - gemfile: gemfiles/active_model_edge.gemfile
61
- rvm: 2.6.2
62
- - gemfile: gemfiles/active_model_edge.gemfile
63
- rvm: 2.5.5
64
19
  allow_failures:
65
20
  - rvm: jruby
66
21
  - rvm: rbx-2
67
- - gemfile: gemfiles/active_model_edge.gemfile
68
- rvm: 2.5.5
69
- - gemfile: gemfiles/active_model_edge.gemfile
70
- rvm: 2.6.2
data/Appraisals CHANGED
@@ -1,16 +1,4 @@
1
1
  # ActiveModel integrations
2
- appraise 'active_model_4.1' do
3
- gem 'activemodel', github: 'rails/rails', branch: '4-1-stable'
4
- end
5
-
6
- appraise 'active_model_4.2' do
7
- gem 'activemodel', github: 'rails/rails', branch: '4-2-stable'
8
- end
9
-
10
- appraise 'active_model_5.0' do
11
- gem 'activemodel', github: 'rails/rails', branch: '5-0-stable'
12
- end
13
-
14
2
  appraise 'active_model_5.1' do
15
3
  gem 'activemodel', github: 'rails/rails', branch: '5-1-stable'
16
4
  end
@@ -19,6 +7,14 @@ appraise 'active_model_5.2' do
19
7
  gem 'activemodel', github: 'rails/rails', branch: '5-2-stable'
20
8
  end
21
9
 
10
+ appraise 'active_model_6.0' do
11
+ gem 'activemodel', github: 'rails/rails', branch: '6-0-stable'
12
+ end
13
+
14
+ appraise 'active_model_6.1' do
15
+ gem 'activemodel', github: 'rails/rails', branch: '6-1-stable'
16
+ end
17
+
22
18
  appraise 'active_model_edge' do
23
19
  gem 'activemodel', github: 'rails/rails', branch: 'master'
24
20
  end
data/LICENSE.txt CHANGED
@@ -1,5 +1,5 @@
1
1
  Copyright (c) 2006-2012 Aaron Pfeifer
2
- Copyright (c) 2014-2015 Abdelkader Boudih
2
+ Copyright (c) 2014-2021 Abdelkader Boudih
3
3
 
4
4
  MIT License
5
5
 
data/README.md CHANGED
@@ -1,5 +1,5 @@
1
- [![Build Status](https://travis-ci.org/state-machines/state_machines-activemodel.svg?branch=master)](https://travis-ci.org/state-machines/state_machines-activemodel)
2
- [![Code Climate](https://codeclimate.com/github/state-machines/state_machines-activemodel.png)](https://codeclimate.com/github/state-machines/state_machines-activemodel)
1
+ [![Build Status](https://travis-ci.com/state-machines/state_machines-activemodel.svg?branch=master)](https://travis-ci.org/state-machines/state_machines-activemodel)
2
+ [![Code Climate](https://codeclimate.com/github/state-machines/state_machines-activemodel.svg)](https://codeclimate.com/github/state-machines/state_machines-activemodel)
3
3
 
4
4
  # StateMachines ActiveModel Integration
5
5
 
@@ -21,6 +21,10 @@ Or install it yourself as:
21
21
 
22
22
  $ gem install state_machines-activemodel
23
23
 
24
+ ## Dependencies
25
+
26
+ Active Model 5.1+
27
+
24
28
  ## Usage
25
29
 
26
30
  ```ruby
@@ -78,11 +82,6 @@ end
78
82
 
79
83
  ```
80
84
 
81
- Dependencies
82
-
83
- Active Model 4.1+
84
-
85
-
86
85
  ## Contributing
87
86
 
88
87
  1. Fork it ( https://github.com/state-machines/state_machines-activemodel/fork )
data/gemfiles/active_model_6.0.gemfile CHANGED
@@ -2,6 +2,10 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
- gem "activemodel", github: "rails/rails", branch: "master"
5
+ gem "activemodel", github: "rails/rails", branch: "6-0-stable"
6
+
7
+ platforms :mri_20, :mri_21 do
8
+ gem "pry-byebug"
9
+ end
6
10
 
7
11
  gemspec path: "../"
data/gemfiles/{active_model_4.1.gemfile → active_model_6.1.gemfile} RENAMED
@@ -2,10 +2,10 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
- gem "activemodel", :github => "rails/rails", :branch => "4-1-stable"
5
+ gem "activemodel", github: "rails/rails", branch: "6-1-stable"
6
6
 
7
7
  platforms :mri_20, :mri_21 do
8
8
  gem "pry-byebug"
9
9
  end
10
10
 
11
- gemspec :path => "../"
11
+ gemspec path: "../"
data/gemfiles/active_model_edge.gemfile CHANGED
@@ -2,10 +2,10 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
- gem "activemodel", :github => "rails/rails", :branch => "master"
5
+ gem "activemodel", github: "rails/rails", branch: "master"
6
6
 
7
7
  platforms :mri_20, :mri_21 do
8
8
  gem "pry-byebug"
9
9
  end
10
10
 
11
- gemspec :path => "../"
11
+ gemspec path: "../"
data/lib/state_machines/integrations/active_model/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module StateMachines
2
2
  module Integrations
3
3
  module ActiveModel
4
- VERSION = '0.6.0'
4
+ VERSION = '0.8.0'
5
5
  end
6
6
  end
7
7
  end
data/lib/state_machines/integrations/active_model.rb CHANGED
@@ -380,7 +380,7 @@ module StateMachines
380
380
  end
381
381
 
382
382
  default_options = default_error_message_options(object, attribute, message)
383
- object.errors.add(attribute, message, options.merge(default_options))
383
+ object.errors.add(attribute, message, **options, **default_options)
384
384
  end
385
385
  end
386
386
 
data/state_machines-activemodel.gemspec CHANGED
@@ -16,9 +16,9 @@ Gem::Specification.new do |spec|
16
16
  spec.files = `git ls-files -z`.split("\x0")
17
17
  spec.test_files = spec.files.grep(/^test\//)
18
18
  spec.require_paths = ['lib']
19
- spec.required_ruby_version = '>= 2.0.0'
19
+ spec.required_ruby_version = '>= 2.2.2'
20
20
  spec.add_dependency 'state_machines', '>= 0.5.0'
21
- spec.add_dependency 'activemodel', '>= 4.1', '< 6.0'
21
+ spec.add_dependency 'activemodel', '>= 5.1'
22
22
 
23
23
  spec.add_development_dependency 'bundler', '>= 1.6'
24
24
  spec.add_development_dependency 'rake', '>= 10'
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: state_machines-activemodel
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Abdelkader Boudih
8
8
  - Aaron Pfeifer
9
- autorequire:
9
+ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2019-04-09 00:00:00.000000000 Z
12
+ date: 2020-12-31 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: state_machines
@@ -31,20 +31,14 @@ dependencies:
31
31
  requirements:
32
32
  - - ">="
33
33
  - !ruby/object:Gem::Version
34
- version: '4.1'
35
- - - "<"
36
- - !ruby/object:Gem::Version
37
- version: '6.0'
34
+ version: '5.1'
38
35
  type: :runtime
39
36
  prerelease: false
40
37
  version_requirements: !ruby/object:Gem::Requirement
41
38
  requirements:
42
39
  - - ">="
43
40
  - !ruby/object:Gem::Version
44
- version: '4.1'
45
- - - "<"
46
- - !ruby/object:Gem::Version
47
- version: '6.0'
41
+ version: '5.1'
48
42
  - !ruby/object:Gem::Dependency
49
43
  name: bundler
50
44
  requirement: !ruby/object:Gem::Requirement
@@ -130,12 +124,10 @@ files:
130
124
  - LICENSE.txt
131
125
  - README.md
132
126
  - Rakefile
133
- - gemfiles/active_model_4.1.gemfile
134
- - gemfiles/active_model_4.2.gemfile
135
- - gemfiles/active_model_5.0.gemfile
136
127
  - gemfiles/active_model_5.1.gemfile
137
128
  - gemfiles/active_model_5.2.gemfile
138
129
  - gemfiles/active_model_6.0.gemfile
130
+ - gemfiles/active_model_6.1.gemfile
139
131
  - gemfiles/active_model_edge.gemfile
140
132
  - lib/state_machines-activemodel.rb
141
133
  - lib/state_machines/integrations/active_model.rb
@@ -171,7 +163,7 @@ homepage: https://github.com/state-machines/state_machines-activemodel
171
163
  licenses:
172
164
  - MIT
173
165
  metadata: {}
174
- post_install_message:
166
+ post_install_message:
175
167
  rdoc_options: []
176
168
  require_paths:
177
169
  - lib
@@ -179,15 +171,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
179
171
  requirements:
180
172
  - - ">="
181
173
  - !ruby/object:Gem::Version
182
- version: 2.0.0
174
+ version: 2.2.2
183
175
  required_rubygems_version: !ruby/object:Gem::Requirement
184
176
  requirements:
185
177
  - - ">="
186
178
  - !ruby/object:Gem::Version
187
179
  version: '0'
188
180
  requirements: []
189
- rubygems_version: 3.0.1
190
- signing_key:
181
+ rubygems_version: 3.0.3
182
+ signing_key:
191
183
  specification_version: 4
192
184
  summary: ActiveModel integration for State Machines
193
185
  test_files:
data/gemfiles/active_model_4.2.gemfile DELETED
@@ -1,11 +0,0 @@
1
- # This file was generated by Appraisal
2
-
3
- source "https://rubygems.org"
4
-
5
- gem "activemodel", :github => "rails/rails", :branch => "4-2-stable"
6
-
7
- platforms :mri_20, :mri_21 do
8
- gem "pry-byebug"
9
- end
10
-
11
- gemspec :path => "../"
data/gemfiles/active_model_5.0.gemfile DELETED
@@ -1,11 +0,0 @@
1
- # This file was generated by Appraisal
2
-
3
- source "https://rubygems.org"
4
-
5
- gem "activemodel", :github => "rails/rails", :branch => "5-0-stable"
6
-
7
- platforms :mri_20, :mri_21 do
8
- gem "pry-byebug"
9
- end
10
-
11
- gemspec :path => "../"