Skip to content

Commit 36a2fb9

Browse files
authored
Merge pull request #39 from AngelList/fix_ruby_2_4_deprecations
support ruby 2.4.3
2 parents f0bb6e4 + e7b048c commit 36a2fb9

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ language: ruby
22
cache: bundler
33
rvm:
44
- 2.2.2
5+
- 2.4.3
56
gemfile:
67
- Gemfile
78
- gemfiles/Gemfile.rails-3.2
89
- gemfiles/Gemfile.rails-4
10+
- gemfiles/Gemfile.rails-5

lib/protip/decorator.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,15 @@ def to_protobuf_value(field, value)
249249
transformer.to_message(value, field)
250250
end
251251
elsif field.type == :enum
252-
value.is_a?(Fixnum) ? value : value.to_sym
252+
value.is_a?(1.class) ? value : value.to_sym
253253
else
254254
value
255255
end
256256
end
257257

258258
def matches?(field, value)
259259
enum = Protip::Decorator.enum_for_field(field)
260-
if value.is_a?(Fixnum)
260+
if value.is_a?(1.class)
261261
sym = enum.lookup_value(value)
262262
else
263263
sym = value.to_sym

lib/protip/transformers/enum_transformer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def enum_for_field(field)
4040
# // ScalarTransformer.to_int(:BAZ) # => 1
4141
# // ScalarTransformer.to_int(4) # => 4
4242
def to_int(symbol_or_int, field)
43-
if symbol_or_int.is_a?(Fixnum)
43+
if symbol_or_int.is_a?(1.class)
4444
symbol_or_int
4545
else
4646
# Convert +.to_sym+ explicitly to allow strings (or other

protip.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# encoding: utf-8
22
Gem::Specification.new do |spec|
33
spec.name = 'protip'
4-
spec.version = '0.31.2'
4+
spec.version = '0.32.0'
55
spec.summary = 'Relatively painless protocol buffers in Ruby.'
66
spec.licenses = ['MIT']
77
spec.homepage = 'https://github.com/AngelList/protip'
@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
2828
spec.add_development_dependency 'rake', '~> 10.0'
2929
spec.add_development_dependency 'simplecov', '~> 0.10'
3030
spec.add_development_dependency 'pry', '~> 0.10'
31-
spec.add_development_dependency 'webmock', '~> 1.20'
31+
spec.add_development_dependency 'webmock', '~> 3.3.0'
3232
end

test/unit/protip/decorator_test.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ class << self
592592
end
593593
end
594594

595-
describe 'when given a Fixnum' do
595+
describe 'when given a Fixnum/Integer' do
596596
before do
597597
decorator.number = :ONE
598598
end
@@ -609,7 +609,7 @@ class << self
609609
end
610610
end
611611

612-
describe 'when given a non-Fixnum' do
612+
describe 'when given a non-Fixnum/Integer' do
613613
before do
614614
decorator.number = :TWO
615615
end
@@ -656,7 +656,7 @@ class << self
656656
refute decorator.number_message?(m)
657657
end
658658

659-
it 'returns true when a Fixnum argument matches the value' do
659+
it 'returns true when a Fixnum/Integer argument matches the value' do
660660
assert decorator.number_message?(1)
661661
end
662662

0 commit comments

Comments
 (0)