foreign-fqdn-routing 0.0.1 → 0.0.2

data/.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
-*.log
+*.log
+pkg/*

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "foreign-fqdn-routing"
-    gem.summary = %Q{This version of foreign_fqdn_routing merges foreign_fqdn_routing with request_routing}
+    gem.summary = %Q{Adds domain, subdomain and fqdn routing support to Rails}
     gem.email = "william@kyakia.com"
     gem.homepage = "http://github.com/autodata/foreign-fqdn-routing"
     gem.authors = ["Brian Mulloy", "Joe Scharf", "William Melody"]

data/VERSION.yml

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

data/foreign-fqdn-routing.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{foreign-fqdn-routing}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Mulloy", "Joe Scharf", "William Melody"]
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{This version of foreign_fqdn_routing merges foreign_fqdn_routing with request_routing}
+  s.summary = %q{Adds domain, subdomain and fqdn routing support to Rails}
   s.test_files = [
     "test/foreign_fqdn_routing_test.rb",
      "test/test_helper.rb"

data/lib/foreign_fqdn_routing/routing_extensions.rb

@@ -1,19 +1,28 @@
 module ForeignFQDNRouting
   module RouteExtensions
 
-    TESTABLE_REQUEST_METHODS = [:subdomain, :domain, :method, :port, :remote_ip, 
-                                :content_type, :accepts, :request_uri, :protocol]
+    TESTABLE_REQUEST_METHODS = [
+      :subdomain,
+      :domain,
+      :method,
+      :port,
+      :remote_ip, 
+      :content_type,
+      :accepts,
+      :request_uri,
+      :protocol
+    ]
     
     def self.included(base)
       base.alias_method_chain :recognition_conditions, :foreign_domain
     end
 
-    def recognition_conditions_with_foreign_domain      
+    def recognition_conditions_with_foreign_domain
       result = recognition_conditions_without_foreign_domain
-      result << "ForeignFQDNRouting.foreign_domain?(env[:host])" if conditions[:foreign_domain] == true
-      result << "!ForeignFQDNRouting.foreign_domain?(env[:host])" if conditions[:foreign_domain] == false
-      result << "ForeignFQDNRouting.foreign_fqdn?(env[:host])" if conditions[:foreign_fqdn] == true
-      result << "!ForeignFQDNRouting.foreign_fqdn?(env[:host])" if conditions[:foreign_fqdn] == false
+      result << "ForeignFQDNRouting.foreign_domain?(env[:host])"  if conditions[:foreign_domain]  == true
+      result << "!ForeignFQDNRouting.foreign_domain?(env[:host])" if conditions[:foreign_domain]  == false
+      result << "ForeignFQDNRouting.foreign_fqdn?(env[:host])"    if conditions[:foreign_fqdn]    == true
+      result << "!ForeignFQDNRouting.foreign_fqdn?(env[:host])"   if conditions[:foreign_fqdn]    == false
       
       conditions.each do |method, value|
         if TESTABLE_REQUEST_METHODS.include? method
@@ -22,14 +31,11 @@ module ForeignFQDNRouting
           else
             "conditions[#{method.inspect}] === env[#{method.inspect}]"
           end
-        else
         end
-      end
-      
-      
+      end # conditions
       result
-    end
-  end
+    end # def
+  end # RouteExtensions
 
   module RouteSetExtensions
     def self.included(base)
@@ -38,16 +44,16 @@ module ForeignFQDNRouting
 
     def extract_request_environment_with_foreign_domain(request)
       extract_request_environment_without_foreign_domain(request).merge({ 
-        :host => request.host,
-        :method => request.method,
-        :subdomain => request.subdomains.first.to_s, 
-        :domain => request.domain, 
-        :port => request.port, 
-        :remote_ip => request.remote_ip, 
+        :host         => request.host,
+        :method       => request.method,
+        :subdomain    => request.subdomains.first.to_s, 
+        :domain       => request.domain, 
+        :port         => request.port, 
+        :remote_ip    => request.remote_ip, 
         :content_type => request.content_type, 
-        :accepts => request.accepts.map(&:to_s).join(','), 
-        :request_uri => request.request_uri, 
-        :protocol => request.protocol
+        :accepts      => request.accepts.map(&:to_s).join(','), 
+        :request_uri  => request.request_uri, 
+        :protocol     => request.protocol
         })
     end
   end

data/rails/init.rb

@@ -1,4 +1,4 @@
-require 'foreign_domain_routing'
+require 'foreign_fqdn_routing'
 
 ActionController::Base.send :include, ForeignFQDNRouting::Controller
 

data/test/test_helper.rb

@@ -6,7 +6,7 @@ require 'action_controller'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'foreign_domain_routing'
+require 'foreign_fqdn_routing'
 
 class Test::Unit::TestCase
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: foreign-fqdn-routing
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Brian Mulloy
@@ -63,7 +63,7 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: This version of foreign_fqdn_routing merges foreign_fqdn_routing with request_routing
+summary: Adds domain, subdomain and fqdn routing support to Rails
 test_files: 
 - test/foreign_fqdn_routing_test.rb
 - test/test_helper.rb