rack-rewrite 1.3.2 → 1.3.3

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

data/lib/rack/rewrite/rule.rb

@@ -11,18 +11,18 @@ module Rack
       protected
         # We're explicitly defining private functions for our DSL rather than
         # using method_missing
-        
+
         # Creates a rewrite rule that will simply rewrite the REQUEST_URI,
-        # PATH_INFO, and QUERY_STRING headers of the Rack environment.  The 
+        # PATH_INFO, and QUERY_STRING headers of the Rack environment.  The
         # user's browser will continue to show the initially requested URL.
-        # 
+        #
         #  rewrite '/wiki/John_Trupiano', '/john'
         #  rewrite %r{/wiki/(\w+)_\w+}, '/$1'
         #  rewrite %r{(.*)}, '/maintenance.html', :if => lambda { File.exists?('maintenance.html') }
         def rewrite(*args)
           add_rule :rewrite, *args
         end
-        
+
         # Creates a redirect rule that will send a 301 when matching.
         #
         #  r301 '/wiki/John_Trupiano', '/john'
@@ -32,10 +32,10 @@ module Rack
         def r301(*args)
           add_rule :r301, *args
         end
-        
+
         alias :moved_permanently :r301
         alias :p :r301
-        
+
         # Creates a redirect rule that will send a 302 when matching.
         #
         #  r302 '/wiki/John_Trupiano', '/john'
@@ -45,9 +45,9 @@ module Rack
         def r302(*args)
           add_rule :r302, *args
         end
-        
+
         alias :found :r302
-        
+
         # Creates a redirect rule that will send a 303 when matching.
         #
         #  r303 '/wiki/John_Trupiano', '/john'
@@ -57,9 +57,9 @@ module Rack
         def r303(*args)
           add_rule :r303, *args
         end
-        
+
         alias :see_other :r303
-        
+
         # Creates a redirect rule that will send a 307 when matching.
         #
         #  r307 '/wiki/John_Trupiano', '/john'
@@ -69,32 +69,32 @@ module Rack
         def r307(*args)
           add_rule :r307, *args
         end
-        
+
         alias :temporary_redirect :r307
         alias :t :r307
-        
+
         # Creates a rule that will render a file if matched.
         #
-        #  send_file /*/, 'public/system/maintenance.html', 
+        #  send_file /*/, 'public/system/maintenance.html',
         #    :if => Proc.new { File.exists?('public/system/maintenance.html') }
         def send_file(*args)
           add_rule :send_file, *args
         end
-        
+
         # Creates a rule that will render a file using x-send-file
         # if matched.
         #
-        #  x_send_file /*/, 'public/system/maintenance.html', 
+        #  x_send_file /*/, 'public/system/maintenance.html',
         #    :if => Proc.new { File.exists?('public/system/maintenance.html') }
         def x_send_file(*args)
           add_rule :x_send_file, *args
         end
-        
+
       private
         def add_rule(method, from, to, options = {}) #:nodoc:
           @rules << Rule.new(method.to_sym, from, to, options)
         end
-        
+
     end
 
     # TODO: Break rules into subclasses
@@ -107,7 +107,7 @@ module Rack
       def matches?(rack_env) #:nodoc:
         return false if options[:if].respond_to?(:call) && !options[:if].call(rack_env)
         path = build_path_from_env(rack_env)
-        
+
         self.match_options?(rack_env) && string_matches?(path, self.from)
       end
 
@@ -123,6 +123,7 @@ module Rack
             additional_headers = @options[:headers] || {}
           end
         end
+        status = @options[:status] || 200
         case self.rule_type
         when :r301
           [301, {'Location' => interpreted_to, 'Content-Type' => Rack::Mime.mime_type(::File.extname(interpreted_to))}.merge!(additional_headers), [redirect_message(interpreted_to)]]
@@ -144,12 +145,12 @@ module Rack
           end
           true
         when :send_file
