interpret 0.2.1 → 1.0.0

data/lib/interpret/helpers.rb

@@ -1,6 +1,5 @@
 module Interpret
   module InterpretHelpers
-
     # Generates the html tree from the given keys
     def interpret_show_tree(tree, origin_keys)
       tree = tree.first[1]
@@ -12,11 +11,6 @@ module Interpret
       build_tree(tree, origin_keys)
     end
 
-    def interpret_section_link_to(name, options = {}, html_options = {})
-      html_options.merge!({ :class => 'current' }) if current_controller?(options)
-      link_to name, options, html_options
-    end
-
     def interpret_title(title)
       content_for :title do
         title
@@ -24,72 +18,29 @@ module Interpret
     end
 
     def interpret_parent_layout(layout)
-      @_content_for[:layout] = self.output_buffer
+      @view_flow.set(:layout, self.output_buffer)
       self.output_buffer = render(:file => "layouts/#{layout}")
     end
 
-    def t(key, options = {})
-      if Interpret.live_edit
-        keys = build_keys(key, options)
-        "<span class='interpret_editable' data-key='#{keys}'>#{translate(key, options)}</span>".html_safe
-      else
-        translate(key, options) #.html_safe
-      end
-    end
-
-    def interpret_live_edition
-      return unless Interpret.live_edit
-      content_tag(:div) do
-        concat(javascript_include_tag "facebox-1.3/facebox")
-        concat javascript_tag <<-JS
-          $(document).ready(function(){
-            $(".interpret_editable").click(function() {
-              var key = $(this).attr("data-key");
-              jQuery.facebox({ ajax: '#{live_edit_interpret_translations_path}?key=' + key});
-              return false;
-            });
-          });
-        JS
-        concat(stylesheet_link_tag "interpret_live_edit_style")
-        concat(stylesheet_link_tag "/javascripts/facebox-1.3/facebox.css")
-      end
-    end
-
   private
-    def build_keys(key, options)
-      I18n.normalize_keys(I18n.locale, scope_key_by_partial(key), options[:scope]).join(".")
-    end
-
-    def scope_key_by_partial(key)
-      if key.to_s.first == "."
-        "#{@_virtual_path.gsub(%r{/_?}, ".")}#{key.to_s}"
-      else
-        key
-      end
-    end
 
     def build_tree(hash, origin_keys = "", prev_key = "")
       out = "<ul>"
       if origin_keys.present? && prev_key.blank?
         parent_key = origin_keys.split(".")[0..-2].join(".")
         if parent_key.blank?
-          out << "<li>#{link_to "..", interpret_root_path}</li>"
+          out << "<li>#{link_to "..", root_path}</li>"
         else
-          out << "<li>#{link_to "..", interpret_root_path(:key => parent_key)}</li>"
+          out << "<li>#{link_to "..", root_path(:key => parent_key)}</li>"
         end
       end
       hash.keys.each do |key|
         out << "<li>"
-        out << "#{link_to key, interpret_root_path(:key => "#{origin_keys.blank? ? "" : "#{origin_keys}."}#{prev_key}#{key}")}"
+        out << "#{link_to key, root_path(:key => "#{origin_keys.blank? ? "" : "#{origin_keys}."}#{prev_key}#{key}")}"
         out << "</li>"
       end
       out << "</ul>"
       out.html_safe
     end
-
-    def current_controller?(opts)
-      hash = Rails.application.routes.recognize_path(url_for(opts))
-      params[:controller] == hash[:controller]
-    end
   end
 end

data/lib/interpret/version.rb

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

data/lib/interpret.rb

@@ -8,20 +8,16 @@ module Interpret
   mattr_accessor :sweeper
   mattr_accessor :parent_controller
   mattr_accessor :registered_envs
-  mattr_accessor :scope
   mattr_accessor :current_user
   mattr_accessor :layout
   mattr_accessor :soft
-  mattr_accessor :live_edit
   mattr_accessor :black_list
   mattr_accessor :ability
 
   @@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"

data/script/rails

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+load File.expand_path('../../test_app/script/rails',  __FILE__)

data/spec/integration/missing_translations_spec.rb

@@ -6,32 +6,32 @@ describe "Missing translations" do
   before { load_integration_data }
 
   it "should show me nothing when I'm in english language" do
-    visit interpret_missing_translations_path(:en)
+    visit 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)
+    visit 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)
+    visit 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)
+    visit 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)
+    visit missing_translations_path(:es)
 
     within("table#missing_translations tbody tr:first") do
-      page.fill_in "interpret_translation_value", :with => "Uno perdido"
+      page.fill_in "translation_value", :with => "Uno perdido"
       page.click_button "Create"
     end
 
@@ -41,7 +41,7 @@ describe "Missing translations" do
   end
 
   it "should let me destroy the original translation" do
-    visit interpret_missing_translations_path(:es)
+    visit missing_translations_path(:es)
 
     within("table#missing_translations tbody tr:first") do
       page.click_link "Destroy"
@@ -53,7 +53,7 @@ describe "Missing translations" do
   end
 
   it "should not show me blacklisted translations" do
-    visit interpret_missing_translations_path(:es)
+    visit missing_translations_path(:es)
     page.should have_no_content("missings.black")
     elements = page.all("table#missing_translations tbody tr")
     elements.size.should == 2

data/spec/integration/search_spec.rb

@@ -6,7 +6,7 @@ describe "Search" do
   before { load_integration_data }
 
   it "should return the correct results searching by text" do
-    visit interpret_search_path(:es)
+    visit search_path(:es)
     fill_in "Translation text", :with => "Comentarios"
     click_button "SEARCH"
 
@@ -17,7 +17,7 @@ describe "Search" do
   end
 
   it "should work with accents and other non ascii chars" do
-    visit interpret_search_path(:es)
+    visit search_path(:es)
     fill_in "Translation text", :with => "extraña"
     click_button "SEARCH"
 
@@ -28,7 +28,7 @@ describe "Search" do
   end
 
   it "should return the correct results searching by key" do
-    visit interpret_search_path(:es)
+    visit search_path(:es)
     fill_in "Key value", :with => "printer"
     click_button "SEARCH"
 
@@ -40,7 +40,7 @@ describe "Search" do
   end
 
   it "should not return blacklisted translations by key" do
-    visit interpret_search_path(:es)
+    visit search_path(:es)
     fill_in "Key value", :with => "black_p1"
     click_button "SEARCH"
 
@@ -48,7 +48,7 @@ describe "Search" do
   end
 
   it "should not return blacklisted translations by text" do
-    visit interpret_search_path(:es)
+    visit search_path(:es)
     fill_in "Translation text", :with => "Una frase prohibida"
     click_button "SEARCH"
 
@@ -56,7 +56,7 @@ describe "Search" do
   end
 
   it "should say the number of results found" do
-    visit interpret_search_path(:es)
+    visit search_path(:es)
     fill_in "Key value", :with => "printer"
     click_button "SEARCH"
 
@@ -66,7 +66,7 @@ describe "Search" do
   end
 
   it "should be able to switch the language after a search" do
-    visit interpret_search_path(:es)
+    visit search_path(:es)
     fill_in "Key value", :with => "printer"
     click_button "SEARCH"
 
@@ -75,7 +75,7 @@ describe "Search" do
   end
 
   it "should see the search results in the same order after switching languages" do
-    visit interpret_search_path(:es)
+    visit 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}

data/spec/integration/stale_translations_spec.rb

@@ -6,23 +6,23 @@ describe "Stale translations" do
   before { load_integration_data }
 
   it "should show me nothing when I'm in english language" do
-    visit interpret_stale_translations_path(:en)
+    visit stale_translations_path(:en)
     page.should have_content("There can't be stale translations for the main language")
   end
 
   it "should show me the recently modified translations in english", :js => true do
-    visit interpret_root_path(:en)
+    visit root_path(:en)
     change_translation("table#results tbody tr:first", "New comments text")
 
-    visit interpret_stale_translations_path(:es)
+    visit stale_translations_path(:es)
     page.all("table#stale_translations tbody tr").size.should == 1
   end
 
   it "should not show anything if I update a 'es' translation", :js => true do
-    visit interpret_root_path(:es)
+    visit root_path(:es)
     change_translation("table#results tbody tr:first", "New comments text")
 
-    visit interpret_stale_translations_path(:es)
+    visit stale_translations_path(:es)
     page.all("table#stale_translations tbody tr").size.should == 0
   end
 end

data/spec/integration/tools_spec.rb

@@ -7,7 +7,7 @@ describe "Tools" do
 
   describe "Download" do
     it "should be able to download a .yml file for the current language" do
-      visit interpret_tools_path(:en)
+      visit tools_path(:en)
       page.should have_button("Download")
 
       page.click_button "Download"
@@ -15,7 +15,7 @@ describe "Tools" do
     end
 
     it "should get a yaml file for the current language" do
-      visit interpret_tools_path(:en)
+      visit tools_path(:en)
       page.should have_button("Download")
 
       page.click_button "Download"
