interpret 0.2.1 → 1.0.0

data/.gitignore

@@ -1,11 +1,9 @@
 pkg/*
 *.gem
-.bundle
+.bundle/
 
 Gemfile.lock
 .DS_Store
-test_app/.bundle
 test_app/db/*.sqlite3
 test_app/log/*.log
-test_app/tmp/**/*
-
+test_app/tmp/

data/Gemfile

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

data/README.md

@@ -422,18 +422,9 @@ backoffice.
     rake interpret:update
     rake interpret:dump
 
-The `update` task is what you may want to run after a deployment, for what
-Interpret already has a capistrano recipe...
+The `update` task is what you may want to run after a deployment.
 
 
-Capistrano recipe
------------------
-
-Interpret also have a capistrano recipe to run the `update` rake task after
-updating code. You only need to require this file in your `deploy.rb`:
-
-    require 'interpret/capistrano'
-
 
 Soft behavior
 --------------

data/{public/stylesheets/interpret_style.css → app/assets/stylesheets/interpret_style.css.erb}

@@ -502,7 +502,7 @@ html body * dd.clear
   padding: .4em;
 }
 #interpret_container #tree_sidebar li {
-  list-style-image: url("/stylesheets/folder.png");
+  list-style-image: url(<%= asset_path "folder.png" %>);
   font-weight: normal;
   padding-bottom: 5px;
   letter-spacing: 1px;

data/app/controllers/interpret/base_controller.rb

@@ -2,7 +2,7 @@ class Interpret::BaseController < eval(Interpret.parent_controller.classify)
   before_filter :set_locale
   before_filter { authorize! :use, :interpret }
   before_filter :check_authorized_language
-  layout 'interpret'
+  layout 'interpret/interpret'
 
 protected
   def current_interpret_user

data/app/controllers/interpret/search_controller.rb

@@ -6,7 +6,7 @@ class Interpret::SearchController < Interpret::BaseController
       opts = {}
       opts[:key] = params[:key] if params[:key].present?
       opts[:value] = params[:value] if params[:value].present?
-      redirect_to interpret_search_url(opts)
+      redirect_to search_url(opts)
     else
       if params[:key].present? || params[:value].present?
         sanitizer = case ActiveRecord::Base.connection.adapter_name
@@ -22,7 +22,13 @@ class Interpret::SearchController < Interpret::BaseController
         t = Interpret::Translation.arel_table
         search_key = params[:key].present? ? params[:key].split(" ").map{|x| sanitizer.call(x)} : []
         search_value = params[:value].present? ? params[:value].split(" ").map{|x| sanitizer.call(x)} : []
-        @translations = Interpret::Translation.allowed.locale(I18n.locale).where(t[:key].matches_all(search_key).or(t[:value].matches_all(search_value))).order("translations.key ASC")
+        if search_value.any? && search_key.any?
+          @translations = Interpret::Translation.allowed.locale(I18n.locale).where(t[:key].matches_all(search_key).or(t[:value].matches_all(search_value))).order("translations.key ASC")
+        elsif search_key.any?
+          @translations = Interpret::Translation.allowed.locale(I18n.locale).where(t[:key].matches_all(search_key)).order("translations.key ASC")
+        else
+          @translations = Interpret::Translation.allowed.locale(I18n.locale).where(t[:value].matches_all(search_value)).order("translations.key ASC")
+        end
       end
     end
   end

data/app/controllers/interpret/tools_controller.rb

@@ -6,7 +6,7 @@ class Interpret::ToolsController < Interpret::BaseController
 
     session.delete(:tree)
     Interpret.backend.reload! if Interpret.backend
-    redirect_to interpret_tools_url, :notice => "Dump done."
+    redirect_to tools_url, :notice => "Dump done."
   end
 
   def export
@@ -22,26 +22,26 @@ class Interpret::ToolsController < Interpret::BaseController
   def run_update
     Interpret::Translation.update
     Interpret.backend.reload! if Interpret.backend
-    redirect_to interpret_tools_url, :notice => "Update done"
+    redirect_to tools_url, :notice => "Update done"
   end
 
   def import
     unless params.has_key? :file
-      redirect_to interpret_tools_url, :alert => "You have to select a file to import."
+      redirect_to tools_url, :alert => "You have to select a file to import."
       return
     end
 
     begin
       Interpret::Translation.import(params[:file])
     rescue Exception => e
-      redirect_to interpret_tools_url, :alert => "Error when importing: #{e.message}"
+      redirect_to tools_url, :alert => "Error when importing: #{e.message}"
       return
     end
 
     session.delete(:tree)
     Interpret.backend.reload! if Interpret.backend
 
-    redirect_to interpret_tools_url, :notice => "Import successfully done."
+    redirect_to tools_url, :notice => "Import successfully done."
   end
 end
 

data/app/controllers/interpret/translations_controller.rb

@@ -1,89 +1,79 @@
-class Interpret::TranslationsController < Interpret::BaseController
-  before_filter :get_tree, :only => :index
-  authorize_resource :class => "Interpret::Translation"
+module Interpret
+  class TranslationsController < Interpret::BaseController
+    before_filter :get_tree, :only => :index
+    authorize_resource :class => "Interpret::Translation"
 
-  def index
-    key = params[:key]
-    t = Interpret::Translation.arel_table
-    if key
-      @translations = Interpret::Translation.allowed.locale(I18n.locale).where(t[:key].matches("#{CGI.escape(key)}.%")).order("translations.key ASC")
-      if I18n.locale != I18n.default_locale
-        @references = Interpret::Translation.allowed.locale(I18n.default_locale).where(t[:key].matches("#{CGI.escape(key)}.%")).order("translations.key ASC")
-      end
-    else
-      @translations = Interpret::Translation.allowed.locale(I18n.locale).where(t[:key].does_not_match("%.%")).order("translations.key ASC")
-      if I18n.locale != I18n.default_locale
-        @references = Interpret::Translation.allowed.locale(I18n.default_locale).where(t[:key].does_not_match("%.%")).order("translations.key ASC")
+    def index
+      key = params[:key]
+      t = Interpret::Translation.arel_table
+      if key
+        @translations = Interpret::Translation.allowed.locale(I18n.locale).where(t[:key].matches("#{CGI.escape(key)}.%")).order("translations.key ASC")
+        if I18n.locale != I18n.default_locale
+          @references = Interpret::Translation.allowed.locale(I18n.default_locale).where(t[:key].matches("#{CGI.escape(key)}.%")).order("translations.key ASC")
+        end
+      else
+        @translations = Interpret::Translation.allowed.locale(I18n.locale).where(t[:key].does_not_match("%.%")).order("translations.key ASC")
+        if I18n.locale != I18n.default_locale
+          @references = Interpret::Translation.allowed.locale(I18n.default_locale).where(t[:key].does_not_match("%.%")).order("translations.key ASC")
+        end
       end
+
+      # not show translations inside nested folders, \w avoids dots
+      @translations = @translations.select{|x| x.key =~ /#{key}\.\w+$/} if key
+      @references = @references.select{|x| x.key =~ /#{key}\.\w+$/} if key && @references
+
+      @total_keys_number = Interpret::Translation.locale(I18n.locale).count
     end
 
-    # not show translations inside nested folders, \w avoids dots
-    @translations = @translations.select{|x| x.key =~ /#{key}\.\w+$/} if key
-    @references = @references.select{|x| x.key =~ /#{key}\.\w+$/} if key && @references
+    def edit
+      @translation = Interpret::Translation.find(params[:id])
+    end
 
-    @total_keys_number = Interpret::Translation.locale(I18n.locale).count
-  end
+    def update
+      @translation = Interpret::Translation.find(params[:id])
+      old_value = @translation.value
 
-  def edit
-    @translation = Interpret::Translation.find(params[:id])
-  end
+      respond_to do |format|
+        if @translation.update_attributes(params[:translation].presence || params[:interpret_translation])
+          msg = ""
+          msg << "By [#{@interpret_user}]. " if @interpret_user
+          msg << "Locale: [#{@translation.locale}], key: [#{@translation.key}]. The translation has been changed from [#{old_value}] to [#{@translation.value}]"
+          Interpret.logger.info msg
 
-  def update
-    @translation = Interpret::Translation.find(params[:id])
-    old_value = @translation.value
+          format.html { redirect_to(request.env["HTTP_REFERER"]) }
+          format.xml  { head :ok }
+          format.json { head :ok }
+        else
+          format.html { redirect_to(request.env["HTTP_REFERER"]) }
+          format.xml  { render :xml => @translation.errors, :status => :unprocessable_entity }
+          format.json { render :status => :unprocessable_entity }
+        end
+      end
+    end
 
-    respond_to do |format|
-      if @translation.update_attributes(params[:interpret_translation])
-        msg = ""
-        msg << "By [#{@interpret_user}]. " if @interpret_user
-        msg << "Locale: [#{@translation.locale}], key: [#{@translation.key}]. The translation has been changed from [#{old_value}] to [#{@translation.value}]"
-        Interpret.logger.info msg
+    def create
+      @translation = Interpret::Translation.new params[:translation]
 
-        format.html { redirect_to(request.env["HTTP_REFERER"]) }
-        format.xml  { head :ok }
-        format.json { head :ok }
+      if @translation.save
+        flash[:notice] = "New translation created for #{@translation.key}"
+        redirect_to request.env["HTTP_REFERER"]
       else
-        format.html { redirect_to(request.env["HTTP_REFERER"]) }
-        format.xml  { render :xml => @translation.errors, :status => :unprocessable_entity }
-        format.json { render :status => :unprocessable_entity }
+        flash[:alert] = "Error when creating a new translation"
+        redirect_to request.env["HTTP_REFERER"]
       end
     end
-  end
 
-  def create
-    @translation = Interpret::Translation.new params[:interpret_translation]
+    def destroy
+      @translation = Interpret::Translation.find(params[:id])
 
-    if @translation.save
-      flash[:notice] = "New translation created for #{@translation.key}"
-      redirect_to request.env["HTTP_REFERER"]
-    else
-      flash[:alert] = "Error when creating a new translation"
+      @translation.destroy
+      flash[:notice] = "Translation #{@translation.key} destroyed."
       redirect_to request.env["HTTP_REFERER"]
     end
-  end
-
-  def destroy
-    @translation = Interpret::Translation.find(params[:id])
-
-    @translation.destroy
-    flash[:notice] = "Translation #{@translation.key} destroyed."
-    redirect_to request.env["HTTP_REFERER"]
-  end
 
-  def live_edit
-    blobs = params[:key].split(".")
-    locale = blobs.first
-    key = blobs[1..-1].join(".")
-    @translation = Interpret::Translation.locale(locale).find_by_key(key)
-
-    respond_to do |format|
-      format.html { render :layout => false }
+  private
+    def get_tree
+      @tree ||= Interpret::Translation.get_tree
     end
   end
-
-private
-  def get_tree
-    @tree ||= Interpret::Translation.get_tree
-  end
-
 end

data/app/models/interpret/translation.rb

@@ -3,6 +3,7 @@ module Interpret
   class Translation < I18n::Backend::ActiveRecord::Translation
     default_scope order('locale ASC')
     validates_uniqueness_of :key, :scope => :locale
+    validates_presence_of :locale
 
     after_update :set_stale
 

data/app/views/interpret/missing_translations/blank.html.erb

@@ -18,7 +18,7 @@
         <td><%= trans.key %></td>
         <td><%= ref || "It's empty" %></td>
         <td>
-          <%= form_for Interpret::Translation.new, :url => interpret_translations_path do |f| %>
+          <%= form_for Interpret::Translation.new, :url => translations_path do |f| %>
             <%= f.hidden_field "locale", :value => I18n.locale %>
             <%= f.hidden_field "key", :value => trans.key %>
             <%= f.text_area :value, :rows => 4, :cols => 60 %>

data/app/views/interpret/missing_translations/index.html.erb

@@ -24,7 +24,7 @@
           <td><%= trans[:key] %></td>
           <td><%= trans[:ref_value] %></td>
           <td>
-            <%= form_for Interpret::Translation.new, :url => interpret_translations_path do |f| %>
+            <%= form_for Interpret::Translation.new, :url => translations_path do |f| %>
               <%= f.hidden_field "locale", :value => I18n.locale %>
               <%= f.hidden_field "key", :value => trans[:key] %>
               <%= f.text_area :value, :rows => 4, :cols => 60 %>

data/app/views/interpret/missing_translations/stale.html.erb

@@ -27,12 +27,12 @@
         <td class='content' id='translation_<%= trans.id %>'>
             <%= best_in_place trans, :value,
                 :type => :textarea,
-                :path => interpret_translation_path(trans),
+                :path => translation_path(trans),
                 :activator => "#translation_#{trans.id}",
                 :sanitize => false %>
         </td>
         <td>
-          <%= form_for trans, :url => interpret_translation_path(trans) do |f| %>
+          <%= form_for trans, :url => translation_path(trans) do |f| %>
             <%= f.hidden_field :stale, :value => false %>
             <%= submit_tag "Mark as OK" %>
           <% end %>

data/app/views/interpret/search/_blank_search.html.erb

@@ -7,7 +7,7 @@
 <div id="search">
   <p>Enter a search term for the key and/or the value of the translation</p>
 
-  <%= form_tag interpret_search_path do %>
+  <%= form_tag search_path do %>
     <%= label_tag "key", "Key value" %>
     <br />
     <%= text_field_tag "key" %>

data/app/views/interpret/search/_filled_search.html.erb

@@ -18,7 +18,7 @@
     <%= @translations.size %> results found.
   </p>
   <div id="side_search">
-    <%= form_tag interpret_search_path do %>
+    <%= form_tag search_path do %>
       <%= label_tag "key", "Key value" %>
       <br />
       <%= text_field_tag "key", params[:key] %>

data/app/views/interpret/tools/index.html.erb

@@ -7,7 +7,7 @@
 <p>With the following button you can download a "<%= I18n.locale %>.yml" file with the current translations for this language.</p>
 
 <p>
-<%= button_to "Download", export_interpret_tools_path, :method => :get %>
+<%= button_to "Download", export_tools_path, :method => :get %>
 </p>
 
 <div class="header">
@@ -23,7 +23,7 @@ and if they already exists they will be overwritten.
 Remember that the first key of the YAML file you're uploading must match the current locale.
 </p>
 
-<%= form_tag import_interpret_tools_path, :multipart => true do %>
+<%= form_tag import_tools_path, :multipart => true do %>
   <%= label_tag "File:" %>
   <%= file_field_tag :file %>
   <%= submit_tag "Upload" %>

data/app/views/interpret/translations/_listing.html.erb

@@ -18,7 +18,7 @@
           <td class="content" id="translation_<%= x.id %>">
             <%= best_in_place x, :value,
                 :type => :textarea,
-                :path => interpret_translation_path(x),
+                :path => translation_path(x),
                 :activator => "#translation_#{x.id}",
                 :sanitize => false %>
           </td>
@@ -34,11 +34,11 @@
             <% if trans %>
               <%= best_in_place trans, :value,
                   :type => :textarea,
-                  :path => interpret_translation_path(trans),
+                  :path => translation_path(trans),
                   :activator => "#translation_#{trans.id}",
                   :sanitize => false %>
             <% else %>
-              <%= link_to "Create this missing translation", interpret_missing_translations_path %>
+              <%= link_to "Create this missing translation", missing_translations_path %>
             <% end %>
           </td>
         </tr>

data/app/views/interpret/translations/new.html.erb

@@ -6,10 +6,10 @@
 Previous value:
 <b>[<%= @reference.locale %>] <%= @reference.value %></b>
 </p>
-<%= form_for [@reference, @translation], :url => interpret_translation_translations_path(@reference) do |f| %>
+<%= form_for [@reference, @translation], :url => translation_translations_path(@reference) do |f| %>
   <%= f.label :value, "Translation to [#{I18n.locale}]" %>
   <%= f.text_area :value, :value => @translation.value %>
   <%= f.submit %>
 <% end %>
 
-<%= link_to "Back", interpret_root_path %>
+<%= link_to "Back", root_path %>

data/app/views/layouts/interpret/interpret.html.erb

@@ -0,0 +1,55 @@
+<div id="interpret_container">
+  <% if flash.any? %>
+    <div class="interpret_flash grid_16 <%= flash.keys.first %>">
+      <%= flash[:notice] || flash[:alert] %>
+    </div>
+  <% end %>
+  <div class="menu grid_12">
+    <%= link_to "Overview", root_path, :class => controller_name == "translations" && action_name == "index" ? "current" : "" %>
+
+    <% if can? :use, :tools%>
+      | <%= link_to "Tools", tools_path, :class => controller_name == "tools" ? "current" : "" %>
+    <% end%>
+
+    <% if can? :use, :search%>
+      | <%= link_to "Search", search_path, :class => controller_name == "search" ? "current" : ""%>
+    <% end%>
+
+    <% if can? :read, :missing_translations%>
+      | <%= link_to "Missing translations", missing_translations_path, :class => controller_name == "missing_translations" && action_name == "index" ? "current" : ""%>
+    <% end%>
+
+    <% if can? :read, :stale_translations%>
+      | <%= link_to "Stale translations", stale_translations_path, :class => controller_name == "missing_translations" && action_name == "stale" ? "current" : ""%>
+    <% end%>
+
+    <% if can? :read, :blank_translations%>
+      | <%= link_to "Blank translations", blank_translations_path, :class => controller_name == "missing_translations" && action_name == "blank" ? "current" : ""%>
+    <% end%>
+
+    <% if can? :read, :unused_translations%>
+      | <%= link_to "Unused translations", unused_translations_path, :class => controller_name == "missing_translations" && action_name == "unused" ? "current" : ""%>
+    <% end%>
+    <hr />
+  </div>
+  <div class="menu grid_4" id='languages_nav'>
+    Languages:
+    <% Interpret::Translation.available_locales.each do |locale| %>
+      <% next unless can? :use, :"interpret_in_#{locale}" %>
+      <% opts = {:locale => locale} %>
+      <% opts[:key] = params[:key] if params[:key] %>
+      <% opts[:value] = params[:value] if params[:value] %>
+      <%= link_to locale, opts %>
+    <% end %>
+    <hr />
+  </div>
+  <div class="clearfix"></div>
+  <div id="sidebar" class="grid_3">
+    <%= yield :sidebar %>
+  </div>
+  <div id="main" class="grid_13">
+    <%= yield %>
+  </div>
+</div>
+
+<%= interpret_parent_layout Interpret.layout%>

data/config/routes.rb

@@ -1,28 +1,26 @@
-Rails.application.routes.draw do
-  scope Interpret.scope do
-    namespace :interpret do
-      resources :translations, :only => [:destroy, :edit, :update, :create] do
-        collection do
-          get :live_edit
-        end
+Interpret::Engine.routes.draw do
+  scope ":locale" do
+    resources :translations, :only => [:destroy, :edit, :update, :create] do
+      collection do
+        get :live_edit
       end
+    end
 
-      resources :tools, :only => :index do
-        collection do
-          get :export
-          post :import
-          post :dump
-          post :run_update
-        end
+    resources :tools, :only => :index do
+      collection do
+        get :export
+        post :import
+        post :dump
+        post :run_update
       end
+    end
 
-      match "search", :to => "search#index"
-      resources :missing_translations
-      match "blank", :to => "missing_translations#blank", :as => "blank_translations"
-      match "unused", :to => "missing_translations#unused", :as => "unused_translations"
-      match "stale", :to => "missing_translations#stale", :as => "stale_translations"
+    match "search", :to => "search#index"
+    resources :missing_translations
+    match "blank", :to => "missing_translations#blank", :as => "blank_translations"
+    match "unused", :to => "missing_translations#unused", :as => "unused_translations"
+    match "stale", :to => "missing_translations#stale", :as => "stale_translations"
 
-      root :to => "translations#index"
-    end
+    root :to => "translations#index"
   end
 end

data/{lib/generators/interpret/templates/migration.rb → db/migrate/20111108094329_create_translations.rb}

@@ -1,5 +1,5 @@
-class InterpretCreateTranslations < ActiveRecord::Migration
-  def self.up
+class CreateTranslations < ActiveRecord::Migration
+  def up
     create_table :translations do |t|
       t.string :locale
       t.string :key
@@ -10,8 +10,7 @@ class InterpretCreateTranslations < ActiveRecord::Migration
     end
   end
 
-  def self.down
+  def down
     drop_table :translations
   end
 end
-

data/interpret.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", "~> 3.0.3"
-  s.add_dependency "i18n", "~> 0.5.0"
+  s.add_dependency "rails", "~> 3.1.0"
+  s.add_dependency "i18n", "~> 0.6.0"
   s.add_dependency "i18n-active_record"
   s.add_dependency "ya2yaml", ">= 0.30.0"
-  s.add_dependency "best_in_place", "~> 0.2.2"
+  s.add_dependency "best_in_place", "~> 1.0.0"
   s.add_dependency "lazyhash", ">= 0.1.1"
   s.add_dependency "cancan", "~> 1.6.0"
 

data/lib/interpret/engine.rb

@@ -1,10 +1,10 @@
-require 'i18n/backend/active_record'
 require 'interpret/logger'
 require 'interpret/helpers'
-require 'interpret/controller_filter'
 
 module Interpret
   class Engine < Rails::Engine
+    isolate_namespace Interpret
+
     initializer "interpret.register_i18n_active_record_backend" do |app|
       app.config.after_initialize do
         if Interpret.registered_envs.include?(Rails.env.to_sym)
@@ -25,10 +25,12 @@ module Interpret
 
 
     initializer "interpret.register_observer" do |app|
-      app.config.before_initialize do |app|
+      #app.config.before_initialize do |app|
+        require 'active_record'
+        require 'i18n/backend/active_record'
         ActiveRecord::Base.observers << Interpret.sweeper.to_sym if Interpret.sweeper && I18n::Backend::ActiveRecord::Translation.table_exists?
         ActiveRecord::Base.observers << :"interpret/expiration_observer" if !Interpret.sweeper && I18n::Backend::ActiveRecord::Translation.table_exists?
-      end
+      #end
     end
   end
 end