redirector 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 63dab49a33d2664b3722c5240d71328cd50ec1ba
-  data.tar.gz: 7baceb65e027c70c8db19a9b62d8e598a3c27e32
+SHA256:
+  metadata.gz: 48575a6f084332c0f16720d2398e8674fced3f96add66675947fc820c47070bc
+  data.tar.gz: 1a4e1e61f2abdcc1d39c655e0d155e707769738b380408a942447bc79bc60feb
 SHA512:
-  metadata.gz: 209ce7d1b98f706a3e44dd6262c732545b36b8e62fdde2e5261a0292b36105f71ee8d5fbc7f43d66ce7c8c1cac2a582ad82b7c97a26172492d1866531f2fdffe
-  data.tar.gz: 26d3ca13b233ea6e2882c6e2aaf5750cc1402d31cd74343cabe6dffb3d5a10e2a428340a46edf51eae594876038951f42beb2978fdad4353d6da0fca91e1e91f
+  metadata.gz: a4b89eaeb9e03e7ff035ce0233285f44107545f301c5807765cf9076e6af17de6c8fd1eeadae130584c9c965a2853e152eeae307cebb337250f56d6a9d94a374
+  data.tar.gz: 3d693e87e63e0b554fba58be2eeb5d5bc7990eaa4a6dd3f3451b6a3d30787c73a633286008143825b27c03e5490e2d8b911a808ee0c28c3edef6151ea517855b

data/lib/redirector/middleware.rb

@@ -64,6 +64,10 @@ module Redirector
         env['HTTP_HOST'].split(':').first
       end
 
+      def request_scheme
+        env['rack.url_scheme']
+      end
+
       def request_port
         @request_port ||= begin
           if env['HTTP_HOST'].include?(':')
@@ -86,7 +90,7 @@ module Redirector
 
       def redirect_uri
         destination_uri.tap do |uri|
-          uri.scheme ||= 'http'
+          uri.scheme ||= request_scheme
           uri.host   ||= request_host
           uri.port   ||= request_port if request_port.present?
           uri.query  ||= env['QUERY_STRING'] if Redirector.preserve_query

data/lib/redirector/version.rb

@@ -1,3 +1,3 @@
 module Redirector
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/dummy/config/database.yml

@@ -5,7 +5,7 @@ development:
   database: redirector_dummy_development
   pool: 5
   username: root
-  password: eli
+  password:
 
 test:
   adapter: mysql2
@@ -14,4 +14,4 @@ test:
   database: redirector_dummy_test
   pool: 5
   username: root
-  password: eli
+  password:

data/spec/dummy/log/development.log

@@ -3,3 +3,34 @@ Connecting to database specified by database.yml
 Migrating to CreateRedirectRules (20120815212612)
 Migrating to CreateRequestEnvironmentRules (20120823163756)
    (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (0.4ms)  SET NAMES utf8,  @@SESSION.sql_mode = CONCAT(CONCAT(@@sql_mode, ',STRICT_ALL_TABLES'), ',NO_AUTO_VALUE_ON_ZERO'),  @@SESSION.sql_auto_is_null = 0, @@SESSION.wait_timeout = 2147483
+   (71.1ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL PRIMARY KEY) ENGINE=InnoDB
+   (36.0ms)  CREATE TABLE `ar_internal_metadata` (`key` varchar(255) NOT NULL PRIMARY KEY, `value` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.5ms)  SELECT GET_LOCK('3013211720225074515', 0)
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` ORDER BY `schema_migrations`.`version` ASC
+Migrating to CreateRedirectRules (20120815212612)
+   (0.4ms)  SELECT RELEASE_LOCK('3013211720225074515')
+   (0.3ms)  SET NAMES utf8,  @@SESSION.sql_mode = CONCAT(CONCAT(@@sql_mode, ',STRICT_ALL_TABLES'), ',NO_AUTO_VALUE_ON_ZERO'),  @@SESSION.sql_auto_is_null = 0, @@SESSION.wait_timeout = 2147483
+   (0.1ms)  SELECT GET_LOCK('3013211720225074515', 0)
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` ORDER BY `schema_migrations`.`version` ASC
+Migrating to CreateRedirectRules (20120815212612)
+   (25.4ms)  CREATE TABLE `redirect_rules` (`id` int NOT NULL AUTO_INCREMENT PRIMARY KEY, `source` varchar(255) NOT NULL, `source_is_regex` tinyint(1) DEFAULT 0 NOT NULL, `source_is_case_sensitive` tinyint(1) DEFAULT 0 NOT NULL, `destination` varchar(255) NOT NULL, `active` tinyint(1) DEFAULT 0, `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (19.9ms)  CREATE  INDEX `index_redirect_rules_on_source`  ON `redirect_rules` (`source`) 
+   (17.8ms)  CREATE  INDEX `index_redirect_rules_on_active`  ON `redirect_rules` (`active`) 
+   (17.0ms)  CREATE  INDEX `index_redirect_rules_on_source_is_regex`  ON `redirect_rules` (`source_is_regex`) 
+   (14.0ms)  CREATE  INDEX `index_redirect_rules_on_source_is_case_sensitive`  ON `redirect_rules` (`source_is_case_sensitive`) 
+   (0.2ms)  BEGIN
+  SQL (0.3ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120815212612')
+   (0.5ms)  COMMIT
+Migrating to CreateRequestEnvironmentRules (20120823163756)
+   (23.4ms)  CREATE TABLE `request_environment_rules` (`id` int NOT NULL AUTO_INCREMENT PRIMARY KEY, `redirect_rule_id` int NOT NULL, `environment_key_name` varchar(255) NOT NULL, `environment_value` varchar(255) NOT NULL, `environment_value_is_regex` tinyint(1) DEFAULT 0 NOT NULL, `environment_value_is_case_sensitive` tinyint(1) DEFAULT 1 NOT NULL, `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (17.4ms)  CREATE  INDEX `index_request_environment_rules_on_redirect_rule_id`  ON `request_environment_rules` (`redirect_rule_id`) 
+   (0.3ms)  BEGIN
+  SQL (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120823163756')
+   (0.6ms)  COMMIT
+  ActiveRecord::InternalMetadata Load (0.4ms)  SELECT  `ar_internal_metadata`.* FROM `ar_internal_metadata` WHERE `ar_internal_metadata`.`key` = 'environment' LIMIT 1
+   (0.8ms)  BEGIN
+  SQL (0.3ms)  INSERT INTO `ar_internal_metadata` (`key`, `value`, `created_at`, `updated_at`) VALUES ('environment', 'development', '2018-06-05 15:16:51', '2018-06-05 15:16:51')
+   (0.2ms)  COMMIT
+   (0.1ms)  SELECT RELEASE_LOCK('3013211720225074515')
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` ORDER BY `schema_migrations`.`version` ASC

data/spec/dummy/log/test.log

@@ -11554,3 +11554,164 @@ ActionController::RoutingError (No route matches [GET] "/my_custom_url/20"):
    (2.7ms)  TRUNCATE TABLE `request_environment_rules`;
    (0.1ms)  SET FOREIGN_KEY_CHECKS = 1
    (0.1ms)  ROLLBACK
+   (1.3ms)  SET NAMES utf8,  @@SESSION.sql_mode = CONCAT(CONCAT(@@sql_mode, ',STRICT_ALL_TABLES'), ',NO_AUTO_VALUE_ON_ZERO'),  @@SESSION.sql_auto_is_null = 0, @@SESSION.wait_timeout = 2147483
+   (0.5ms)  BEGIN
+   (0.2ms)  SELECT @@FOREIGN_KEY_CHECKS
+   (0.2ms)  SET FOREIGN_KEY_CHECKS = 0
+   (0.9ms)  select table_name from information_schema.views where table_schema = 'redirector_dummy_test'
+   (0.4ms)  SET FOREIGN_KEY_CHECKS = 1
+   (0.4ms)  ROLLBACK
+   (0.4ms)  BEGIN
+   (0.5ms)  SELECT @@FOREIGN_KEY_CHECKS
+   (0.3ms)  SET FOREIGN_KEY_CHECKS = 0
+   (0.2ms)  SET FOREIGN_KEY_CHECKS = 1
+   (0.1ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.8ms)  SELECT @@FOREIGN_KEY_CHECKS
+   (0.9ms)  SET FOREIGN_KEY_CHECKS = 0
+   (0.4ms)  SET FOREIGN_KEY_CHECKS = 1
+   (0.7ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.3ms)  SELECT @@FOREIGN_KEY_CHECKS
+   (0.2ms)  SET FOREIGN_KEY_CHECKS = 0
+   (0.2ms)  SET FOREIGN_KEY_CHECKS = 1
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.3ms)  SELECT @@FOREIGN_KEY_CHECKS
+   (0.4ms)  SET FOREIGN_KEY_CHECKS = 0
+   (0.2ms)  SET FOREIGN_KEY_CHECKS = 1
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.4ms)  SELECT @@FOREIGN_KEY_CHECKS
+   (0.3ms)  SET FOREIGN_KEY_CHECKS = 0
+   (0.2ms)  SET FOREIGN_KEY_CHECKS = 1
+   (0.2ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.2ms)  SELECT @@FOREIGN_KEY_CHECKS
+   (0.3ms)  SET FOREIGN_KEY_CHECKS = 0
+   (0.2ms)  SET FOREIGN_KEY_CHECKS = 1
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.4ms)  SELECT @@FOREIGN_KEY_CHECKS
+   (0.3ms)  SET FOREIGN_KEY_CHECKS = 0
+   (0.4ms)  SET FOREIGN_KEY_CHECKS = 1
+   (0.3ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.5ms)  SELECT @@FOREIGN_KEY_CHECKS
+   (0.4ms)  SET FOREIGN_KEY_CHECKS = 0
+   (0.3ms)  SET FOREIGN_KEY_CHECKS = 1
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.4ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.4ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.5ms)  ROLLBACK
+   (1.0ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.4ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.4ms)  ROLLBACK
+   (0.7ms)  BEGIN
+   (0.4ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.4ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.5ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.4ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.4ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.5ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.5ms)  ROLLBACK
+   (0.9ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.4ms)  ROLLBACK
+   (0.4ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.7ms)  BEGIN
+   (0.8ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.6ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.1ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.6ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.4ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.4ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.4ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.1ms)  ROLLBACK
+   (0.3ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.5ms)  BEGIN
+   (0.2ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.3ms)  ROLLBACK
+   (0.2ms)  BEGIN
+   (0.2ms)  ROLLBACK

data/spec/features/middleware_spec.rb

@@ -60,6 +60,13 @@ describe 'Redirector middleware', :type => :feature do
     expect(current_url).to eq('http://example.com:3000/news/5')
   end
 
+  it 'handles https requests' do
+    Capybara.app_host = 'https://example.com'
+
+    visit '/my_custom_url'
+    expect(current_url).to eq('https://example.com/news/5')
+  end
+
   it 'foregoes search if ignored path pattern is detected' do
     original_option = Redirector.ignored_patterns
     Redirector.ignored_patterns = [/^\/my_custom_url\/.+/]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redirector
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brian Landau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Rails engine that adds a piece of middleware to the top of your middleware