rack-joint 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 595e4f24147babd3c40fdd8318a486b993af80433773a9c8fbc2677d2a9e7705
-  data.tar.gz: 24f53761060d9b6da3ad8c4196bf7776993605eb803b5c3e0b501988360291a1
+  metadata.gz: f3e792eebe6018b20bcfcd52b8585ed66527ef3f726d66c262870713de146734
+  data.tar.gz: 637b67d842b4a9d8fd1ad282eb411d2d643e939bc06fd870f268d9e44dccdf0e
 SHA512:
-  metadata.gz: a92a6fb727c0b8a52af9794e2c50f6fb313ea5b78a761273db5404994047548ef25b117e109c28358d52e455031ddfd395e80b92f1d4afae97b9a33ead8c06ed
-  data.tar.gz: '0807958e81e2df1b34def393de3e9ebffae85cee215e21e6697f28f0783d78335470605bc3afeeacf528227b663169ddb8d0db341146fb36f251d1ba80101a14'
+  metadata.gz: 8a4903e59817ca4e4bdb9a0a8beb65e31a152dd36f575fb9f53f45b52863e01afe126c4f6ea0edcfb3fb597f84b8b318c79bb9687d85c1ce8e5a371285530161
+  data.tar.gz: 414c0224b3ec9097f2d600fcc70c36ae92ad4fc0cc7dd27859b51005c3742aff5f5ed0e8d469b94c854bcfbe93016a0b0633a4f85bc34bfc23c63cd54e9a18a4

data/CHANGELOG.md

@@ -2,8 +2,12 @@
 
 ## master
 
