rewrite-tester 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c802a0f6312df1bb99b997bae087306778c85fff
-  data.tar.gz: 700d3dc001faff00de90d2994cbc9bc749a1d9c9
+  metadata.gz: 3ae93c1fc9b599befce895a0c47deda08744fb52
+  data.tar.gz: 2f204d38b3584ea62804be58b2e963d5a63f68e2
 SHA512:
-  metadata.gz: c07c4f3c966d048fe705b16c221e57ff6c94a4a8df29e6de01937775fafc76464f5a2ae45c432f84ce891bc1970fdf47616f92989462f2a948b8bae9a433690d
-  data.tar.gz: 0e4d451fce2db291e9b99ef4ff7771aae7f785723f03e4e18e4bdbdd0419844266eb97c09c3130c705e1c981b4a2a9d142a40ee0ca936c2b9c8ea0e32c3b1650
+  metadata.gz: 246a47c50679f2e154b5d4522afa3e88e2e0c104c0df0d0158da5909f4a9244c610301e2c0e844170eb04047740efe5bdf5e5ba0cd7f22a536b068244a2045a8
+  data.tar.gz: ecf1ca0230049cf452674a8e9f9a3aeb17ebfa7c5ba9763a9b5643040274b63f76983696b7c9fa9c71097448eb621d065946dbcb16aaea0a04b1e59307d3f2ba

data/README.md

@@ -1,7 +1,7 @@
 Rewrite Tester
 ===
 
