Skip to content

Commit 44bc207

Browse files
Require Rails 5+ and Ruby 2.2+
1 parent 2bb1eac commit 44bc207

7 files changed

+16
-47
lines changed

.travis.yml

-20
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,14 @@ rvm:
1616
- rbx-3.107
1717

1818
gemfile:
19-
- gemfiles/rails_4_2.gemfile
2019
- gemfiles/rails_5_0.gemfile
2120
- gemfiles/rails_5_1.gemfile
2221
- gemfiles/rails_5_2.gemfile
2322
- gemfiles/rails_6_0.gemfile
2423
- gemfiles/rails_head.gemfile
2524

2625
matrix:
27-
include:
28-
- rvm: 1.9
29-
gemfile: gemfiles/rails_4_2.gemfile
30-
- rvm: 2.0
31-
gemfile: gemfiles/rails_4_2.gemfile
32-
- rvm: 2.1
33-
gemfile: gemfiles/rails_4_2.gemfile
34-
- rvm: 2.3
35-
gemfile: gemfiles/rails_4_2.gemfile
36-
- rvm: jruby-19mode
37-
gemfile: gemfiles/rails_4_2.gemfile
38-
- rvm: rbx-3.107
39-
gemfile: gemfiles/rails_4_2.gemfile
4026
exclude:
41-
- rvm: 2.4.6
42-
gemfile: gemfiles/rails_4_2.gemfile
43-
- rvm: 2.5.5
44-
gemfile: gemfiles/rails_4_2.gemfile
45-
- rvm: 2.6.2
46-
gemfile: gemfiles/rails_4_2.gemfile
4727
- rvm: 2.2.10
4828
gemfile: gemfiles/rails_6_0.gemfile
4929
- rvm: 2.3.8

Appraisals

+7-13
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
appraise "rails-4-2" do
2-
gem "rails", "~> 4.2.0"
1+
appraise "rails-5-0" do
2+
gem "rails", "~> 5.0.0"
33
end
44

5-
if RUBY_VERSION >= "2.2.2"
6-
appraise "rails-5-0" do
7-
gem "rails", "~> 5.0.0"
8-
end
9-
10-
appraise "rails-5-1" do
11-
gem "rails", "~> 5.1.0"
12-
end
5+
appraise "rails-5-1" do
6+
gem "rails", "~> 5.1.0"
7+
end
138

14-
appraise "rails-5-2" do
15-
gem "rails", "~> 5.2.0"
16-
end
9+
appraise "rails-5-2" do
10+
gem "rails", "~> 5.2.0"
1711
end
1812

1913
if RUBY_VERSION >= "2.5.0"

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
Unreleased
4+
----------
5+
6+
* Requires Rails 5+ and Ruby 2.2+
7+
38
2.9.1
49
-----
510

gemfiles/rails_4_2.gemfile

-10
This file was deleted.

jbuilder.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
77
s.homepage = 'https://github.com/rails/jbuilder'
88
s.license = 'MIT'
99

10-
s.required_ruby_version = '>= 1.9.3'
10+
s.required_ruby_version = '>= 2.2.2'
1111

12-
s.add_dependency 'activesupport', '>= 4.2.0'
12+
s.add_dependency 'activesupport', '>= 5.0.0'
1313

1414
s.files = `git ls-files`.split("\n")
1515
s.test_files = `git ls-files -- test/*`.split("\n")

lib/jbuilder.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def child!
163163
#
164164
# [ { "name": David", "age": 32 }, { "name": Jamie", "age": 31 } ]
165165
#
166-
# If you are using Ruby 1.9+, you can use the call syntax instead of an explicit extract! call:
166+
# You can use the call syntax instead of an explicit extract! call:
167167
#
168168
# json.(@people) { |person| ... }
169169
#

test/jbuilder_test.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class JbuilderTest < ActiveSupport::TestCase
9999
assert_equal 32, result['age']
100100
end
101101

102-
test 'extracting from object using call style for 1.9' do
102+
test 'extracting from object using call style' do
103103
person = Struct.new(:name, :age).new('David', 32)
104104

105105
result = jbuild do |json|

0 commit comments

Comments
 (0)