paraphrase 0.11.0 → 0.12.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a1edd35702f438a125a18ad4ad3dd8fc4933c10a
4
- data.tar.gz: f31827e436da49e098499f602d0225428492f73c
3
+ metadata.gz: 19ca3f1e96c0f2ef2d46435233f32a577273b532
4
+ data.tar.gz: 708b0b6de6a4347de81ab1afb83df6856d362616
5
5
  SHA512:
6
- metadata.gz: 3901ba0d17fe8e7ec907c92bc51028f35385c2cd8c9d024c952e1a9d644e7685ed0e8d4f0578b146e952292fbe07364bdf3c3a71e52ac920ed3271626c6c8988
7
- data.tar.gz: 2114539257bc4b5f2bfb3f55d85625530ec8aeb6d71959ec1ad3fc6a43ffb56ad9905827bd3fe35f22519439914bb33c7d05233893ab3af6159719965795fbf4
6
+ metadata.gz: b8769ab377322993110b03c40e38d373598440832e4303695248e750f1fd241f1ea3149dfe6f69d9a6f2b62693823634fa76868c905094fe5227dd4ce32240f5
7
+ data.tar.gz: 65eb9f28a492eeaf5d3d91a55bf5e59ce925023edfb68b0d6471d121c7c49ac58ae4ddf9fb9c856711e442bde3afcee569803b68f0abce94b195641aff3dbdcf
data/.travis.yml CHANGED
@@ -1,7 +1,9 @@
1
+ sudo: false
1
2
  rvm:
2
3
  - 1.9.3
3
4
  - 2.0.0
4
- - 2.1.1
5
+ - 2.1.5
6
+ - 2.2.0
5
7
  - jruby-19mode
6
8
  - rbx-2
7
9
  gemfile:
@@ -9,6 +11,7 @@ gemfile:
9
11
  - gemfiles/3.2.gemfile
10
12
  - gemfiles/4.0.gemfile
11
13
  - gemfiles/4.1.gemfile
14
+ - gemfiles/4.2.gemfile
12
15
  install: 'travis_retry bundle install -j 4'
13
16
  script: 'bundle exec rake'
14
17
  env:
@@ -18,3 +21,8 @@ env:
18
21
  matrix:
19
22
  allow_failures:
20
23
  - rvm: rbx-2
24
+ exclude:
25
+ - rvm: 2.2.0
26
+ gemfile: gemfiles/3.1.gemfile
27
+ - rvm: 2.2.0
28
+ gemfile: gemfiles/3.2.gemfile
data/Appraisals CHANGED
@@ -21,3 +21,9 @@ appraise '4.1' do
21
21
  gem 'activesupport', '~> 4.1.0'
22
22
  gem 'actionpack', '~> 4.1.0'
23
23
  end
24
+
25
+ appraise '4.2' do
26
+ gem 'activerecord', '~> 4.2.0'
27
+ gem 'activesupport', '~> 4.2.0'
28
+ gem 'actionpack', '~> 4.2.0'
29
+ end
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ ## 0.12.0 / 2-7-2015
2
+
3
+ * Add Rails 4.2 support
4
+ * Add `Pararhase::Query#model_name` to support `action_view` 4.2
5
+
1
6
  ## 0.11.0 / 9-17-2014
2
7
 
3
8
  * Enable setting default values in param processors. The following will now
@@ -1,10 +1,10 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- paraphrase (0.11.0)
5
- activemodel (>= 3.1, < 4.2)
6
- activerecord (>= 3.1, < 4.2)
7
- activesupport (>= 3.1, < 4.2)
4
+ paraphrase (0.12.0)
5
+ activemodel (>= 3.1, < 5.0)
6
+ activerecord (>= 3.1, < 5.0)
7
+ activesupport (>= 3.1, < 5.0)
8
8
 
9
9
  GEM
10
10
  remote: https://rubygems.org/
@@ -1,10 +1,10 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- paraphrase (0.11.0)
5
- activemodel (>= 3.1, < 4.2)
6
- activerecord (>= 3.1, < 4.2)
7
- activesupport (>= 3.1, < 4.2)
4
+ paraphrase (0.12.0)
5
+ activemodel (>= 3.1, < 5.0)
6
+ activerecord (>= 3.1, < 5.0)
7
+ activesupport (>= 3.1, < 5.0)
8
8
 
9
9
  GEM
10
10
  remote: https://rubygems.org/
@@ -1,10 +1,10 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- paraphrase (0.11.0)
5
- activemodel (>= 3.1, < 4.2)
6
- activerecord (>= 3.1, < 4.2)
7
- activesupport (>= 3.1, < 4.2)
4
+ paraphrase (0.12.0)
5
+ activemodel (>= 3.1, < 5.0)
6
+ activerecord (>= 3.1, < 5.0)
7
+ activesupport (>= 3.1, < 5.0)
8
8
 
9
9
  GEM
10
10
  remote: https://rubygems.org/
@@ -1,10 +1,10 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- paraphrase (0.11.0)
5
- activemodel (>= 3.1, < 4.2)
6
- activerecord (>= 3.1, < 4.2)
7
- activesupport (>= 3.1, < 4.2)
4
+ paraphrase (0.12.0)
5
+ activemodel (>= 3.1, < 5.0)
6
+ activerecord (>= 3.1, < 5.0)
7
+ activesupport (>= 3.1, < 5.0)
8
8
 
9
9
  GEM
10
10
  remote: https://rubygems.org/
