rewrite-tester 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e03d9b04469c37e1360bab69c386edbf104b2773
-  data.tar.gz: 09c41531e7e412eba4b8c0872aeb8a11fd13ee1c
+  metadata.gz: c802a0f6312df1bb99b997bae087306778c85fff
+  data.tar.gz: 700d3dc001faff00de90d2994cbc9bc749a1d9c9
 SHA512:
-  metadata.gz: 4b8f3e9bf1135e3e9de1b8f2ad804f67d5bc16e0cfb1ab5c33fa0af33faa0442dddc4d8275e3cf57a45a3ee3d876e45983026af983e6f75b7d3d2e89e1457819
-  data.tar.gz: ab4d281465f251f24148baa1c810e6ea83eff770a5b19d02fafb8a22ec7254ef6a76944ae1cf19215d8399121e94969b2cd8a0f6c2b16157c6cf75bf6b0e4516
+  metadata.gz: c07c4f3c966d048fe705b16c221e57ff6c94a4a8df29e6de01937775fafc76464f5a2ae45c432f84ce891bc1970fdf47616f92989462f2a948b8bae9a433690d
+  data.tar.gz: 0e4d451fce2db291e9b99ef4ff7771aae7f785723f03e4e18e4bdbdd0419844266eb97c09c3130c705e1c981b4a2a9d142a40ee0ca936c2b9c8ea0e32c3b1650

data/README.md

@@ -1,6 +1,8 @@
 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)
+
 This tool provides Rspec integration tests to test your server's *url rewriting* capabilities given a set of Apache `RewriteRules`.
 
 

data/lib/redirects.rb

@@ -1,17 +1,46 @@
 require 'rewrite_rule'
+require 'rewrite_cond'
 
 class Redirects
 
-  def initialize(io_instance, http_host = 'example.com')
-    @rules = []
+  HTTP_HOST = ENV['HTTP_HOST'] || 'example.com'
+  HTTP_SCHEME = ENV['HTTP_SCHEME'] || 'http://'
 
+  def initialize(io_instance)
+    @rules = []
     unless io_instance.nil?
+
+      conds = []
+
       io_instance.readlines.each do |line|
-        @rules << RewriteRule.new(line, http_host)
+
+        match_data = /RewriteCond/.match(line)
+
+        unless match_data.nil?
+          conds << RewriteCond.new(line)
+          next
+        end
+
+        match_data = /RewriteRule/.match(line)
+
+        unless match_data.nil?
+          @rules << RewriteRule.new(line, conds)
+          conds = []
+          next
+        end
       end
     end
   end
   
-  attr_accessor :rules
+  attr_accessor :rules, :http_host, :http_scheme
+
+  def self.substitute substitute_rule, substituted_data = []
+    substitution = substitute_rule
+    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] || '' }.
+      gsub('%{HTTP_HOST}', HTTP_HOST).
+      gsub('%{HTTP_SCHEME}', HTTP_SCHEME)
+  end
 
 end

data/lib/rewrite_cond.rb

@@ -0,0 +1,17 @@
+class RewriteCond 
+  def initialize(line)
+    @line = line
+    self.parse line
+  end
+
+  def parse(line)
+    match_data = /RewriteCond[ ]+([^ ]+)[ ]+([^ ]+)([ ]+\[([^ ]+)\]\n?)?$/.match(line)
+
+    return if match_data.nil?
+
+    @expression = match_data[1]
+    @compare = match_data[2]
+    @flgas = match_data[3]
+  end
+
+end

data/lib/rewrite_rule.rb

@@ -1,28 +1,26 @@
+require 'redirects'
+
 class RewriteRule
 
   attr_accessor :possibilities, :substitution, :line
 
-  def initialize(line, http_host = 'example.com', http_scheme = 'http://')
+  def initialize(line, conditions = [])
     @line = line
-    @http_host = http_host
-    @http_scheme = http_scheme
+    @conds = conditions
     self.parse line
   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?
 
-    me = self
-
     @regex = match_data[1]
     @possibilities = generate_possibilities @regex
     @substitution = match_data[2]
     @substitutions = @possibilities.map do |possibility|
-      me.send(:substitute, @substitution, possibility[:substituted_data])
+      ::Redirects.substitute @substitution, possibility[:substituted_data]
     end
     @flags = match_data[3].split(',')
 
@@ -37,11 +35,9 @@ class RewriteRule
   end
 
   def redirects
-    me = self
-    
     @substitutions.map.with_index do |substitution, i|
       { 
-        :possibility => me.send(:substitute, @possibilities[i][:request_uri]),
+        :possibility => ::Redirects.substitute(@possibilities[i][:request_uri]),
         :substitution => substitution, 
         :code => redirection_code(@flags)
       }
@@ -61,9 +57,9 @@ class RewriteRule
     until match_data.nil?    
       matched = match_data[1]
       if /\.\*/.match(matched)
-        matched = match_data[0].gsub('.*', generate_random_string(0, 8))
+        matched = matched.gsub('.*', generate_random_string(0, 8))
       elsif /\?$/.match(match_data[0])            
-        matched = rand(2) == 0 ? match_data[1] : ''
+        matched = rand(2) == 0 ? matched : ''
       end
       
       base = base.gsub(match_data[0], matched)
@@ -87,13 +83,4 @@ class RewriteRule
     redirect_regex = /^R=?([0-9]{3})?$/
     redirect_regex.match(flags.detect { |flag| redirect_regex.match(flag) })[1] || '302'
   end
-  
-  def substitute substitute_rule, substituted_data = []
-    substitution = substitute_rule
-    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] || '' }.
-      gsub('%{HTTP_HOST}', @http_host).
-      gsub('%{HTTP_SCHEME}', @http_scheme)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rewrite-tester
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Paul Bonaud
@@ -38,6 +38,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This tool was built to do full integration testing of HTTP requests
 email: paul.bonaud@clicrdv.com
 executables: []
@@ -47,6 +89,7 @@ files:
 - LICENSE
 - README.md
 - lib/redirects.rb
+- lib/rewrite_cond.rb
 - lib/rewrite_rule.rb
 homepage: http://rubygems.org/gems/rewrite-tester
 licenses: