interpret 0.2.0 → 0.2.1

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

@@ -0,0 +1,27 @@
+<% unless @unused_translations %>
+  <p>There are no useless translations</p>
+<% else %>
+  <p>There are <%= @unused_translations.size %> translations that exists for
+  the [ <%= I18n.locale %> ] language, but DO NOT exists for [ <%= I18n.default_locale %> ].
+  You probably want to do something about it.
+  </p>
+
+  <table>
+    <thead>
+      <tr class="header">
+        <th>Key</th>
+        <th>Value in [ <%= I18n.locale %> ]</th>
+        <th>Delete</th>
+      </tr>
+    </thead>
+    <% @unused_translations.each do |trans| %>
+      <tr>
+        <td><%= trans.key %></td>
+        <td><%= trans.value %></td>
+        <td>
+          <%= link_to "Destroy it", trans, :method => :delete, :confirm => "Are you sure?" %>
+        </td>
+      </tr>
+    <% end%>
+  </table>
+<% end %>

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

@@ -1,40 +1,30 @@
 <% interpret_title "Interpret - Tools" %>
 
 <div class="header">
-  <h1>Tools for import/export locale data</h1>
+  <h1>Download the current .yml file for language [ <%= I18n.locale %> ]</h1>
 </div>
 
-<p><%= link_to "Download", export_interpret_tools_path %> the current translations for '<%= I18n.locale %>' language as .yml file</p>
-<p>Upload your .yml file for '<%= I18n.locale %>' language</p>
-<p>
-<%= form_tag import_interpret_tools_path, :multipart => true do %>
-  <%= label_tag "File:" %>
-  <%= file_field_tag :file %>
-  <%= submit_tag "Upload" %>
-<% end %>
-
-
-<div class="header">
-  <h1>Update contents from yml locale files</h1>
-</div>
+<p>With the following button you can download a "<%= I18n.locale %>.yml" file with the current translations for this language.</p>
 
-<p>Update all your application translations from the yml files.<br/>
+<p>
+<%= button_to "Download", export_interpret_tools_path, :method => :get %>
 </p>
-<%= button_to "Update", run_update_interpret_tools_path %>
-
 
 <div class="header">
-  <h1>Dump .yml contents into database</h1>
+  <h1>Import translations from a .yml file</h1>
 </div>
 
-<p>With this option you can export all of your *.yml contents into the database backend<br/>
-<b>Be aware!!</b> All of your current database translations will be updated to match with your current *.yml files.
+<p>This action will let you update the translations from a standard .yml file.
+All existing translations in that file will be copied into the application,
+and if they already exists they will be overwritten.
 </p>
 
-<% if Rails.env == "production" %>
-  <p><b>MY GOD!!! You're in PRODUCTION!! You're sure you wanna do this??</b></p>
-<% end %>
-
 <p>
-<%= button_to "Dump", dump_interpret_tools_path %>
+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 %>
+  <%= label_tag "File:" %>
+  <%= file_field_tag :file %>
+  <%= submit_tag "Upload" %>
+<% end %>

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

@@ -1,4 +1,4 @@
-<table>
+<table id="results">
   <thead>
     <tr class="header">
       <% if @references %>
@@ -8,15 +8,12 @@
         <th>Key</th>
       <% end %>
       <th>Content [<%= I18n.locale %>]</th>
-      <% if @interpret_admin && @references.nil? %>
-        <th style="width:5%">Protected?</th>
-      <% end %>
     </tr>
   </thead>
   <tbody>
     <% unless @references %>
       <% @translations.each do |x| %>
-        <tr<%= " class='protected'" if x.protected %>>
+        <tr>
           <td class='key'><%= x.key %></td>
           <td class="content" id="translation_<%= x.id %>">
             <%= best_in_place x, :value,
@@ -25,21 +22,12 @@
                 :activator => "#translation_#{x.id}",
                 :sanitize => false %>
           </td>
-          <% if @interpret_admin %>
-            <td style="width:5%" class='protection_input' id="protection_<%= x.id %>">
-              <%= best_in_place x, :protected,
-                  :type => :checkbox,
-                  :path => interpret_translation_path(x),
-                  :activator => "#protection_#{x.id}"
-                  %>
-            </td>
-          <% end %>
         </tr>
       <% end %>
     <% else %>
       <% @references.each do |x| %>
         <% trans = @translations.detect{|y| y.key == x.key} %>
-        <tr<%= " id='translation_#{trans.id}'" if trans %><%= " class='protected'" if x.protected %>>
+        <tr<%= " id='translation_#{trans.id}'" if trans %>>
           <td style='width:5%'><%= x.key %></td>
           <td style='width:50%'><%= x.value %></td>
           <td style='width:50%'>

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

@@ -4,6 +4,9 @@
   <h1>Translations for [<%= I18n.locale %>]</h1>
 </div>
 <p>
+There is a total of <%= @total_keys_number %> translations for [ <%= I18n.locale %> ].
+</p>
+<p>
 Below are the translations without any particulary key in your application.
 That use to be some global names or terms for common use along all the site,
 which doesn't belong to any page or section in particulary. To dive into the

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

@@ -6,17 +6,37 @@
     </div>
   <% end %>
   <div class="menu grid_12">
-    <%= interpret_section_link_to "Overview", interpret_root_path %> |
-    <% unless @interpret_user && !@interpret_admin %>
-      <%= interpret_section_link_to "Tools", interpret_tools_path %> |
+    <%= interpret_section_link_to "Overview", interpret_root_path %>
+
+    <% if can? :use, :tools %>
+      | <%= interpret_section_link_to "Tools", interpret_tools_path %>
+    <% end %>
+
+    <% if can? :use, :search %>
+      | <%= interpret_section_link_to "Search", interpret_search_path %>
+    <% end %>
+
+    <% if can? :read, :missing_translations %>
+      | <%= link_to "Missing translations", interpret_missing_translations_path, :class => controller_name == "missing_translations" && action_name == "index" ? "current" : "" %>
+    <% end %>
+
+    <% if can? :read, :stale_translations %>
+      | <%= link_to "Stale translations", interpret_stale_translations_path, :class => controller_name == "missing_translations" && action_name == "stale" ? "current" : "" %>
+    <% end %>
+
+    <% if can? :read, :blank_translations %>
+      | <%= link_to "Blank translations", interpret_blank_translations_path, :class => controller_name == "missing_translations" && action_name == "blank" ? "current" : "" %>
+    <% end %>
+
+    <% if can? :read, :unused_translations %>
+      | <%= link_to "Unused translations", interpret_unused_translations_path, :class => controller_name == "missing_translations" && action_name == "unused" ? "current" : "" %>
     <% end %>
-    <%= interpret_section_link_to "Search", interpret_search_path %> |
-    <%= interpret_section_link_to "Missing translations", interpret_missing_translations_path %>
     <hr />
   </div>
-  <div class="menu grid_4">
+  <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] %>

data/config/routes.rb

@@ -1,7 +1,7 @@
 Rails.application.routes.draw do
   scope Interpret.scope do
     namespace :interpret do
-      resources :translations, :only => [:edit, :update, :create] do
+      resources :translations, :only => [:destroy, :edit, :update, :create] do
         collection do
           get :live_edit
         end
@@ -18,6 +18,9 @@ Rails.application.routes.draw do
 
       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

data/interpret.gemspec

@@ -23,8 +23,11 @@ Gem::Specification.new do |s|
   s.add_dependency "i18n", "~> 0.5.0"
   s.add_dependency "i18n-active_record"
   s.add_dependency "ya2yaml", ">= 0.30.0"
-  s.add_dependency "best_in_place", ">= 0.1.7"
+  s.add_dependency "best_in_place", "~> 0.2.2"
   s.add_dependency "lazyhash", ">= 0.1.1"
+  s.add_dependency "cancan", "~> 1.6.0"
 
   s.add_development_dependency "rspec-rails", "~> 2.5"
+  s.add_development_dependency "capybara", "~> 1.0.1"
+  s.add_development_dependency "launchy"
 end

data/lib/generators/interpret/templates/migration.rb

@@ -6,7 +6,7 @@ class InterpretCreateTranslations < ActiveRecord::Migration
       t.text   :value
       t.text   :interpolations
       t.boolean :is_proc, :default => false
-      t.boolean :protected, :default => false
+      t.boolean :stale, :default => false
     end
   end
 

data/lib/interpret.rb

@@ -1,5 +1,6 @@
 require 'best_in_place'
 require 'lazyhash'
+require 'cancan'
 
 module Interpret
   mattr_accessor :backend
@@ -9,21 +10,41 @@ module Interpret
   mattr_accessor :registered_envs
   mattr_accessor :scope
   mattr_accessor :current_user
-  mattr_accessor :admin
   mattr_accessor :layout
   mattr_accessor :soft
   mattr_accessor :live_edit
+  mattr_accessor :black_list
+  mattr_accessor :ability
 
-  @@controller = "action_controller/base"
+  @@parent_controller = "application_controller"
   @@registered_envs = [:production, :staging]
   @@scope = ""
   @@layout = "interpret_base"
   @@soft = false
   @@live_edit = false
+  @@black_list = []
+  @@current_user = "current_user"
+  @@ability = "interpret/ability"
 
   def self.configure
     yield self
   end
+
+  def self.fixed_blacklist
+    @@black_list.select{|x| !x.include?("*")}
+  end
+
+  def self.wild_blacklist
+    @@black_list.select{|x| x.include?("*")}.map{|x| x.gsub("*", "")}
+  end
+
+  def self.ability
+    unless @@ability.is_a?(Class)
+      @@ability.classify.constantize
+    else
+      @@ability
+    end
+  end
 end
 
 require 'interpret/engine' if defined? Rails

data/lib/interpret/controller_filter.rb

@@ -7,16 +7,6 @@ class ActionController::Base
 
       if Interpret.current_user && defined?(Interpret.current_user.to_sym)
         @interpret_user = eval(Interpret.current_user)
-
-        if @interpret_user.nil?
-          @interpret_admin = false
-          return
-        end
-
-        @interpret_admin = true
-        if Interpret.admin && @interpret_user.respond_to?(Interpret.admin)
-          @interpret_admin = @interpret_user.send(Interpret.admin)
-        end
       end
     end
 end

data/lib/interpret/helpers.rb

@@ -29,7 +29,7 @@ module Interpret
     end
 
     def t(key, options = {})
-      if Interpret.live_edit && @interpret_admin
+      if Interpret.live_edit
         keys = build_keys(key, options)
         "<span class='interpret_editable' data-key='#{keys}'>#{translate(key, options)}</span>".html_safe
       else
@@ -38,7 +38,7 @@ module Interpret
     end
 
     def interpret_live_edition
-      return unless Interpret.live_edit && @interpret_admin
+      return unless Interpret.live_edit
       content_tag(:div) do
         concat(javascript_include_tag "facebox-1.3/facebox")
         concat javascript_tag <<-JS

data/lib/interpret/version.rb

@@ -1,3 +1,3 @@
 module Interpret
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/public/javascripts/interpret.js

@@ -1,7 +1,4 @@
 $(document).ready(function() {
-  $("#interpret_container .protection_input").click(function() {
-    $(this).parent().toggleClass("protected");
-  });
   /* Activating Best In Place */
   $("#interpret_container .best_in_place").best_in_place()
 });

data/public/stylesheets/interpret_style.css

@@ -382,12 +382,6 @@ html body * dd.clear
   cursor: pointer;
 }
 
-#interpret_container tr.protected {
-  border: 2px dashed red;
-  background-color: #FFEDED;
-}
-
-
 #interpret_container tr:hover {
   background-color: #DDD;
   -moz-transition: background .4s linear;

