tolk 1.2.0 → 1.3.0

data/app/assets/stylesheets/tolk/screen.css

@@ -69,23 +69,35 @@ div#head a {
   text-decoration: none;
 }
 
+div#head span {
+  padding: 8px 6px;
+  margin-right: 1px;
+}
+
 div#head span.home {
+  background: #333;
+}
+
+div#head span.locale {
+  background: #444;
+}
+
+div#head span.locale a {
+  color: #fff;
+}
+
+div#head span:first-child {
+  padding-left: 12px;
   -webkit-border-top-left-radius: 10px;
   -webkit-border-bottom-left-radius: 10px;
   -moz-border-radius-topleft: 10px;
   -moz-border-radius-bottomleft: 10px;
   border-top-left-radius: 10px;
   border-bottom-left-radius: 10px;
-  background: #333;
-  padding: 8px 6px 8px 12px;
-  margin-right: 1px;
 }
 
-div#head span.locale {
-  color: #fff;
-  font-weight: bold;
-  background: #444;
-  padding: 8px 12px 8px 6px;
+div#head span:last-child {
+  padding-right: 12px;
   -webkit-border-top-right-radius: 10px;
   -webkit-border-bottom-right-radius: 10px;
   -moz-border-radius-topright: 10px;
@@ -94,24 +106,6 @@ div#head span.locale {
   border-bottom-right-radius: 10px;
 }
 
-div#head span.locale.empty {
-  background: #333;
-  padding-left: 0;
-  margin-left: -6px;
-}
-
-div#head span.locale em {
-  font-style: normal;
-  font-weight: normal;
-}
-
-div#head span.note {
-  color: #777;
-  font-size: 13px;
-  font-weight: normal;
-  margin-left: 10px;
-}
-
 h2,
 h3 {
   font-size: 18px;

data/app/controllers/tolk/locales_controller.rb

@@ -4,7 +4,7 @@ module Tolk
     before_filter :ensure_no_primary_locale, :only => [:all, :update, :show, :updated]
 
     def index
-      @locales = Tolk::Locale.secondary_locales
+      @locales = Tolk::Locale.secondary_locales.sort_by(&:language_name)
     end
   
     def show

data/app/helpers/tolk/application_helper.rb

@@ -21,7 +21,7 @@ module Tolk
     def tolk_locale_selection
       existing_locale_names = Tolk::Locale.all.map(&:name)
 
-      pairs = Tolk::Locale::MAPPING.to_a.map(&:reverse).sort_by(&:first)
+      pairs = Tolk.config.mapping.to_a.map(&:reverse).sort_by(&:first)
       pairs.reject {|pair| existing_locale_names.include?(pair.last) }
     end
 

data/app/models/tolk/locale.rb

@@ -1,55 +1,13 @@
+require 'tolk/config'
+
 module Tolk
   class Locale < ActiveRecord::Base
     self.table_name = "tolk_locales"
 
-    MAPPING = {
-      'ar'    => 'Arabic',
-      'bs'    => 'Bosnian',
-      'bt'    => 'Bulgarian',
-      'ca'    => 'Catalan',
-      'cz'    => 'Czech',
-      'da'    => 'Danish',
-      'de'    => 'German',
-      'dsb'   => 'Lower Sorbian',
-      'el'    => 'Greek',
-      'en'    => 'English',
-      'es'    => 'Spanish',
-      'et'    => 'Estonian',
-      'fa'    => 'Persian',
-      'fi'    => 'Finnish',
-      'fr'    => 'French',
-      'he'    => 'Hebrew',
-      'hr'    => 'Croatian',
-      'hsb'   => 'Upper Sorbian',
-      'hu'    => 'Hungarian',
-      'id'    => 'Indonesian',
-      'is'    => 'Icelandic',
-      'it'    => 'Italian',
-      'jp'    => 'Japanese',
-      'ko'    => 'Korean',
-      'lo'    => 'Lao',
-      'lt'    => 'Lithuanian',
-      'lv'    => 'Latvian',
-      'mk'    => 'Macedonian',
-      'nl'    => 'Dutch',
-      'no'    => 'Norwegian',
-      'pl'    => 'Polish',
-      'pt-br' => 'Portuguese (Brazilian)',
-      'pt-PT' => 'Portuguese (Portugal)',
-      'ro'    => 'Romanian',
-      'ru'    => 'Russian',
-      'se'    => 'Swedish',
-      'sk'    => 'Slovak',
-      'sl'    => 'Slovenian',
-      'sr'    => 'Serbian',
-      'sw'    => 'Swahili',
-      'th'    => 'Thai',
-      'tr'    => 'Turkish',
-      'uk'    => 'Ukrainian',
-      'vi'    => 'Vietnamese',
-      'zh-CN' => 'Chinese (Simplified)',
-      'zh-TW' => 'Chinese (Traditional)'
-    }
+    def self._dump_path
+      # Necessary to acces rails.root at runtime !
+      @dump_path ||= Tolk.config.dump_path.is_a?(Proc) ? instance_eval(&Tolk.config.dump_path) : Tolk.config.dump_path
+    end
 
     has_many :phrases, :through => :translations, :class_name => 'Tolk::Phrase'
     has_many :translations, :class_name => 'Tolk::Translation', :dependent => :destroy
@@ -59,7 +17,7 @@ module Tolk
 
     attr_accessible :name
     cattr_accessor :locales_config_path
-    self.locales_config_path = "#{Rails.root}/config/locales"
+    self.locales_config_path = self._dump_path
 
     cattr_accessor :primary_locale_name
     self.primary_locale_name = I18n.default_locale.to_s
@@ -191,7 +149,7 @@ module Tolk
     end
 
     def language_name
-      MAPPING[self.name] || self.name
+      Tolk.config.mapping[self.name] || self.name
     end
 
     def get(key)
@@ -208,8 +166,23 @@ module Tolk
       translations
     end
 
+    def self.rename(old_name, new_name)
+      if old_name.blank? || new_name.blank?
+        "You need to provide both names, aborting."
+      else
+        if locale = find_by_name(old_name)
+          locale.name = new_name
+          locale.save
+          "Locale ' #{old_name}' was renamed '#{new_name}'"
+        else
+          "Locale with name '#{old_name}' not found."
+        end
+      end
+    end
+    
     private
 
+
     def remove_invalid_translations_from_target
       self.translations.target.dup.each do |t|
          unless t.valid?

data/app/views/layouts/tolk/application.html.erb

@@ -1,6 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= Tolk::Locale.primary_locale_name %>" lang="<%= Tolk::Locale.primary_locale_name %>">
+<!DOCTYPE html>
+<html lang="<%= Tolk::Locale.primary_locale_name %>">
 
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -14,7 +13,7 @@
 <body>
   <div id="container">
     <div id="head">
-      <h1><span class="home"><%= link_to "Tolk", tolk.root_path %></span><%= yield :locale %></h1>
+      <h1><span class="home"><%= link_to "Tolk", root_path %></span><% if @locale.present? %><span class="locale"><%= link_to @locale.language_name, locale_path(@locale) %></span><% end %></h1>
     </div>
     <%= yield %>
   </div>

data/app/views/tolk/locales/all.html.erb

@@ -1,6 +1,3 @@
-<% content_for :locale do %><span class="locale"><%= @locale.language_name %></span>
-<% end %>
-
 <h3 class="switch">Completed translations <span>(<%= link_to 'See phrases missing translation', @locale %>)</span></h3>
 
 <% if @locale.has_updated_translations? && action_name != 'updated' %>

data/app/views/tolk/locales/index.html.erb

@@ -1,6 +1,3 @@
-<% content_for :locale do %><span class="locale empty"></span>
-<% end %>
-
 <h2>Locales <span>Primary locale is <%= Tolk::Locale.primary_locale.language_name %></span></h2>
 <% if @locales.any? %>
   <ul class="locales clearfix">

data/app/views/tolk/locales/show.html.erb

@@ -1,7 +1,3 @@
-<% content_for :locale do %>
-  <span class="locale"><%= @locale.language_name %></span>
-<% end %>
-
 <% content_for :head do %>
   <link rel="alternate" type="application/rss+xml" title="RSS" href="<%= tolk.locale_path(@locale, :format => 'atom') -%>" />
 <% end %>

data/app/views/tolk/searches/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_tag "/tolk/search", :method => :get do %>
+<%= form_tag tolk.search_path, :method => :get do %>
   <%= hidden_field_tag :locale, locale.name %>
   Search for
   <%= scope_selector_for(@locale) %>

data/app/views/tolk/searches/show.html.erb

@@ -1,7 +1,3 @@
-<% content_for :locale do %>
-  <span class="locale"><%= @locale.language_name %></span>
-<% end %>
-
 <h3 class="search">
   <%= render :partial => "form", :locals => { :locale => @locale } %>
 </h3>

data/lib/generators/tolk/install_generator.rb

@@ -0,0 +1,44 @@
+require 'rails/generators'
+require File.expand_path('../utils', __FILE__)
+
+# http://guides.rubyonrails.org/generators.html
+# http://rdoc.info/github/wycats/thor/master/Thor/Actions.html
+# keep generator idempotent, thanks
+# Thanks to https://github.com/sferik/rails_admin !
+
+module Tolk
+  class InstallGenerator < Rails::Generators::Base
+
+    source_root File.expand_path("../templates", __FILE__)
+    include Rails::Generators::Migration
+    include Generators::Utils::InstanceMethods
+    extend Generators::Utils::ClassMethods
+
+    argument :_namespace, :type => :string, :required => false, :desc => "Tolk url namespace"
+    desc "Tolk installation generator"
+    def install
+      routes = File.open(Rails.root.join("config/routes.rb")).try :read
+      initializer = (File.open(Rails.root.join("config/initializers/tolk.rb")) rescue nil).try :read
+
+      display "Hello, Tolk installer will help you sets things up!", :black
+      unless initializer
+        install_generator = ask_boolean("Do you wan't to install the optional configuration file (to change mappings, locales dump location etc..) ?")
+        template "initializer.erb", "config/initializers/tolk.rb" if install_generator
+      else
+        display "You already have a config file. You're updating, heh? I'm generating a new 'tolk.rb.example' that you can review."
+        template "initializer.erb", "config/initializers/tolk.rb.example"
+      end
+
+      display "Adding a migration..."
+      migration_template 'migration.rb', 'db/migrate/create_tolk_tables.rb' rescue display $!.message
+
+      namespace = ask_for("Where do you want to mount tolk?", "tolk", _namespace)
+      gsub_file "config/routes.rb", /mount Tolk::Engine => \'\/.+\', :as => \'tolk\'/, ''
+      gsub_file "config/routes.rb", /mount Tolk::Engine => \'\/.+\'/, ''
+      route("mount Tolk::Engine => '/#{namespace}', :as => 'tolk'")
+
+      display "Job's done: migrate, start your server and visit '/#{namespace}'!", :blue
+
+    end
+  end
+end

data/lib/generators/tolk/templates/initializer.erb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+# Tolk config file. Generated on <%= DateTime.now.to_s(:long) %>
+# See github.com/tolk/tolk for more informations
+
+Tolk.config do |config|
+
+  # If you need to add a mapping do it like this :
+  # May we suggest you use http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+  # config.mapping["fr-ES"] = 'Frañol !'
+
+end

data/lib/generators/tolk/utils.rb

@@ -0,0 +1,35 @@
+module Tolk
+  module Generators
+    module Utils
+      module InstanceMethods
+        def display(output, color = :green)
+          say("           -  #{output}", color)
+        end
+
+        def ask_for(wording, default_value = nil, override_if_present_value = nil)
+          override_if_present_value.present? ?
+            display("Using [#{override_if_present_value}] for question '#{wording}'") && override_if_present_value :
+            ask("           ?  #{wording} Press <enter> for [#{default_value}] >", :yellow).presence || default_value
+        end
+
+        def ask_boolean(wording, default_value = nil)
+          value = ask_for(wording, 'Y')
+          value = (value == 'Y')
+        end
+      end
+
+      module ClassMethods
+        def next_migration_number(dirname)
+          if ActiveRecord::Base.timestamped_migrations
+            migration_number = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+            migration_number += 1
+            migration_number.to_s
+          else
+            "%.3d" % (current_migration_number(dirname) + 1)
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/tasks/tolk_tasks.rake

@@ -1,7 +1,14 @@
 namespace :tolk do
+  desc "Update locale"
+  task :update_locale, [:old_name, :new_name] => :environment do |t, args|
+    old_name, new_name = args[:old_name], args[:new_name]
+    puts Tolk::Locale.rename(old_name, new_name)
+  end
+
   desc "Add database tables, copy over the assets, and import existing translations"
   task :setup => :environment do
-    system("rails generate tolk_migration")
+    system 'rails g tolk:install'
+
     Rake::Task['db:migrate'].invoke
     Rake::Task['tolk:sync'].invoke
     Rake::Task['tolk:import'].invoke

data/lib/tolk.rb

@@ -1,8 +1,17 @@
 require 'will_paginate'
 require 'ya2yaml'
+require 'tolk/config'
 require 'tolk/engine'
 require 'tolk/sync'
 require 'tolk/import'
 
 module Tolk
+  # Setup Tolk
+  def self.config(&block)
+    if block_given?
+      block.call(Tolk::Config)
+    else
+      Tolk::Config
+    end
+  end
 end

data/lib/tolk/config.rb

@@ -0,0 +1,69 @@
+require 'active_support/core_ext/class/attribute_accessors'
+
+module Tolk
+  module Config
+
+
+    class << self
+      # Mapping : a hash of the type { 'ar'    => 'Arabic' }
+      attr_accessor :mapping
+
+      # Dump locale path by default the locales folder (config/locales)
+      attr_accessor :dump_path
+      
+      def reset
+        @dump_path = Proc.new { "#{Rails.application.root}/config/locales" }
+        
+        @mapping = {
+          'ar'    => 'Arabic',
+          'bs'    => 'Bosnian',
+          'bg'    => 'Bulgarian',
+          'ca'    => 'Catalan',
+          'cs'    => 'Czech',
+          'da'    => 'Danish',
+          'de'    => 'German',
+          'el'    => 'Greek',
+          'en'    => 'English',
+          'es'    => 'Spanish',
+          'et'    => 'Estonian',
+          'fa'    => 'Persian',
+          'fi'    => 'Finnish',
+          'fr'    => 'French',
+          'he'    => 'Hebrew',
+          'hr'    => 'Croatian',
+          'hu'    => 'Hungarian',
+          'id'    => 'Indonesian',
+          'is'    => 'Icelandic',
+          'it'    => 'Italian',
+          'ja'    => 'Japanese',
+          'ko'    => 'Korean',
+          'lo'    => 'Lao',
+          'lt'    => 'Lithuanian',
+          'lv'    => 'Latvian',
+          'mk'    => 'Macedonian',
+          'nl'    => 'Dutch',
+          'no'    => 'Norwegian',
+          'pl'    => 'Polish',
+          'pt-br' => 'Portuguese (Brazilian)',
+          'pt-PT' => 'Portuguese (Portugal)',
+          'ro'    => 'Romanian',
+          'ru'    => 'Russian',
+          'sv'    => 'Swedish',
+          'sk'    => 'Slovak',
+          'sl'    => 'Slovene',
+          'sr'    => 'Serbian',
+          'sw'    => 'Swahili',
+          'th'    => 'Thai',
+          'tr'    => 'Turkish',
+          'uk'    => 'Ukrainian',
+          'vi'    => 'Vietnamese',
+          'zh-CN' => 'Chinese (Simplified)',
+          'zh-TW' => 'Chinese (Traditional)'
+        }
+      end
+    end
+
+    # Set default values for configuration options on load
+    self.reset
+  end
+end

data/lib/tolk/import.rb

@@ -8,8 +8,14 @@ module Tolk
 
       def import_secondary_locales
         locales = Dir.entries(self.locales_config_path)
-        locales = locales.reject {|l| ['.', '..'].include?(l) || !l.ends_with?('.yml') }.map {|x| x.split('.').first } - [Tolk::Locale.primary_locale.name]
-
+        
+        locale_block_filter = Proc.new { 
+          |l| ['.', '..'].include?(l) ||
+            !l.ends_with?('.yml') ||
+            l.match(/(.*\.){2,}/) # reject files of type xxx.en.yml
+        }
+        locales = locales.reject(&locale_block_filter).map {|x| x.split('.').first } 
+        locales = locales - [Tolk::Locale.primary_locale.name]
         locales.each {|l| import_locale(l) }
       end
 

data/lib/tolk/version.rb

@@ -1,3 +1,3 @@
 module Tolk
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tolk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
@@ -56,9 +56,12 @@ files:
 - MIT-LICENSE
 - config/routes.rb
 - init.rb
-- lib/generators/tolk_migration/templates/migrate/create_tolk_tables.rb
-- lib/generators/tolk_migration/tolk_migration_generator.rb
+- lib/generators/tolk/install_generator.rb
+- lib/generators/tolk/templates/initializer.erb
+- lib/generators/tolk/templates/migration.rb
+- lib/generators/tolk/utils.rb
 - lib/tasks/tolk_tasks.rake
+- lib/tolk/config.rb
 - lib/tolk/engine.rb
 - lib/tolk/import.rb
 - lib/tolk/sync.rb
@@ -88,7 +91,10 @@ files:
 - app/views/tolk/searches/show.html.erb
 homepage: http://github.com/tolk/tolk
 licenses: []
-post_install_message: 
+post_install_message: ! "##################################\n# Tolk, if upgrading
+  from pre-1.3.\n##################################\n  - A configuration file is now
+  available, run tolk:setup.\n  - Mapping has been updated, use update_locale rake
+  task if necessary."
 rdoc_options: []
 require_paths:
 - lib

data/lib/generators/tolk_migration/tolk_migration_generator.rb

@@ -1,19 +0,0 @@
-class TolkMigrationGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
-
-  source_root File.expand_path("../templates", __FILE__)
-
-  def create_migration_file
-    migration_template "migrate/create_tolk_tables.rb", "db/migrate/create_tolk_tables.rb"
-  end
-
-  # Implement the required interface for Rails::Generators::Migration.
-  def self.next_migration_number(dirname) #:nodoc:
-    next_migration_number = current_migration_number(dirname) + 1
-    if ActiveRecord::Base.timestamped_migrations
-      [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-    else
-      "%.3d" % next_migration_number
-    end
-  end
-end