@@ -24,7 +24,7 @@ describe "Tools" do
     end
 
     it "should get a yaml file with all the correct translations" do
-      visit interpret_tools_path(:en)
+      visit tools_path(:en)
       page.should have_button("Download")
 
       page.click_button "Download"
@@ -37,7 +37,7 @@ describe "Tools" do
 
   describe "Import" do
     it "should be able to import a file" do
-      visit interpret_tools_path(:en)
+      visit tools_path(:en)
       path = create_tmp_file("""
                              en:
                                someky: somevalue
@@ -52,7 +52,7 @@ describe "Tools" do
                              it:
                                someky: somevalue
                              """)
-      visit interpret_tools_path(:en)
+      visit tools_path(:en)
       page.attach_file("file", path)
       page.click_button "Upload"
       page.should have_content("the language doesn't match")
@@ -60,12 +60,12 @@ describe "Tools" do
 
     it "should update existing translations" do
       path = create_tmp_file(import_en_yml)
-      visit interpret_tools_path(:en)
+      visit tools_path(:en)
 
       page.attach_file("file", path)
       page.click_button "Upload"
 
-      visit interpret_root_path(:en)
+      visit root_path(:en)
       within("table#results tbody tr:nth-child(4)") do
         page.should have_content("A new printer phrase")
       end
@@ -73,12 +73,12 @@ describe "Tools" do
 
     it "should create non existant translations" do
       path = create_tmp_file(import_en_yml)
-      visit interpret_tools_path(:en)
+      visit tools_path(:en)
 
       page.attach_file("file", path)
       page.click_button "Upload"
 
-      visit interpret_root_path(:en)
+      visit root_path(:en)
       page.should have_content("new_stuff")
       page.should have_content("Something brand new")
     end

data/spec/integration/translations_spec.rb

@@ -6,7 +6,7 @@ describe "Translations" do
   before { load_integration_data }
 
   it "should let me edit a translation", :js => true do
-    visit interpret_root_path(:en)
+    visit root_path(:en)
 
     # We need this to identify the translation we want to change
     bip_id = ""
@@ -18,7 +18,7 @@ describe "Translations" do
     bip_area bip_id, :value, "New value"
 
 
-    visit interpret_root_path(:en)
+    visit root_path(:en)
     within("table#results tbody tr:first") do
       page.should have_content("New value")
     end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path('../../test_app/config/environment', __FILE__)
+require File.expand_path('../../test_app/config/environment.rb', __FILE__)
 require "rspec/rails"
 require 'yaml'
 
@@ -9,14 +9,7 @@ require 'yaml'
 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 BestInPlace::TestHelpers
-  config.use_transactional_fixtures = true
 
-  # == Mock Framework
-  config.mock_with :rspec
+  config.use_transactional_fixtures = true
 end

data/spec/support/load_routes.rb

@@ -0,0 +1,6 @@
+RSpec.configure do |c|
+  c.include Interpret::Engine.routes.url_helpers,
+    :example_group => {
+      :file_path => /\bspec\/integration\//
+    }
+end

data/test_app/Gemfile

@@ -1,12 +1,17 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.0.5'
+gem 'rails', '~> 3.1.1'
 gem 'haml-rails'
-gem 'capistrano'
 
-group :development, :test do
-  gem 'sqlite3-ruby', :require => 'sqlite3'
-end
+gem 'sqlite3'
 
 gem 'interpret', :path => ".."
-gem 'mysql2', "~> 0.2.7"
+gem 'mysql2', "~> 0.3.0"
+
+gem 'jquery-rails'
+
+group :assets do
+  gem 'sass-rails',   '~> 3.1.4'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'uglifier', '>= 1.0.3'
+end

data/test_app/app/assets/javascripts/application.js

@@ -0,0 +1,4 @@
+//= require jquery
+//= require best_in_place
+//= require jquery.purr
+//= require interpret

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

