merge asok/master, updated specs

.gitignore

@@ -1,7 +1,10 @@
 .DS_Store
 *.log
+**.swp
 .svn
 /pkg
 .idea
 .idea/*
 *.gem
+/coverage
+/coverage.data

.rspec

@@ -0,0 +1 @@
+--colour

README.rdoc

@@ -1,3 +1,7 @@
+= Changes in this fork
+
+[current_subdomain] will return all subdomains except for mirrors. For the URL http://www.stuff.example.com it will return "stuff" if "www" is configured as a mirror
+
 = SubdomainFu
 
 SubdomainFu provides a modern implementation of subdomain handling in Rails.
@@ -13,7 +17,7 @@ you are looking to use it on Rails 2.x, please install version v0.5.x instead.
 SubdomainFu is available both as a traditional plugin and a GemPlugin. To
 install it as a traditional plugin:
 
-  script/plugin install git://github.com/intridea/subdomain-fu.git
+  script/plugin install git://github.com/ramontayag/subdomain-fu.git
 
 To use it as a gem, add it to your Gemfile. Until Rails 3 is officially released,
 the Rails 3 version of the plugin is only available as a prerelease gem:

Rakefile

@@ -1,14 +1,4 @@
 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'
@@ -23,34 +13,33 @@ begin
     gemspec.authors = ["Michael Bleigh"]
   end
   Jeweler::GemcutterTasks.new
+  FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
+begin
+  require 'rspec/core/rake_task'
+
+  task :cleanup_rcov_files do
+    rm_rf 'coverage.data'
+  end
+
+  desc "Run all specs."
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.rspec_opts = %w[--color]
+  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
+  namespace :spec do
+    desc "Run all specs using rcov."
+    RSpec::Core::RakeTask.new(:rcov => :cleanup_rcov_files) do |t|
+      t.rcov = true
+      t.rcov_opts = '-Ilib:spec --exclude "gems/.*,features"'
+      t.rcov_opts << %[--text-report --sort coverage --html --aggregate coverage.data]
+    end
+  end
+
+  task :default => :spec
+rescue LoadError
+  puts "RSpec-2 not available."
+end

VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
-:build: beta2
+:build: beta3
 :minor: 0
 :patch: 0

init.rb

@@ -0,0 +1,3 @@
+require 'subdomain_fu/url_rewriter'
+require 'subdomain_fu/subdomain_fu'
+require 'subdomain_fu/plugin'