interpret 0.1.1 → 0.1.2

data/Gemfile

@@ -2,3 +2,7 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in interpret.gemspec
 gemspec
+
+group :development, :test do
+  gem 'sqlite3-ruby', :require => 'sqlite3'
+end

data/Rakefile

@@ -1,2 +1,8 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/app/models/interpret/translation.rb

@@ -16,7 +16,7 @@ module Interpret
       # Generates a hash representing the tree structure of the translations
       # for the given locale. It includes only "folders" in the sense of
       # locale keys that includes some real translations, or other keys.
-      def get_tree(lang = I18n.locale)
+      def get_tree(lang = I18n.default_locale)
         t = arel_table
         all_trans = locale(lang).select(t[:key]).where(t[:key].matches("%.%")).all
 
@@ -40,6 +40,9 @@ module Interpret
         translations.each do |e|
           LazyHash.lazy_add(res, "#{e.locale}.#{e.key}", e.value)
         end
+        if res.keys.size != 1
+          raise IndexError, "Generated hash must have only one root key. Your translation data in datrabase may be corrupted."
+        end
         res
       end
 
@@ -152,24 +155,24 @@ module Interpret
         files = Dir[Rails.root.join("config", "locales", "*.yml").to_s]
 
         @languages = {}
-        @main = {}
         files.each do |f|
           ar = YAML.load_file f
           lang = ar.keys.first
-          @languages[lang.to_s] = ar.first[1]
-          if I18n.default_locale.to_s == lang.to_s
-            @main = ar.first[1]
-            @main_lang = lang
+          if @languages.has_key?(lang.to_s)
+            @languages[lang.to_s] = @languages[lang.to_s].deep_merge(ar.first[1])
+          else
+            @languages[lang.to_s] = ar.first[1]
           end
         end
 
+        @main = @languages[I18n.default_locale.to_s].clone
         sync(@main)
       end
 
     private
       def sync(hash, prefix = "", existing = nil)
         if existing.nil?
-          translations = locale(@main_lang).all
+          translations = locale(I18n.default_locale).all
           existing = export(translations)
           existing = existing.first[1] unless existing.empty?
         end
@@ -180,7 +183,7 @@ module Interpret
           if hash[x].kind_of?(Hash)
             sync(hash[x], "#{prefix}#{x}.", existing[x])
           else
-            old = locale(@main_lang).find_by_key("#{prefix}#{x}")
+            old = locale(I18n.default_locale).find_by_key("#{prefix}#{x}")
 
             unless old
               # Creates the new entry
@@ -200,29 +203,34 @@ module Interpret
       # Check if the the given key exists in all languages except @main. If
       # not, create an entry.
       def check_in_other_langs(key)
-        (@languages.keys - [@main_lang]).each do |lang|
+        (@languages.keys - [I18n.default_locale]).each do |lang|
           trans = locale(lang).find_by_key(key)
           if trans.nil?
             create! :locale => lang,
                     :key => key,
-                    :value => ""
+                    :value => "untranslated"
             Interpret.logger.info "Created inexistent key [#{key}] for lang [#{lang}]"
           end
         end
       end
 
-      def create_new_translation(key)
+      def create_new_translation(missing_key)
         @languages.keys.each do |lang|
           origin_hash = @languages[lang].clone
-          key.split(".")[0..-2].each do |key|
+          value = nil
+          missing_key.split(".")[0..-2].each do |key|
+            if origin_hash[key].nil?
+              value = "untranslated"
+              break
+            end
             origin_hash = origin_hash[key]
           end
-          value = origin_hash[key.split(".").last]
+          value ||= origin_hash[missing_key.split(".").last]
           create! :locale => lang,
-                  :key => key,
+                  :key => missing_key,
                   :value => value
         end
-        Interpret.logger.info "New key created [#{key}] for languages #{@languages.keys.inspect}"
+        Interpret.logger.info "New key created [#{missing_key}] for languages #{@languages.keys.inspect}"
       end
 
       def remove_unused_keys(hash, prefix = "")

data/interpret.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_dependency "will_paginate", ">= 3.0.pre2"
   s.add_dependency "best_in_place", ">= 0.1.7"
 
-  s.add_development_dependency "rspec-rails", ">= 2.5"
+  s.add_development_dependency "rspec-rails", "~> 2.5"
 end

data/lib/generators/interpret/setup_generator.rb

@@ -13,9 +13,7 @@ module Interpret
     end
 
     def copy_images
-      copy_file "stylesheets/plus_icon.gif", "public/stylesheets/plus_icon.gif"
-      copy_file "stylesheets/minus_icon.gif", "public/stylesheets/minus_icon.gif"
-
+      copy_file "stylesheets/folder.png", "public/stylesheets/folder.png"
     end
   end
 end

data/lib/interpret/capistrano.rb

@@ -1,15 +1,18 @@
-namespace :interpret do
-  desc "Update translations keys in database"
-  task :update, :roles => :app, :except => { :no_release => true } do
-    commands = [
-      "RAILS_ENV=#{rails_env} rake interpret:update",
-    ]
+Capistrano::Configuration.instance(:must_exist).load do
+  namespace :interpret do
+    def rails_env
+      fetch(:rails_env, false) ? "RAILS_ENV=#{fetch(:rails_env)}" : ''
+    end
 
-    run <<-CMD
-      cd #{release_path} &&
-      #{commands.join(" && ")}
-    CMD
+    def roles
+      fetch(:delayed_job_server_role, :app)
+    end
+
+    desc "Update translations keys in database"
+    task :update, :roles => lambda {roles} do
+      run "cd #{current_path};#{rails_env} rake interpret:update"
+    end
   end
-end
 
-after "deploy:update_code", "interpret:update"
+  after "deploy:update_code", "interpret:update"
+end

data/lib/interpret/version.rb

@@ -1,3 +1,3 @@
 module Interpret
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/public/stylesheets/interpret_style.css

@@ -353,25 +353,26 @@ html body * dd.clear
 }
 
 body {
-  font-family: Helvetica;
+  font-family: "Lucida Grande", Helvetica;
 }
 
 #container {
   border: .3em solid #333;
 }
 
-#header {
+#header, .header {
   padding: 0 1em;
   margin-top: 1em;
   color: #FFF;
   background-color: #666;
