localized 0.0.4 → 0.0.5

data/Gemfile

@@ -1,3 +1,4 @@
 source :rubygems
 
 gemspec
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    localized (0.0.3)
+    localized (0.0.4)
       rails (>= 3.0)
 
 GEM

data/README.md

@@ -32,9 +32,12 @@ easier than if a user was using YAML.
 
         Localized::Convert.to_csv('/a/file.csv')
 
-Coming soon... #from_csv
+## TODO
+
+1. #from_csv
+
+2. Support for google docs so translations can be synchronized
 
-Comeing
 
 ## Contributing
 

data/lib/localized/convert.rb

@@ -3,15 +3,16 @@ module Localized::Convert
 
   def self.to_csv(file)
     CSV.open(file, "wb") do |csv|
-      csv << ["Token", translations.keys.sort].flatten
+      csv << ["Token", *locale_columns]
       locale_cache.keys.sort.each do |token|
         row = [token]
-        locale_cache[token].keys.sort.each do |locale|
+        locale_columns.each do |locale|
           row << locale_cache[token][locale]
         end
         csv << row
       end
     end
+    nil
   end
 
   def self.load_cache
@@ -26,12 +27,11 @@ module Localized::Convert
   def self.locale_cache
     @locale_cache = begin
       rows = {}
-      columns = Hash[translations.keys.map{|l| [l, nil]}]
-      translations.keys.each do |locale| # each locale
-        translations[locale].each do |key, value| # each translation
-          key_string, value_string = formalize_keys(key, value)
-          rows[key_string] ||= columns
-          rows[key_string] = rows[key_string].merge(locale => value_string)
+      columns = Hash[locale_columns.map{|l| [l, nil]}]
+      Localized::Config.supported_locales.each do |locale| # each locale
+        formalize_keys(nil, (translations[locale] || {})).each do |(key, value)| # each translation
+          rows[key] ||= columns
+          rows[key] = rows[key].merge(locale => value)
         end
       end
       rows.reject { |k, r| r.values.compact.blank? }
@@ -41,16 +41,22 @@ module Localized::Convert
   private
 
   def self.formalize_keys(key, value)
-    key_string = key.to_s
-    value_string = nil
-    if value.is_a? Hash
-      value.each do |key, new_value|
-        key_string += ".#{key}"
-        key_string, value_string = formalize_keys(key_string, new_value)
+    pairs = []
+    if value.is_a?(Hash)
+      value.each do |new_key, new_value|
+        pairs << formalize_keys("#{key}#{key && "."}#{new_key}", new_value)
       end
-    else
-      value_string = value
+    elsif value.is_a? String
+      pairs << [key, value]
     end
-    [key_string, value_string]
+    Hash[*pairs.flatten].to_a
   end
+
+  def self.locale_columns
+    @locale_columns ||= [
+      Localized::Config.default_locale,
+      *Localized::Config.supported_locales.reject { |t| t == Localized::Config.default_locale }
+    ]
+  end
+
 end

data/localized.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name        = 'localized'
   s.author      = 'Paul Hepworth'
   s.email       = 'paul<dot>hepworth<at>peppyheppy<dot>com'
-  s.version     = '0.0.4'
+  s.version     = '0.0.5'
   s.homepage    = 'https://github.com/peppyheppy/localized'
   s.date        = '2011-07-09'
   s.summary     = "A ruby on rails gem that provides locale setting support through the subdomain (in a box)"

data/spec/config/locales/en-US.yml

@@ -2,4 +2,11 @@ en-US:
   one:
     two:
       three: "three"
-
+      six: "moroni"
+    four: "hello"
+  five: "special"
+  seven:
+    eight:
+      nine:
+        ten:
+          eleven: "truth"

data/spec/lib/localized/convert_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe Localized::Convert do
   include Localized
-  before :all do
+  before :each do
+    Rails.stub!(:root).and_return(Pathname.new(File.join(File.dirname(__FILE__),'..', '..')))
     I18n.load_path = Dir[File.join('spec/config/locales/*.yml')]
   end
 
@@ -23,31 +24,66 @@ describe Localized::Convert do
       Convert.locale_cache['one.two.three'][:'es-ES'].should be_nil
     end
 
+    it "should have values set for one deep" do
+      Convert.locale_cache['five'][:'en-US'].should == 'special'
+    end
+
+    it "should have values set for two deep" do
+      Convert.locale_cache['one.four'][:'en-US'].should == 'hello'
+    end
+
+    it "should have values set for three deep" do
+      Convert.locale_cache['one.two.six'][:'en-US'].should == 'moroni'
+    end
+
+    it "should have values set for six deep" do
+      Convert.locale_cache['seven.eight.nine.ten.eleven'][:'en-US'].should == 'truth'
+    end
+
     it "should not have empty valueless keys" do
       Convert.locale_cache.should_not have_key 'one.two'
     end
+
+    it "should have the same keys that are listed in the localized config file" do
+      Convert.locale_cache['one.two.three'].keys.sort.should == Localized::Config.supported_locales.sort
+    end
   end
 
   describe "CSV export" do
     it "should convert the locale cache to a CSV file" do
       file = 'spec/test_csv.csv'
-      File.should_not exist file
+      #File.should_not exist file
       Convert.to_csv(file)
       File.should exist file
       rows = CSV.read(file)
       # header row
+      # ["Token", "en-US", "de-DE", "en-AU", "en-CA", "en-GB", "es-ES", "fr-FR", "it-IT", "ja-JP", "nl-NL", "sv-SE"]
       rows.first[0].should == "Token"
       rows.first[1].should == "en-US"
-      rows.first[2].should == "es-ES"
-      rows.first[3].should == "nl-NL"
-      rows.first[4].should be_nil
+      rows.first[2].should == "de-DE"
+      rows.first[3].should == "en-AU"
+      rows.first[4].should == "en-CA"
+      rows.first[5].should == "en-GB"
+      rows.first[6].should == "es-ES"
+      rows.first[7].should == "fr-FR"
+      rows.first[8].should == "it-IT"
+      rows.first[9].should == "ja-JP"
+      rows.first[10].should == "nl-NL"
+      rows.first[11].should == "sv-SE"
 
       # data row
-      rows.last[0].should == "one.two.three"
-      rows.last[1].should == "three"
+      # ["one.two.three", "three", nil, nil, nil, nil, nil, nil, nil, nil, nil, "another", nil]
+      rows.last[0].should == "seven.eight.nine.ten.eleven"
+      rows.last[1].should == "truth"
       rows.last[2].should be_nil
-      rows.last[3].should == "another"
+      rows.last[3].should be_nil
       rows.last[4].should be_nil
+      rows.last[5].should be_nil
+      rows.last[6].should be_nil
+      rows.last[7].should be_nil
+      rows.last[8].should be_nil
+      rows.last[9].should be_nil
+      rows.last[11].should be_nil
 
       File.delete(file)
     end

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ require "ruby-debug"
 require "localized"
 require "action_controller/railtie"
 require 'rspec/rails'
+require 'rspec/mocks'
+require 'rspec/rails/mocks'
 
 class Application < Rails::Application
   # abusing locale for site/locale

metadata

@@ -2,7 +2,7 @@
 name: localized
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Paul Hepworth
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-09 00:00:00 -07:00
+date: 2011-07-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency