mholling-subdomain_routes 0.2.0 → 0.2.1

data/README.textile

@@ -12,7 +12,7 @@ The gem is called <code>SubdomainRoutes</code>, and is easy to install from GitH
 
 <pre>
 gem sources -a http://gems.github.com
-sudo gem install mholling-active_url
+sudo gem install mholling-subdomain_routes
 </pre>
 
 In your Rails app, make sure to specify the gem dependency in environment.rb:
@@ -21,7 +21,7 @@ In your Rails app, make sure to specify the gem dependency in environment.rb:
 config.gem "mholling-subdomain_routes", :lib => "subdomain_routes", :source => "http://gems.github.com"
 </pre>
 
-(Note that the SubdomainRoutes gem requires Rails 2.2 or later to run since it uses <code>ActiveSupport::Memoizable</code>. If you're on an older version of Rails, you need to get with the program. ;)
+(Note that the SubdomainRoutes gem requires Rails 2.2 or later to run since it changes <code>ActionController::Resources::INHERITABLE_OPTIONS</code>. If you're on an older version of Rails, you need to get with the program. ;)
 
 Finally, you'll probably want to configure your session to work across all your subdomains. You can do this in your environment files:
 

data/Rakefile

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rake'
+require 'yaml'
 
 begin
   require 'jeweler'
@@ -11,12 +12,12 @@ begin
       one or many specified subdomains. An URL will be recognised only if the host subdomain matches the
       subdomain specified in the route. Route generation is also enhanced, so that the subdomain of a
       generated URL (or path) will be changed if the requested route has a different subdomain to that of
-      the current request. Dynamic subdomain routes can also be defined.
+      the current request. Model-based subdomain routes can also be defined.
     EOF
     gem.email = "mdholling@gmail.com"
     gem.homepage = "http://github.com/mholling/subdomain_routes"
     gem.authors = ["Matthew Hollingworth"]
-    gem.add_dependency 'actionpack', ">= 2.2.1" # requires ActiveSupport::Memoizable
+    gem.add_dependency 'actionpack', ">= 2.2.1"
     gem.has_rdoc = false
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :major: 0
 :minor: 2

data/rails/init.rb

@@ -0,0 +1 @@
+require 'subdomain_routes'

data/spec/extraction_spec.rb

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe "subdomain extraction" do
-  before(:each) do
-    ActionController::Routing::Routes.clear!
-  end
-  
   include SubdomainRoutes::SplitHost
 
   it "should add a subdomain method to requests" do
@@ -12,12 +8,6 @@ describe "subdomain extraction" do
     request.host = "admin.example.com"
     request.subdomain.should == "admin"
   end
-
-  describe "configuration" do
-    it "should have a default domain length of nil" do
-      SubdomainRoutes::Config.domain_length.should be_nil
-    end
-  end
   
   it "should raise an error if no host is supplied" do
     lambda { split_host(nil) }.should raise_error(SubdomainRoutes::HostNotSupplied)
@@ -44,7 +34,7 @@ describe "subdomain extraction" do
     before(:each) do
       SubdomainRoutes::Config.stub!(:domain_length).and_return(2)
     end        
-  
+      
     it "should find the domain" do
       domain_for_host("www.example.com").should == "example.com"
     end

data/spec/recognition_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 describe "subdomain route recognition" do
   before(:each) do
-    ActionController::Routing::Routes.clear!
-    SubdomainRoutes::Config.stub!(:domain_length).and_return(2)
     @request = ActionController::TestRequest.new
     @request.host = "www.example.com"
     @request.request_uri = "/items/2"

data/spec/resources_spec.rb

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
 describe "resource" do
-  before(:each) do
-    ActionController::Routing::Routes.clear!
-    SubdomainRoutes::Config.stub!(:domain_length).and_return(2)
-  end
-  
   describe "mappings" do
     it "should pass the specified subdomains to any nested routes" do
       map_subdomain(:admin) do |admin|

data/spec/routes_spec.rb

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
 describe "subdomain routes" do
-  before(:each) do
-    ActionController::Routing::Routes.clear!
-    SubdomainRoutes::Config.stub!(:domain_length).and_return(2)
-  end
-    
   it "should check the validity of each subdomain" do
     SubdomainRoutes.should_receive(:valid_subdomain?).twice.and_return(true, true)
     lambda { map_subdomain(:www, :www1) { } }.should_not raise_error
@@ -158,8 +153,6 @@ end
 
 describe "ActionController::Routing::Routes" do
   before(:each) do
-    SubdomainRoutes::Config.stub!(:domain_length).and_return(2)
-    ActionController::Routing::Routes.clear!
     map_subdomain(:www, nil) { |www| www.root :controller => "homes", :action => "show" }
   end
   

data/spec/spec_helper.rb

@@ -10,7 +10,12 @@ require 'action_mailer' # only required for testing optional features, not requi
 require 'subdomain_routes'
 
 Spec::Runner.configure do |config|
+  config.before(:each) do
+    ActionController::Routing::Routes.clear!
+    SubdomainRoutes::Config.stub!(:domain_length).and_return(2)
+  end
 end
+
 require 'action_controller/test_process'
 require 'action_view/test_case'
 

data/spec/url_writing_spec.rb

@@ -1,11 +1,6 @@
 require 'spec_helper'
 
 describe "URL writing" do
-  before(:each) do
-    ActionController::Routing::Routes.clear!
-    SubdomainRoutes::Config.stub!(:domain_length).and_return(2)
-  end
-  
   { "nil" => nil, "an IP address" => "207.192.69.152" }.each do |host_type, host|
     context "when the host is #{host_type}" do
       it "should raise an error when a subdomain route is requested" do

data/spec/validations_spec.rb

@@ -1,7 +1,5 @@
 describe "ActiveRecord::Base" do
   before(:each) do
-    ActionController::Routing::Routes.clear!
-    SubdomainRoutes::Config.stub!(:domain_length).and_return(2)
     class User < ActiveRecord::Base
       attr_accessor :subdomain
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mholling-subdomain_routes
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Matthew Hollingworth
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -07:00
+date: 2009-06-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.1
     version: 
-description: SubdomainRoutes add subdomain conditions to the Rails routing system. Routes may be restricted to one or many specified subdomains. An URL will be recognised only if the host subdomain matches the subdomain specified in the route. Route generation is also enhanced, so that the subdomain of a generated URL (or path) will be changed if the requested route has a different subdomain to that of the current request. Dynamic subdomain routes can also be defined.
+description: SubdomainRoutes add subdomain conditions to the Rails routing system. Routes may be restricted to one or many specified subdomains. An URL will be recognised only if the host subdomain matches the subdomain specified in the route. Route generation is also enhanced, so that the subdomain of a generated URL (or path) will be changed if the requested route has a different subdomain to that of the current request. Model-based subdomain routes can also be defined.
 email: mdholling@gmail.com
 executables: []
 
@@ -45,6 +45,7 @@ files:
 - lib/subdomain_routes/split_host.rb
 - lib/subdomain_routes/url_writer.rb
 - lib/subdomain_routes/validations.rb
+- rails/init.rb
 - spec/extraction_spec.rb
 - spec/recognition_spec.rb
 - spec/resources_spec.rb