muck-engine 0.1.31 → 0.1.32

data/VERSION

@@ -1 +1 @@
-0.1.31
+0.1.32

data/app/helpers/muck_engine_helper.rb

@@ -80,16 +80,24 @@ module MuckEngineHelper
   end
   
   def locale_link(name, locale)
-    link_to name, request.protocol + locale + '.' + request.domain + request.request_uri
-    #link_to name, request.url.gsub(request.protocol, "#{request.protocol}#{locale}.")
-    #link_to name, request.url.sub(request.protocol, "#{request.protocol}#{locale}.").sub('www.','')
-    protocol = request.protocol
-    if request.domain.count('.') == 1
-      new_domain = request.url.sub(protocol, "#{protocol}#{locale}.")
+    parts = request.host.split('.')
+    first_subdomain = parts.first
+    request_uri = request.request_uri
+    if first_subdomain == 'www' or Language.supported_locale?(first_subdomain)
+      link_to name, request.protocol + (locale == I18n.default_locale.to_s ? 'www' : locale) + '.' + parts[1..-1].join('.') + request.port_string + request_uri
+    elsif /^localhost/.match( request.host ) or /^(\d{1,3}\.){3}\d{1,3}$/.match( request.host )
+      if request_uri.include?('?')
+        if request_uri.include?('locale')
+          link_to name, request.protocol + request.host_with_port + request_uri.sub(/locale=.*/, 'locale=' + locale)
+        else
+          link_to name, request.protocol + request.host_with_port + request_uri + '&locale=' + locale
+        end
+      else
+        link_to name, request.protocol + request.host_with_port + request_uri + '?locale=' + locale
+      end  
     else
-      new_domain = request.url.sub(Regexp.new(protocol + "[^\.]+."), "#{protocol}#{locale}.")
+      link_to name, request.protocol + (locale == I18n.default_locale.to_s ? 'www' : locale) + '.' + request.host_with_port + request_uri
     end
-    link_to name, new_domain
   end
 
   # Generate parameters for a url that refer to a given object as parent.  Useful

data/app/models/language.rb

@@ -12,10 +12,25 @@
 
 class Language < ActiveRecord::Base
 
+  @@locale_ids = nil
+
   def self.locale_id
-    languages = Language.find(:all, :select => 'id, locale', :conditions => 'languages.muck_raker_supported = true')
-    @@locale_ids ||= Hash[*languages.collect {|v|[v.locale.to_sym, v.id]}.flatten]
+    cache_locale_ids
     @@locale_ids[I18n.locale]
   end
+
+  def self.supported_locale? locale
+    cache_locale_ids
+    @@locale_ids[locale.to_sym] != nil
+  end
+
+  private
+
+  def self.cache_locale_ids
+    if !@@locale_ids
+      languages = Language.find(:all, :select => 'id, locale', :conditions => ['languages.supported = ?', true])
+      @@locale_ids = Hash[*languages.collect {|v|[v.locale.to_sym, v.id]}.flatten]
+    end
+  end
   
 end

data/muck-engine.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-engine}
-  s.version = "0.1.31"
+  s.version = "0.1.32"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball"]
@@ -376,6 +376,9 @@ Gem::Specification.new do |s|
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/.keep",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
+     "test/rails_root/db/migrate/20090402234137_create_languages.rb",
+     "test/rails_root/db/migrate/20090426041056_create_countries.rb",
+     "test/rails_root/db/migrate/20090426041103_create_states.rb",
      "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
@@ -549,6 +552,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/.keep",
      "test/rails_root/test/unit/basic_mailer_test.rb",
+     "test/rails_root/test/unit/muck_engine_helper_test.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/README",
      "test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb",
@@ -585,6 +589,9 @@ Gem::Specification.new do |s|
      "test/rails_root/config/initializers/session_store.rb",
      "test/rails_root/config/routes.rb",
      "test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb",
+     "test/rails_root/db/migrate/20090402234137_create_languages.rb",
+     "test/rails_root/db/migrate/20090426041056_create_countries.rb",
+     "test/rails_root/db/migrate/20090426041103_create_states.rb",
      "test/rails_root/db/migrate/20090602041838_create_users.rb",
      "test/rails_root/features/step_definitions/webrat_steps.rb",
      "test/rails_root/features/support/env.rb",
