rack-joint 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e792eebe6018b20bcfcd52b8585ed66527ef3f726d66c262870713de146734
-  data.tar.gz: 637b67d842b4a9d8fd1ad282eb411d2d643e939bc06fd870f268d9e44dccdf0e
+  metadata.gz: f3059643a9228fad6f23fa1f0a6851023c1612c5bd8fbbde57fe0f584f600ca9
+  data.tar.gz: '05907c6390bfb966cd2a517c0a2e247f2b51a449aaee09da4e2b27f2368fd6b2'
 SHA512:
-  metadata.gz: 8a4903e59817ca4e4bdb9a0a8beb65e31a152dd36f575fb9f53f45b52863e01afe126c4f6ea0edcfb3fb597f84b8b318c79bb9687d85c1ce8e5a371285530161
-  data.tar.gz: 414c0224b3ec9097f2d600fcc70c36ae92ad4fc0cc7dd27859b51005c3742aff5f5ed0e8d469b94c854bcfbe93016a0b0633a4f85bc34bfc23c63cd54e9a18a4
+  metadata.gz: 6cdb06e0d4b1e06182f8a69d6d78907b19cd39f5ac925c5b9c14ec642a123f8336b31af5adc974715b3fe6b102b4f3650bc226066774a8799fd7d16f75cc60a1
+  data.tar.gz: 6d2222cb89b23d1e014bb74dd42c07f2cc55c569f18342c8ac647fb3669c0a9080499a4991ed66ebd415d386bbecdbc7b08fd8f6a1a97737e2e39a918ea2fb8b

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## master
 
+### 0.3.0 (2018-09-01)
+* Determine scheme in response to requests. [#7](https://github.com/akito19/rack-joint/pull/7)
+
 ### 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)

data/README.md

@@ -73,9 +73,9 @@ You can use following resources with block.
 | :------- | :--- | :---------- |
 | `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. |
+| `ssl` | Boolean | Whether to enable SSL. If the option isn't set, the scheme of `Location` header is determined in response to GET request. |
+| `new_host` | String | A new host name redirects to. |
+| `to` | String | A new path name redirects to. |
 | `status` | Integer | Status when redirecting. You can use `301`, `302`, `303`, `307`, `308`; which is `301` to default. |
 
 ## Development

data/lib/rack/joint/redirect_interface.rb

@@ -6,22 +6,23 @@ module Rack
     class BadRedirectError < StandardError; end
 
     class RedirectInterface
-      attr_reader :request, :old_host, :old_path, :old_url
+      attr_reader :scheme, :request_scheme, :old_host, :old_path, :old_url
       def initialize(request, old_host, old_path, &block)
         @status = 301
-        @ssl = false
-        @request = request
+        @scheme = nil
+        @request_scheme = request.scheme
         @old_host = old_host
         @old_path = old_path
-        @old_url = build_uri(request.scheme, 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!
+        @scheme ||= request_scheme
         @new_host ||= old_host
         @new_path ||= old_path
-        new_location = build_uri(uri_scheme, @new_host, @new_path)
+        new_location = build_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,15 +31,6 @@ module Rack
 
       private
 
-      # @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
@@ -51,10 +43,15 @@ module Rack
         end
       end
 
-      # @param scheme [Boolean] Wether enabling SSL or not.
-      # @return [Boolean]
-      def ssl(scheme)
-        @ssl = scheme
+      # @param flag [Boolean]
+      # @return [String] `http` or `https`
+      def ssl(flag)
+        @scheme =
+          if flag
+            'https'
+          else
+            'http'
+          end
       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.2.0"
+    VERSION = "0.3.0"
   end
 end

data/rack-joint.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["kasai@akito19.com"]
 
   spec.summary       = %q{A rack middleware for redirecting.}
-  spec.description   = %q{A rack middleware to help you to redirect.}
+  spec.description   = %q{Rack::Joint is a rack middleware to help redirecting to each path.}
   spec.homepage      = "https://github.com/akito19/rack-joint"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-joint
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Akito Kasai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-29 00:00:00.000000000 Z
+date: 2018-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A rack middleware to help you to redirect.
+description: Rack::Joint is a rack middleware to help redirecting to each path.
 email:
 - kasai@akito19.com
 executables: []