data/spec/integration/missing_translations_spec.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe "Missing translations" do
+  before(:all) { User.create!  }
+  before { load_integration_data }
+
+  it "should show me nothing when I'm in english language" do
+    visit interpret_missing_translations_path(:en)
+    page.should have_content("There can't be missing translations for the main language")
+  end
+
+  it "should show the total number of missing translations" do
+    visit interpret_missing_translations_path(:es)
+    page.should have_content("There are 2 missing translations in [es]")
+  end
+
+  it "should show me a table with all missing translations" do
+    visit interpret_missing_translations_path(:es)
+    elements = page.all("table#missing_translations tbody tr")
+    elements.size.should == 2
+    elements.first.should have_content("missings.p1")
+  end
+
+  it "should show me the value in english for a given key" do
+    visit interpret_missing_translations_path(:es)
+    page.should have_content("Missing one")
+  end
+
+  it "should let me create a new translation in the current language" do
+    visit interpret_missing_translations_path(:es)
+
+    within("table#missing_translations tbody tr:first") do
+      page.fill_in "interpret_translation_value", :with => "Uno perdido"
+      page.click_button "Create"
+    end
+
+    page.should have_content("New translation created for missings.p1")
+    page.all("table#missing_translations tbody tr").size.should == 1
+    page.should have_content("Missing two")
+  end
+
+  it "should let me destroy the original translation" do
+    visit interpret_missing_translations_path(:es)
+
+    within("table#missing_translations tbody tr:first") do
+      page.click_link "Destroy"
+    end
+
+    page.should have_content("Translation missings.p1 destroyed")
+    page.all("table#missing_translations tbody tr").size.should == 1
+    page.should have_content("Missing two")
+  end
+
+  it "should not show me blacklisted translations" do
+    visit interpret_missing_translations_path(:es)
+    page.should have_no_content("missings.black")
+    elements = page.all("table#missing_translations tbody tr")
+    elements.size.should == 2
+  end
+end

data/spec/integration/search_spec.rb

@@ -0,0 +1,88 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe "Search" do
+  before(:all) { User.create!  }
+  before { load_integration_data }
+
+  it "should return the correct results searching by text" do
+    visit interpret_search_path(:es)
+    fill_in "Translation text", :with => "Comentarios"
+    click_button "SEARCH"
+
+    page.all("table#results tbody tr").size.should == 1
+    within("table#results") do
+      page.should have_content("Comentarios")
+    end
+  end
+
+  it "should work with accents and other non ascii chars" do
+    visit interpret_search_path(:es)
+    fill_in "Translation text", :with => "extraña"
+    click_button "SEARCH"
+
+    page.all("table#results tbody tr").size.should == 1
+    within("table#results") do
+      page.should have_content("extraña")
+    end
+  end
+
+  it "should return the correct results searching by key" do
+    visit interpret_search_path(:es)
+    fill_in "Key value", :with => "printer"
+    click_button "SEARCH"
+
+    page.all("table#results tbody tr").size.should == 2
+    within("table#results") do
+      page.should have_content("Para imprimir")
+      page.should have_content("Otra impresora")
+    end
+  end
+
+  it "should not return blacklisted translations by key" do
+    visit interpret_search_path(:es)
+    fill_in "Key value", :with => "black_p1"
+    click_button "SEARCH"
+
+    page.all("table#results tbody tr").size.should == 0
+  end
+
+  it "should not return blacklisted translations by text" do
+    visit interpret_search_path(:es)
+    fill_in "Translation text", :with => "Una frase prohibida"
+    click_button "SEARCH"
+
+    page.all("table#results tbody tr").size.should == 0
+  end
+
+  it "should say the number of results found" do
+    visit interpret_search_path(:es)
+    fill_in "Key value", :with => "printer"
+    click_button "SEARCH"
+
+    within("#sidebar") do
+      page.should have_content("2 results found")
+    end
+  end
+
+  it "should be able to switch the language after a search" do
+    visit interpret_search_path(:es)
+    fill_in "Key value", :with => "printer"
+    click_button "SEARCH"
+
+    within("#languages_nav") { click_link "en" }
+    page.all("table#results tbody tr").size.should == 2
+  end
+
+  it "should see the search results in the same order after switching languages" do
+    visit interpret_search_path(:es)
+    fill_in "Key value", :with => "printer"
+    click_button "SEARCH"
+    res = page.all("table#results tbody tr").map{|x| x.find("td.key").text}
+    res.should == ["printer", "section1.printer"]
+
+    within("#languages_nav") { click_link "en" }
+    res = page.all("table#results tbody tr").map{|x| x.find("td.key").text}
+    res.should == ["printer", "section1.printer"]
+  end
+end