@@ -0,0 +1,9 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "activerecord", "~> 4.2.0"
6
+ gem "activesupport", "~> 4.2.0"
7
+ gem "actionpack", "~> 4.2.0"
8
+
9
+ gemspec :path=>"../"
@@ -0,0 +1,116 @@
1
+ PATH
2
+ remote: ../
3
+ specs:
4
+ paraphrase (0.12.0)
5
+ activemodel (>= 3.1, < 5.0)
6
+ activerecord (>= 3.1, < 5.0)
7
+ activesupport (>= 3.1, < 5.0)
8
+
9
+ GEM
10
+ remote: https://rubygems.org/
11
+ specs:
12
+ actionpack (4.2.0)
13
+ actionview (= 4.2.0)
14
+ activesupport (= 4.2.0)
15
+ rack (~> 1.6.0)
16
+ rack-test (~> 0.6.2)
17
+ rails-dom-testing (~> 1.0, >= 1.0.5)
18
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
19
+ actionview (4.2.0)
20
+ activesupport (= 4.2.0)
21
+ builder (~> 3.1)
22
+ erubis (~> 2.7.0)
23
+ rails-dom-testing (~> 1.0, >= 1.0.5)
24
+ rails-html-sanitizer (~> 1.0, >= 1.0.1)
25
+ activemodel (4.2.0)
26
+ activesupport (= 4.2.0)
27
+ builder (~> 3.1)
28
+ activerecord (4.2.0)
29
+ activemodel (= 4.2.0)
30
+ activesupport (= 4.2.0)
31
+ arel (~> 6.0)
32
+ activesupport (4.2.0)
33
+ i18n (~> 0.7)
34
+ json (~> 1.7, >= 1.7.7)
35
+ minitest (~> 5.1)
36
+ thread_safe (~> 0.3, >= 0.3.4)
37
+ tzinfo (~> 1.1)
38
+ appraisal (0.5.2)
39
+ bundler
40
+ rake
41
+ arel (6.0.0)
42
+ builder (3.2.2)
43
+ codeclimate-test-reporter (0.4.6)
44
+ simplecov (>= 0.7.1, < 1.0.0)
45
+ coderay (1.1.0)
46
+ diff-lcs (1.2.5)
47
+ docile (1.1.5)
48
+ erubis (2.7.0)
49
+ i18n (0.7.0)
50
+ json (1.8.2)
51
+ loofah (2.0.1)
52
+ nokogiri (>= 1.5.9)
53
+ method_source (0.8.2)
54
+ mini_portile (0.6.2)
55
+ minitest (5.5.1)
56
+ multi_json (1.10.1)
57
+ nokogiri (1.6.5)
58
+ mini_portile (~> 0.6.0)
59
+ pry (0.10.1)
60
+ coderay (~> 1.1.0)
61
+ method_source (~> 0.8.1)
62
+ slop (~> 3.4)
63
+ rack (1.6.0)
64
+ rack-test (0.6.3)
65
+ rack (>= 1.0)
66
+ rails-deprecated_sanitizer (1.0.3)
67
+ activesupport (>= 4.2.0.alpha)
68
+ rails-dom-testing (1.0.5)
69
+ activesupport (>= 4.2.0.beta, < 5.0)
70
+ nokogiri (~> 1.6.0)
71
+ rails-deprecated_sanitizer (>= 1.0.1)
72
+ rails-html-sanitizer (1.0.1)
73
+ loofah (~> 2.0)
74
+ rake (0.9.6)
75
+ redcarpet (2.1.1)
76
+ rspec (3.1.0)
77
+ rspec-core (~> 3.1.0)
78
+ rspec-expectations (~> 3.1.0)
79
+ rspec-mocks (~> 3.1.0)
80
+ rspec-core (3.1.7)
81
+ rspec-support (~> 3.1.0)
82
+ rspec-expectations (3.1.2)
83
+ diff-lcs (>= 1.2.0, < 2.0)
84
+ rspec-support (~> 3.1.0)
85
+ rspec-mocks (3.1.3)
86
+ rspec-support (~> 3.1.0)
87
+ rspec-support (3.1.2)
88
+ simplecov (0.9.1)
89
+ docile (~> 1.1.0)
90
+ multi_json (~> 1.0)
91
+ simplecov-html (~> 0.8.0)
92
+ simplecov-html (0.8.0)
93
+ slop (3.6.0)
94
+ sqlite3 (1.3.10)
95
+ thread_safe (0.3.4)
96
+ tzinfo (1.2.2)
97
+ thread_safe (~> 0.1)
98
+ yard (0.8.7.6)
99
+
100
+ PLATFORMS
101
+ ruby
102
+
103
+ DEPENDENCIES
104
+ actionpack (~> 4.2.0)
105
+ activerecord (~> 4.2.0)
106
+ activesupport (~> 4.2.0)
107
+ appraisal (~> 0.4)
108
+ bundler (~> 1.0)
109
+ codeclimate-test-reporter (~> 0.3)
110
+ paraphrase!
111
+ pry (~> 0.9)
112
+ rake (~> 0.9.2)
113
+ redcarpet (~> 2.1.1)
114
+ rspec (~> 3.0)
115
+ sqlite3 (~> 1.3.6)
116
+ yard (~> 0.7)
@@ -22,6 +22,10 @@ module Paraphrase
22
22
  true
23
23
  end
24
24
 
25
+ def model_name
26
+ self.class.model_name
27
+ end
28
+
25
29
  module ClassMethods
26
30
  def model_name
27
31
  ::ActiveModel::Name.new(self, nil, 'Q')
@@ -1,3 +1,3 @@
1
1
  module Paraphrase
2
- VERSION = "0.11.0"
2
+ VERSION = "0.12.0"
3
3
  end
data/paraphrase.gemspec CHANGED
@@ -24,11 +24,11 @@ Gem::Specification.new do |gem|
24
24
 
25
25
  gem.required_ruby_version = '>= 1.9.3'
26
26
 
27
- gem.add_dependency 'activerecord', '>= 3.1', '< 4.2'
28
- gem.add_dependency 'activesupport', '>= 3.1', '< 4.2'
29
- gem.add_dependency 'activemodel', '>= 3.1', '< 4.2'
27
+ gem.add_dependency 'activerecord', '>= 3.1', '< 5.0'
28
+ gem.add_dependency 'activesupport', '>= 3.1', '< 5.0'
29
+ gem.add_dependency 'activemodel', '>= 3.1', '< 5.0'
30
30
 