@@ -600,6 +607,7 @@ Gem::Specification.new do |s|
      "test/rails_root/test/shoulda_macros/plugins.rb",
      "test/rails_root/test/test_helper.rb",
      "test/rails_root/test/unit/basic_mailer_test.rb",
+     "test/rails_root/test/unit/muck_engine_helper_test.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb",
      "test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb",
      "test/rails_root/vendor/plugins/validation_reflection/init.rb",

data/test/rails_root/db/migrate/20090402234137_create_languages.rb

@@ -0,0 +1,18 @@
+class CreateLanguages < ActiveRecord::Migration
+  def self.up
+    create_table :languages, :force => true do |t|
+      t.string :name
+      t.string :english_name
+      t.string :locale
+      t.boolean :supported, :default => true
+      t.integer :is_default, :default => false
+    end
+    add_index :languages, :name
+    add_index :languages, :locale
+  end
+
+  def self.down
+    drop_table :languages
+  end
+  
+end

data/test/rails_root/db/migrate/20090426041056_create_countries.rb

@@ -0,0 +1,15 @@
+class CreateCountries < ActiveRecord::Migration
+  def self.up
+    create_table :countries, :force => true do |t|
+      t.string "name",         :limit => 128, :default => "", :null => false
+      t.string "abbreviation", :limit => 3,   :default => "", :null => false
+      t.integer "sort",                       :default => 1000, :null => false
+    end
+    add_index :countries, :name
+    add_index :countries, :abbreviation
+  end
+
+  def self.down
+    drop_table :countries
+  end
+end

data/test/rails_root/db/migrate/20090426041103_create_states.rb

@@ -0,0 +1,18 @@
+class CreateStates < ActiveRecord::Migration
+  def self.up
+    create_table :states, :force => true do |t|
+      t.string  "name",         :limit => 128, :default => "", :null => false
+      t.string  "abbreviation", :limit => 3,   :default => "", :null => false
+      t.integer "country_id",   :limit => 8,                   :null => false
+    end
+
+    add_index :states, :country_id
+    add_index :states, :name
+    add_index :states, :abbreviation
+    
+  end
+
+  def self.down
+    drop_table :states
+  end
+end

data/test/rails_root/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'test_help'
 gem 'thoughtbot-factory_girl' # from github
 require 'factory_girl'
 require 'mocha'
+require 'ruby-debug'
 require 'redgreen' rescue LoadError
 require File.expand_path(File.dirname(__FILE__) + '/factories')
 require File.join(File.dirname(__FILE__), 'shoulda_macros', 'controller')

data/test/rails_root/test/unit/muck_engine_helper_test.rb