+### 0.2.0 (2018-08-30)
+* Enable to use SSL when redirecting. [#4](https://github.com/akito19/rack-joint/pull/4)
+* Refactor to run redirect process. [#5](https://github.com/akito19/rack-joint/pull/5)
+
 ### 0.1.1 (2018-08-27)
 * Update a class name, method name and filename. [#1](https://github.com/akito19/rack-joint/pull/1)
 
-### 0.1.0 (2018-08-26)
+### 0.1.0 (2018-08-25)
 Initial :muscle:

data/README.md

@@ -32,7 +32,7 @@ require 'rack/joint'
 use Rack::Joint do
   host 'example.com' do
     # If you access `http://example.com/dogs/bark.html`,
-    # redirect to `http://example.org/bowwow.html` with 301. 
+    # redirect to `http://example.org/bowwow.html` with 301.
     redirect '/dogs/bark.html' do
       new_host 'example.org'
       to '/bowwow.html'
@@ -40,12 +40,14 @@ use Rack::Joint do
     end
 
     # If you access `http://example.com/cats.html`,
-    # redirect to `http://example.org/meow/mew` with 302.
+    # redirect to `https://example.org/meow/mew` with 302.
     redirect '/cats.html' do
       new_host 'example.org'
+      ssl true
       to '/meow/mew'
       status 302
     end
+  end
 
   host 'example.net' do
     # If you access `http://example.net/frog.html`,
@@ -53,11 +55,11 @@ use Rack::Joint do
     redirect '/frog.html' do
       to '/croak'
     end
-    
+
     # If you access `http://example.net/quack`,
     # redirect to `http://example.org/quack` with 301.
     redirect '/quack' do
-      new_host 'example.org' 
+      new_host 'example.org'
     end
   end
 end
@@ -67,13 +69,14 @@ run lambda { |env| [200, {'Content-Type' => 'text/plain'}, ['Hello World!']] }
 
 You can use following resources with block.
 
-| Resource | Description |
-| :------- | :---------- |
-| `host`   | Host name. |
-| `redirect` | Path name. |
-| `new_host` | A new host name redirects to. Optional. |
-| `to` | A new path name redirects to. Optional. |
-| `status` | Status when redirecting. You can use `301`, `302`, `303`, `307`, `308`; which is `301` to default. |
+| Resource | Type | Description |
+| :------- | :--- | :---------- |
+| `host`   | String | Host name. |
+| `redirect` | String | Path name. |
+| `ssl` | Boolean | Whether to enable SSL or not; which is `false` to default. |
+| `new_host` | String | A new host name redirects to. Optional. |
+| `to` | String | A new path name redirects to. Optional. |
+| `status` | Integer | Status when redirecting. You can use `301`, `302`, `303`, `307`, `308`; which is `301` to default. |
 
 ## Development
 

data/lib/rack/joint.rb

@@ -6,21 +6,20 @@ require "rack/joint/version"
 
 module Rack
   class Joint
-    attr_reader :app
-    attr_reader :mappings
+    attr_reader :app, :block
     def initialize(app, &block)
       @app = app
-      @mappings = Context.new.instance_exec(&block) if block_given?
+      @block = block if block_given?
     end
 
     def call(env)
-      rack_env = Rack::Request.new(env)
-      env_host = rack_env.host
-      env_path = rack_env.fullpath
-      requests = valid_mapping(env_host)
+      rack_request = Rack::Request.new(env)
+      mappings = Context.new(rack_request).instance_exec(&block)
+      env_host = rack_request.host
+      responses = valid_mapping(mappings, env_host)
 
-      if check_redirect?(requests, env_path)
-        redirect_info(requests, env_path)
+      if check_redirect?(rack_request, responses)
+        redirect_info(rack_request, responses)
       else
         app.call(env)
       end
@@ -28,28 +27,31 @@ module Rack
 
     private
 
-    # @param host [String] Requested hostname(env)
+    # @param mapping [Array] URI mappings for redirecting.
+    # @param host    [String] Requested hostname(env).
     # @return [Array] Return URL mapped responses.
-    def valid_mapping(host)
+    def valid_mapping(mappings, host)
       return [] unless mappings
       mappings.select { |res| res[host] }.first.values.flatten(1)
     end
 
-    # @param  requests [Array] Mapped redirect response information.
-    # @param  path     [String] Requested pathname(env)
+    # @param  request   [Rack::Request] Request env.
+    # @param  responses [Array] Mapped redirect response information.
     # @return [Boolean]
-    def check_redirect?(requests, path)
-      requests.map do |req|
-        req[2].to_s.include?(path)
+    def check_redirect?(request, responses)
+      current_url = request.url
+      responses.map do |res|
+        res[2].to_s.include?(current_url)
       end.include?(true)
     end
 
-    # @param  requests [Array] Mapped redirect response information.
-    # @param  path     [String] Requested pathname(env)
+    # @param  request   [Rack::Request] Request env.
+    # @param  responses [Array] Mapped redirect response information.
     # @return [Array] Return response corresponded request.
-    def redirect_info(requests, path)
-      requests.select do |req|
-        req[2].to_s.include?(path)
+    def redirect_info(request, responses)
+      current_url = request.url
+      responses.select do |res|
+        res[2].to_s.include?(current_url)
       end.to_a.flatten(1)
     end
   end

data/lib/rack/joint/context.rb

@@ -1,8 +1,9 @@
 module Rack
   class Joint
     class Context
-      attr_reader :responses
-      def initialize
+      attr_reader :request, :responses
+      def initialize(request)
+        @request = request
         @responses = []
       end
 
@@ -11,9 +12,9 @@ module Rack
       # @return [Array] Return Array consisted of block under `redirect`.
       def host(old_host, &block)
         responses << {
-          "#{old_host}" => Redirect.new(old_host).instance_exec(&block)
+          "#{old_host}" => Redirect.new(request, old_host).instance_exec(&block)
         }
       end
     end
   end
-end
+end

data/lib/rack/joint/redirect.rb

@@ -3,10 +3,10 @@
 module Rack
   class Joint
     class Redirect
-      attr_reader :responses
-      attr_reader :old_host
-      def initialize(old_host)
+      attr_reader :responses, :request, :old_host
+      def initialize(request, old_host)
         @responses = []
+        @request = request
         @old_host = old_host
       end
 
@@ -14,7 +14,7 @@ module Rack
       # @param &block [block] Given block with `redirect`.
       # @return [Array] Return Array consisted of block under `redirect`.
       def redirect(old_path, &block)
-        responses << RedirectInterface.new(old_host, old_path, &block).apply!
+        responses << RedirectInterface.new(request, old_host, old_path, &block).apply!
       end
     end
   end

data/lib/rack/joint/redirect_interface.rb

@@ -6,22 +6,22 @@ module Rack
     class BadRedirectError < StandardError; end
 
     class RedirectInterface
-      attr_reader :old_host
-      attr_reader :old_path
-      attr_reader :old_url
-      def initialize(old_host, old_path, &block)
+      attr_reader :request, :old_host, :old_path, :old_url
+      def initialize(request, old_host, old_path, &block)
+        @status = 301
+        @ssl = false
+        @request = request
         @old_host = old_host
         @old_path = old_path
-        @old_url = build_uri(old_host, old_path)
+        @old_url = build_uri(request.scheme, old_host, old_path)
         instance_exec(&block)
       end
 
       # @return [Array] Return response given parameters in `config.ru`.
       def apply!
-        @status ||= 301
         @new_host ||= old_host
         @new_path ||= old_path
-        new_location = build_uri(@new_host, @new_path)
+        new_location = build_uri(uri_scheme, @new_host, @new_path)
         if old_url == new_location
           raise BadRedirectError.new('Redirect URL has been declared the same as current URL.')
         end
@@ -30,11 +30,31 @@ module Rack
 
       private
 
-      # @param host [String]
-      # @param path [String]
+      # @return [String] `http` or `https`
+      def uri_scheme
+        if @ssl
+          'https'
+        else
+          'http'
+        end
+      end
+
+      # @param scheme [String] 'http' or 'https'
+      # @param host [String] Host name
+      # @param path [String] Path name
       # @return [URI]
-      def build_uri(host, path)
-        URI::HTTP.build({ host: host, path: path }).to_s
+      def build_uri(scheme, host, path)
+        if scheme == 'https'
+          URI::HTTPS.build({ scheme: scheme, host: host, path: path }).to_s
+        else
+          URI::HTTP.build({ scheme: scheme, host: host, path: path }).to_s
+        end
+      end
+
+      # @param scheme [Boolean] Wether enabling SSL or not.
+      # @return [Boolean]
+      def ssl(scheme)
+        @ssl = scheme
       end
 
       # @param status [Integer] `status` parameter when redirecting in `config.ru`.

data/lib/rack/joint/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Joint
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-joint
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Akito Kasai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack