ensure_subdomain 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c706bfd647210b33566e2fbb57308663f51ee4cd
-  data.tar.gz: 07180f9ce0482aa1ce23ed97686635d617ad54d6
+  metadata.gz: 3a5b38bc301b07a5d51159dfc71595fb49e1a919
+  data.tar.gz: cf9297a48daaa005a972a1e80003b553d78ba4b0
 SHA512:
-  metadata.gz: ce86ba5c71b3c9882a3d2c7a1ab071cd5798abdb3b6d3bfdc7fa19112939b77f13bf0e7c83a81ffe907b99f65a32b78347c07bb7f2c131f6fce2885761745c7e
-  data.tar.gz: 788952e1e1bfc52aaaf6318a1c8952fc691594450a83dbcbedbf7270a3bb02c3beb61af7c330b8d7e5954bf3b960b0387d489259d906b0e825937f10e95d0471
+  metadata.gz: 097c68036be7e3c157399be5db6e3f5db1f3e938f4233debdcfd6b284af229634fe4e8e8fc6e1a481c888a0090d206123a5953d6d12d84b27c4f8d318f882fc4
+  data.tar.gz: 548b8d69cee9fe45c209e97d4edf8a077f50076a5e1eda1b584d1048ebca969a2e6a1d9189ddd7821ba7da1eb5e147fd5b8667ab4ab18af0af21396d6da2d163

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :minitest do
+  # with Minitest::Unit
+  watch(%r{^test/(.*)\/?(.*)\_test.rb$})
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}#{m[2]}_test.rb" }
+  watch(%r{^test/test_helper\.rb$})      { 'test' }
+end

data/ensure_subdomain.gemspec

@@ -3,18 +3,18 @@
 require File.expand_path('../lib/ensure_subdomain/version', __FILE__)
 
 Gem::Specification.new do |s|
-	s.name = 'ensure_subdomain'
-	s.version = EnsureSubdomain::VERSION::STRING
-	s.platform = Gem::Platform::RUBY
-	s.authors = "Jacob Evan Shreve"
-	s.email = %w(jacob@shreve.ly)
-	s.summary = 'Ensure requests are going to the right subdomain.'
-	s.description = 'Ensure requests are going to the right subdomain to avoid competing with yourself for dem SERPs. Adds a couple methods to ActionDispatch for routes.'
-	s.homepage = 'https://github.com/shreve/ensure_subdomain'
-	s.license = 'MIT'
+  s.name = 'ensure_subdomain'
+  s.version = EnsureSubdomain::VERSION::STRING
+  s.platform = Gem::Platform::RUBY
+  s.authors = "Jacob Evan Shreve"
+  s.email = %w(jacob@shreve.ly)
+  s.summary = 'Ensure requests are going to the right subdomain.'
+  s.description = 'Ensure requests are going to the right subdomain to avoid competing with yourself for dem SERPs. Adds a couple methods to ActionDispatch for routes.'
+  s.homepage = 'https://github.com/shreve/ensure_subdomain'
+  s.license = 'MIT'
 
-	s.add_dependency 'actionpack', '~>4.0.0'
+  s.add_runtime_dependency 'actionpack', '>= 4.0.0'
 
-	s.files = `git ls-files`.split("\n")
-	s.require_path = 'lib'
+  s.files = `git ls-files`.split("\n")
+  s.require_path = 'lib'
 end

data/lib/ensure_subdomain.rb

@@ -1,40 +1,47 @@
 class EnsureSubdomain
-	attr_accessor :subdomain
+  attr_accessor :subdomain
 
-	def initialize(subdomain)
-		self.subdomain = subdomain.sub(/\.$/, '')
-	end
+  def initialize(subdomain)
+    self.subdomain = subdomain.sub(/\.$/, '')
+  end
 
-	def matches?(request)
-		# ''.match('www') #=> nil, which is is the opposite of what we want
-		(self.subdomain.empty? && request.subdomain.present?) ||
-			request.subdomain.match(self.subdomain).nil?
-	end
+  def matches?(request)
+    # ''.match('www') #=> nil, which is is the opposite of what we want
+    (self.subdomain.empty? && request.subdomain.present?) ||
+      request.subdomain.match(self.subdomain).nil?
+  end
 
-	def to(params, request)
-		url = request.protocol
-		url << "#{self.subdomain}." if self.subdomain.present?
-		url << request.domain
-		url << "/#{params[:path]}" if params[:path].present?
-		url
-	end
+  def to(params, request)
+    url = request.protocol
+    url << "#{self.subdomain}." if self.subdomain.present?
+    url << "#{request.subdomain}." if vendor_url?(request)
+    url << request.domain
+    url << "/#{params[:path]}" if params[:path].present?
+    url
+  end
+
+  private
+  def vendor_url?(request)
+    request.domain.match /heroku/
+  end
 end
 
 module ActionDispatch::Routing::Mapper::HttpHelpers
-	def ensure_no_www
-		ensure_subdomain ''
-	end
-	alias_method :ensure_non_www, :ensure_no_www
+  def ensure_no_www
+    ensure_subdomain ''
+  end
+  alias_method :ensure_non_www, :ensure_no_www
 
-	def ensure_www
-		ensure_subdomain 'www'
-	end
+  def ensure_www
+    ensure_subdomain 'www'
+  end
 
-	def ensure_subdomain(subdomain, options={})
-		redirector = EnsureSubdomain.new( subdomain )
-		verbs = options[:via] || [:get, :post, :put, :patch, :delete]
-		constraints( redirector ) do
-			match '/*path', to: redirect { |params, request| redirector.to params, request }, via: verbs
-		end
-	end
+  def ensure_subdomain(subdomain, options={})
+    redirector = EnsureSubdomain.new( subdomain )
+    verbs = options[:via] || [:get, :post, :put, :patch, :delete]
+    constraints( redirector ) do
+      match '/', to: redirect { |params, request| redirector.to params, request }, via: verbs
+      match '/*path', to: redirect { |params, request| redirector.to params, request }, via: verbs
+    end
+  end
 end

data/lib/ensure_subdomain/version.rb

@@ -2,7 +2,7 @@ class EnsureSubdomain
 	module VERSION
 		MAJOR = 1
 		MINOR = 0
-		TINY = 0
+		TINY = 1
 
 		STRING = [MAJOR, MINOR, TINY].join('.')
 	end

data/test/ensure_subdomain_test.rb

@@ -1,84 +1,65 @@
-require 'minitest/autorun'
-require 'action_dispatch'
-require File.join(File.dirname(__FILE__), '../lib/ensure_subdomain')
-require 'ostruct'
+require 'test_helper'
 
 class TestEnsureSubdomain < MiniTest::Unit::TestCase
 =begin
-	Test that the EnsureSubdomain constraint matching works.
-	Involves class initialization, and the matches method
+  Test that the EnsureSubdomain constraint matching works.
+  Involves class initialization, and the matches method
 =end
-	def test_empty_subdomain_will_redirect_to_www
-		redirector = www_redirector
-		assert redirector.matches?(empty_subdomain_request),
-			"request with empty subdomain won't redirect with www_redirector"
-	end
+  def test_empty_subdomain_will_redirect_to_www
+    redirector = www_redirector
+    assert redirector.matches?(empty_subdomain_request),
+      "request with empty subdomain won't redirect with www_redirector"
+  end
 
-	def test_empty_subdomain_will_not_redirect_if_empty
-		redirector = empty_redirector
-		refute redirector.matches?(empty_subdomain_request),
-			"request with empty subdomain will redirect with empty_redirector"
-	end
+  def test_empty_subdomain_will_not_redirect_if_empty
+    redirector = empty_redirector
+    refute redirector.matches?(empty_subdomain_request),
+      "request with empty subdomain will redirect with empty_redirector"
+  end
 
-	def test_www_will_redirect_to_empty
-		redirector = empty_redirector
-		assert redirector.matches?(subdomain_request),
-			"request with www subdomain won't redirect with empty_redirector"
-	end
+  def test_www_will_redirect_to_empty
+    redirector = empty_redirector
+    assert redirector.matches?(subdomain_request),
+      "request with www subdomain won't redirect with empty_redirector"
+  end
 
-	def test_www_will_not_redirect_if_www
-		redirector = www_redirector
-		refute redirector.matches?(subdomain_request),
-			"request with www subdomain will redirect with www_redirector"
-	end
+  def test_www_will_not_redirect_if_www
+    redirector = www_redirector
+    refute redirector.matches?(subdomain_request),
+      "request with www subdomain will redirect with www_redirector"
+  end
 
 =begin
