Skip to content

Commit

Permalink
Merge pull request #130 from gaffneyc/ruby-2-7
Browse files Browse the repository at this point in the history
Fix deprecation warning on Ruby 2.7 and test against on Travis
  • Loading branch information
lightDev0405 authored and lightDev0405 committed May 12, 2020
2 parents 176449a + 6fdc3e4 commit 536ffc3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 15 deletions.
18 changes: 6 additions & 12 deletions .travis.yml
Expand Up @@ -2,15 +2,14 @@ language: ruby
cache: bundler

rvm:
- 2.3
- 2.4
- 2.5
- 2.6
- 2.7

gemfile:
- gemfiles/rails4.2.gemfile
- gemfiles/rails5.1.gemfile
- gemfiles/rails5.2.gemfile
- gemfiles/rails6.0.gemfile
- gemfiles/stripe3.gemfile
- gemfiles/stripe4.gemfile
- gemfiles/stripe5.gemfile
Expand All @@ -19,17 +18,12 @@ matrix:
include:
- rvm: 2.3
gemfile: gemfiles/rails3.2.gemfile
- rvm: 2.5
gemfile: gemfiles/rails6.0.gemfile
- rvm: 2.6
gemfile: gemfiles/rails6.0.gemfile
- rvm: 2.6
gemfile: gemfiles/rails_master.gemfile
exclude:
- rvm: 2.5
- rvm: 2.3
gemfile: gemfiles/rails4.2.gemfile
- rvm: 2.6
- rvm: 2.4
gemfile: gemfiles/rails4.2.gemfile
- rvm: ruby
gemfile: gemfiles/rails_master.gemfile
allow_failures:
- gemfile: gemfiles/rails_master.gemfile
fast_finish: true
Expand Down
6 changes: 4 additions & 2 deletions lib/stripe_event.rb
Expand Up @@ -18,11 +18,13 @@ def instrument(event)
backend.instrument namespace.call(event.type), event if event
end

def subscribe(name, callable = Proc.new)
def subscribe(name, callable = nil, &block)
callable ||= block
backend.subscribe namespace.to_regexp(name), adapter.call(callable)
end

def all(callable = Proc.new)
def all(callable = nil, &block)
callable ||= block
subscribe nil, callable
end

Expand Down
2 changes: 1 addition & 1 deletion stripe_event.gemspec
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "appraisal"
s.add_development_dependency "coveralls"
s.add_development_dependency "rails", [">= 3.1"]
s.add_development_dependency "rake", "< 11.0"
s.add_development_dependency "rake"
s.add_development_dependency "rspec-rails", "~> 3.7"
s.add_development_dependency "webmock", "~> 1.9"
end

0 comments on commit 536ffc3

Please sign in to comment.