rewrite-tester 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 763e235adb195c5ca273470564ebd7b0d9c484b9
-  data.tar.gz: e94fe3e995481687c8a7d229d4857c8a2d18a2b3
+  metadata.gz: e03d9b04469c37e1360bab69c386edbf104b2773
+  data.tar.gz: 09c41531e7e412eba4b8c0872aeb8a11fd13ee1c
 SHA512:
-  metadata.gz: 860246b0af05c765a004a38950c2795d5d62f72b0b8c2526469ec99cbfb759a2fefcf0daf443bbbf17047e5db9854b0552a34bef7a9e8e77f2e89f1aa75b75f4
-  data.tar.gz: d973871a71c7d4f1190fda33926b2eecce77d7c45a33d7d4d3241bd4101eb1938bb86801053258394e269d3d41e84c8bf437a95334280efdbddfc88e0752feff
+  metadata.gz: 4b8f3e9bf1135e3e9de1b8f2ad804f67d5bc16e0cfb1ab5c33fa0af33faa0442dddc4d8275e3cf57a45a3ee3d876e45983026af983e6f75b7d3d2e89e1457819
+  data.tar.gz: ab4d281465f251f24148baa1c810e6ea83eff770a5b19d02fafb8a22ec7254ef6a76944ae1cf19215d8399121e94969b2cd8a0f6c2b16157c6cf75bf6b0e4516

data/README.md

@@ -13,24 +13,24 @@ Usage
 
     - Clone the repository and use the default rake task to run the tests. You will need to give the absolute path of a file containing a list of `RewriteRules` through a `RULES` env variable. Additionally you will need to provide a `HTTP_HOST` env variable, containing the host that you are testing against.
 
-    `bash
-    $ HTTP_HOST=www.example.com RULES=/path/to//my/rules rake
-    `
-
+    ```bash
+    $ HTTP_HOST=www.example.com RULES=/path/to//my/rules rake try:redirects
+    ```
+    
 - From your project
 
     - Include the gem in your `Gemfile`
 
-    `ruby
+    ```ruby
     gem 'rewrite-tester'
-    `
+    ```
 
     - Use the `test:redirects` rake task by giving a absolute file path to the `RULES` env variable.
 
-    `bash
-    $ HTTP_HOST=www.example.com RULES=/path/to//my/rules rake test:redirects
-    `
-
+    ```bash
+    $ HTTP_HOST=www.example.com RULES=/path/to//my/rules rake try:redirects
+    ```
+    
 LICENSE
 ===
 

data/lib/redirects.rb

@@ -11,17 +11,7 @@ class Redirects
       end
     end
   end
-
-  # Increments the rul reading
-  def has_next?
-    !@rules.empty?
-  end
-
-  # Returns a rule
-  def next
-    @rules.pop
-  end
-
+  
   attr_accessor :rules
 
 end

data/lib/rewrite_rule.rb

@@ -16,9 +16,14 @@ class RewriteRule
 
     return if match_data.nil?
 
+    me = self
+
     @regex = match_data[1]
     @possibilities = generate_possibilities @regex
-    @substitution = substitute match_data[2]
+    @substitution = match_data[2]
+    @substitutions = @possibilities.map do |possibility|
+      me.send(:substitute, @substitution, possibility[:substituted_data])
+    end
     @flags = match_data[3].split(',')
 
   end
@@ -32,43 +37,62 @@ class RewriteRule
   end
 
   def redirects
-    @possibilities.map { |possibility|
-      { possibility => { :substitution => @substitution, :code => redirection_code(@flags) } }
-    }
+    me = self
+    
+    @substitutions.map.with_index do |substitution, i|
+      { 
+        :possibility => me.send(:substitute, @possibilities[i][:request_uri]),
+        :substitution => substitution, 
+        :code => redirection_code(@flags)
+      }
+    end
   end
 
+  private
+
   def generate_possibilities regex
     some = []
     base = regex.gsub(/\^|\$/,'')
 
     # Maybe will generate two possibilities, with and without
-    maybe_regex = /\(([^*+]+)\)\?/
+    maybe_regex = /\(([^)^(]+?)\)\??/
     match_data = maybe_regex.match(base)
-    if match_data.nil?
-      some << base
-    else
-      some << base.gsub(match_data[0], match_data[1])
-      some << base.gsub(match_data[0], '')
+    substituted_data = []
+    until match_data.nil?    
+      matched = match_data[1]
+      if /\.\*/.match(matched)
+        matched = match_data[0].gsub('.*', generate_random_string(0, 8))
+      elsif /\?$/.match(match_data[0])            
+        matched = rand(2) == 0 ? match_data[1] : ''
+      end
+      
+      base = base.gsub(match_data[0], matched)
+      substituted_data << matched
+      match_data = maybe_regex.match(base) 
     end
-
-    # Anything will be replaced by nothing
-    some.map { |possibility|
-      "#{@http_scheme}#{@http_host}#{possibility.gsub('(.*)', '')}"
+    
+    some << {
+      :request_uri => "#{base}",
+      :substituted_data => substituted_data
     }
   end
   
-  private
+  # Generate a string containing downcase letters, with a random length included
+  # between min and max
+  def generate_random_string min, max
+    (min...rand(max)).map { (97 + rand(26)).chr }.join
+  end
   
   def redirection_code flags
     redirect_regex = /^R=?([0-9]{3})?$/
     redirect_regex.match(flags.detect { |flag| redirect_regex.match(flag) })[1] || '302'
   end
   
-  def substitute substitute_rule
+  def substitute substitute_rule, substituted_data = []
     substitution = substitute_rule
-    substitution = "#{@http_scheme}#{@http_host}#{substitution}" if /^\//.match(substitution)
+    substitution = "#{@http_scheme}#{@http_host}#{substitution}" unless /^https?\:\/\//.match(substitution)
     substitution = substitution.      
-      gsub(/\$[0-9]+/, '').
+      gsub(/\$[0-9]+?/){ |m| !m.nil? && substituted_data[m[1..-1].to_i] || '' }.
       gsub('%{HTTP_HOST}', @http_host).
       gsub('%{HTTP_SCHEME}', @http_scheme)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rewrite-tester
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Paul Bonaud