ensure_subdomain 0.9.9 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c706bfd647210b33566e2fbb57308663f51ee4cd
+  data.tar.gz: 07180f9ce0482aa1ce23ed97686635d617ad54d6
+SHA512:
+  metadata.gz: ce86ba5c71b3c9882a3d2c7a1ab071cd5798abdb3b6d3bfdc7fa19112939b77f13bf0e7c83a81ffe907b99f65a32b78347c07bb7f2c131f6fce2885761745c7e
+  data.tar.gz: 788952e1e1bfc52aaaf6318a1c8952fc691594450a83dbcbedbf7270a3bb02c3beb61af7c330b8d7e5954bf3b960b0387d489259d906b0e825937f10e95d0471

data/.gitignore

@@ -0,0 +1 @@
+ensure_subdomain-*.gem

data/README.md

@@ -2,8 +2,6 @@
 
 an ActionDispatch extension to handle subdomain redirects
 
-#### Warning: There aren't any tests yet, so this is probably not suitable for production. If you'd like to contribute, I wouldn't be opposed.
-
 Let's say you believe that [using the www subdomain is dumb](http://no-www.org).
 Ensuring your rails app doesn't use this subdomain is pretty easy, but now it's easier.
 
@@ -40,4 +38,4 @@ Finally, if you've got some other domain, there's a method for that too.
 		ensure_subdomain 'blog'
 	end
 	
-GETting http://my-app.dev/ will redirect to http://blog.my-app.dev
+GETting http://my-app.dev/ will redirect to http://blog.my-app.dev

data/lib/ensure_subdomain.rb

@@ -1,14 +1,16 @@
 class EnsureSubdomain
 	attr_accessor :subdomain
-	
+
 	def initialize(subdomain)
 		self.subdomain = subdomain.sub(/\.$/, '')
 	end
 
 	def matches?(request)
-		request.subdomain.match(self.subdomain).nil?
+		# ''.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?
@@ -23,14 +25,14 @@ module ActionDispatch::Routing::Mapper::HttpHelpers
 		ensure_subdomain ''
 	end
 	alias_method :ensure_non_www, :ensure_no_www
-	
+
 	def ensure_www
 		ensure_subdomain 'www'
 	end
 
 	def ensure_subdomain(subdomain, options={})
 		redirector = EnsureSubdomain.new( subdomain )
-		verbs = options[:via] || [:get, :post, :put, :patch, :delete] 
+		verbs = options[:via] || [:get, :post, :put, :patch, :delete]
 		constraints( redirector ) do
 			match '/*path', to: redirect { |params, request| redirector.to params, request }, via: verbs
 		end

data/lib/ensure_subdomain/version.rb

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

data/test/ensure_subdomain_test.rb

@@ -0,0 +1,84 @@
+require 'minitest/autorun'
+require 'action_dispatch'
+require File.join(File.dirname(__FILE__), '../lib/ensure_subdomain')
+require 'ostruct'
+
+class TestEnsureSubdomain < MiniTest::Unit::TestCase
+=begin
+	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_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_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
+=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_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
+=end
+	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 no_path_params
+		{ _method: :get }
+	end
+
+	def path_params
+		base = no_path_params
+		base[:path] = 'user/signup'
+		base
+	end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ensure_subdomain
 version: !ruby/object:Gem::Version
-  version: 0.9.9
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Jacob Evan Shreve
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,34 +32,35 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - LICENSE
 - README.md
 - ensure_subdomain.gemspec
 - lib/ensure_subdomain.rb
 - lib/ensure_subdomain/version.rb
+- test/ensure_subdomain_test.rb
 homepage: https://github.com/shreve/ensure_subdomain
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ensure requests are going to the right subdomain.
 test_files: []