redirector 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48575a6f084332c0f16720d2398e8674fced3f96add66675947fc820c47070bc
-  data.tar.gz: 1a4e1e61f2abdcc1d39c655e0d155e707769738b380408a942447bc79bc60feb
+  metadata.gz: 3795c5f05e3924521efe95b4fae87fb6f54ff8175cd42f57270923135e3eddc8
+  data.tar.gz: 8782cb91c17c0e50aef45016a99d413db0bd8543705c14123a4c59806834c8c4
 SHA512:
-  metadata.gz: a4b89eaeb9e03e7ff035ce0233285f44107545f301c5807765cf9076e6af17de6c8fd1eeadae130584c9c965a2853e152eeae307cebb337250f56d6a9d94a374
-  data.tar.gz: 3d693e87e63e0b554fba58be2eeb5d5bc7990eaa4a6dd3f3451b6a3d30787c73a633286008143825b27c03e5490e2d8b911a808ee0c28c3edef6151ea517855b
+  metadata.gz: bcadbff5bc278f14d9496838ee1069d4383bde0a75cd8a1fec00b9837e097c0c8f05449a997619a77647d5d17bf5fc10b81e9563d2aa419ac6b7d56eb2b8b9c7
+  data.tar.gz: e416e72e42dfcdb817a620cdbdc9ca64a9d37fcbe3a274562f99f4e0122e7b72878e2081748046825d66e80d3544cac9c13ad7560fcf8f5e383d3c6df84a6cc7

data/app/models/redirect_rule.rb

@@ -14,7 +14,11 @@ class RedirectRule < ActiveRecord::Base
   accepts_nested_attributes_for :request_environment_rules, :allow_destroy => true, :reject_if => :all_blank
 
   validates :source, :destination, :presence => true
-  validates :active, :inclusion => { :in => ['0', '1', true, false] }
+
+  # Not working with rails 5.0.1
+  if Rails.version.to_i < 5
+    validates :active, :inclusion => { :in => ['0', '1', true, false] }
+  end
 
   before_save :strip_source_whitespace
 
@@ -22,6 +26,9 @@ class RedirectRule < ActiveRecord::Base
     if connection_mysql?
       '(redirect_rules.source_is_case_sensitive = :true AND :source REGEXP BINARY redirect_rules.source) OR '+
       '(redirect_rules.source_is_case_sensitive = :false AND :source REGEXP redirect_rules.source)'
+    elsif connection_sqlite?
+      '(redirect_rules.source_is_case_sensitive = :true AND :source REGEXP redirect_rules.source COLLATE BINARY) OR '+
+      '(redirect_rules.source_is_case_sensitive = :false AND :source REGEXP redirect_rules.source)'
     else
       '(redirect_rules.source_is_case_sensitive = :true AND :source ~ redirect_rules.source) OR '+
       '(redirect_rules.source_is_case_sensitive = :false AND :source ~* redirect_rules.source)'
@@ -32,7 +39,7 @@ class RedirectRule < ActiveRecord::Base
     <<-SQL
       redirect_rules.active = :true AND
       ((source_is_regex = :false AND source_is_case_sensitive = :false AND LOWER(redirect_rules.source) = LOWER(:source)) OR
-      (source_is_regex = :false AND source_is_case_sensitive = :true AND #{'BINARY' if connection_mysql?} redirect_rules.source = :source) OR
+      (source_is_regex = :false AND source_is_case_sensitive = :true AND #{'BINARY' if connection_mysql?} redirect_rules.source = :source #{'COLLATE BINARY' if connection_sqlite?}) OR
       (source_is_regex = :true AND (#{regex_expression})))
     SQL
   end
@@ -74,6 +81,10 @@ class RedirectRule < ActiveRecord::Base
     connection.adapter_name.downcase.include?('mysql')
   end
 
+  def self.connection_sqlite?
+    connection.adapter_name.downcase.include?('sqlite')
+  end
+
   def strip_source_whitespace
     self.source = self.source.strip
   end

data/lib/redirector/regex_attribute.rb

@@ -1,15 +1,18 @@
 module Redirector
   module RegexAttribute
-    
+
     def regex_attribute(attribute_name)
       include ValidationMethod
 
       cattr_accessor :regex_attribute_name
       self.regex_attribute_name = attribute_name
 
-      validates "#{attribute_name}_is_regex".to_sym, :inclusion => { :in => ['0', '1', true, false] }
-      validates "#{attribute_name}_is_case_sensitive".to_sym, :inclusion => { :in => ['0', '1', true, false] }
       validate :regex_attribute_is_valid_regex
+      # Not working with rails 5.0.1
+      if Rails.version.to_i < 5
+        validates "#{attribute_name}_is_regex".to_sym, :inclusion => { :in => ['0', '1', true, false] }
+        validates "#{attribute_name}_is_case_sensitive".to_sym, :inclusion => { :in => ['0', '1', true, false] }
+      end
 
       define_method("#{regex_attribute_name}_regex") do
         if self.send("#{regex_attribute_name}_is_case_sensitive?")
@@ -19,11 +22,11 @@ module Redirector
         end
       end
     end
-    
+
     module ValidationMethod
-      
+
       protected
-      
+
       def regex_attribute_is_valid_regex
         if self.send("#{regex_attribute_name}_is_regex?") && self.send("#{regex_attribute_name}?")
           begin

data/lib/redirector/version.rb

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

data/redirector.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |s|
   s.test_files = Dir["spec/**/*"]
 
   s.add_dependency "rails", ">= 3.1"
-  # s.add_dependency "jquery-rails"
 
   s.add_development_dependency "mysql2"
   s.add_development_dependency "pg"
+
   s.add_development_dependency 'rspec-rails', '~> 3.7'
+  s.add_development_dependency "sqlite3"
   s.add_development_dependency 'shoulda-matchers'
   s.add_development_dependency 'capybara', '~> 2.2'
   s.add_development_dependency 'database_cleaner'

data/spec/dummy/db/schema.rb

@@ -9,35 +9,35 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120823163756) do
+ActiveRecord::Schema.define(version: 20120823163756) do
 
-  create_table "redirect_rules", :force => true do |t|
-    t.string   "source",                                      :null => false
-    t.boolean  "source_is_regex",          :default => false, :null => false
-    t.boolean  "source_is_case_sensitive", :default => false, :null => false
-    t.string   "destination",                                 :null => false
-    t.boolean  "active",                   :default => false
-    t.datetime "created_at",                                  :null => false
-    t.datetime "updated_at",                                  :null => false
+  create_table "redirect_rules", force: :cascade do |t|
+    t.string   "source",                   limit: 255,                 null: false
+    t.boolean  "source_is_regex",          limit: 1,   default: false, null: false
+    t.boolean  "source_is_case_sensitive", limit: 1,   default: false, null: false
+    t.string   "destination",              limit: 255,                 null: false
+    t.boolean  "active",                   limit: 1,   default: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "redirect_rules", ["active"], :name => "index_redirect_rules_on_active"
-  add_index "redirect_rules", ["source"], :name => "index_redirect_rules_on_source"
-  add_index "redirect_rules", ["source_is_case_sensitive"], :name => "index_redirect_rules_on_source_is_case_sensitive"
-  add_index "redirect_rules", ["source_is_regex"], :name => "index_redirect_rules_on_source_is_regex"
+  add_index "redirect_rules", ["active"], name: "index_redirect_rules_on_active", using: :btree
+  add_index "redirect_rules", ["source"], name: "index_redirect_rules_on_source", using: :btree
+  add_index "redirect_rules", ["source_is_case_sensitive"], name: "index_redirect_rules_on_source_is_case_sensitive", using: :btree
+  add_index "redirect_rules", ["source_is_regex"], name: "index_redirect_rules_on_source_is_regex", using: :btree
 
-  create_table "request_environment_rules", :force => true do |t|
-    t.integer  "redirect_rule_id",                                       :null => false
-    t.string   "environment_key_name",                                   :null => false
-    t.string   "environment_value",                                      :null => false
-    t.boolean  "environment_value_is_regex",          :default => false, :null => false
-    t.boolean  "environment_value_is_case_sensitive", :default => true,  :null => false
-    t.datetime "created_at",                                             :null => false
-    t.datetime "updated_at",                                             :null => false
+  create_table "request_environment_rules", force: :cascade do |t|
+    t.integer  "redirect_rule_id",                    limit: 4,                   null: false
+    t.string   "environment_key_name",                limit: 255,                 null: false
+    t.string   "environment_value",                   limit: 255,                 null: false
+    t.boolean  "environment_value_is_regex",          limit: 1,   default: false, null: false
+    t.boolean  "environment_value_is_case_sensitive", limit: 1,   default: true,  null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "request_environment_rules", ["redirect_rule_id"], :name => "index_request_environment_rules_on_redirect_rule_id"
+  add_index "request_environment_rules", ["redirect_rule_id"], name: "index_request_environment_rules_on_redirect_rule_id", using: :btree
 
 end

data/spec/dummy/log/development.log

@@ -34,3 +34,23 @@ Migrating to CreateRequestEnvironmentRules (20120823163756)
    (0.2ms)  COMMIT
    (0.1ms)  SELECT RELEASE_LOCK('3013211720225074515')
    (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` ORDER BY `schema_migrations`.`version` ASC
+   (0.8ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (19.5ms)  DROP DATABASE IF EXISTS `redirector_dummy_test`
+   (0.7ms)  CREATE DATABASE `redirector_dummy_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (1.9ms)  CREATE TABLE `redirect_rules` (`id` int(11) DEFAULT 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
+Mysql2::Error: All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead: CREATE TABLE `redirect_rules` (`id` int(11) DEFAULT 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
+   (0.1ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (0.5ms)  DROP DATABASE IF EXISTS `redirector_dummy_test`
+   (10.8ms)  CREATE DATABASE `redirector_dummy_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (0.4ms)  CREATE TABLE `redirect_rules` (`id` int(11) DEFAULT 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 NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+Mysql2::Error: All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead: CREATE TABLE `redirect_rules` (`id` int(11) DEFAULT 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 NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.1ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (0.5ms)  DROP DATABASE IF EXISTS `redirector_dummy_test`
+   (0.3ms)  CREATE DATABASE `redirector_dummy_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (0.4ms)  CREATE TABLE `redirect_rules` (`id` int(11) DEFAULT 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 NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+Mysql2::Error: All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead: CREATE TABLE `redirect_rules` (`id` int(11) DEFAULT 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 NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (10.7ms)  DROP DATABASE IF EXISTS `redirector_dummy_test`
+   (6.6ms)  CREATE DATABASE `redirector_dummy_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (0.4ms)  CREATE TABLE `redirect_rules` (`id` int(11) DEFAULT 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
+Mysql2::Error: All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead: CREATE TABLE `redirect_rules` (`id` int(11) DEFAULT 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

data/spec/models/redirect_rule_spec.rb

@@ -39,7 +39,7 @@ describe RedirectRule do
 
   describe 'strip_source_whitespace before_save callback' do
     it 'strips leading and trailing whitespace when saved' do
-      subject = FactoryBot.build(:redirect_rule, :source => ' /needs-stripping ')
+      subject = build(:redirect_rule, :source => ' /needs-stripping ')
 
       subject.save
       expect(subject.reload.source).to eq('/needs-stripping')

data/spec/models/request_environment_rule_spec.rb

@@ -21,14 +21,15 @@ describe RequestEnvironmentRule do
 
   it 'should not allow an invalid regex' do
     rule = build(:request_environment_rule_regex, :environment_value => '[')
+
     rule.validate
     expect(rule.errors[:environment_value]).to eq(['is an invalid regular expression'])
   end
 
   it "should know if it's matched for a non-regex value" do
-    expect(subject.matches?({'SERVER_NAME' => 'example.com'})).to be_truthy
-    expect(subject.matches?({'HTTP_HOST' => 'www.example.com'})).to be_falsey
-    expect(subject.matches?({'SERVER_NAME' => 'example.ca'})).to be_falsey
+    subject.matches?({'SERVER_NAME' => 'example.com'}).should be_truthy
+    subject.matches?({'HTTP_HOST' => 'www.example.com'}).should be_falsey
+    subject.matches?({'SERVER_NAME' => 'example.ca'}).should be_falsey
   end
 
   context 'with a case sensitive regex value' do

data/spec/spec_helper.rb

@@ -25,7 +25,7 @@ RSpec.configure do |config|
   config.infer_base_class_for_anonymous_controllers = false
 
   config.after(:each, :type => :feature) do
-    DatabaseCleaner.clean       # Truncate the database
+    DatabaseCleaner.clean_with :truncation, except: %w(ar_internal_metadata)
     Capybara.reset_sessions!    # Forget the (simulated) browser state
     Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redirector
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Brian Landau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-14 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement