rack-www 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67bab3314c14a6baf165bf7697f2640e290cd9f9
-  data.tar.gz: 39c53a98db554ad2a7d178d9c62aa0fdac9b5deb
+  metadata.gz: da7f0cfe7b164575cae38adb196629c11f18f6a7
+  data.tar.gz: e7d06b79e38106649e038ef948ebe504927072de
 SHA512:
-  metadata.gz: 8b3c507ada98ad3a4489c21a791b660257cb67db00ade55983ca8fecb2d5e35c77042736ad8295e257a75790558d8b14c17d874e8dc2c09e4689431302d3c307
-  data.tar.gz: 429293155e765b0fda94c704577b80f00a990715fb3a50be42a68c444d65f563006b2e8695d45761386a9cf8b0e23a77b6f1cb5d0ffe2695be51c202b00e9402
+  metadata.gz: f9aee65608b0332c10002c0302bba3888878154829f3c54325879a0658d23ea5d95786ce9e3fd9a6d1012c7752cd52c375bf87b2d8414c135b3ee512ade5857a
+  data.tar.gz: e67fe65e9ec3c270b0ebddf5081762e0c3599e392ff47d42ab033c1f0365224d15afadbb693aff827e099644547835f32b3f4f5515cd7e689434d19e3ca4773f

data/.gitignore

@@ -1,2 +1,35 @@
 *.gem
 *.rbc
+.DS_Store
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
+/log/
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+## Vagrant files
+/vagrant/.vagrant/
+
+/lib/stokstad/config/mongoid.yml
+Gemfile.lock

data/CHANGELOG.md

@@ -1,38 +1,54 @@
-## 2.1
+Changelog
+=========
 
-- Ignore rack-www when request host is an IP address
+Version 2.2.0 (August 11, 2016)
+-----------------------------
 
-## 2.0
+* Do not append port for SSL redirect
 
-- Update EVERYTHING
+Version 2.1.0
+-----------------------------
 
-## 1.5
+* Ignore rack-www when request host is an IP address
 
-- Bug fixes
+Version 2.0.0
+-----------------------------
 
-## 1.4
+* Update EVERYTHING
 
-- Respect server port
-- Body responds to :each
-- Rack::Lint on tests
+Version 1.5
+-----------------------------
 
-## 1.3
+* Bug fixes
 
-- Added possibility to redirects to any given :subdomain [Ryan Weald (https://github.com/rweald)]
-- Added more tests
+Version 1.4
+-----------------------------
 
-## 1.2
+* Respect server port
+* Body responds to :each
+* Rack::Lint on tests
 
-- Redirects to the right url without calling the app
-- Keep the path when redirecting
-- Keep the query string when redirecting
-- Added more tests
+Version 1.3
+-----------------------------
 
-## 1.1
+* Added possibility to redirect to any given :subdomain [Ryan Weald (https://github.com/rweald)]
+* Added more tests
 
-- Added possibility to redirects with www or without www
-- Added possibility to set a param :message to show while redirecting
+Version 1.2
+-----------------------------
 
-## 1.0
+* Redirects to the right url without calling the app
+* Keep the path when redirecting
+* Keep the query string when redirecting
+* Added more tests
 
-- Redirects all traffic to www
+Version 1.1
+-----------------------------
+
+* Added possibility to redirects with www or without www
+* Added possibility to set a param :message to show while redirecting
+
+Version 1.0
+-----------------------------
+
+* Redirects all traffic to www

data/Guardfile

@@ -1,8 +1,5 @@
 guard :minitest do
-  # with Minitest::Unit
-  watch(%r{^test/(.*)\/?test_(.*)\.rb$})
-  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-  watch(%r{^test/test_helper\.rb$})      { 'test' }
+  watch(%r{^(.*)\/?.rb$}) { 'test' }
 end
 
 guard :rubocop do

data/README.md

@@ -53,6 +53,8 @@ You can optionally specify predicate to determine if redirect should take place:
   }
 ```
 
+It ignores any redirects when using IP addresses.
+
 ### Options
 
 - :www => default is true, redirects all traffic to www;

data/lib/rack/www.rb

@@ -81,7 +81,7 @@ module Rack
 
     def extract_host(env)
       [env['SERVER_NAME'].to_s.gsub(/^(#{@subdomain}\.|www\.)/, ''),
-       env['SERVER_PORT'] == '80' ? '' : ":#{env['SERVER_PORT']}",
+       %w(80 443).include?(env['SERVER_PORT']) ? '' : ":#{env['SERVER_PORT']}",
        env['PATH_INFO'],
        env['QUERY_STRING'].empty? ? '' : '?' + env['QUERY_STRING'].to_s]
     end

data/rack-www.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'rack-www'
-  s.version     = '2.1.0'
+  s.version     = '2.2.0'
   s.date        = '2015-12-02'
   s.homepage    = 'https://github.com/stjhimy/rack-www'
   s.email       = 'stjhimy@gmail.com'

data/test/subdomain_test.rb

@@ -48,6 +48,13 @@ class SubdomainTest < TestClass
     assert_equal last_response.body, ''
   end
 
+  def test_multiple_subdomains
+    self.app = Rack::WWW.new(default_app, subdomain: 'foo.bar')
+    get 'http://example.com/'
+    assert_equal 'http://foo.bar.example.com/',
+                 last_response.headers['Location']
+  end
+
   def test_ignore_www_when_ip_request
     get 'http://111.111.111.111/'
     assert_equal last_response.status, 200

data/test/www_false_test.rb

@@ -11,6 +11,12 @@ class FalseWWW < TestClass
                  last_response.headers['Location']
   end
 
+  def test_www_false_with_ssl
+    get 'https://www.example.com/'
+    assert_equal 'https://example.com/',
+                 last_response.headers['Location']
+  end
+
   def test_www_false_with_path
     get 'http://www.example.com/path/1'
     assert_equal 'http://example.com/path/1',

data/test/www_true_test.rb

@@ -25,6 +25,11 @@ class TrueWWW < TestClass
     assert_equal 'http://www.example.com/', last_response.headers['Location']
   end
 
+  def test_www_true_with_ssl
+    get 'https://example.com/'
+    assert_equal 'https://www.example.com/', last_response.headers['Location']
+  end
+
   def test_www_true_with_path
     get 'http://example.com/path/1'
     assert_equal 'http://www.example.com/path/1',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-www
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jhimy Fernandes Villar
@@ -119,7 +119,6 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE
 - README.md

data/Gemfile.lock

@@ -1,83 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rack-www (2.1.0)
-      rack (~> 1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.1.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    coderay (1.1.0)
-    ffi (1.9.10)
-    formatador (0.2.5)
-    guard (2.13.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-minitest (2.4.4)
-      guard-compat (~> 1.2)
-      minitest (>= 3.0)
-    guard-rubocop (1.2.0)
-      guard (~> 2.0)
-      rubocop (~> 0.20)
-    listen (3.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    method_source (0.8.2)
-    minitest (5.8.3)
-    nenv (0.2.0)
-    notiffany (0.0.8)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    parser (2.2.3.0)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.1)
-    pry (0.10.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rainbow (2.0.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.6)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
-    ruby-progressbar (1.7.5)
-    shellany (0.0.1)
-    slop (3.6.0)
-    thor (0.19.1)
-    tins (1.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  guard (~> 2.13)
-  guard-minitest (~> 2.4)
-  guard-rubocop (~> 1.2)
-  minitest (~> 5.8)
-  rack-test (~> 0.6)
-  rack-www!
-  rake (~> 10.4)
-
-BUNDLED WITH
-   1.10.6