rack-www 1.5.0 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c1a573de69069e3e4dba5fa155a61171e7f2a5db
+  data.tar.gz: 1eccb6a5132455dac0d7a3e52870ef3fc8999292
+SHA512:
+  metadata.gz: 793e64555ba1265be7ac95a543920aeb2156a64636153ae6f16b35bf77393b40638f886b0c38227a778c1f35f0067a44064d451eafeade87450e049332ccde64
+  data.tar.gz: 4ae7ab8da7a192df653a069118b97db41b7b38a3f61c47c2b6f332dd4fdc9dbf3a452c1356d408d7e7d07236527c59239347bb58f0baa3a7395b6c77db3fa957

data/.gitignore

@@ -0,0 +1,2 @@
+*.gem
+*.rbc

data/.ruby-gemset

@@ -0,0 +1 @@
+rack-www

data/.ruby-version

@@ -0,0 +1 @@
+2.2.3

data/CHANGELOG.md

@@ -0,0 +1,34 @@
+## 2.0
+
+- Update EVERYTHING
+
+## 1.5
+
+- Bug fixes
+
+## 1.4
+
+- Respect server port
+- Body responds to :each
+- Rack::Lint on tests
+
+## 1.3
+
+- Added possibility to redirects to any given :subdomain [Ryan Weald (https://github.com/rweald)]
+- Added more tests
+
+## 1.2
+
+- Redirects to the right url without calling the app
+- Keep the path when redirecting
+- Keep the query string when redirecting
+- Added more tests
+
+## 1.1
+
+- Added possibility to redirects with www or without www
+- Added possibility to set a param :message to show while redirecting
+
+## 1.0
+
+- Redirects all traffic to www

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    rack-www (2.0.0)
+      rack (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    minitest (5.8.3)
+    rack (1.6.4)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rake (10.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  minitest (~> 5.8)
+  rack-test (~> 0.6)
+  rack-www!
+  rake (~> 10.4)
+
+BUNDLED WITH
+   1.10.6

data/{README.rdoc → README.md}

@@ -1,55 +1,65 @@
-= rack-www
+## rack-www
 
-Rack middleware to force subdomain redirects, e.g: www.
+Rack middleware to force subdomain redirects, e.g: www or www2
 
-=== Installation
+### Installation
 
+```ruby
   #default installation
   gem install rack-www
 
   #when using bundler
   gem 'rack-www'
+```
 
-
-=== Usage
+### Usage
 
 Default usage (by default will redirect all requests to www subdomain):
 
+```ruby
   #redirects all traffic to www subdomain
   config.middleware.use Rack::WWW
+```
 
 Customizing the :www option to true or false:
 
+```ruby
   #redirects all traffic to www
-  config.middleware.use Rack::WWW, :www => true
+  config.middleware.use Rack::WWW, www: true
 
 
   #redirects all traffic to the same domain without www
-  config.middleware.use Rack::WWW, :www => false
+  config.middleware.use Rack::WWW, www: false
+```
 
 Redirecting to a given subdomain:
 
+```ruby
   #redirects all traffic to the 'secure' subdomain
   config.middleware.use Rack::WWW, :subdomain => "secure"
+```
 
 If you like it's also possible to show a message while redirecting the user:
 
+```ruby
   config.middleware.use Rack::WWW, :www => false, :message => "You are being redirected..."
+```
 
 You can optionally specify predicate to determine if redirect should take place:
 
+```ruby
   config.middleware.use Rack::WWW, :predicate => lambda { |env|
     !Rack::Request.new(env).params.has_key? "noredirect"
   }
+```
 
+### Options
 
-=== Options
-
-* :www => default is true, redirects all traffic to www;
-* :subdomain => redirects to any given subdomain;
-* :message => display a message while redirecting;
+- :www => default is true, redirects all traffic to www;
+- :subdomain => redirects to any given subdomain;
+- :message => display a message while redirecting;
 
 
-=== License
+### License
 
-MIT License. Copyright 2011 Jhimy Fernandes Villar. http://www.stjhimy.com
+MIT License. Copyright 2011 Jhimy Fernandes Villar http://stjhimy.com

data/Rakefile

@@ -0,0 +1,9 @@
+require 'rake/testtask'
+
+task :default => :test
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+  t.warning = true
+end

data/lib/rack/www.rb

@@ -4,11 +4,10 @@ require 'rack/request'
 module Rack
   class WWW
     def initialize(app, options = {})
-      @options = {:subdomain => "www" }.merge(options)
+      @options = {:subdomain => "www"}.merge(options)
       @app = app
 
-      @redirect = true
-      @redirect = @options[:www] if @options[:www] != nil
+      @redirect = @options[:www] != nil ? @options[:www] : true
       @message = @options[:message]
       @subdomain = @options[:subdomain]
       @predicate = @options[:predicate]
@@ -23,7 +22,6 @@ module Rack
     end
 
     private
-
     def redirect(env)
       url = prepare_url(env)
       headers = {"Content-Type" => "text/html", "location" => url}
@@ -50,29 +48,20 @@ module Rack
 
     def change_subdomain?(env)
       @redirect && !already_subdomain?(env) ||
-      !@redirect && already_subdomain?(env)
+        !@redirect && already_subdomain?(env)
     end
 
     def already_subdomain?(env)
-      env["HTTP_HOST"].downcase =~ /^(#{@subdomain}.)/
+      env["HTTP_HOST"].to_s.downcase =~ /^(#{@subdomain}\.)/
     end
 
     def prepare_url(env)
       scheme = env["rack.url_scheme"]
-
-      host = env["SERVER_NAME"].gsub(/^(#{@subdomain}.)/, "")
-      host = host.gsub(/^(www.)/, "")
-
-      if env['SERVER_PORT'] == '80'
-        port = ''
-      else
-        port = ":#{env['SERVER_PORT']}"
-      end
-
+      host = env["SERVER_NAME"].to_s.gsub(/^(#{@subdomain}\.)/, "").gsub(/^(www\.)/, "")
+      port = env['SERVER_PORT'] == '80' ? '' : ":#{env['SERVER_PORT']}"
       path = env["PATH_INFO"]
 
-      query_string = ""
-      if !env["QUERY_STRING"].empty?
+      unless env["QUERY_STRING"].empty?
         query_string = "?" + env["QUERY_STRING"]
       end
 
@@ -81,6 +70,7 @@ module Rack
       else
         host = "://" + host
       end
+
       "#{scheme}#{host}#{port}#{path}#{query_string}"
     end
   end

data/rack-www.gemspec

@@ -0,0 +1,21 @@
+Gem::Specification.new do |s|
+  s.name        = 'rack-www'
+  s.version     = '2.0.0'
+  s.date        = '2015-12-02'
+  s.homepage    = "https://github.com/stjhimy/rack-www"
+  s.email       = "stjhimy@gmail.com"
+  s.summary     = "Force redirects to a any given subdomain, example: www or www2"
+  s.description = "Rack middleware to force subdomain redirects."
+  s.licenses    = ["MIT"]
+  s.authors     = ["Jhimy Fernandes Villar"]
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- test/*`.split("\n")
+  s.require_paths = ["lib"]
+  s.required_ruby_version = '>= 1.9.3'
+
+  s.add_runtime_dependency 'rack', '~> 1.0'
+  s.add_development_dependency 'rake', '~> 10.4'
+  s.add_development_dependency 'rack-test', '~> 0.6'
+  s.add_development_dependency 'minitest', '~> 5.8'
+end

data/test/helper.rb

@@ -0,0 +1,21 @@
+require "rack/www"
+require 'minitest/autorun'
+require 'rack/test'
+
+class TestClass < MiniTest::Test
+  include Rack::Test::Methods
+
+  def default_app
+    lambda { |env|
+      headers = {'Content-Type' => "text/html"}
+      headers['Set-Cookie'] = "id=1; path=/\ntoken=abc; path=/; secure; HttpOnly"
+      [200, headers, ["default body"]]
+    }
+  end
+
+  def app
+    @app ||= Rack::Lint.new(Rack::WWW.new(default_app))
+  end
+
+  attr_writer :app
+end

data/test/predicate_test.rb

@@ -0,0 +1,20 @@
+require "helper"
+
+class PredicateTest < TestClass
+  def test_predicate_false
+    self.app = Rack::WWW.new(default_app, :predicate => lambda { |env| false } )
+    get_example
+    assert_equal last_response.status, 200
+  end
+
+  def test_predicate_true
+    self.app = Rack::WWW.new(default_app, :predicate => lambda { |env| true } )
+    get_example
+    assert_equal "http://www.example.com/", last_response.headers['Location']
+  end
+
+  private
+  def get_example
+    get "http://example.com/"
+  end
+end

data/test/subdomain_test.rb

@@ -0,0 +1,43 @@
+require "helper"
+
+class SubdomainTest < TestClass
+  def setup
+    self.app = Rack::WWW.new(default_app, :subdomain => "secure")
+  end
+
+  def test_if_allow_custom_subdomain
+    get 'http://example.com'
+    assert_equal 'http://secure.example.com/', last_response.headers['Location']
+  end
+
+  def test_custom_subdomain_with_path
+    get "http://example.com/path/1"
+    assert_equal "http://secure.example.com/path/1", last_response.headers['Location']
+  end
+
+  def test_custom_subdomain_with_path_and_www
+    get "http://www.example.com/path/1"
+    assert_equal "http://secure.example.com/path/1", last_response.headers['Location']
+  end
+
+  def test_custom_subdomain_with_query
+    get "http://example.com/path/1?test=true"
+    assert_equal "http://secure.example.com/path/1?test=true", last_response.headers['Location']
+  end
+
+  def test_custom_subdomain_with_query_and_www
+    get "http://www.example.com/path/1?test=true"
+    assert_equal "http://secure.example.com/path/1?test=true", last_response.headers['Location']
+  end
+
+  def test_body_with_custom_subdomain_and_message
+    self.app = Rack::WWW.new(default_app, :subdomain => "secure", :message => "redirecting now!")
+    get "http://example.com/"
+    assert_equal last_response.body, "redirecting now!"
+  end
+
+  def test_body_with_custom_subdomain_without_message
+    get "http://example.com/"
+    assert_equal last_response.body, ""
+  end
+end

data/test/www_false_test.rb

@@ -0,0 +1,27 @@
+require "helper"
+
+class FalseWWW < TestClass
+  def setup
+    self.app = Rack::WWW.new(default_app, :www => false)
+  end
+
+  def test_www_false
+    get "http://www.example.com/"
+    assert_equal "http://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", last_response.headers['Location']
+  end
+
+  def test_www_false_with_query
+    get "http://www.example.com/path/1?param=test"
+    assert_equal "http://example.com/path/1?param=test", last_response.headers['Location']
+  end
+
+  def test_www_false_non_www
+    get "http://example.com/"
+    assert last_response.ok?
+  end
+end

data/test/www_true_test.rb

@@ -0,0 +1,58 @@
+require "helper"
+
+class TrueWWW < TestClass
+  def setup
+    self.app = Rack::WWW.new(default_app, :www => true)
+  end
+
+  def test_response_200
+    get "http://www.example.com"
+    assert_equal last_response.status, 200
+  end
+
+  def test_response_301
+    get "http://example.com"
+    assert_equal last_response.status, 301
+  end
+
+  def test_redirects
+    get "http://example.com/"
+    assert_equal "http://www.example.com/", last_response.headers['Location']
+  end
+
+  def test_www_true
+    get "http://example.com/"
+    assert_equal "http://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", last_response.headers['Location']
+  end
+
+  def test_www_true_with_query
+    get "http://example.com/path/1?param=test"
+    assert_equal "http://www.example.com/path/1?param=test", last_response.headers['Location']
+  end
+
+  def test_body_with_message
+    self.app = Rack::WWW.new(default_app, :www => true, :message => "redirecting now!")
+    get "http://example.com/"
+    assert_equal last_response.body, "redirecting now!"
+  end
+
+  def test_body_without_message
+    get "http://example.com/"
+    assert_equal last_response.body, ""
+  end
+
+  def test_server_port
+    get "http://example.com:8080/"
+    assert_equal "http://www.example.com:8080/",last_response.headers['Location']
+  end
+
+  def test_server_port_80
+    get "http://example.com:80/"
+    assert_equal "http://www.example.com/",last_response.headers['Location']
+  end
+end

metadata

@@ -1,67 +1,121 @@
 --- !ruby/object:Gem::Specification
 name: rack-www
 version: !ruby/object:Gem::Version
-  version: 1.5.0
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Jhimy Fernandes Villar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: ! '    Rack middleware to force subdomain redirects, e.g: www.
-
-'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.8'
+description: Rack middleware to force subdomain redirects.
 email: stjhimy@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- CHANGELOG.md
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- Rakefile
 - lib/rack-www.rb
 - lib/rack/www.rb
-- LICENSE
-- CHANGELOG.rdoc
-- README.rdoc
+- rack-www.gemspec
+- test/helper.rb
+- test/predicate_test.rb
+- test/subdomain_test.rb
+- test/www_false_test.rb
+- test/www_true_test.rb
 homepage: https://github.com/stjhimy/rack-www
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
-summary: ! 'Force redirects to a any given subdomain, e.g: www.'
-test_files: []
+specification_version: 4
+summary: 'Force redirects to a any given subdomain, example: www or www2'
+test_files:
+- test/helper.rb
+- test/predicate_test.rb
+- test/subdomain_test.rb
+- test/www_false_test.rb
+- test/www_true_test.rb

data/CHANGELOG.rdoc

@@ -1,26 +0,0 @@
-== 1.4
-
-* Respect server port
-* Body responds to :each
-* Rack::Lint on tests
-
-== 1.3
-
-* Added possibility to redirects to any given :subdomain [Ryan Weald (https://github.com/rweald)].
-* Added more tests
-
-== 1.2
-
-* Redirects to the right url without calling the app
-* Keep the path when redirecting
-* Keep the query string when redirecting
-* Added more tests
-
-== 1.1
-
-* Added possibility to redirects with www or without www.
-* Added possibility to set a param :message to show while redirecting.
-
-== 1.0
-
-* Redirects all traffic to www.