interpret 0.1.3 → 0.1.4

data/public/stylesheets/interpret_style.css

@@ -8,7 +8,7 @@
 /* =Containers
 --------------------------------------------------------------------------------*/
 
-#container
+#interpret_container
 {
   width: 92%;
   margin-left: 4%;
@@ -18,22 +18,22 @@
 /* =Grid >> Global
 --------------------------------------------------------------------------------*/
 
-.grid_1,
-.grid_2,
-.grid_3,
-.grid_4,
-.grid_5,
-.grid_6,
-.grid_7,
-.grid_8,
-.grid_9,
-.grid_10,
-.grid_11,
-.grid_12,
-.grid_13,
-.grid_14,
-.grid_15,
-.grid_16
+#interpret_container .grid_1,
+#interpret_container .grid_2,
+#interpret_container .grid_3,
+#interpret_container .grid_4,
+#interpret_container .grid_5,
+#interpret_container .grid_6,
+#interpret_container .grid_7,
+#interpret_container .grid_8,
+#interpret_container .grid_9,
+#interpret_container .grid_10,
+#interpret_container .grid_11,
+#interpret_container .grid_12,
+#interpret_container .grid_13,
+#interpret_container .grid_14,
+#interpret_container .grid_15,
+#interpret_container .grid_16
 {
   display: inline;
   float: left;
@@ -41,22 +41,22 @@
   margin-right: 1%;
 }
 
-#container .grid_4
+#interpret_container .grid_4
 {
   width: 23%;
 }
 
-#container .grid_8
+#interpret_container .grid_8
 {
   width: 48%;
 }
 
-#container .grid_12
+#interpret_container .grid_12
 {
   width: 73%;
 }
 
-#container .grid_16
+#interpret_container .grid_16
 {
   width: 98%;
 }
@@ -78,62 +78,62 @@
 /* =Grid >> 16 Columns
 --------------------------------------------------------------------------------*/
 
-#container .grid_1
+#interpret_container .grid_1
 {
   width: 4.25%;
 }
 
-#container .grid_2
+#interpret_container .grid_2
 {
   width: 10.5%;
 }
 
-#container .grid_3
+#interpret_container .grid_3
 {
   width: 16.75%;
 }
 
-#container .grid_5
+#interpret_container .grid_5
 {
   width: 29.25%;
 }
 
-#container .grid_6
+#interpret_container .grid_6
 {
   width: 35.5%;
 }
 
-#container .grid_7
+#interpret_container .grid_7
 {
   width: 41.75%;
 }
 
-#container .grid_9
+#interpret_container .grid_9
 {
   width: 54.25%;
 }
 
-#container .grid_10
+#interpret_container .grid_10
 {
   width: 60.5%;
 }
 
-#container .grid_11
+#interpret_container .grid_11
 {
   width: 66.75%;
 }
 
-#container .grid_13
+#interpret_container .grid_13
 {
   width: 79.25%;
 }
 
-#container .grid_14
+#interpret_container .grid_14
 {
   width: 85.5%;
 }
 
-#container .grid_15
+#interpret_container .grid_15
 {
   width: 91.75%;
 }
@@ -141,17 +141,17 @@
 /* =Prefix Extra Space >> Global
 --------------------------------------------------------------------------------*/
 
-#container .prefix_4
+#interpret_container .prefix_4
 {
   padding-left: 25%;
 }
 
-#container .prefix_8
+#interpret_container .prefix_8
 {
   padding-left: 50%;
 }
 
-#container .prefix_12
+#interpret_container .prefix_12
 {
   padding-left: 75%;
 }
@@ -159,62 +159,62 @@
 /* =Prefix Extra Space >> 16 Columns
 --------------------------------------------------------------------------------*/
 
-#container .prefix_1
+#interpret_container .prefix_1
 {
   padding-left: 6.25%;
 }
 
-#container .prefix_2
+#interpret_container .prefix_2
 {
   padding-left: 12.5%;
 }
 
-#container .prefix_3
+#interpret_container .prefix_3
 {
   padding-left: 18.75%;
 }
 
-#container .prefix_5
+#interpret_container .prefix_5
 {
   padding-left: 31.25%;
 }
 
-#container .prefix_6
+#interpret_container .prefix_6
 {
   padding-left: 37.5%;
 }
 
-#container .prefix_7
+#interpret_container .prefix_7
 {
   padding-left: 43.75%;
 }
 
-#container .prefix_9
+#interpret_container .prefix_9
 {
   padding-left: 56.25%;
 }
 
-#container .prefix_10
+#interpret_container .prefix_10
 {
   padding-left: 62.5%;
 }
 
-#container .prefix_11
+#interpret_container .prefix_11
 {
   padding-left: 68.75%;
 }
 
-#container .prefix_13
+#interpret_container .prefix_13
 {
   padding-left: 81.25%;
 }
 
-#container .prefix_14
+#interpret_container .prefix_14
 {
   padding-left: 87.5%;
 }
 
-#container .prefix_15
+#interpret_container .prefix_15
 {
   padding-left: 93.75%;
 }
@@ -222,17 +222,17 @@
 /* =Suffix Extra Space >> Global
 --------------------------------------------------------------------------------*/
 
-#container .suffix_4
+#interpret_container .suffix_4
 {
   padding-right: 25%;
 }
 
-#container .suffix_8
+#interpret_container .suffix_8
 {
   padding-right: 50%;
 }
 
-#container .suffix_12
+#interpret_container .suffix_12
 {
   padding-right: 75%;
 }
@@ -241,62 +241,62 @@
 /* =Suffix Extra Space >> 16 Columns
 --------------------------------------------------------------------------------*/
 
-#container .suffix_1
+#interpret_container .suffix_1
 {
   padding-right: 6.25%;
 }
 
-#container .suffix_2
+#interpret_container .suffix_2
 {
   padding-right: 16.5%;
 }
 
-#container .suffix_3
+#interpret_container .suffix_3
 {
   padding-right: 18.75%;
 }
 
-#container .suffix_5
+#interpret_container .suffix_5
 {
   padding-right: 31.25%;
 }
 
-#container .suffix_6
+#interpret_container .suffix_6
 {
   padding-right: 37.5%;
 }
 
-#container .suffix_7
+#interpret_container .suffix_7
 {
   padding-right: 43.75%;
 }
 
-#container .suffix_9
+#interpret_container .suffix_9
 {
   padding-right: 56.25%;
 }
 
-#container .suffix_10
+#interpret_container .suffix_10
 {
   padding-right: 62.5%;
 }
 
-#container .suffix_11
+#interpret_container .suffix_11
 {
   padding-right: 68.75%;
 }
 
-#container .suffix_13
+#interpret_container .suffix_13
 {
   padding-right: 81.25%;
 }
 
-#container .suffix_14
+#interpret_container .suffix_14
 {
   padding-right: 87.5%;
 }
 
-#container .suffix_15
+#interpret_container .suffix_15
 {
   padding-right: 93.75%;
 }
@@ -328,7 +328,7 @@ html body * dd.clear
 
 /* http://www.positioniseverything.net/easyclearing.html */
 
-.clearfix:after
+#interpret_container .clearfix:after
 {
   clear: both;
   content: '.';
@@ -337,30 +337,17 @@ html body * dd.clear
   height: 0;
 }
 
-.clearfix
-{
-  display: inline-block;
-}
-
-* html .clearfix
-{
-  height: 1%;
-}
-
-.clearfix
+#interpret_container .clearfix
 {
   display: block;
+  height: 1%;
 }
 
-body {
+#interpret_container {
   font-family: "Lucida Grande", Helvetica;
 }
 
-#container {
-  border: .3em solid #333;
-}
-
-#header, .header {
+#interpret_container #header, .header {
   padding: 0 1em;
   margin-top: 1em;
   color: #FFF;
@@ -368,81 +355,87 @@ body {
   border-radius: 5px;
 }
 
-table {
+#interpret_container table {
  border-collapse:collapse;
  width: 100%;
  border-right: 1px solid #CCC;
  border-left: 1px solid #CCC;
 }
 
-td, th {
+#interpret_container td, th {
   color: #363636;
   padding: .4em;
 }
 
-td:first-child, td:first-child {
-  width: 50%;
+#interpret_container td.key {
+  width: 20%;
 }
 
-td:last-child, td:last-child {
-  width: 50%;
+#interpret_container td.content {
+  text-align:center;
+  width: 80%;
 }
 
-tr {
+#interpret_container tr {
   border-bottom:1px solid #CCC;
   cursor: hand;
   cursor: pointer;
 }
 
+#interpret_container tr.protected {
+  border: 2px dashed red;
+  background-color: #FFEDED;
+}
+
 
-tr:hover {
+#interpret_container tr:hover {
   background-color: #DDD;
   -moz-transition: background .4s linear;
   -o-transition: background .4s linear;
   -webkit-transition: background .4s linear;
 }
 
-tr.header {
+#interpret_container tr.header {
   background-color: #555;
   color: white;
   height: 2em;
   cursor: default;
 }
-tr.header:hover {
+#interpret_container tr.header:hover {
   background: #555;
   -moz-transition: none;
   -o-transition: none;
   -webkit-transition: none;
   height: 2em;
 }
-tr.header th {;
+#interpret_container tr.header th {;
   color: #EEE;
 }
 
-tbody td a {
+#interpret_container tbody td a {
   color:#363636;
   text-decoration:none;
 }
 
-.menu {
+#interpret_container .menu {
   margin-top: 10px;
 }
 
-.menu a.current {
+#interpret_container .menu a.current {
   font-weight: bold;
 }
 
 /* Search Page */
 
-#search {
+#interpret_container #search {
   border: 1px solid #CCC;
   padding-left: 3em;
 }
-#search label {
+#interpret_container #search label {
   font-size: 1.4em;
 }
 
-#search input {
+#interpret_container #search input {
   width: 40%;
   font-size: 1.2em;
   height: 2em;
@@ -451,17 +444,17 @@ tbody td a {
   padding-left: .4em;
 }
 
-#search input:focus {
+#interpret_container #search input:focus {
   border: .2em solid #555;
 }
 
-#search input[type="submit"] {
+#interpret_container #search input[type="submit"] {
   width: 15em;
   margin-top: 2em;
   margin-left: 4%;
 }
 
-#search input[type="submit"]:hover {
+#interpret_container #search input[type="submit"]:hover {
   background-color: #444;
   color: #FFF;
   cursor: hand;
@@ -470,15 +463,15 @@ tbody td a {
 
 /* Sidebar for Search page */
 
-#side_search {
+#interpret_container #side_search {
   border: 1px solid #CCC;
   padding: .4em 0 .4em .8em;
 }
-#side_search label {
+#interpret_container #side_search label {
   font-size: .8em;
 }
 
-#side_search input {
+#interpret_container #side_search input {
   width: 90%;
   font-size: .9em;
   height: 1.5em;
@@ -487,44 +480,44 @@ tbody td a {
   padding: .2em;
 }
 
-#side_search input:focus {
+#interpret_container #side_search input:focus {
   border: .2em solid #555;
 }
 
-#side_search input[type="submit"] {
+#interpret_container #side_search input[type="submit"] {
   width: 94%;
   margin-top: 1.2em;
   height: 2em;
 }
 
-#side_search input[type="submit"]:hover {
+#interpret_container #side_search input[type="submit"]:hover {
   background-color: #444;
   color: #FFF;
   cursor: hand;
   cursor: pointer;
 }
 
-.best_in_place textarea {
+#interpret_container .best_in_place textarea {
   width: 100%;
   border: transparent;
   font-size: .9em;
 }
 
-#tree_sidebar ul{
+#interpret_container #tree_sidebar ul{
   margin: 0;
   padding: .4em;
 }