+  border-radius: 5px;
 }
 
 table {
  border-collapse:collapse;
  width: 100%;
- border-right: 1px solid #444;
- border-left: 1px solid #444;
+ border-right: 1px solid #CCC;
+ border-left: 1px solid #CCC;
 }
 
 td, th {
@@ -388,7 +389,7 @@ td:last-child, td:last-child {
 }
 
 tr {
-  border-bottom:1px solid gray;
+  border-bottom:1px solid #CCC;
   cursor: hand;
   cursor: pointer;
 }
@@ -396,7 +397,6 @@ tr {
 
 tr:hover {
   background-color: #DDD;
-  height: 6.5em;
   -moz-transition: background .4s linear;
   -o-transition: background .4s linear;
   -webkit-transition: background .4s linear;
@@ -415,7 +415,7 @@ tr.header:hover {
   -webkit-transition: none;
   height: 2em;
 }
-tr.header th {
+tr.header th {;
   color: #EEE;
 }
 
@@ -506,7 +506,6 @@ tbody td a {
 
 .best_in_place textarea {
   width: 100%;
-  height: 6em;
   border: transparent;
   font-size: .9em;
 }
@@ -516,17 +515,10 @@ tbody td a {
   padding: .4em;
 }
 #tree_sidebar li {
-  list-style-image: url("/stylesheets/plus_icon.gif");
+  list-style-image: url("/stylesheets/folder.png");
   font-weight: normal;
-}
-
-
-#tree_sidebar li.current {
-  list-style-image: url("/stylesheets/minus_icon.gif");
-}
-
-#tree_sidebar li.current  {
-  font-weight: bold;
+  padding-bottom: 5px;
+  letter-spacing: 1px;
 }
 
 #tree_sidebar a {
@@ -536,7 +528,3 @@ tbody td a {
 #tree_sidebar a:hover {
   text-decoration: underline;
 }
-
-#loading_sidebar {
-  display: none;
-}

data/spec/database_helpers.rb

@@ -0,0 +1,15 @@
+module DatabaseHelpers
+
+  def migrate_database
+    silence_stream(STDOUT) do
+      ActiveRecord::Migrator.migrate File.expand_path('../../test_app/db/migrate/', __FILE__)
+    end
+  end
+
+  def drop_all_tables
+    ActiveRecord::Base.connection.tables.each do |table|
+      ActiveRecord::Base.connection.drop_table(table)
+    end
+  end
+
+end

data/spec/models/translation_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe Interpret::Translation do
+
+  let(:en_yml) {"""
+en:
+  p1: Hello world!
+  folder1:
+    pr1: Hi
+  folder2:
+    pr1: Some other text here
+  folder3:
+    pr1: More phrases
+    sub:
+      name: This is a 2 level subfolder
+      subsub:
+        name: With another nested folder inside
+    other:
+      name: folder
+    """
+  }
+
+  def file2db(string_file)
+    hash = YAML.load string_file
+
+    lang = hash.keys.first
+    records = Interpret::Translation.send(:parse_hash, hash.first[1], lang)
+    Interpret::Translation.transaction do
+      records.each {|x| x.save!}
+    end
+  end
+
+  describe ".get_tree" do
+    it "should return a hash representing a tree folder structure of the i18n keys" do
+      file2db(en_yml)
+      Interpret::Translation.get_tree('en').should == {'index' => {
+        'folder1' => {},
+        'folder2' => {},
+        'folder3' => {
+          'sub' => {
+            'subsub' => {}
+          },
+          'other' => {}
+        }
+      }}
+    end
+  end
+
+  describe ".export" do
+    it "should return a hash representing the yml locale file for the given translations" do
+      file2db(en_yml)
+      translations = Interpret::Translation.all
+      Interpret::Translation.export(translations).should == YAML.load(en_yml)
+    end
+  end
+
+  describe ".import" do
+    pending
+  end
+
+  describe ".dump" do
+    pending
+  end
+
+  describe ".update" do
+    pending
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,35 @@
+# Configure Rails Envinronment
+ENV["RAILS_ENV"] = "test"
+
+require File.expand_path('../../test_app/config/environment', __FILE__)
+require "rails/test_help"
+require "rspec/rails"
+require "database_helpers"
+
+ActionMailer::Base.delivery_method = :test
+ActionMailer::Base.perform_deliveries = true
+ActionMailer::Base.default_url_options[:host] = "test.com"
+
+Rails.backtrace_cleaner.remove_silencers!
+
+include DatabaseHelpers
+# Run any available migration
+puts 'Setting up database...'
+drop_all_tables
+migrate_database
+
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each{|f| require f}
+
+
+RSpec.configure do |config|
+  # Remove this line if you don't want RSpec's should and should_not
+  # methods or matchers
+  require 'rspec/expectations'
+
+  config.include RSpec::Matchers
+  config.include DatabaseHelpers
+
+  # == Mock Framework
+  config.mock_with :rspec
+end

data/test_app/Capfile

@@ -0,0 +1,4 @@
+load 'deploy' if respond_to?(:namespace) # cap2 differentiator
+Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
+
+load 'config/deploy' # remove this line to skip loading any of the default tasks

data/test_app/Gemfile

@@ -1,11 +1,10 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.0.0'
+gem 'rails', '~> 3.0.3'
 gem 'interpret', :path => ".."
 gem 'haml-rails'
+gem 'capistrano'
 
 group :development, :test do
   gem 'sqlite3-ruby', :require => 'sqlite3'
 end
-
-

data/test_app/config/deploy.rb

@@ -0,0 +1,24 @@
+require '../lib/interpret/capistrano'
+
+set :application, "set your application name here"
+set :repository,  "set your repository location here"
+
+set :scm, :subversion
+# Or: `accurev`, `bzr`, `cvs`, `darcs`, `git`, `mercurial`, `perforce`, `subversion` or `none`
+
+role :web, "your web-server here"                          # Your HTTP server, Apache/etc
+role :app, "your app-server here"                          # This may be the same as your `Web` server
+role :db,  "your primary db-server here", :primary => true # This is where Rails migrations will run
+role :db,  "your slave db-server here"
+
+# If you are using Passenger mod_rails uncomment this:
+# if you're still using the script/reapear helper you will need
+# these http://github.com/rails/irs_process_scripts
+
+# namespace :deploy do
+#   task :start do ; end
+#   task :stop do ; end
+#   task :restart, :roles => :app, :except => { :no_release => true } do
+#     run "#{try_sudo} touch #{File.join(current_path,'tmp','restart.txt')}"
+#   end
+# end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: interpret
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Roger Campos
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-14 00:00:00 +01:00
+date: 2011-02-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 3
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 5
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -72,7 +68,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 103
         segments: 
         - 0
         - 30
@@ -88,7 +83,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1876988247
         segments: 
         - 3
         - 0
@@ -104,7 +98,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 0
         - 1
@@ -118,9 +111,8 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 5
@@ -172,6 +164,10 @@ files:
 - public/javascripts/jquery.purr.js
 - public/stylesheets/folder.png
 - public/stylesheets/interpret_style.css
+- spec/database_helpers.rb
+- spec/models/translation_spec.rb
+- spec/spec_helper.rb
+- test_app/Capfile
 - test_app/Gemfile
 - test_app/README
 - test_app/Rakefile
@@ -186,6 +182,7 @@ files:
 - test_app/config/application.rb
 - test_app/config/boot.rb
 - test_app/config/database.yml
+- test_app/config/deploy.rb
 - test_app/config/environment.rb
 - test_app/config/environments/development.rb
 - test_app/config/environments/production.rb
@@ -238,7 +235,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -247,7 +243,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"