rack-joint 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee257b799f66a7c26ac7f2c84c21cae1db7b2d43dd7c119ef79bf644b9d529b5
-  data.tar.gz: b9d746c446d687b39edadf90078a02449675f0952a57b142eb2e784656be933a
+  metadata.gz: 0141cddd5e1ef68701c51e0764c3567f5aaba781690376045555ba69e36d0f2e
+  data.tar.gz: 8bc87b56895863b25aeeb1e665c59f3187bc3374040635eaccae3d1dbc3e86f4
 SHA512:
-  metadata.gz: a3b15942200d64afa3af22f76e89d5ac26bb75b95994c941c82fed88fa8de33a9f6830ec06f4f9e821df2d22c6ff500681fd50c14363f418f731dfc490ed780e
-  data.tar.gz: a95a55acbde20af0026cd4e5d9db0d67a7c201428868476844dbdf8d69a604cb73e78f3fa711cc3ec4f56e383f9ee6bf8070955ce9474fe85278ec440ac7454f
+  metadata.gz: 70e64306e8ce1d02f0adae9e77eb3c2e1a7ec2b271ac7498c632ffc95bb89e2e56c1fca3d6332e86298bb38bfa8936bf3a68c365c8786d2613b3b11d8c923380
+  data.tar.gz: e287349d64b491b119911494155db46dd91c30a88035980018a37350ac11efd86a9520dc32a3ca8501bd7d7f9408413f711a7fd41172fbce221a5b4fd93b94d4

data/.github/workflows/ruby.yml

@@ -0,0 +1,33 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  # https://docs.github.com/en/actions/reference/events-that-trigger-workflows
+  push:
+    branches: '*'
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## master
 
+### 0.3.5
+* Add Ruby 3.1 and 3.2 test and specify Rack version. [#21](https://github.com/akito19/rack-joint/pull/21)
+
+### 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/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.5"
   end
 end

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/rack-joint.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack"
+  spec.add_dependency "rack", "~> 3.0"
   spec.add_development_dependency "bundler", ">= 1.17"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rack-test"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rack-joint
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Akito Kasai
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-01-19 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -88,8 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -102,13 +102,14 @@ 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
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,9 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: A rack middleware for redirecting.
 test_files: []

data/.travis.yml

@@ -1,8 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.4
-  - 2.5.1
-  - 2.6.0
-before_install: gem install bundler
-script: bundle exec rake test