@@ -0,0 +1,113 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class MuckEngineLocaleHelper
+
+  include ERB::Util
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::UrlHelper
+  include MuckEngineHelper
+
+  attr_accessor :request
+
+end
+
+class MuckEngineHelperTest < ActiveSupport::TestCase
+
+  context "locale_link" do
+
+    setup do
+      @lh = MuckEngineLocaleHelper.new
+      @lh.request = ActionController::TestRequest.new
+    end
+
+    should "prepend the locale to a domain without a subdomain" do
+      @lh.request.host = 'folksemantic.com'
+      assert_equal '<a href="http://es.folksemantic.com/">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "use www as the subdomain when switching to english" do
+       @lh.request.host = 'es.folksemantic.com'
+       assert_equal '<a href="http://www.folksemantic.com/">English</a>', @lh.locale_link('English','en')
+     end
+
+     should "leave the path alone when prepending a locale subdomain" do
+      @lh.request.host = 'folksemantic.com'
+      @lh.request.request_uri = '/login'
+      assert_equal '<a href="http://es.folksemantic.com/login">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "replace the www subdomain with the specified locale" do
+      @lh.request.host = 'www.folksemantic.com'
+      assert_equal '<a href="http://es.folksemantic.com/">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "replace locale subdomains with the specified locale" do
+      @lh.request.host = 'fr.folksemantic.com'
+      assert_equal '<a href="http://es.folksemantic.com/">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "specify the locale in the query string when the domain is localhost" do
+      @lh.request.host = 'localhost'
+      assert_equal '<a href="http://localhost/?locale=es">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "leave the port alone when doing a locale rewrite" do
+      @lh.request.host = 'localhost'
+      @lh.request.port = '3000'
+      assert_equal '<a href="http://localhost:3000/?locale=es">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "leave the port alone when doing a locale rewrite on a request that includes a path" do
+      @lh.request.host = 'localhost'
+      @lh.request.port = '3000'
+      @lh.request.request_uri = '/users/admin'
+      assert_equal '<a href="http://localhost:3000/users/admin?locale=es">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "leave the port alone when doing a locale rewrite on a request that includes a path and already specifies a locale" do
+      @lh.request.host = 'localhost'
+      @lh.request.port = '3000'
+      @lh.request.request_uri = '/users/admin?locale=fr'
+      @lh.request.env['query_string'] = 'locale=fr'
+      assert_equal '<a href="http://localhost:3000/users/admin?locale=es">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "leave the rest of the query string alone when replacing the locale parameter" do
+      @lh.request.host = 'localhost'
+      @lh.request.port = '3000'
+      @lh.request.request_uri = '/users/admin?test=false&locale=fr'
+      assert_equal '<a href="http://localhost:3000/users/admin?test=false&amp;locale=es">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "append the locale parameter when other query string parameters are specified" do
+      @lh.request.host = 'localhost'
+      @lh.request.port = '3000'
+      @lh.request.request_uri = '/users/admin?test=false'
+      assert_equal '<a href="http://localhost:3000/users/admin?test=false&amp;locale=es">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "replace the locale query parameter when working from localhost if another locale is already specified" do
+      @lh.request.host = 'localhost'
+      @lh.request.request_uri = '/login'
+      @lh.request.env['query_string'] = 'locale=fr'
+      assert_equal '<a href="http://localhost/login?locale=es">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "specify the locale in the query string when the domain is an ip address" do
+      @lh.request.host = '155.23.322.13'
+      assert_equal '<a href="http://155.23.322.13/?locale=es">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "prepend the locale if multiple submdomains are specified and the first is not www" do
+      @lh.request.host = 'math.folksemantic.com'
+      assert_equal '<a href="http://es.math.folksemantic.com/">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+    should "replace the www subdomain if multiple submdomains are specified and the first is www" do
+      @lh.request.host = 'www.math.folksemantic.com'
+      assert_equal '<a href="http://es.math.folksemantic.com/">Espanol</a>', @lh.locale_link('Espanol','es')
+    end
+
+  end
+end 
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: muck-engine
 version: !ruby/object:Gem::Version 
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors: 
 - Justin Ball
@@ -303,6 +303,9 @@ files:
 - test/rails_root/config/routes.rb
 - test/rails_root/db/.keep
 - test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
+- test/rails_root/db/migrate/20090402234137_create_languages.rb
+- test/rails_root/db/migrate/20090426041056_create_countries.rb
+- test/rails_root/db/migrate/20090426041103_create_states.rb
 - test/rails_root/db/migrate/20090602041838_create_users.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb
 - test/rails_root/features/support/env.rb
@@ -476,6 +479,7 @@ files:
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/.keep
 - test/rails_root/test/unit/basic_mailer_test.rb
+- test/rails_root/test/unit/muck_engine_helper_test.rb
 - test/rails_root/vendor/plugins/ssl_requirement/README
 - test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb
 - test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb
@@ -533,6 +537,9 @@ test_files:
 - test/rails_root/config/initializers/session_store.rb
 - test/rails_root/config/routes.rb
 - test/rails_root/db/migrate/20090320174818_create_muck_permissions_and_roles.rb
+- test/rails_root/db/migrate/20090402234137_create_languages.rb
+- test/rails_root/db/migrate/20090426041056_create_countries.rb
+- test/rails_root/db/migrate/20090426041103_create_states.rb
 - test/rails_root/db/migrate/20090602041838_create_users.rb
 - test/rails_root/features/step_definitions/webrat_steps.rb
 - test/rails_root/features/support/env.rb
@@ -548,6 +555,7 @@ test_files:
 - test/rails_root/test/shoulda_macros/plugins.rb
 - test/rails_root/test/test_helper.rb
 - test/rails_root/test/unit/basic_mailer_test.rb
+- test/rails_root/test/unit/muck_engine_helper_test.rb
 - test/rails_root/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb
 - test/rails_root/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb
 - test/rails_root/vendor/plugins/validation_reflection/init.rb