@@ -13,7 +13,7 @@ margin: 0px;
 
 body
 {
-background: #F9F9F7 url('/images/a1.gif') repeat-x;
+background: #F9F9F7 url(<%= asset_path 'a1.gif' %>) repeat-x;
 font-size: 11px;
 font-family: "trebuchet ms", helvetica, sans-serif;
 color: #8C8C73;
@@ -47,7 +47,7 @@ img.picA
 {
 position: relative;
 top: -2px;
-background: url('/images/a47.gif') no-repeat;
+background: url(<%= asset_path 'a47.gif' %>) no-repeat;
 width: 76px;
 height: 74px;
 padding: 8px;
@@ -57,7 +57,7 @@ img.picB
 {
 position: relative;
 top: -2px;
-background: url('/images/a26.gif') no-repeat;
+background: url(<%= asset_path 'a26.gif' %>) no-repeat;
 width: 146px;
 height: 75px;
 padding: 7px;
@@ -94,7 +94,7 @@ padding-top: 0px;
 position: absolute;
 top: 0px;
 left: 0px;
-background: #fff url('/images/upbg.gif') no-repeat;
+background: #fff url(<%= asset_path 'upbg.gif' %>) no-repeat;
 width: 747px;
 height: 264px;
 z-index: 1;
@@ -105,7 +105,7 @@ z-index: 1;
 position: relative;
 width: 747px;
 margin: 0 auto;
-background: #fff url('/images/abg.gif') repeat-y;
+background: #fff url(<%= asset_path 'abg.gif' %>) repeat-y;
 }
 
 #inner
@@ -118,7 +118,7 @@ z-index: 2;
 #header
 {
 position: absolute;
-background: #FF7800 url('/images/a8.gif') repeat-x;
+background: #FF7800 url(<%= asset_path 'a8.gif' %>) repeat-x;
 width: 202px;
 height: 92px;
 color: #fff;
@@ -157,7 +157,7 @@ color: #FCE2CA;
 {
 position: absolute;
 right: 30px;
-background: #EAEAE2 url('/images/a10.jpg') no-repeat;
+background: #EAEAE2 url(<%= asset_path 'a10.jpg' %>) no-repeat;
 width: 458px;
 height: 92px;
 }
@@ -165,7 +165,7 @@ height: 92px;
 #menu
 {
 position: relative;
-background: #46461F url('/images/a16.gif') repeat-x;
+background: #46461F url(<%= asset_path 'a16.gif' %>) repeat-x;
 height: 67px;
 padding: 0px 20px 0px 5px;
 margin: 98px 0px 20px 0px;
@@ -199,7 +199,7 @@ font-weight: bold;
 
 #menu ul li a:hover
 {
-background: #fff url('/images/a18.gif') repeat-x top;
+  background: #fff url(<%= asset_path 'a18.gif' %>) repeat-x top;
 color: #4A4A24;
 text-decoration: none;
 }
@@ -223,7 +223,7 @@ font-size: 16px;
 line-height: 25px;
 color: #656551;
 letter-spacing: -1px;
-background: url('/images/a22.gif') bottom repeat-x;
+background: url(<%= asset_path 'a22.gif' %>) bottom repeat-x;
 padding: 0px 0px 10px 10px;
 margin-bottom: 20px;
 }
@@ -249,7 +249,7 @@ font-size: 18px;
 line-height: 25px;
 color: #111;
 letter-spacing: -1px;
-background: url('/images/a22.gif') bottom repeat-x;
+background: url(<%= asset_path 'a22.gif' %>) bottom repeat-x;
 padding: 0px 0px 10px 15px;
 margin-bottom: 20px;
 }
@@ -289,7 +289,7 @@ margin-bottom: 0px;
 {
 position: relative;
 top: -10px;
-background: url('/images/a33.gif') repeat-x;
+background: url(<%= asset_path 'a33.gif' %>) repeat-x;
 height: 64px;
 }
 
@@ -313,17 +313,17 @@ background-position: 0px 2px;
 
 #primarycontent .post .footer ul li.printerfriendly
 {
-background-image: url('/images/a41.gif');
+  background-image: url(<%= asset_path 'a41.gif' %>);
 }
 
 #primarycontent .post .footer ul li.comments
 {
-background-image: url('/images/a36.gif');
+  background-image: url(<%= asset_path 'a36.gif' %>);
 }
 
 #primarycontent .post .footer ul li.readmore
 {
-background-image: url('/images/a38.gif');
+  background-image: url(<%= asset_path 'a38.gif' %>);
 }
 
 #footer
@@ -333,7 +333,7 @@ clear: both;
 height: 66px;
 text-align: center;
 line-height: 66px;
-background-image: url('/images/a50.gif');
+background-image: url(<%= asset_path 'a50.gif' %>);
 color: #A8A88D;
 }
 

data/test_app/app/controllers/admin/dashboard_controller.rb

@@ -0,0 +1,6 @@
+class Admin::DashboardController < ApplicationController
+  layout 'backoffice'
+
+  def index
+  end
+end

data/test_app/app/views/admin/dashboard/index.html.erb

@@ -0,0 +1 @@
+Another Backoffice section