subdomainitis 0.9.30 → 0.9.31

data/lib/subdomainitis.rb

@@ -73,13 +73,11 @@ module Subdomainitis
   end
 
   def subdomain_as(subdomain_key, &block)
-    @set.subdomain_routes ||= {}
     subdomain_routeset = SubdomainRouteSet.new @set, subdomain_key
     subdomain_routeset.draw &block
   end
 
   def main_domain(&block)
-    @set.maindomain_routes ||= {}
     maindomain_routeset = MainDomainRouteSet.new @set
     maindomain_routeset.draw &block
   end
@@ -117,6 +115,17 @@ module Subdomainitis
   end
 
   module RouteSetMethods
+    def clear!
+      subdomainitis_defaults!
+      super
+    end
+
+    def subdomainitis_defaults!
+      self.tld_length = DEFAULT_TLD_LENGTH
+      self.subdomain_routes = {}
+      self.maindomain_routes = {}
+    end
+
     def url_for_with_subdomains(args)
       route_name = args[:use_route]
       if subdomain_key = subdomain_routes[route_name]
@@ -181,15 +190,19 @@ module Subdomainitis
   end
 
   def self.extended(mapper)
-    mapper.instance_variable_get(:@set).class_eval do
-      include RouteSetMethods
-      alias_method_chain :url_for, :subdomains
-      attr_accessor :subdomain_routes, :maindomain_routes, :use_fake_subdomains, :tld_length
+    set = mapper.instance_variable_get(:@set)
+
+    unless set.is_a? RouteSetMethods
+      set.class_eval do
+        include RouteSetMethods
+        alias_method_chain :url_for, :subdomains
+        attr_accessor :subdomain_routes, :maindomain_routes, :use_fake_subdomains, :tld_length
+      end
     end
 
     delegate :tld_length=, :to => :@set
 
-    mapper.tld_length = DEFAULT_TLD_LENGTH
+    set.subdomainitis_defaults!
   end
 
 

metadata

@@ -1,97 +1,72 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: subdomainitis
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 30
-  version: 0.9.30
+version: !ruby/object:Gem::Version
+  version: 0.9.31
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Stephen Judkins
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-02 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153987400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153987400
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2153986700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
-  version_requirements: *id002
-description: subdomainitis provides easy, simple support for using wildcard subdomains as controller parameters in Rails 3
-email: 
+  prerelease: false
+  version_requirements: *2153986700
+description: subdomainitis provides easy, simple support for using wildcard subdomains
+  as controller parameters in Rails 3
+email:
 - stephen.judkins@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/subdomainitis/spec_helpers.rb
 - lib/subdomainitis.rb
 - LICENSE
 - README.md
-has_rdoc: true
 homepage: http://github.com/stephenjudkins/subdomainitis
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Easy routing based on subdomains for Rails 3
 test_files: []
-