Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pattern matching fix #72

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pattern matching fix #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee7b0c9
have assert fail on 0
frasermince Mar 20, 2015
4d9d8a7
have string_matches return a boolean instead of a fixnum
frasermince Mar 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/rack/rewrite/rule.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ def match(path)

def string_matches?(string, matcher)
if self.is_a_regexp?(matcher)
string =~ matcher
(string =~ matcher) != nil
elsif matcher.is_a?(String)
string == matcher
elsif matcher.is_a?(Symbol)
Expand Down
2 changes: 1 addition & 1 deletion test/rule_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class RuleTest < Test::Unit::TestCase
class RuleTest < ZeroTest

TEST_ROOT = File.dirname(__FILE__)

Expand Down
15 changes: 14 additions & 1 deletion test/test_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,17 @@ def rack_env_for(url, options = {})

def supported_status_codes
[:r301, :r302, :r303, :r307]
end
end

class ZeroTest < Test::Unit::TestCase
def assert(test, msg= nil)
if test.class == Fixnum && test.zero?
super(false)
end
if msg.nil?
super(test)
else
super(test, msg)
end
end
end