subdomainitis 0.9.0 → 0.9.1

data/README.md

@@ -1,8 +1,10 @@
-# Subdomainitis: easily and transparently use subdomains as parameters in a Rails 3 application
+# Subdomainitis: transparently use subdomains as parameters in Rails 3
 
 ### Installation and usage
 To install, add `gem "subdomainitis"` to your `Gemfile`.  Then modify your routes.rb file; see the example below for usage.
 
+    require 'subdomainitis'
+    
     MyProject::Application.routes.draw do
       extend Subdomainitis
     
@@ -23,11 +25,11 @@ In the example above, the routes for `spams` will work regardless of the presenc
 
 Accessing `bars` routes will only work when a subdomain is provided.  Additionally, the specific subdomain is passed into the controller as a path parameter, as specified by the first argument to `subdomain_as`.  For example, `http://subdomain.mycompany.com/bars` resolves to `{:controller => 'bars', :action => 'index', :account => 'subdomain'}`.
 
-URL generation should work transparently as well; make sure you're using url instead of path generation (ie, `foos_url` instead of `foos_path`).  Subdomainitis tries to fail fast by raising exceptions when a working URL cannot be generated.
+URL generation should work transparently as well; make sure you're using url instead of path generation (ie, `foos_url` instead of `foos_path`).  Subdomainitis tries to fail fast by raising exceptions when a functional URL cannot be generated.
 
-Call `use_fake_subdomains!` to use the `_subdomain` GET parameter instead of an actual subdomain.  This is useful for development where wildcard subdomains aren't possible, or for testing environments like Cucumber that don't support subdomains.  This support has been tested with both recognition and generation.
+Call `use_fake_subdomains!` to use the `_subdomain` GET parameter instead of an actual subdomain.  This is useful for development where wildcard subdomains aren't possible, or for testing environments like Cucumber that don't support subdomains.  Enabling this mode should be completely transparent if you're using URL generators.
 
-No changes are necessary in the controllers.
+No changes to controllers are necessary.
 
 ### Issues
 Though this library seems to work fine for me, there are probably bugs and untested corner cases.  Currently only named routes have been verified to work.

data/lib/subdomainitis/spec_helpers.rb

@@ -39,7 +39,7 @@ module Subdomainitis
     end
 
     def generate(args)
-      url_helpers.url_for(args.merge(:host => 'test.host'))
+      url_helpers.url_for({:host => 'test.host'}.merge(args))
     end
 
     def url_helpers

data/lib/subdomainitis.rb

@@ -1,6 +1,7 @@
 module Subdomainitis
 
   SUBDOMAIN_KEY = "_subdomain"
+  DEFAULT_TLD_LENGTH = 1
 
   class IsSubdomain
     def initialize(route_set)
@@ -8,11 +9,13 @@ module Subdomainitis
     end
     attr_reader :route_set
 
+    delegate :use_fake_subdomains, :tld_length, :to => :route_set
+
     def matches?(request)
-      if route_set.use_fake_subdomains
+      if use_fake_subdomains
         request.GET.has_key?(SUBDOMAIN_KEY)
       else
-        request.subdomain.present?
+        request.subdomain(tld_length).present?
       end
     end
   end
@@ -65,6 +68,7 @@ module Subdomainitis
     end
 
     attr_reader :route_set, :subdomain_key, :dispatcher
+    delegate :use_fake_subdomains, :tld_length, :to => :route_set
 
     PATH_PARAMETER_KEY = 'action_dispatch.request.path_parameters'
 
@@ -78,10 +82,10 @@ module Subdomainitis
     end
 
     def subdomain_from(request)
-      if route_set.use_fake_subdomains
+      if use_fake_subdomains
         request.GET[SUBDOMAIN_KEY]
       else
-        request.subdomain
+        request.subdomain(tld_length)
       end
     end
   end
@@ -113,19 +117,25 @@ module Subdomainitis
 
     def host_name(subdomain_parameter, host)
       raise HostRequired.new unless host
-      ([subdomain_parameter] + host.split(".")[-2..-1]).join(".")
+      index = -1 - tld_length
+      ([subdomain_parameter] + host.split(".")[index..-1]).join(".")
     end
 
   end
 
-  def self.extended(router)
-    router.instance_variable_get(:@set).class_eval do
+  def self.extended(mapper)
+    mapper.instance_variable_get(:@set).class_eval do
       include RouteSetMethods
       alias_method_chain :url_for, :subdomains
-      attr_accessor :subdomain_routes, :use_fake_subdomains
+      attr_accessor :subdomain_routes, :use_fake_subdomains, :tld_length
     end
+
+    delegate :tld_length=, :to => :@set
+
+    mapper.tld_length = DEFAULT_TLD_LENGTH
   end
 
+
   class HostRequired < Exception
     def initialize
       super("A hostname must be specified to generate this URL since it depends on a subdomain")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Stephen Judkins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -07:00
+date: 2010-10-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency