redirect_code_generator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8d40e38556846c2530c58303c51369dc731fd33
-  data.tar.gz: 8cf75b5d12d87525ebf9e0a94cadc26381d060bd
+  metadata.gz: bb3b5ce617aeb53103a1f93dfa01154e46133dde
+  data.tar.gz: 72d48d2b52d6f26f271bbb54dc7b516ed38a7591
 SHA512:
-  metadata.gz: ec79fdc6c0fea74be355f293491a890902459dc0649f13264d251ef15fbf567e77ea0b45fd33df66cf5f339c42f5554f7fe8a8af74fc89843c78aa764af51889
-  data.tar.gz: 7667527be387eb74f9c00d8a441d3c113afbbef034775ccbbd8453b324ed26704796a34ea216c889e0153a2ddb0603fe5d7e2dfe7d7d57bff0605d7bdeea5903
+  metadata.gz: ac183ba6f2af987ccd14f8f987b1992d701d91e37ef3d3f549f3f4ff41599cda43122cd05be778dfd772bcbb9e63b9424979ce715c3de3ba9120fe9db8fa952c
+  data.tar.gz: e4e5d7d585657a69b0348fa4d354b48056f09af721fc94bd7a03964bdc0b5627db0bcf388eda9dec5d3282bb70ccbf48b4e55f850b23e4bd5961aef5c786eb68

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
+/.idea/
 /.yardoc
 /Gemfile.lock
 /_yardoc/

data/README.md

@@ -1,6 +1,6 @@
 # RedirectCodeGenerator
 
-RedirectCodeGenerator creates Apache redirect code
+RedirectCodeGenerator creates Apache redirect code.
 
 [![Build Status](https://travis-ci.org/tsmsogn/redirect_code_generator.svg?branch=master)](https://travis-ci.org/tsmsogn/redirect_code_generator)
 
@@ -11,7 +11,7 @@ $ ./create_apache_redirect_code /old_dir /new_dir
 # 301 /old_dir -> /new_dir
 <IfModule mod_rewrite.c>
     RewriteEngine On
-    RewriteRule ^/old_dir$ /new_dir? [R=301,L]
+    RewriteRule ^/?old_dir$ /new_dir? [R=301,L]
 </IfModule>
 ```
 

data/lib/redirect_code_generator/apache_rewrite_normalize.rb

@@ -0,0 +1,16 @@
+require 'uri'
+
+
+module RedirectCodeGenerator
+  module ApacheRewriteNormalize
+    def to_rewrite_rule_path(path)
+      path.gsub(/^\//, "/?")
+    end
+
+    def escape(str)
+      Regexp.escape(str)
+    end
+
+    module_function :to_rewrite_rule_path, :escape
+  end
+end

data/lib/redirect_code_generator/erb_templates.rb

@@ -2,24 +2,24 @@ module RedirectCodeGenerator
   module ERBTemplates
 
     APACHE = <<CODE
-# <%= permanent? ? 301 : 302 %> <%= old %> -> <%= new %>
+# <%= redirect_http_status_code %> <%= old %> -> <%= new %>
 <IfModule mod_rewrite.c>
     RewriteEngine On
-<% if default_port? && uri.scheme %>
-    RewriteCond %{HTTPS} <% if uri.scheme == 'https'%>on<% else %>off<% end %>
+<% if default_port? && old_uri.scheme %>
+    RewriteCond %{HTTPS} <% if old_uri.scheme == 'https'%>on<% else %>off<% end %>
 <% end %>
-<% if uri.host %>
-    RewriteCond %{HTTP_HOST} ^<%= escape? ? escape(uri.host) : uri.host %>$
+<% if old_uri.host %>
+    RewriteCond %{HTTP_HOST} ^<%= escape? ? escape(old_uri.host) : old_uri.host %>$
 <% end %>
-<% if !default_port? && uri.scheme %>
-    RewriteCond %{SERVER_PORT} <%= uri.port %>
+<% if !default_port? && old_uri.scheme %>
+    RewriteCond %{SERVER_PORT} <%= old_uri.port %>
 <% end %>
-<% if uri.query %>
-<% uri.query.split('&').each do |param| %>
+<% if old_uri.query %>
+<% old_uri.query.split('&').each do |param| %>
     RewriteCond %{QUERY_STRING} (^|&)<%= param %>($|&)
 <% end %>
 <% end %>
-    RewriteRule ^<%= escape? ? escape(uri.path) : uri.path %>$ <%= new %>? [R=<%= permanent? ? 301 : 302 %>,L]
+    RewriteRule ^<%= rewrite_rule_source_path %>$ <%= new %>? [R=<%= redirect_http_status_code %>,L]
 </IfModule>
 CODE
     

data/lib/redirect_code_generator/generator/apache.rb

@@ -1,8 +1,10 @@
 require "redirect_code_generator/generator/generator"
+require "redirect_code_generator/apache_rewrite_normalize"
 
 module RedirectCodeGenerator
   module Generator
     class Apache < Generator
+      include ApacheRewriteNormalize
       attr_reader :old, :new
 
       def initialize(old, new, permanent = true, escape = true)
@@ -14,8 +16,12 @@ module RedirectCodeGenerator
         erb.result(binding)
       end
 
-      def uri
-        @uri ||= URI.parse(@old)
+      def old_uri
+        @old_uri ||= URI.parse(@old)
+      end
+
+      def new_uri
+        @new_uri ||= URI.parse(@new)
       end
 
       def permanent?
@@ -26,10 +32,28 @@ module RedirectCodeGenerator
         @escape
       end
 
+      def rewrite_rule_source_path
+        path = old_uri.path
+        if escape?
+          path = escape(path)
+        end
+
+        to_rewrite_rule_path(path)
+      end
+
+      def redirect_http_status_code
+        case permanent?
+        when true then
+          301
+        when false then
+          302
+        end
+      end
+
       def default_port?
-        if uri.scheme == 'http' && uri.port == 80
+        if old_uri.scheme == 'http' && old_uri.port == 80
           true
-        elsif uri.scheme == 'https' && uri.port == 443
+        elsif old_uri.scheme == 'https' && old_uri.port == 443
           true
         else
           false

data/lib/redirect_code_generator/generator/generator.rb

@@ -1,11 +1,9 @@
 require "uri"
 require "redirect_code_generator/erb_factory"
-require "redirect_code_generator/sanitizer"
 
 module RedirectCodeGenerator
   module Generator
     class Generator
-      include Sanitizer
 
       def initialize(options = {})
       end

data/lib/redirect_code_generator/version.rb

@@ -1,3 +1,3 @@
 module RedirectCodeGenerator
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redirect_code_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - tsmsogn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,12 +72,12 @@ files:
 - bin/setup
 - create_apache_redirect_code
 - lib/redirect_code_generator.rb
+- lib/redirect_code_generator/apache_rewrite_normalize.rb
 - lib/redirect_code_generator/erb_factory.rb
 - lib/redirect_code_generator/erb_templates.rb
 - lib/redirect_code_generator/generator/apache.rb
 - lib/redirect_code_generator/generator/generator.rb
 - lib/redirect_code_generator/generator_factory.rb
-- lib/redirect_code_generator/sanitizer.rb
 - lib/redirect_code_generator/version.rb
 - redirect_code_generator.gemspec
 homepage: https://github.com/tsmsogn/redirect_code_generator

data/lib/redirect_code_generator/sanitizer.rb

@@ -1,7 +0,0 @@
-module RedirectCodeGenerator
-  module Sanitizer
-    def escape(str)
-      Regexp.escape(str)
-    end
-  end
-end