31
- gem.add_development_dependency 'actionpack', '>= 3.1', '< 4.2'
31
+ gem.add_development_dependency 'actionpack', '>= 3.1', '< 5.0'
32
32
  gem.add_development_dependency 'bundler', '~> 1.0'
33
33
  gem.add_development_dependency 'yard', '~> 0.7'
34
34
  gem.add_development_dependency 'rspec', '~> 3.0'
@@ -184,9 +184,9 @@ module Paraphrase
184
184
  expect(markup).to match(/<select.*name="q\[start_date\(2i\)/)
185
185
  expect(markup).to match(/<select.*name="q\[start_date\(3i\)/)
186
186
 
187
- expect(markup).to match(/<option.*selected="selected" value="2012"/)
188
- expect(markup).to match(/<option.*selected="selected" value="10"/)
189
- expect(markup).to match(/<option.*selected="selected" value="1"/)
187
+ expect(markup).to match(/<option(.*(selected="selected"|value="2012")){2}/)
188
+ expect(markup).to match(/<option(.*(selected="selected"|value="10")){2}/)
189
+ expect(markup).to match(/<option(.*(selected="selected"|value="1")){2}/)
190
190
  end
191
191
  end
192
192
  end
data/spec/spec_helper.rb CHANGED
@@ -30,7 +30,7 @@ ActiveRecord::Schema.define do
30
30
  t.boolean :published
31
31
  t.datetime :published_at
32
32
  t.references :user
33
- t.timestamps
33
+ t.timestamps null: false
34
34
  end
35
35
 
36
36
  create_table :accounts, force: true do |t|
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: paraphrase
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.11.0
4
+ version: 0.12.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Eduardo Gutierrez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-18 00:00:00.000000000 Z
11
+ date: 2015-02-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord
@@ -19,7 +19,7 @@ dependencies:
19
19
  version: '3.1'
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
- version: '4.2'
22
+ version: '5.0'
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
29
29
  version: '3.1'
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
- version: '4.2'
32
+ version: '5.0'
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: activesupport
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
39
39
  version: '3.1'
40
40
  - - "<"
41
41
  - !ruby/object:Gem::Version
42
- version: '4.2'
42
+ version: '5.0'
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
49
49
  version: '3.1'
50
50
  - - "<"
51
51
  - !ruby/object:Gem::Version
52
- version: '4.2'
52
+ version: '5.0'
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: activemodel
55
55
  requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
59
59
  version: '3.1'
60
60
  - - "<"
61
61
  - !ruby/object:Gem::Version
62
- version: '4.2'
62
+ version: '5.0'
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
69
69
  version: '3.1'
70
70
  - - "<"
71
71
  - !ruby/object:Gem::Version
72
- version: '4.2'
72
+ version: '5.0'
73
73
  - !ruby/object:Gem::Dependency
74
74
  name: actionpack
75
75
  requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
79
79
  version: '3.1'
80
80
  - - "<"
81
81
  - !ruby/object:Gem::Version
82
- version: '4.2'
82
+ version: '5.0'
83
83
  type: :development
84
84
  prerelease: false
85
85
  version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
89
89
  version: '3.1'
90
90
  - - "<"
91
91
  - !ruby/object:Gem::Version
92
- version: '4.2'
92
+ version: '5.0'
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: bundler
95
95
  requirement: !ruby/object:Gem::Requirement
@@ -243,6 +243,8 @@ files:
243
243
  - gemfiles/4.0.gemfile.lock
244
244
  - gemfiles/4.1.gemfile
245
245
  - gemfiles/4.1.gemfile.lock
246
+ - gemfiles/4.2.gemfile
247
+ - gemfiles/4.2.gemfile.lock
246
248
  - lib/paraphrase.rb
247
249
  - lib/paraphrase/active_model.rb
248
250
  - lib/paraphrase/mapping.rb
@@ -276,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
276
278
  version: '0'
277
279
  requirements: []
278
280
  rubyforge_project:
279
- rubygems_version: 2.2.2
281
+ rubygems_version: 2.4.2
280
282
  signing_key:
281
283
  specification_version: 4
282
284
  summary: Map query params to model scopes