-[![Gem Version](https://badge.fury.io/rb/rewrite-tester.svg)](http://badge.fury.io/rb/rewrite-tester) [![Build Status](https://travis-ci.org/popox/rewrite-tester.svg?branch=master)](https://travis-ci.org/popox/rewrite-tester) [![Coverage Status](https://coveralls.io/repos/popox/rewrite-tester/badge.png?branch=master)](https://coveralls.io/r/popox/rewrite-tester?branch=master) [![Dependency Status](https://gemnasium.com/popox/rewrite-tester.svg)](https://gemnasium.com/popox/rewrite-tester)
+[![Gem Version](https://badge.fury.io/rb/rewrite-tester.svg)](http://badge.fury.io/rb/rewrite-tester) [![Code Climate](https://codeclimate.com/github/popox/rewrite-tester.png)](https://codeclimate.com/github/popox/rewrite-tester) [![Dependency Status](https://gemnasium.com/popox/rewrite-tester.svg)](https://gemnasium.com/popox/rewrite-tester)
 
 This tool provides Rspec integration tests to test your server's *url rewriting* capabilities given a set of Apache `RewriteRules`.
 
@@ -33,6 +33,10 @@ Usage
     $ HTTP_HOST=www.example.com RULES=/path/to//my/rules rake try:redirects
     ```
     
+Build status
+===
+[![Build Status](https://travis-ci.org/popox/rewrite-tester.svg?branch=master)](https://travis-ci.org/popox/rewrite-tester) [![Coverage Status](https://coveralls.io/repos/popox/rewrite-tester/badge.png?branch=master)](https://coveralls.io/r/popox/rewrite-tester?branch=master)
+    
 LICENSE
 ===
 

data/lib/invalid_rule.rb

@@ -0,0 +1,2 @@
+class InvalidRule < Exception  
+end

data/lib/redirects.rb

@@ -8,26 +8,45 @@ class Redirects
 
   def initialize(io_instance)
     @rules = []
+    @untestable_rules = []
     unless io_instance.nil?
 
       conds = []
 
-      io_instance.readlines.each do |line|
+      io_instance.readlines.each.with_index do |line,i|
 
-        match_data = /RewriteCond/.match(line)
+        begin
+          match_data = /^[^#]*RewriteCond/.match(line)
 
-        unless match_data.nil?
-          conds << RewriteCond.new(line)
-          next
-        end
+          unless match_data.nil?
+            conds << RewriteCond.new(line)
+            next
+          end
 
-        match_data = /RewriteRule/.match(line)
+          match_data = /^[^#]*RewriteRule/.match(line)
 
-        unless match_data.nil?
-          @rules << RewriteRule.new(line, conds)
-          conds = []
-          next
+          unless match_data.nil?
+            rule = RewriteRule.new(line, conds)
+            @rules << rule
+            conds = []
+            next
+          end
+        rescue InvalidRule => e
+          raise "\e[41mSyntax error on Line #{i+1}: #{line}\e[49m"
+        rescue Untestable => e
+          @untestable_rules << "(Line #{i+1}) #{/.*(Rewrite.*)/.match(line)[1]}"
         end
+
+      end
+
+      unless @untestable_rules.empty?
+        text = <<EOS
+\e[91m
+Rewriting rule with conditions are not supported (for now..), please check the following rules by hand:
+#{@untestable_rules.join("\n")}
+\e[49m
+EOS
+        puts text
       end
     end
   end
@@ -35,7 +54,9 @@ class Redirects
   attr_accessor :rules, :http_host, :http_scheme
 
   def self.substitute substitute_rule, substituted_data = []
+    return nil if substitute_rule == '-'
     substitution = substitute_rule
+    substitution = "/#{substitution}" if /^(\/|https?:\/\/)/.match(substitution).nil?
     substitution = "#{HTTP_SCHEME}#{HTTP_HOST}#{substitution}" unless /^https?\:\/\//.match(substitution)
     substitution = substitution.
       gsub(/\$[0-9]+?/){ |m| !m.nil? && substituted_data[m[1..-1].to_i-1] || '' }.

data/lib/rewrite_cond.rb

@@ -1,7 +1,11 @@
+require 'invalid_rule'
+
 class RewriteCond 
   def initialize(line)
     @line = line
     self.parse line
+
+    raise InvalidRule.new unless valid?
   end
 
   def parse(line)
@@ -11,7 +15,11 @@ class RewriteCond
 
     @expression = match_data[1]
     @compare = match_data[2]
-    @flgas = match_data[3]
+    @flags = match_data[4].nil? ? nil : match_data[4].split(',')
+  end
+
+  def valid?
+    !@expression.nil? && !@compare.nil?
   end
 
 end

data/lib/rewrite_rule.rb

@@ -1,4 +1,6 @@
 require 'redirects'
+require 'invalid_rule'
+require 'untestable'
 
 class RewriteRule
 
@@ -7,12 +9,16 @@ class RewriteRule
   def initialize(line, conditions = [])
     @line = line
     @conds = conditions
+
     self.parse line
+
+    raise Untestable.new unless @conds.empty?
+    raise InvalidRule.new unless valid?
   end
 
   # Parse an apache RewriteRule and transform it into a Ruby object
   def parse(line)
-    match_data = /RewriteRule[ ]+([^ ]+)[ ]+([^ ]+)[ ]+\[([^ ]+)\](\n)?$/.match(line)
+    match_data = /RewriteRule[ ]+([^ ]+)[ ]+([^ ]+)([ ]+\[([^ ]+)\]\n?)?$/.match(line)
 
     return if match_data.nil?
 
@@ -22,12 +28,12 @@ class RewriteRule
     @substitutions = @possibilities.map do |possibility|
       ::Redirects.substitute @substitution, possibility[:substituted_data]
     end
-    @flags = match_data[3].split(',')
+    @flags = match_data[4].nil? ? nil : match_data[4].split(',')
 
   end
 
   def valid?
-    !@regex.nil? && !@substitution.nil? && !@flags.nil?
+    !@regex.nil? && !@substitution.nil?
   end
 
   def redirection?
@@ -36,35 +42,51 @@ class RewriteRule
 
   def redirects
     @substitutions.map.with_index do |substitution, i|
+      request = ::Redirects.substitute(@possibilities[i][:request_uri])
+      response = substitution.nil? ? request : substitution
       { 
-        :possibility => ::Redirects.substitute(@possibilities[i][:request_uri]),
-        :substitution => substitution, 
+        :possibility => request,
+        :substitution => response,
         :code => redirection_code(@flags)
       }
     end
   end
 
+  def last?
+    !@flags.nil? && @flags.include?('L')
+  end
+
   private
 
   def generate_possibilities regex
     some = []
     base = regex.gsub(/\^|\$/,'')
 
-    # Maybe will generate two possibilities, with and without
-    maybe_regex = /\(([^)^(]+?)\)\??/
-    match_data = maybe_regex.match(base)
+    capture_regex = /\(([^)^(]+?)\)\??/
+    match_data = capture_regex.match(base)
     substituted_data = []
     until match_data.nil?    
       matched = match_data[1]
       if /\.\*/.match(matched)
+        # Match anything -> Replace by a random string
         matched = matched.gsub('.*', generate_random_string(0, 8))
       elsif /\?$/.match(match_data[0])            
+        # Maybe regex -> Replace by match or by empty string
         matched = rand(2) == 0 ? matched : ''
       end
       
       base = base.gsub(match_data[0], matched)
       substituted_data << matched
-      match_data = maybe_regex.match(base) 
+      match_data = capture_regex.match(base)
+    end
+
+    any_regex = /(\.\*)/
+    match_data = any_regex.match(base)
+    until match_data.nil?
+      matched = match_data[1]
+      matched = matched.gsub('.*', generate_random_string(0, 8))
+      base = base.gsub(match_data[0], matched)
+      match_data = any_regex.match(base)
     end
     
     some << {

data/lib/untestable.rb

@@ -0,0 +1,2 @@
+class Untestable < Exception
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rewrite-tester
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Paul Bonaud
@@ -88,9 +88,11 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- lib/invalid_rule.rb
 - lib/redirects.rb
 - lib/rewrite_cond.rb
 - lib/rewrite_rule.rb
+- lib/untestable.rb
 homepage: http://rubygems.org/gems/rewrite-tester
 licenses:
 - MIT