rack-canonical-host 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7351e7d1c54f3951648e9a1b9f0468d5c631edc0
-  data.tar.gz: dedd6608456b3b02233428832026f30ab72560d5
+  metadata.gz: 35d3203952564f0ba3368443e122d7469a26e1d3
+  data.tar.gz: b818b81e58a6fe8a720dbc27387b783d48d94ced
 SHA512:
-  metadata.gz: 79f6fb8fab7040d6a002e5c27e521e5c2f3f35760865f3dc80c29da399a22df2bf945b768dd701b7d4709146cf0a7e6b2a9954d7e8e0a3c6063c38e5be84b052
-  data.tar.gz: 3ea4f3d955331bf2a96471564c7ba1cf82b57805ed127aac803a646b50f23d7b5ca8b9b5883a1cde7b1358962e074ca457bb152e80d048692c1cadbd80a57adf
+  metadata.gz: c3a7af383aaf322c84ca2bdfc6994963ca3cb149b787cd6dec803e103d9e23857f8db48a204bb2cd77ab40740b925c5c183ac544f028bb836ed4af35ca4d5dd6
+  data.tar.gz: 270717db4dbf29ba4a5356fd682e01a5faef0dba3847b231394e6ffd4dc7bdb2ab659a73ad7e74a4edb94b190af190dfe9ef66adf506cf0e27dc2b83e0c67b40

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 script: bundle exec rspec
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.0 (2014-04-16)
+
+  * Add `:force_ssl` option ([Jeff Carbonella][jcarbo])
+
 ## 0.0.9 (2014-02-14)
 
   * Add `:if` option ([Nick Ostrovsky][firedev])
@@ -41,6 +45,7 @@
 
   * Initial release ([Tyler Hunt][tylerhunt])
 
+[jcarbo]: http://github.com/jcarbo
 [finack]: http://github.com/finack
 [firedev]: http://github.com/firedev
 [jellybob]: http://github.com/jellybob

data/README.md

@@ -96,6 +96,15 @@ use Rack::CanonicalHost, 'example.com', if: /.*\.example\.com/
 use Rack::CanonicalHost, 'example.ru', if: /.*\.example\.ru/
 ```
 
+If you'd like to enforce the use of HTTPS, use the `:force_ssl` option:
+
+``` ruby
+use Rack::CanonicalHost, 'example.com', force_ssl: true
+```
+
+In this case, requests like `http://example.com` will be redirected to
+`https://example.com`.
+
 
 ## Contributing
 
@@ -111,6 +120,7 @@ use Rack::CanonicalHost, 'example.ru', if: /.*\.example\.ru/
 Thanks to the following people who have contributed patches or helpful
 suggestions:
 
+  * [Jeff Carbonella](https://github.com/jcarbo)
   * [Joost Schuur](https://github.com/jellybob)
   * [Jon Wood](https://github.com/jellybob)
   * [Peter Baker](https://github.com/finack)

data/lib/rack/canonical_host/redirect.rb

@@ -17,12 +17,13 @@ module Rack
       def initialize(env, host, options={})
         @env = env
         @host = host
+        @force_ssl = options[:force_ssl]
         @ignore = Array(options[:ignore])
         @if = Array(options[:if])
       end
 
       def canonical?
-          known? || ignored? || !conditions_match?
+        (known? && ssl?) || ignored? || !conditions_match?
       end
 
       def response
@@ -36,6 +37,10 @@ module Rack
         @host.nil? || request_uri.host == @host
       end
 
+      def ssl?
+        !@force_ssl || request_uri.scheme == "https"
+      end
+
       def ignored?
         @ignore && @ignore.include?(request_uri.host)
       end
@@ -52,7 +57,10 @@ module Rack
       private :any_regexp_match?
 
       def new_url
-        request_uri.tap { |uri| uri.host = @host }.to_s
+        request_uri.tap { |uri|
+          uri.host = @host if @host
+          uri.scheme = "https" if @force_ssl
+        }.to_s
       end
 
       def request_uri

data/lib/rack/canonical_host/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class CanonicalHost
-    VERSION = '0.0.9'
+    VERSION = '0.1.0'
   end
 end

data/spec/rack/canonical_host_spec.rb

@@ -117,6 +117,34 @@ describe Rack::CanonicalHost do
 
     end
 
+    context 'with :force_ssl option' do
+      let(:app) { build_app('example.com', :force_ssl => true) }
+
+      context 'with a non-ssl request' do
+        let(:url) { 'http://example.com/full/path' }
+        it { should be_redirect.to('https://example.com/full/path') }
+      end
+
+      context 'with an ssl request' do
+        let(:url) { 'https://example.com/full/path' }
+        it { should_not be_redirect }
+      end
+
+      context 'when host is not set' do
+        let(:app) { build_app(nil, :force_ssl => true) }
+        let(:url) { 'http://example.com/full/path' }
+
+        it { should be_redirect.to('https://example.com/full/path') }
+      end
+
+      context 'when :forse_ssl is false' do
+        let(:app) { build_app('example.com', :force_ssl => false) }
+        let(:url) { 'http://example.com/full/path' }
+
+        it { should_not be_redirect }
+      end
+    end
+
     context 'with a block' do
       let(:app) { build_app { 'example.com' } }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-canonical-host
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Tyler Hunt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable