subdomain-fu 0.4.1 → 0.5.3

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 2009-09-13
+
+* Added current_domain method
+* Added controller & view usage to readme
+* Added more tests
+* Fixing load paths
+
 == 2009-08-26
 
 * Fixed needs_rewrite? method

data/README.rdoc

@@ -45,6 +45,20 @@ users_path(:subdomain => false) # => /users
 In this way you can rest assured that you will never misdirect your links to the
 same subdomain when you meant to change it.
 
+== Use in controllers and views
+
+You have access to current_subdomain and current_domain methods.
+
+current_subdomain - returns all subdomains.
+  Example for the URL http://awesome.website.stuff.example.com current_subdomain will return "awesome.website.stuff"
+
+current_domain - returns all subdomains except for the subdomain, including the TLD.
+  Example for the URL http://awesome.website.stuff.example.com current_subdomain will return "website.stuff.example.com"
+
+If what you really want is the entire domain, then use <tt>request.domain</tt> in
+your controllers.  The purpose of current_domain is to only strip off the first 
+subdomain, if any, and return what's left.
+
 == Configuration
 
 You may need to configure SubdomainFu based on your development setup. The
@@ -82,10 +96,14 @@ will default to the preferred mirror.
 
 SubdomainFu can also work within Rails' routing for subdomain-specific routes. For instance, if you only wanted your administrative tools available in the "admin" subdomain you could add this to your routes.rb file:
 
-    map.with_options :conditions => {:subdomain => 'admin} do |admin|
+    map.with_options :conditions => {:subdomain => 'admin'} do |admin|
       admin.resources :posts
       admin.resources :users
     end
+    
+In addition to specifying a string, you could also specify <tt>false</tt> to
+require no subdomain (this includes mirrors that you've set up such as www)
+or a regular expression to match a range of subdomains.
 
 == Resources
 

data/Rakefile

@@ -26,3 +26,30 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
+
+# These are new tasks
+begin
+  require 'rake/contrib/sshpublisher'
+  namespace :rubyforge do
+
+    desc "Release gem and RDoc documentation to RubyForge"
+    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
+
+    namespace :release do
+      desc "Publish RDoc to RubyForge."
+      task :docs => [:rdoc] do
+        config = YAML.load(
+            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
+        )
+
+        host = "#{config['username']}@rubyforge.org"
+        remote_dir = "/var/www/gforge-projects/the-perfect-gem/"
+        local_dir = 'rdoc'
+
+        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
+      end
+    end
+  end
+rescue LoadError
+  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 4
-:patch: 1
+:minor: 5
+:patch: 3
 :major: 0

data/lib/subdomain-fu.rb

@@ -137,14 +137,25 @@ module SubdomainFu
     end
   end
 
+  #Enables subdomain-fu to more completely replace DHH's account_location plugin
+  def self.current_domain(request)
+    domain = ""
+    domain << request.subdomains[1..-1].join(".") + "." if request.subdomains.length > 1
+    domain << request.domain + request.port_string
+  end
+
   module Controller
     def self.included(controller)
       controller.helper_method(:current_subdomain)
+      controller.helper_method(:current_domain)
     end
 
     protected
     def current_subdomain
       SubdomainFu.current_subdomain(request)
     end
+    def current_domain
+      SubdomainFu.current_domain(request)
+    end
   end
 end

data/rails/init.rb

@@ -1,6 +1,4 @@
-# Add this path to ruby load path
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
-
+#Allow whatever Ruby Package tool is being used ot manage load paths.  gem auto adds the gem's lib dir to load path.
 require 'subdomain-fu' unless defined?(SubdomainFu)
 
 ActionController::Base.send :include, SubdomainFu::Controller

data/spec/subdomain_fu_spec.rb

@@ -159,6 +159,33 @@ describe "SubdomainFu" do
     end
   end
 
+  describe "#current_domain" do
+    it "should return the current domain if there is one" do
+      request = mock("request", :subdomains => [], :domain => "example.com", :port_string => "")
+      SubdomainFu.current_domain(request).should == "example.com"
+    end
+
+    it "should return empty string if there is no domain" do
+      request = mock("request", :subdomains => [], :domain => "", :port_string => "")
+      SubdomainFu.current_domain(request).should == ""
+    end
+
+    it "should return the current domain if there is only one level of subdomains" do
+      request = mock("request", :subdomains => ["www"], :domain => "example.com", :port_string => "")
+      SubdomainFu.current_domain(request).should == "example.com"
+    end
+
+    it "should return everything but the first level of subdomain when there are multiple levels of subdomains" do
+      request = mock("request", :subdomains => ["awesome","rad","cheese","chevy","ford"], :domain => "example.com", :port_string => "")
+      SubdomainFu.current_domain(request).should == "rad.cheese.chevy.ford.example.com"
+    end
+
+    it "should return the domain with port if port is given" do
+      request = mock("request", :subdomains => ["awesome","rad","cheese","chevy","ford"], :domain => "example.com", :port_string => ":3000")
+      SubdomainFu.current_domain(request).should == "rad.cheese.chevy.ford.example.com:3000"
+    end
+  end
+
   describe "#same_subdomain?" do
     it { SubdomainFu.same_subdomain?("www","www.localhost").should be_true }
     it { SubdomainFu.same_subdomain?("www","localhost").should be_true }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: subdomain-fu
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -04:00
+date: 2009-09-13 00:00:00 -04:00
 default_executable: 
 dependencies: []