mbleigh-subdomain-fu 0.0.5 → 0.1.0

data/CHANGELOG

@@ -0,0 +1,3 @@
+== 2008-06-25
+
+* Removed stray puts

data/Rakefile

@@ -0,0 +1,27 @@
+require 'rake'
+require 'spec/rake/spectask'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc 'Run the specs'
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
+  t.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "subdomain-fu"
+    gemspec.summary = "SubdomainFu is a Rails plugin that provides subdomain routing and URL writing helpers."
+    gemspec.email = "michael@intridea.com"
+    gemspec.homepage = "http://github.com/mbleigh/subdomain-fu"
+    gemspec.files =  FileList["[A-Z]*", "{lib,spec,rails}/**/*"] - FileList["**/*.log"]
+    gemspec.description = "SubdomainFu is a Rails plugin to provide all of the basic functionality necessary to handle multiple subdomain applications (such as Basecamp-esque subdomain accounts and more)."
+    gemspec.authors = ["Michael Bleigh"]
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+

data/VERSION

@@ -0,0 +1 @@
+0.1.0

data/lib/subdomain-fu.rb

@@ -31,7 +31,12 @@ module SubdomainFu
   
   # Is the current subdomain either nil or a mirror?
   def self.has_subdomain?(subdomain)
-    !subdomain.blank? && !SubdomainFu.mirrors.include?(subdomain)
+    subdomain != false && !subdomain.blank? && !SubdomainFu.mirrors.include?(subdomain)
+  end
+
+  # Is the subdomain a preferred mirror
+  def self.preferred_mirror?(subdomain)
+    subdomain == SubdomainFu.preferred_mirror || SubdomainFu.preferred_mirror.nil?
   end
   
   # Gets the subdomain from the host based on the TLD size
@@ -49,14 +54,15 @@ module SubdomainFu
   
   # Rewrites the subdomain of the host unless they are equivalent (i.e. mirrors of each other)
   def self.rewrite_host_for_subdomains(subdomain, host)
-    unless needs_rewrite?(subdomain, host)
-      if has_subdomain?(subdomain) || (subdomain_from(host) == SubdomainFu.preferred_mirror) || (!has_subdomain?(subdomain) && SubdomainFu.preferred_mirror == nil)
+    if needs_rewrite?(subdomain, host)
+      change_subdomain_of_host(subdomain || SubdomainFu.preferred_mirror, host)
+    else
+      if has_subdomain?(subdomain) || preferred_mirror?(subdomain_from(host)) ||
+          (subdomain.nil? && has_subdomain?(subdomain_from(host)))
         host
       else
         change_subdomain_of_host(SubdomainFu.preferred_mirror, host)
       end
-    else
-      change_subdomain_of_host(subdomain || SubdomainFu.preferred_mirror, host)
     end
   end
   
@@ -70,14 +76,14 @@ module SubdomainFu
   # Is this subdomain equivalent to the subdomain found in this host string?
   def self.same_subdomain?(subdomain, host)
     subdomain = nil unless subdomain
-    (subdomain == SubdomainFu.subdomain_from(host)) || 
-      (!SubdomainFu.has_subdomain?(subdomain) && !SubdomainFu.has_subdomain?(SubdomainFu.subdomain_from(host)))
+    (subdomain == subdomain_from(host)) ||
+      (!has_subdomain?(subdomain) && !has_subdomain?(subdomain_from(host)))
   end
   
-  def self.needs_rewrite?(subdomain, host)    
+  def self.needs_rewrite?(subdomain, host)
     return false if subdomain.nil?
-    subdomain = nil if subdomain.blank?
-    (!has_subdomain?(subdomain) && subdomain != SubdomainFu.preferred_mirror && SubdomainFu.preferred_mirror != nil) || 
+
+    (!has_subdomain?(subdomain) && preferred_mirror?(subdomain) && !preferred_mirror?(subdomain_from(host))) || 
       !same_subdomain?(subdomain, host)
   end
   
@@ -96,7 +102,6 @@ module SubdomainFu
     end
     
     protected
-    
     def current_subdomain
       SubdomainFu.current_subdomain(request)
     end

data/lib/subdomain_fu/routing_extensions.rb

@@ -10,7 +10,7 @@ module SubdomainFu
 
     def recognition_conditions_with_subdomain
       result = recognition_conditions_without_subdomain
-      result << "conditions[:subdomain] === env[:subdomain]" if conditions[:subdomain] && conditions[:subdomain] != true && conditions[:subdomain] != false
+      result << "conditions[:subdomain] === env[:subdomain].to_s" if conditions[:subdomain] && conditions[:subdomain] != true && conditions[:subdomain] != false
       result << "SubdomainFu.has_subdomain?(env[:subdomain])" if conditions[:subdomain] == true
       result << "!SubdomainFu.has_subdomain?(env[:subdomain])" if conditions[:subdomain] == false
       result

data/lib/subdomain_fu/url_rewriter.rb

@@ -1,11 +1,11 @@
 module ActionController
   module UrlWriter
     def url_for_with_subdomains(options)
-      unless SubdomainFu.needs_rewrite?(options[:subdomain], options[:host] || default_url_options[:host])
-        options.delete(:subdomain)
-      else
+      if SubdomainFu.needs_rewrite?(options[:subdomain], options[:host] || default_url_options[:host]) || options[:only_path] == false
         options[:only_path] = false 
         options[:host] = SubdomainFu.rewrite_host_for_subdomains(options.delete(:subdomain), options[:host] || default_url_options[:host])
+      else
+        options.delete(:subdomain)
       end
       url_for_without_subdomains(options)
     end
@@ -16,11 +16,11 @@ module ActionController
     private
     
     def rewrite_url_with_subdomains(options)
-      unless SubdomainFu.needs_rewrite?(options[:subdomain], (options[:host] || @request.host_with_port))
-        options.delete(:subdomain)
-      else
+      if SubdomainFu.needs_rewrite?(options[:subdomain], options[:host] || @request.host_with_port) || options[:only_path] == false
         options[:only_path] = false
         options[:host] = SubdomainFu.rewrite_host_for_subdomains(options.delete(:subdomain), options[:host] || @request.host_with_port)
+      else
+        options.delete(:subdomain)
       end
       rewrite_url_without_subdomains(options)
     end

data/spec/spec.opts

@@ -0,0 +1,7 @@
+--colour
+--format
+specdoc
+--loadby
+mtime
+--reverse
+--backtrace

data/spec/subdomain_fu_spec.rb

@@ -1,6 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe "SubdomainFu" do
+  before do
+    SubdomainFu.tld_sizes = SubdomainFu::DEFAULT_TLD_SIZES.dup
+    SubdomainFu.preferred_mirror = nil
+  end
+
   describe "TLD Sizes" do
     before do
       SubdomainFu.tld_sizes = SubdomainFu::DEFAULT_TLD_SIZES.dup
@@ -37,6 +42,7 @@ describe "SubdomainFu" do
     it "shoud be false for a nil or blank subdomain" do
       SubdomainFu.has_subdomain?("").should be_false
       SubdomainFu.has_subdomain?(nil).should be_false
+      SubdomainFu.has_subdomain?(false).should be_false
     end
   end
   
@@ -63,7 +69,19 @@ describe "SubdomainFu" do
     SubdomainFu.host_without_subdomain("awesome.localhost:3000").should == "localhost:3000"
     SubdomainFu.host_without_subdomain("something.awful.localhost:3000").should == "localhost:3000"
   end
-  
+
+  describe "#preferred_mirror?" do
+    describe "when preferred_mirror is false" do
+      before do
+        SubdomainFu.preferred_mirror = false
+      end
+
+      it "should return true for false" do
+        SubdomainFu.preferred_mirror?(false).should be_true
+      end
+    end
+  end
+
   describe "#rewrite_host_for_subdomains" do
     it "should not change the same subdomain" do
       SubdomainFu.rewrite_host_for_subdomains("awesome","awesome.localhost").should == "awesome.localhost"
@@ -80,10 +98,28 @@ describe "SubdomainFu" do
     it "should remove the subdomain if passed false when it's not a mirror" do
       SubdomainFu.rewrite_host_for_subdomains(false,"cool.localhost").should == "localhost"
     end
-    
+
     it "should not remove the subdomain if passed false when it is a mirror" do
       SubdomainFu.rewrite_host_for_subdomains(false,"www.localhost").should == "www.localhost"
     end
+
+    it "should not remove the subdomain if passed nil when it's not a mirror" do
+      SubdomainFu.rewrite_host_for_subdomains(nil,"cool.localhost").should == "cool.localhost"
+    end
+
+    describe "when preferred_mirror is false" do
+      before do
+        SubdomainFu.preferred_mirror = false
+      end
+
+      it "should remove the subdomain if passed false when it is a mirror" do
+        SubdomainFu.rewrite_host_for_subdomains(false,"www.localhost").should == "localhost"
+      end
+
+      it "should not remove the subdomain if passed nil when it's not a mirror" do
+        SubdomainFu.rewrite_host_for_subdomains(nil,"cool.localhost").should == "cool.localhost"
+      end
+    end
   end
   
   describe "#change_subdomain_of_host" do
@@ -130,4 +166,25 @@ describe "SubdomainFu" do
     it { SubdomainFu.same_subdomain?(nil,"www.localhost").should be_true }
     it { SubdomainFu.same_subdomain?("www","awesome.localhost").should be_false }
   end
+
+  describe "#needs_rewrite?" do
+    it { SubdomainFu.needs_rewrite?("www","www.localhost").should be_false }
+    it { SubdomainFu.needs_rewrite?("www","localhost").should be_false }
+    it { SubdomainFu.needs_rewrite?("awesome","www.localhost").should be_true }
+    it { SubdomainFu.needs_rewrite?("cool","awesome.localhost").should be_true }
+    it { SubdomainFu.needs_rewrite?(nil,"www.localhost").should be_false }
+    it { SubdomainFu.needs_rewrite?(nil,"awesome.localhost").should be_false }
+    it { SubdomainFu.needs_rewrite?(false,"awesome.localhost").should be_true }
+    it { SubdomainFu.needs_rewrite?(false,"www.localhost").should be_false }
+    it { SubdomainFu.needs_rewrite?("www","awesome.localhost").should be_true }
+
+    describe "when preferred_mirror is false" do
+      before do
+        SubdomainFu.preferred_mirror = false
+      end
+
+      it { SubdomainFu.needs_rewrite?(false,"www.localhost").should be_true }
+      it { SubdomainFu.needs_rewrite?(nil,"awesome.localhost").should be_false }
+    end
+  end
 end

data/spec/url_rewriter_spec.rb

@@ -3,6 +3,7 @@ require File.dirname(__FILE__) + '/spec_helper'
 describe "SubdomainFu URL Writing" do
   before do
     SubdomainFu.tld_size = 1
+    SubdomainFu.preferred_mirror = nil
     default_url_options[:host] = "testapp.com"
   end
   
@@ -47,7 +48,12 @@ describe "SubdomainFu URL Writing" do
       default_url_options[:host] = "awesome.testapp.com"
       needs_subdomain_path(:subdomain => "awesome").should == "/needs_subdomain"
     end
-    
+
+    it "should force the full url if it's a different subdomain" do
+      default_url_options[:host] = "awesome.testapp.com"
+      needs_subdomain_path(:subdomain => "crazy").should == "http://crazy.testapp.com/needs_subdomain"
+    end
+
     it "should not force the full url if the current subdomain is nil and so is the target" do
       needs_subdomain_path(:subdomain => nil).should == "/needs_subdomain"
     end
@@ -69,14 +75,28 @@ describe "SubdomainFu URL Writing" do
       foo_path(:id => "something", :subdomain => false).should == "http://testapp.com/foos/something"
     end
 
+    it "should work when passed in a paramable object" do
+      foo_path(Paramed.new("something"), :subdomain => "awesome").should == "http://awesome.testapp.com/foos/something"
+    end
+
     it "should work when passed in a paramable object" do
       foo_path(Paramed.new("something"), :subdomain => "awesome").should == "http://awesome.testapp.com/foos/something"
     end
     
+    it "should work when passed in a paramable object and no subdomain to a _path" do
+      default_url_options[:host] = "awesome.testapp.com"
+      foo_path(Paramed.new("something")).should == "/foos/something"
+    end
+
+    it "should work when passed in a paramable object and no subdomain to a _url" do
+      default_url_options[:host] = "awesome.testapp.com"
+      foo_url(Paramed.new("something")).should == "http://awesome.testapp.com/foos/something"
+    end
+
     it "should work on nested resource collections" do
       foo_bars_path(Paramed.new("something"), :subdomain => "awesome").should == "http://awesome.testapp.com/foos/something/bars"
     end
