redirector 1.0.0 → 1.0.1

data/spec/features/middleware_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'Redirector middleware', :type => :feature do
   before do
-    FactoryGirl.create(:redirect_rule, :destination => '/news/5', :source => '/my_custom_url')
-    FactoryGirl.create(:redirect_rule_regex, :destination => '/news/$1', :source => '/my_custom_url/([A-Za-z0-9_]+)')
-    FactoryGirl.create(:redirect_rule_regex, :destination => '/news', :source => 'categoryID=12345')
+    create(:redirect_rule, :destination => '/news/5', :source => '/my_custom_url')
+    create(:redirect_rule_regex, :destination => '/news/$1', :source => '/my_custom_url/([A-Za-z0-9_]+)')
+    create(:redirect_rule_regex, :destination => '/news', :source => 'categoryID=12345')
   end
 
   it 'correctly redirects the visitor for an exact match rule' do
@@ -61,12 +61,12 @@ describe 'Redirector middleware', :type => :feature do
   end
 
   it 'handles invalid URIs properly' do
-    bad_rule = FactoryGirl.create(:redirect_rule_regex, :destination => 'http://www.example.com$1', :source => '^/custom(.*)$')
+    bad_rule = create(:redirect_rule_regex, :destination => 'http://www.example.com$1', :source => '^/custom(.*)$')
 
     begin
-      visit '/custom)%e2'
+      visit '/custom)e2'
     rescue Redirector::RuleError => e
-      e.message.should == "RedirectRule #{bad_rule.id} generated the bad destination: http://www.example.com)%e2"
+      e.message.should == "RedirectRule #{bad_rule.id} generated the bad destination: http://www.example.com)e2"
     end
   end
 end

data/spec/models/redirect_rule_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe RedirectRule do
-  subject { FactoryGirl.create(:redirect_rule) }
+  subject { create(:redirect_rule) }
   let!(:rule) { subject }
 
   it { should have_many(:request_environment_rules) }
@@ -41,8 +41,32 @@ describe RedirectRule do
       RedirectRule.match_for('/catchy_thingy', {}).should == subject
     end
 
+    context 'for a case sensitive match' do
+      let!(:case_sensitive_rule) { create(:redirect_rule, :source_is_case_sensitive => true, :source => '/Case-Does-Matter') }
+
+      it 'returns the rule if it matches the case' do
+        RedirectRule.match_for('/Case-Does-Matter', {}).should == case_sensitive_rule
+      end
+
+      it 'returns nil if it does not match the case' do
+        RedirectRule.match_for('/case-does-matter', {}).should be_nil
+      end
+    end
+
+    context 'for a case insensitive match' do
+      let!(:case_insensitive_rule) { create(:redirect_rule, :source_is_case_sensitive => false, :source => '/Case-Does-Not-Matter') }
+
+      it 'returns the rule if it matches the case' do
+        RedirectRule.match_for('/Case-Does-Not-Matter', {}).should == case_insensitive_rule
+      end
+
+      it 'returns the rule if it does not match the case' do
+        RedirectRule.match_for('/case-does-not-matter', {}).should == case_insensitive_rule
+      end
+    end
+
     context 'for a case sensitive regex match' do
-      let!(:regex_rule){ FactoryGirl.create(:redirect_rule_regex, :source_is_case_sensitive => true) }
+      let!(:regex_rule){ create(:redirect_rule_regex, :source_is_case_sensitive => true) }
 
       it 'returns the rule if it matches the case' do
         RedirectRule.match_for('/new_shiny/from_company', {}).should == regex_rule
@@ -54,7 +78,7 @@ describe RedirectRule do
     end
 
     context 'for a case insensitive regex match' do
-      let!(:regex_rule){ FactoryGirl.create(:redirect_rule_regex) }
+      let!(:regex_rule){ create(:redirect_rule_regex) }
 
       it 'returns the rule if it matches the case' do
         RedirectRule.match_for('/new_shiny/from_company', {}).should == regex_rule
@@ -67,7 +91,7 @@ describe RedirectRule do
 
     context 'with a rule with one environment condition' do
       before do
-        FactoryGirl.create(:request_environment_rule, :redirect_rule => subject)
+        create(:request_environment_rule, :redirect_rule => subject)
       end
 
       it 'should find the rule if it matches' do
@@ -81,8 +105,8 @@ describe RedirectRule do
 
     context 'with a rule with multiple environment conditions' do
       before do
-        FactoryGirl.create(:request_environment_rule, :redirect_rule => subject)
-        FactoryGirl.create(:request_environment_rule_regex, :redirect_rule => subject)
+        create(:request_environment_rule, :redirect_rule => subject)
+        create(:request_environment_rule_regex, :redirect_rule => subject)
       end
 
       it 'should find the rule if it matches' do
