fb-localizer 0.1.2 → 0.1.3

data/.gitignore

@@ -0,0 +1,2 @@
+pkg/
+pkg/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fb-localizer (0.1.1)
+    fb-localizer (0.1.2)
       i18n
       libxml-ruby (= 1.1.3)
       rails

data/lib/fb-localizer/version.rb

@@ -1,5 +1,5 @@
 module Fb
   module Localizer
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/fb-localizer.rb

@@ -2,17 +2,34 @@ require 'fb-localizer/railtie' if defined? Rails
 require 'i18n'
 
 module FbLocalizer
+  DEFAULT_PRIORITIES = { :en => "en_US", :es => "es_ES", :pt => "pt_PT", :zh => "zh_CN" }
+  mattr_accessor :priorized
+
   module FbLocalizerHelpers
     def get_fb_locale(ruby_locale = nil)
+      ruby_locale = ruby_locale.to_sym if ruby_locale.is_a? String
       ruby_locale ||= I18n.locale
       fb_candidate_locales = FbLocalizer::FbLocalizerHelpers::FB_LOCALES.select{ |l| l.match(/^#{ruby_locale}/)}
       if fb_candidate_locales.any?
-        fb_candidate_locales[0]
+        priorized = FbLocalizer.priorized[ruby_locale] # get priorized locale for that one
+        if priorized && fb_candidate_locales.include?(priorized) # if available, get that one
+          priorized
+        else # if not, just get the first available
+          fb_candidate_locales[0]
+        end
       else
-        "en_US"
+        "en_US" # US english by default
       end
     end
   end
+
+  def self.configure
+    yield self
+  end
+
+  def self.priorized
+    DEFAULT_PRIORITIES.merge(@@priorized)
+  end
 end
 
 ActionView::Base.send(:include, FbLocalizer::FbLocalizerHelpers)

data/spec/helpers/fb-localizer_spec.rb

@@ -10,11 +10,16 @@ describe FbLocalizer::FbLocalizerHelpers do
   end
 
   context "when we check for english" do
-    it "should return en_PI" do
-      helper.get_fb_locale("en").should == "en_PI"
+    it "should return en_GB" do
+      helper.get_fb_locale("en").should == "en_GB"
     end
   end
 
+  context "when we check for chinese" do
+    it "should return zh_CN" do
+      helper.get_fb_locale("zh").should == "zh_CN" # simplified Chinese
+    end
+  end
 
   # Invalid checks
   context "when we check for spanish" do
@@ -28,4 +33,29 @@ describe FbLocalizer::FbLocalizerHelpers do
       helper.get_fb_locale("cy").should_not == "ca_ES"
     end
   end
+
+  # Set some priorizations
+  context "when we check for english" do
+    it "should not return en_GB" do
+      FbLocalizer.priorized = { :en => "en_US" }
+      helper.get_fb_locale("en").should_not == "en_GB"
+    end
+
+    it "should return en_US" do
+      FbLocalizer.priorized = { :en => "en_US" }
+      helper.get_fb_locale("en").should == "en_US"
+    end
+  end
+
+  context "when we check for chinese" do
+    it "should not return zh_CN" do
+      FbLocalizer.priorized = { :zh => "zh_HK" } # switch Hong Kong's chinese
+      helper.get_fb_locale("zh").should_not == "zh_CN"
+    end
+
+    it "should return zh_HK" do
+      FbLocalizer.priorized = { :zh => "zh_HK" } # switch Hong Kong's chinese
+      helper.get_fb_locale("zh").should == "zh_HK"
+    end
+  end
 end

data/testapp/Gemfile

@@ -3,30 +3,6 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.5'
 gem 'fb-localizer', :path => ".."
 
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem 'haml-rails'
 
 gem 'sqlite3'
-
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19', :require => 'ruby-debug'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-#   gem 'webrat'
-# end

data/testapp/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ..
   specs:
-    fb-localizer (0.1.0)
+    fb-localizer (0.1.2)
       i18n
-      libxml-ruby
+      libxml-ruby (= 1.1.3)
       rails
 
 GEM
@@ -40,8 +40,14 @@ GEM
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    haml (3.1.1)
+    haml-rails (0.3.4)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      haml (~> 3.0)
+      railties (~> 3.0)
     i18n (0.5.0)
-    libxml-ruby (1.1.4)
+    libxml-ruby (1.1.3)
     mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -79,5 +85,6 @@ PLATFORMS
 
 DEPENDENCIES
   fb-localizer!
+  haml-rails
   rails (= 3.0.5)
   sqlite3

data/testapp/app/controllers/static_controller.rb

@@ -0,0 +1,15 @@
+class StaticController < ApplicationController
+  NAMES = {
+    :en => "UK English", # default is US, but we priorize en_GB in app/initializers/fb-localizer.rb
+    :es => "Spain's Spanish",
+    :it => "Italian",
+    :ca => "Catalan",
+    :pt => "Portugal's Portuguese",
+    :tl => "Klingon"
+  }
+
+  def index
+    @locale = params[:locale] ? params[:locale].to_sym : I18n.locale
+    @names = NAMES
+  end
+end

data/testapp/app/views/static/index.html.haml

@@ -0,0 +1,6 @@
+- @names.each do |k,v|
+  = link_to v, root_path(:locale => k)
+%hr
+%h2= @names[@locale]
+%script{:src => "http://connect.facebook.net/#{get_fb_locale(@locale)}/all.js#xfbml=1"}
+%fb:like{:href => request.url, :layout => "button_count", :show_faces => "true"}

data/testapp/config/initializers/fb-localizer.rb

@@ -0,0 +1,3 @@
+FbLocalizer.configure do |config|
+  config.priorized = { :en => "en_GB" }
+end

data/testapp/config/routes.rb

@@ -1,58 +1,3 @@
 Testapp::Application.routes.draw do
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => "welcome#index"
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
+  root :to => "static#index"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fb-localizer
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Albert Bellonch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 +02:00
+date: 2011-05-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -107,8 +108,10 @@ files:
 - testapp/README
 - testapp/Rakefile
 - testapp/app/controllers/application_controller.rb
+- testapp/app/controllers/static_controller.rb
 - testapp/app/helpers/application_helper.rb
 - testapp/app/views/layouts/application.html.erb
+- testapp/app/views/static/index.html.haml
 - testapp/config.ru
 - testapp/config/application.rb
 - testapp/config/boot.rb
@@ -118,6 +121,7 @@ files:
 - testapp/config/environments/production.rb
 - testapp/config/environments/test.rb
 - testapp/config/initializers/backtrace_silencers.rb
+- testapp/config/initializers/fb-localizer.rb
 - testapp/config/initializers/inflections.rb
 - testapp/config/initializers/mime_types.rb
 - testapp/config/initializers/secret_token.rb
@@ -132,7 +136,6 @@ files:
 - testapp/public/500.html
 - testapp/public/favicon.ico
 - testapp/public/images/rails.png
-- testapp/public/index.html
 - testapp/public/javascripts/application.js
 - testapp/public/javascripts/controls.js
 - testapp/public/javascripts/dragdrop.js

data/testapp/public/index.html

@@ -1,239 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Ruby on Rails: Welcome aboard</title>
-    <style type="text/css" media="screen">
-      body {
-        margin: 0;
-        margin-bottom: 25px;
-        padding: 0;
-        background-color: #f0f0f0;
-        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
-        font-size: 13px;
-        color: #333;
-      }
-
-      h1 {
-        font-size: 28px;
-        color: #000;
-      }
-
-      a  {color: #03c}
-      a:hover {
-        background-color: #03c;
-        color: white;
-        text-decoration: none;
-      }
-
-
-      #page {
-        background-color: #f0f0f0;
-        width: 750px;
-        margin: 0;
-        margin-left: auto;
-        margin-right: auto;
-      }
-
-      #content {
-        float: left;
-        background-color: white;
-        border: 3px solid #aaa;
-        border-top: none;
-        padding: 25px;
-        width: 500px;
-      }
-
-      #sidebar {
-        float: right;
-        width: 175px;
-      }
-
-      #footer {
-        clear: both;
-      }
-
-
-      #header, #about, #getting-started {
-        padding-left: 75px;
-        padding-right: 30px;
-      }
-
-
-      #header {
-        background-image: url("images/rails.png");
-        background-repeat: no-repeat;
-        background-position: top left;
-        height: 64px;
-      }
-      #header h1, #header h2 {margin: 0}
-      #header h2 {
-        color: #888;
-        font-weight: normal;
-        font-size: 16px;
-      }
-
-
-      #about h3 {
-        margin: 0;
-        margin-bottom: 10px;
-        font-size: 14px;
-      }
-
-      #about-content {
-        background-color: #ffd;
-        border: 1px solid #fc0;
-        margin-left: -55px;
-        margin-right: -10px;
-      }
-      #about-content table {
-        margin-top: 10px;
-        margin-bottom: 10px;
-        font-size: 11px;
-        border-collapse: collapse;
-      }
-      #about-content td {
-        padding: 10px;
-        padding-top: 3px;
-        padding-bottom: 3px;
-      }
-      #about-content td.name  {color: #555}
-      #about-content td.value {color: #000}
-
-      #about-content ul {
-        padding: 0;
-        list-style-type: none;
-      }
-
-      #about-content.failure {
-        background-color: #fcc;
-        border: 1px solid #f00;
-      }
-      #about-content.failure p {
-        margin: 0;
-        padding: 10px;
-      }
-
-
-      #getting-started {
-        border-top: 1px solid #ccc;
-        margin-top: 25px;
-        padding-top: 15px;
-      }
-      #getting-started h1 {
-        margin: 0;
-        font-size: 20px;
-      }
-      #getting-started h2 {
-        margin: 0;
-        font-size: 14px;
-        font-weight: normal;
-        color: #333;
-        margin-bottom: 25px;
-      }
-      #getting-started ol {
-        margin-left: 0;
-        padding-left: 0;
-      }
-      #getting-started li {
-        font-size: 18px;
-        color: #888;
-        margin-bottom: 25px;
-      }
-      #getting-started li h2 {
-        margin: 0;
-        font-weight: normal;
-        font-size: 18px;
-        color: #333;
-      }
-      #getting-started li p {
-        color: #555;
-        font-size: 13px;
-      }
-
-
-      #sidebar ul {
-        margin-left: 0;
-        padding-left: 0;
-      }
-      #sidebar ul h3 {
-        margin-top: 25px;
-        font-size: 16px;
-        padding-bottom: 10px;
-        border-bottom: 1px solid #ccc;
-      }
-      #sidebar li {
-        list-style-type: none;
-      }
-      #sidebar ul.links li {
-        margin-bottom: 5px;
-      }
-
-    </style>
-    <script type="text/javascript">
-      function about() {
-        info = document.getElementById('about-content');
-        if (window.XMLHttpRequest)
-          { xhr = new XMLHttpRequest(); }
-        else
-          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
-        xhr.open("GET","rails/info/properties",false);
-        xhr.send("");
-        info.innerHTML = xhr.responseText;
-        info.style.display = 'block'
-      }
-    </script>
-  </head>
-  <body>
-    <div id="page">
-      <div id="sidebar">
-        <ul id="sidebar-items">
-          <li>
-            <h3>Browse the documentation</h3>
-            <ul class="links">
-              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
-              <li><a href="http://stdlib.rubyonrails.org/">Ruby standard library</a></li>
-              <li><a href="http://corelib.rubyonrails.org/">Ruby core</a></li>
-              <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
-            </ul>
-          </li>
-        </ul>
-      </div>
-
-      <div id="content">
-        <div id="header">
-          <h1>Welcome aboard</h1>
-          <h2>You&rsquo;re riding Ruby on Rails!</h2>
-        </div>
-
-        <div id="about">
-          <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
-          <div id="about-content" style="display: none"></div>
-        </div>
-
-        <div id="getting-started">
-          <h1>Getting started</h1>
-          <h2>Here&rsquo;s how to get rolling:</h2>
-
-          <ol>
-            <li>
-              <h2>Use <code>rails generate</code> to create your models and controllers</h2>
-              <p>To see all available options, run it without parameters.</p>
-            </li>
-
-            <li>
-              <h2>Set up a default route and remove or rename this file</h2>
-              <p>Routes are set up in config/routes.rb.</p>
-            </li>
-
-            <li>
-              <h2>Create your database</h2>
-              <p>Run <code>rake db:migrate</code> to create your database. If you're not using SQLite (the default), edit <code>config/database.yml</code> with your username and password.</p>
-            </li>
-          </ol>
-        </div>
-      </div>
-
-      <div id="footer">&nbsp;</div>
-    </div>
-  </body>
-</html>