-          [200, {
+          [status, {
             'Content-Length' => ::File.size(interpreted_to).to_s,
             'Content-Type'   => Rack::Mime.mime_type(::File.extname(interpreted_to))
             }.merge!(additional_headers), [::File.read(interpreted_to)]]
         when :x_send_file
-          [200, {
+          [status, {
             'X-Sendfile'     => interpreted_to,
             'Content-Length' => ::File.size(interpreted_to).to_s,
             'Content-Type'   => Rack::Mime.mime_type(::File.extname(interpreted_to))
@@ -158,7 +159,7 @@ module Rack
           raise Exception.new("Unsupported rule: #{self.rule_type}")
         end
       end
-      
+
       protected
         def interpret_to(env) #:nodoc:
           path = build_path_from_env(env)
@@ -166,32 +167,33 @@ module Rack
           return computed_to(path) if compute_to?(path)
           self.to
         end
-        
+
         def is_a_regexp?(obj)
           obj.is_a?(Regexp) || (Object.const_defined?(:Oniguruma) && obj.is_a?(Oniguruma::ORegexp))
         end
-        
+
         def match_options?(env, path = build_path_from_env(env))
           matches = []
           request = Rack::Request.new(env)
 
           # negative matches
           matches << !string_matches?(path, options[:not]) if options[:not]
-          
+
           # possitive matches
           matches << string_matches?(env['REQUEST_METHOD'], options[:method]) if options[:method]
           matches << string_matches?(request.host, options[:host]) if options[:host]
-          
+          matches << string_matches?(request.scheme, options[:scheme]) if options[:scheme]
+
           matches.all?
         end
-        
+
       private
         def normalize_options(arg)
           options = arg.respond_to?(:call) ? {:if => arg} : arg
           options.symbolize_keys! if options.respond_to? :symbolize_keys!
           options.freeze
         end
-      
+
         def interpret_to_proc(path, env)
           return self.to.call(match(path), env) if self.from.is_a?(Regexp)
           self.to.call(self.from, env)
@@ -201,15 +203,17 @@ module Rack
           self.is_a_regexp?(from) && match(path)
         end
 
-        def match(path) 
+        def match(path)
           self.from.match(path)
         end
-        
+
         def string_matches?(string, matcher)
           if self.is_a_regexp?(matcher)
             string =~ matcher
           elsif matcher.is_a?(String)
             string == matcher
+          elsif matcher.is_a?(Symbol)
+            string.downcase == matcher.to_s.downcase
           else
             false
           end
@@ -224,14 +228,14 @@ module Rack
           end
           return computed_to
         end
-        
+
         # Construct the URL (without domain) from PATH_INFO and QUERY_STRING
         def build_path_from_env(env)
-          path = env['PATH_INFO']
+          path = env['PATH_INFO'] || ''
           path += "?#{env['QUERY_STRING']}" unless env['QUERY_STRING'].nil? || env['QUERY_STRING'].empty?
           path
         end
-        
+
         def redirect_message(location)
           %Q(Redirecting to <a href="#{location}">#{location}</a>)
         end

data/rack-rewrite.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "Gemfile",
-    "Gemfile.lock",
     "lib/rack-rewrite.rb",
     "lib/rack/rewrite.rb",
     "lib/rack/rewrite/rule.rb",

data/test/rule_test.rb

@@ -185,6 +185,16 @@ class RuleTest < Test::Unit::TestCase
         assert_equal [File.read(@file)], @response[2]
       end
     end
+
+    should 'return proper status for send_file or x_send_file if specified' do
+      [:send_file, :x_send_file].each do |rule_type|
+        file = File.join(TEST_ROOT, 'geminstaller.yml')
+        rule = Rack::Rewrite::Rule.new(rule_type, /.*/, file, :status => 503)
+        env = {'PATH_INFO' => '/abc'}
+        assert_equal 503, rule.apply!(env)[0]
+      end
+    end
+
   end
   
   context 'Rule#matches' do
@@ -254,9 +264,17 @@ class RuleTest < Test::Unit::TestCase
       end
     end
     
-    should 'match with the ^ operator for regexps' do
-      rule = Rack::Rewrite::Rule.new(:rewrite, %r{^/jason}, '/steve')
-      assert rule.matches?(rack_env_for('/jason'))
+    context 'Given a rule with the ^ operator' do
+      setup do
+        @rule = Rack::Rewrite::Rule.new(:rewrite, %r{^/jason}, '/steve')
+      end
+      should 'match with the ^ operator if match is at the beginning of the path' do
+        assert @rule.matches?(rack_env_for('/jason'))
+      end
+    
+      should 'not match with the ^ operator when match is deeply nested' do
+        assert !@rule.matches?(rack_env_for('/foo/bar/jason'))
+      end
     end
         
     context 'Given any rule with a "from" regular expression of /features(.*)' do
@@ -397,6 +415,13 @@ class RuleTest < Test::Unit::TestCase
     end
   end
   
+  context 'Mongel 1.2.0.pre2 edge case: root url with a query string' do
+    should 'handle a nil PATH_INFO variable without errors' do
+      rule = Rack::Rewrite::Rule.new(:r301, '/a', '/')
+      assert_equal '?exists', rule.send(:build_path_from_env, {'QUERY_STRING' => 'exists'})
+    end
+  end
+  
   def rack_env_for(url, options = {})
     components = url.split('?')
     {'PATH_INFO' => components[0], 'QUERY_STRING' => components[1] || ''}.merge(options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-rewrite
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,6 @@ files:
 - Rakefile
 - VERSION
 - Gemfile
-- Gemfile.lock
 - lib/rack-rewrite.rb
 - lib/rack/rewrite.rb
 - lib/rack/rewrite/rule.rb

data/Gemfile.lock

@@ -1,23 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rack-rewrite (1.3.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    mocha (0.9.12)
-    rack (1.4.1)
-    rake (10.0.2)
-    shoulda (2.10.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  mocha (~> 0.9.7)
-  rack
-  rack-rewrite!
-  rake
-  shoulda (~> 2.10.2)