rack-joint 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee257b799f66a7c26ac7f2c84c21cae1db7b2d43dd7c119ef79bf644b9d529b5
-  data.tar.gz: b9d746c446d687b39edadf90078a02449675f0952a57b142eb2e784656be933a
+  metadata.gz: c970bb4e0434cb885b6964104eac12d33fe5b10088183ce1a9d751f88408f443
+  data.tar.gz: d7f226e76b27b5958598e63dc9f48002553a070ced6be052c91211eb6de672c8
 SHA512:
-  metadata.gz: a3b15942200d64afa3af22f76e89d5ac26bb75b95994c941c82fed88fa8de33a9f6830ec06f4f9e821df2d22c6ff500681fd50c14363f418f731dfc490ed780e
-  data.tar.gz: a95a55acbde20af0026cd4e5d9db0d67a7c201428868476844dbdf8d69a604cb73e78f3fa711cc3ec4f56e383f9ee6bf8070955ce9474fe85278ec440ac7454f
+  metadata.gz: c5a0da46d2f05ada980d6de76654d94970091ac41483e1afdc194809aa63f6b5d6a9066536adb337ea4a5a767608628e0334257523cb147dd403abdc281d89a1
+  data.tar.gz: e03c685fb7237a11f4cf56bae63c27134f7d3913751397a3015e316b490837c1d6e44353c2bf64d27a34fc1fd8cf3745a48afc856ae78ab24f39d0dd12fa6383

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## master
 
+### 0.3.4 (2019-03-25)
+* Allow query parameters when request URLs have them. [#18](https://github.com/akito19/rack-joint/pull/18)
+
 ### 0.3.3 (2019-01-19)
 * Support Bundler2. [#15](https://github.com/akito19/rack-joint/pull/15)
 

data/lib/rack/joint.rb

@@ -2,6 +2,7 @@ require "rack"
 require "rack/joint/context"
 require "rack/joint/redirect"
 require "rack/joint/redirect_interface"
+require "rack/joint/url_builder"
 require "rack/joint/version"
 
 module Rack
@@ -27,7 +28,7 @@ module Rack
 
     private
 
-    # @param mapping [Array] URI mappings for redirecting.
+    # @param mappings [Array] URI mappings for redirecting.
     # @param host    [String] Requested hostname(env).
     # @return [Array] Return URL mapped responses.
     def valid_mapping(mappings, host)

data/lib/rack/joint/redirect_interface.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
-require 'uri'
-
 module Rack
   class Joint
     class BadRedirectError < StandardError; end
 
     class RedirectInterface
-      attr_reader :scheme, :request_scheme, :old_host, :old_path
+      attr_reader :scheme, :request_scheme, :request_query, :old_host, :old_path
       def initialize(request, old_host, old_path, &block)
         @status = 301
         @scheme = nil
+        @request_query = request.query_string
         @request_scheme = request.scheme
         @old_host = old_host
         @old_path = old_path || request.path_info
@@ -21,8 +20,8 @@ module Rack
         @scheme ||= request_scheme
         @new_host ||= old_host
         @new_path ||= old_path
-        old_url = build_uri(request_scheme, old_host, old_path)
-        new_location = build_uri(scheme, @new_host, @new_path)
+        old_url = UrlBuilder.new(request_scheme, request_query, old_host, old_path).build
+        new_location = UrlBuilder.new(scheme, request_query, @new_host, @new_path).build
         if old_url == new_location
           raise BadRedirectError.new('Redirect URL has been declared the same as current URL.')
         end
@@ -31,18 +30,6 @@ module Rack
 
       private
 
-      # @param scheme [String] 'http' or 'https'
-      # @param host [String] Host name
-      # @param path [String] Path name
-      # @return [URI]
-      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 flag [Boolean]
       # @return [String] `http` or `https`
       def ssl(flag)

data/lib/rack/joint/url_builder.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+require 'uri'
+
+module Rack
+  class Joint
+    class UrlBuilder
+      attr_reader :scheme, :query, :host, :path
+      def initialize(scheme, request_query, host, path)
+        @scheme = scheme
+        @query = request_query
+        @host = host
+        @path = path
+      end
+
+      # @return [URI] URL with SSL or non-SSL
+      def build
+        if scheme == 'https'
+          https_url_builder
+        else
+          http_url_builder
+        end
+      end
+
+      private
+
+      # @return [URI]
+      def https_url_builder
+        # When query parameters isn't added to request URL,
+        # returns empty String object with `Rack::Request::Helper#query_string`.
+        if query.empty?
+          URI::HTTPS.build({ host: host, path: path }).to_s
+        else
+          URI::HTTPS.build({ host: host, path: path, query: query }).to_s
+        end
+      end
+
+      # @return [URI]
+      def http_url_builder
+        # When query parameters isn't added to request URL,
+        # returns empty String object with `Rack::Request::Helper#query_string`.
+        if query.empty?
+          URI::HTTP.build({ host: host, path: path }).to_s
+        else
+          URI::HTTP.build({ host: host, path: path, query: query }).to_s
+        end
+      end
+    end
+  end
+end

data/lib/rack/joint/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Joint
-    VERSION = "0.3.3"
+    VERSION = "0.3.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-joint
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Akito Kasai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -102,6 +102,7 @@ files:
 - lib/rack/joint/context.rb
 - lib/rack/joint/redirect.rb
 - lib/rack/joint/redirect_interface.rb
+- lib/rack/joint/url_builder.rb
 - lib/rack/joint/version.rb
 - rack-joint.gemspec
 homepage: https://github.com/akito19/rack-joint