@@ -97,12 +121,12 @@ describe RedirectRule do
     end
 
     context 'with multiple rules with multiple environment conditions' do
-      let!(:rule2){ FactoryGirl.create(:redirect_rule) }
+      let!(:rule2){ create(:redirect_rule) }
       before do
-        FactoryGirl.create(:request_environment_rule, :redirect_rule => subject)
-        FactoryGirl.create(:request_environment_rule_regex, :redirect_rule => subject)
-        FactoryGirl.create(:request_environment_rule, :redirect_rule => rule2)
-        FactoryGirl.create(:request_environment_rule_regex, :redirect_rule => rule2,
+        create(:request_environment_rule, :redirect_rule => subject)
+        create(:request_environment_rule_regex, :redirect_rule => subject)
+        create(:request_environment_rule, :redirect_rule => rule2)
+        create(:request_environment_rule_regex, :redirect_rule => rule2,
           :environment_value => 'another=value')
       end
 
@@ -123,7 +147,7 @@ describe RedirectRule do
     end
 
     context 'with a regex rule that also matches an exact string match' do
-      let!(:regex_rule){ FactoryGirl.create(:redirect_rule_regex, :source => '[A-Za-z0-9]_thingy') }
+      let!(:regex_rule){ create(:redirect_rule_regex, :source => '[A-Za-z0-9]_thingy') }
 
       it 'should return the exact match' do
         RedirectRule.match_for('/catchy_thingy', {}).should == subject
@@ -132,7 +156,7 @@ describe RedirectRule do
   end
 
   describe '.destination_for' do
-    let!(:regex_rule) { FactoryGirl.create(:redirect_rule_regex) }
+    let!(:regex_rule) { create(:redirect_rule_regex) }
 
     it 'should find a regex match' do
       RedirectRule.destination_for('/new_shiny/from_company', {}).should == 'http://www.example.com/news/from_company'
@@ -148,7 +172,7 @@ describe RedirectRule do
   end
 
   describe '#evaluated_destination_for' do
-    let(:regex_rule) { FactoryGirl.create(:redirect_rule_regex) }
+    let(:regex_rule) { create(:redirect_rule_regex) }
 
     it 'returns the destination for a non regex rule' do
       subject.evaluated_destination_for('/catchy_thingy').should == 'http://www.example.com/products/1'

data/spec/models/request_environment_rule_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe RequestEnvironmentRule do
-  subject { FactoryGirl.create(:request_environment_rule) }
+  subject { create(:request_environment_rule) }
 
   it { should belong_to(:redirect_rule) }
 
@@ -20,7 +20,7 @@ describe RequestEnvironmentRule do
   it { should allow_value(false).for(:environment_value_is_case_sensitive) }
 
   it 'should not allow an invalid regex' do
-    rule = FactoryGirl.build(:request_environment_rule_regex, :environment_value => '[')
+    rule = build(:request_environment_rule_regex, :environment_value => '[')
     rule.errors_on(:environment_value).should == ['is an invalid regular expression']
   end
 
@@ -31,7 +31,7 @@ describe RequestEnvironmentRule do
   end
 
   context 'with a case sensitive regex value' do
-    subject { FactoryGirl.create(:request_environment_rule_regex) }
+    subject { create(:request_environment_rule_regex) }
 
     it "should know if it's matched" do
       subject.matches?({'QUERY_STRING' => 'something=value'}).should be_true
@@ -44,7 +44,7 @@ describe RequestEnvironmentRule do
   end
 
   context 'with a case insensitve regex value' do
-    subject { FactoryGirl.create(:request_environment_rule_regex, :environment_value_is_case_sensitive => false) }
+    subject { create(:request_environment_rule_regex, :environment_value_is_case_sensitive => false) }
 
     it "should know if it's matched" do
       subject.matches?({'QUERY_STRING' => 'something=value'}).should be_true

data/spec/spec_helper.rb

@@ -18,11 +18,13 @@ Rails.backtrace_cleaner.remove_silencers!
 DatabaseCleaner.strategy = :truncation
 
 RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+
   config.mock_with :rspec
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
 
-  config.after(:each, :type => :request) do
+  config.after(:each, :type => :feature) do
     DatabaseCleaner.clean       # Truncate the database
     Capybara.reset_sessions!    # Forget the (simulated) browser state
     Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redirector
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Brian Landau
@@ -29,7 +29,7 @@ cert_chain:
   QHjym4e4y/FmXBJjpO/TtRoYd8a5YTCaOsML7M/nb/XrArvE3l5JaNEXkhH/nGs7
   wR9huisTMlESX3ReGKU=
   -----END CERTIFICATE-----
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -77,16 +77,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.2
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '4.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Rails engine that adds a piece of middleware to the top of your middleware