-	Test that the EnsureSubdomain url generator works.
-	Involves the to method
+  Test that the EnsureSubdomain url generator works.
+  Involves the to method
 =end
-	def test_www_redirector_generates_www_url
-		redirector = www_redirector
-		assert_equal "http://www.example.com", redirector.to(no_path_params, empty_subdomain_request)
-	end
+  def test_www_redirector_generates_www_url
+    redirector = www_redirector
+    assert_equal "http://www.example.com", redirector.to(no_path_params, empty_subdomain_request)
+  end
 
-	def test_empty_redirector_generates_empty_url
-		redirector = empty_redirector
-		assert_equal "http://example.com", redirector.to(no_path_params, subdomain_request)
-	end
+  def test_empty_redirector_generates_empty_url
+    redirector = empty_redirector
+    assert_equal "http://example.com", redirector.to(no_path_params, subdomain_request)
+  end
 
-	def test_path_is_included
-		redirector = empty_redirector
-		assert_equal "http://example.com/user/signup", redirector.to(path_params, empty_subdomain_request)
-	end
+  def test_path_is_included
+    redirector = empty_redirector
+    assert_equal "http://example.com/user/signup", redirector.to(path_params, empty_subdomain_request)
+  end
 
 =begin
-	Test helpers because I'm too lazy for a separate file
+  Test hosting vendor special url compatability
+  ex: http://myapp.herokuapp.com shouldn't redirect to herokuapp.com on ensure_no_subdomain
 =end
-	def www_redirector
-		EnsureSubdomain.new('www')
-	end
+  def test_no_subdomain_wont_redirect_to_herokuapp
+    redirector = empty_redirector
+    assert_equal "http://example.herokuapp.com", redirector.to(no_path_params, heroku_request)
+  end
 
-	def empty_redirector
-		EnsureSubdomain.new('')
-	end
+  def test_www_subdomain_will_remain_on_herokuapp
+    redirector = www_redirector
+    assert_equal "http://www.example.herokuapp.com", redirector.to(no_path_params, heroku_request)
+  end
 
-	def empty_subdomain_request
-		OpenStruct.new(protocol: 'http://', domain: 'example.com', subdomain: '')
-	end
-
-	def subdomain_request(sub='www')
-		base = empty_subdomain_request
-		base[:subdomain] = sub
-		base
-	end
-
-	def no_path_params
-		{ _method: :get }
-	end
-
-	def path_params
-		base = no_path_params
-		base[:path] = 'user/signup'
-		base
-	end
 end

data/test/test_helper.rb

@@ -0,0 +1,58 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'minitest/autorun'
+require 'action_dispatch'
+require 'ensure_subdomain'
+require 'ostruct'
+
+def www_redirector
+  EnsureSubdomain.new('www')
+end
+
+def empty_redirector
+  EnsureSubdomain.new('')
+end
+
+def empty_subdomain_request
+  OpenStruct.new(protocol: 'http://', domain: 'example.com', subdomain: '')
+end
+
+def subdomain_request(sub='www')
+  base = empty_subdomain_request
+  base[:subdomain] = sub
+  base
+end
+
+def heroku_request
+  base = empty_subdomain_request
+  base[:subdomain] = base[:domain].sub('.com', '')
+  base[:domain] = 'herokuapp.com'
+  base
+end
+
+def no_path_params
+  { _method: :get }
+end
+
+def path_params
+  base = no_path_params
+  base[:path] = 'user/signup'
+  base
+end
+
+def router
+  ActionDispatch::Routing::RouteSet.new
+end
+
+def www_router
+  router.draw do
+    ensure_www
+  end
+  router
+end
+
+def empty_router
+  router.draw do
+    ensure_no_www
+  end
+  router
+end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ensure_subdomain
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jacob Evan Shreve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-24 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 description: Ensure requests are going to the right subdomain to avoid competing with
@@ -32,13 +32,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- Guardfile
 - LICENSE
 - README.md
 - ensure_subdomain.gemspec
 - lib/ensure_subdomain.rb
 - lib/ensure_subdomain/version.rb
 - test/ensure_subdomain_test.rb
+- test/test_helper.rb
 homepage: https://github.com/shreve/ensure_subdomain
 licenses:
 - MIT
@@ -49,17 +51,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ensure requests are going to the right subdomain.