-#tree_sidebar li {
+#interpret_container #tree_sidebar li {
   list-style-image: url("/stylesheets/folder.png");
   font-weight: normal;
   padding-bottom: 5px;
   letter-spacing: 1px;
 }
 
-#tree_sidebar a {
+#interpret_container #tree_sidebar a {
   text-decoration: none;
   color: #222;
 }
-#tree_sidebar a:hover {
+#interpret_container #tree_sidebar a:hover {
   text-decoration: underline;
 }

data/spec/models/translation_spec.rb

@@ -214,13 +214,36 @@ es:
       @file = new_en_yml
     end
 
-    it "should dump the contents for the given file into database" do
+    it "should update the contents of the database from the given file" do
+      Interpret::Translation.delete_all
       file2db(en_yml)
       @file.stub!(:content_type).and_return("text/plain")
       Interpret::Translation.import(@file)
 
-      en_trans = Interpret::Translation.locale('en').all
-      Interpret::Translation.export(en_trans).should == YAML.load(new_en_yml)
+      trans = Interpret::Translation.locale('en').find_by_key("p1")
+      trans.value.should == "Hello modified world! This new translation should not be copied into database"
+    end
+
+    it "should not create new keys" do
+      Interpret::Translation.delete_all
+      file2db(en_yml)
+      howm_before = Interpret::Translation.locale('en').count
+
+      @file.stub!(:content_type).and_return("text/plain")
+      Interpret::Translation.import(@file)
+
+      howm_after = Interpret::Translation.locale('en').count
+      howm_before.should == howm_after
+    end
+
+    it "should not touch translations not present in the file" do
+      Interpret::Translation.delete_all
+      file2db(en_yml)
+      @file.stub!(:content_type).and_return("text/plain")
+      Interpret::Translation.import(@file)
+
+      trans = Interpret::Translation.locale('en').find_by_key("folder1.content")
+      trans.value.should == "Some large text content"
     end
 
     it "should not modify the database contents for other languages" do

data/test_app/app/controllers/application_controller.rb

@@ -1,3 +1,15 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  before_filter :set_current_user
+  helper_method :current_user
+
+  def current_user
+    session[:user_id] ? User.find(session[:user_id]) : User.first
+  end
+
+  def set_current_user
+    if params[:admin]
+      session[:user_id] = params[:admin] == "true" ? User.where(:admin => true).first : User.where(:admin => false).first
+    end
+  end
 end

data/test_app/app/models/user.rb

@@ -0,0 +1,5 @@
+class User < ActiveRecord::Base
+  def admin?
+    admin
+  end
+end

data/test_app/app/views/layouts/application.html.erb

@@ -3,13 +3,13 @@
 <head>
   <title>Cuca</title>
   <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
+  <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js" %>
+  <%= javascript_include_tag :all %>
   <%= csrf_meta_tag %>
 </head>
 <body>
-This is the APPLICATION main Layout
-<%= yield %>
-
+  This is the APPLICATION main Layout
+  <%= yield %>
 </body>
 </html>
 

data/test_app/app/views/pages/index.html.haml

@@ -6,4 +6,5 @@
 %p= t ".line3"
 %p= t ".line4_html"
 
-= link_to "Traduccions", interpret_root_path
+= link_to "Login to interpret as admin", interpret_root_path(:admin => "true")
+= link_to "Login to interpret as user", interpret_root_path(:admin => "false")

data/test_app/config/initializers/interpret.rb

@@ -1,2 +1,8 @@
-Interpret.sweeper = "page_sweeper"
-Interpret.registered_envs = [:production, :development]
+Interpret.configure do |config|
+  config.sweeper = "page_sweeper"
+  config.registered_envs = [:production, :development]
+  config.parent_controller = "application_controller"
+  config.current_user = "current_user"
+  config.admin = "admin?"
+  config.layout = "application"
+end

data/test_app/db/migrate/{20110209185258_interpret_create_translations.rb → 20110219143622_interpret_create_translations.rb}

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

data/test_app/db/migrate/20110219173536_create_users.rb

@@ -0,0 +1,13 @@
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.boolean :admin, :default => false, :null => false
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end