-    
+
     it "should work on nested resource members" do
       foo_bar_path(Paramed.new("something"),Paramed.new("else"), :subdomain => "awesome").should == "http://awesome.testapp.com/foos/something/bars/else"
     end
@@ -91,13 +111,23 @@ describe "SubdomainFu URL Writing" do
       default_url_options[:host] = "awesome.testapp.com"
       needs_subdomain_url(:subdomain => false).should == "http://www.testapp.com/needs_subdomain"
     end
-    
+
+    it "should switch to the preferred mirror automatically" do
+      default_url_options[:host] = "testapp.com"
+      needs_subdomain_url.should == "http://www.testapp.com/needs_subdomain"
+    end
+
+    it "should work when passed in a paramable object and no subdomain to a _url" do
+      default_url_options[:host] = "awesome.testapp.com"
+      foo_url(Paramed.new("something")).should == "http://awesome.testapp.com/foos/something"
+    end
+
     it "should force a switch to no subdomain on a mirror if preferred_mirror is false" do
       SubdomainFu.preferred_mirror = false
       default_url_options[:host] = "www.testapp.com"
       needs_subdomain_url(:subdomain => false).should == "http://testapp.com/needs_subdomain"
     end
-    
+
     after do
       SubdomainFu.preferred_mirror = nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mbleigh-subdomain-fu
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,37 +9,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 -08:00
+date: 2009-05-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: SubdomainFu aims to solve the problem of subdomain-based routing and in a unified way, establishing simple conventions for linking between subdomains of a Rails app.
+description: SubdomainFu is a Rails plugin to provide all of the basic functionality necessary to handle multiple subdomain applications (such as Basecamp-esque subdomain accounts and more).
 email: michael@intridea.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
 files: 
+- CHANGELOG
 - MIT-LICENSE
 - README
-- init.rb
-- lib/subdomain_fu
+- Rakefile
+- VERSION
+- lib/subdomain-fu.rb
 - lib/subdomain_fu/routing_extensions.rb
 - lib/subdomain_fu/url_rewriter.rb
-- lib/subdomain-fu.rb
 - rails/init.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - spec/subdomain_fu_spec.rb
 - spec/url_rewriter_spec.rb
-- subdomain-fu.gemspec
-has_rdoc: true
-homepage: http://www.actsascommunity.com/projects/subdomain-fu
+has_rdoc: false
+homepage: http://github.com/mbleigh/subdomain-fu
 post_install_message: 
 rdoc_options: 
-- --main
-- README
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -59,7 +59,9 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
-summary: Provides a simple solution for route handling and linking between subdomains in a Rails application.
-test_files: []
-
+specification_version: 3
+summary: SubdomainFu is a Rails plugin that provides subdomain routing and URL writing helpers.
+test_files: 
+- spec/spec_helper.rb
+- spec/subdomain_fu_spec.rb
+- spec/url_rewriter_spec.rb

data/init.rb

@@ -1 +0,0 @@
-require File.dirname(__FILE__) + "/rails/init"

data/subdomain-fu.gemspec

@@ -1,26 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = "subdomain-fu"
-  s.version = "0.0.5"
-  s.date = "2009-01-13"
-  s.summary = "Provides a simple solution for route handling and linking between subdomains in a Rails application."
-  s.email = "michael@intridea.com"
-  s.homepage = "http://www.actsascommunity.com/projects/subdomain-fu"
-  s.description = "SubdomainFu aims to solve the problem of subdomain-based routing and in a unified way, establishing simple conventions for linking between subdomains of a Rails app."
-  s.has_rdoc = true
-  s.authors = ["Michael Bleigh"]
-  s.files = [ "MIT-LICENSE",
-              "README",
-              "init.rb",
-              "lib/subdomain_fu",
-              "lib/subdomain_fu/routing_extensions.rb",
-              "lib/subdomain_fu/url_rewriter.rb",
-              "lib/subdomain-fu.rb",
-              "rails/init.rb",
-              "spec/spec_helper.rb",
-              "spec/subdomain_fu_spec.rb",
-              "spec/url_rewriter_spec.rb",
-              "subdomain-fu.gemspec" ]
-  s.rdoc_options = ["--main", "README"]
-  #s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  #s.add_dependency("mbleigh-mash", [">= 0.0.5"])
-end