couch_i18n 0.2.1 → 0.3.0

data/README.rdoc

@@ -1,5 +1,5 @@
 = CouchI18n
-
+{<img src="https://travis-ci.org/bterkuile/couch_i18n.png?branch=master" alt="Build Status" />}[https://travis-ci.org/bterkuile/couch_i18n]
 <b>Note this is a Rails >= 3.1 engine</b>
 
 This projects is created to make translations editable. It is created using

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

@@ -6,5 +6,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require twitter/bootstrap
+//= require bootstrap
 //= require_directory .

data/app/assets/stylesheets/couch_i18n/bootstrap_and_override.css.sass

@@ -0,0 +1,6 @@
+@import "bootstrap"
+
+body
+  padding-top: 60px
+
+@import "bootstrap-responsive"

data/app/controllers/couch_i18n/application_controller.rb

@@ -1,14 +1,22 @@
 module CouchI18n
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ::ApplicationController
     before_filter :authorize_user
-    layout 'couch_i18n/application'
+    layout :couch_i18n_layout
 
     private
 
+    def couch_i18n_layout
+      defined?(Cmtool) ? 'cmtool/application' : 'couch_i18n/application'
+      # Does not integrate well with cmtool layout at the moment (2012-12-17)
+      'couch_i18n/application'
+    end
+
     def authorize_user
       if respond_to?(:authorize_couch_i18n)
         authorize_couch_i18n
-      elsif respond_to?(:current_user) && current_user.present? && current_user.respond_to?(:is_admin) && !current_user.is_admin.present?
+      elsif defined?(Cmtool)
+        authorize_cmtool
+      elsif respond_to?(:current_user) && current_user.respond_to?(:is_admin) && !current_user.is_admin.present?
         redirect_to '/', :alert => I18n.t('couch_i18n.general.not_authorized')
       end
     end

data/app/controllers/couch_i18n/translations_controller.rb

@@ -5,39 +5,38 @@ module CouchI18n
       @available_deeper_offsets = []
       per_page = params[:per_page].presence.try(:to_i) || 30
       if params[:partfinder].present?
-        @translations = CouchI18n::Translation.find_all_by_key_part(params[:offset], page: params[:page], per_page: per_page)
+        if untranslated?
+          @translations = CouchI18n::Translation.find_all_untranslated_by_key_part(params[:offset], page: params[:page], per_page: per_page)
+        else
+          @translations = CouchI18n::Translation.find_all_by_key_part(params[:offset], page: params[:page], per_page: per_page)
+        end
       elsif params[:valuefinder].present?
-        @translations = CouchI18n::Translation.find_all_by_value(params[:offset], page: params[:page], per_page: per_page)
+        if untranslated?
+          @translations = CouchI18n::Translation.find_all_untranslated_by_value(params[:offset], page: params[:page], per_page: per_page)
+        else
+          @translations = CouchI18n::Translation.find_all_by_value(params[:offset], page: params[:page], per_page: per_page)
+        end
       else
         if params[:offset].present?
-          @levels = params[:offset].split('.')
-          # Add higher levels. Do not add the last level, since it is the current one => 0..-2
-          @levels[0..-2].each_with_index do |level_name, i|
-            @available_higher_offsets << {
-              :name => level_name,
-              :offset => @levels[0..i].join('.')
-            }
-          end
           if untranslated?
             @translations = CouchI18n::Translation.untranslated_with_offset(params[:offset], :page => params[:page], :per_page => per_page)
           else
             @translations = CouchI18n::Translation.with_offset(params[:offset], :page => params[:page], :per_page => per_page)
           end
-          @available_deeper_offsets = CouchI18n::Translation.get_keys_by_level(@levels.size, :startkey => @levels, :endkey => @levels + [{}]).
-            map{|dl| {:name => dl, :offset => [params[:offset], dl].join('.')}}
         else
           if untranslated?
             @translations = CouchI18n::Translation.untranslated(:page => params[:page], :per_page => per_page)
           else
             @translations = CouchI18n::Translation.all(:page => params[:page], :per_page => per_page)
           end
-          @available_deeper_offsets = CouchI18n::Translation.get_keys_by_level(0).map{|dl| {:name => dl, :offset => dl}}
         end
+        @available_higher_offsets = CouchI18n::Translation.higher_keys_for_offset(params[:offset])
+        @available_deeper_offsets = CouchI18n::Translation.deeper_keys_for_offset(params[:offset])
       end
     end
 
     def show
-      @translation = CouchI18n::Translation.find(params[:id])
+      redirect_to action: :edit
     end
 
     def new

data/app/models/couch_i18n/translation.rb

@@ -22,6 +22,7 @@ module CouchI18n
 
     view :untranslated_view, key: :key, conditions: "!doc['translated']"
     view :by_value, key: :value
+    view :untranslated_by_value, key: :value, conditions: "!doc['translated']"
     view :by_key_part, type: :custom, map_function: %|function(doc){
       if(doc.ruby_class && doc.ruby_class == 'CouchI18n::Translation') {
         var parts = doc.key.split('.');
@@ -31,6 +32,15 @@ module CouchI18n
       }
     }|, reduce_function: '_count'
 
+    view :untranslated_by_key_part, type: :custom, map_function: %|function(doc){
+      if(doc.ruby_class && doc.ruby_class == 'CouchI18n::Translation' && !doc.translated) {
+        var parts = doc.key.split('.');
+        for(var i = 0; i < parts.length; i++){
+          emit(parts[i], 1);
+        }
+      }
+    }|, reduce_function: '_count'
+
     def self.get_keys_by_level(level = 0, options = {})
       data = database.view(with_key_array(options.merge(:group_level => level.succ)))["rows"]
       # data = data.select{|h| h["key"].size > level } # Only select ones that have a deeper nesting
@@ -56,8 +66,37 @@ module CouchI18n
       end
     end
 
+    # Find all untranslated records having the term part in their key
+    #   nl.action.one
+    #   en.action.two
+    #   en.activemodel.plural.models.user
+    # and using
+    #   find_all_by_part('action')
+    # will return the first two since they have action as key part
+    def self.find_all_untranslated_by_key_part(part, options = {})
+      total_entries = database.view(by_key_part(key: part, reduce: true))
+      with_pagination_options options.merge(total_entries: total_entries) do |options|
+        database.view(untranslated_by_key_part(options.merge(key: part, reduce: false, include_docs: true)))
+      end
+    end
+
+    # Find all untranslated records having the term part as value
+    #   nl.action.one: 'Value', translated: true
+    #   en.action.two: 'Value', translated: false
+    #   en.activemodel.plural.models.user: 'Other Value', translated: false
+    # and using
+    #   find_all_untranslated_by_value('Value')
+    # will return en.action.two
+    def self.find_all_untranslated_by_value(part, options = {})
+      total_entries = database.view(untranslated_by_value(key: part, reduce: true))
+      with_pagination_options options.merge(total_entries: total_entries) do |options|
+        database.view(untranslated_by_value(options.merge(key: part, reduce: false, include_docs: true)))
+      end
+    end
+
+
     def self.untranslated(options = {})
-      total_entries = database.view(untranslated_view(options.select{|k,v| [:key, :keys, :startkey, :endkey].include?(k)}.merge(reduce: true)))
+      total_entries = database.view(untranslated_view(options.slice(:key, :keys, :startkey, :endkey).merge(reduce: true)))
       with_pagination_options options.merge(total_entries: total_entries) do |options|
         database.view(untranslated_view(options))
       end
@@ -73,5 +112,27 @@ module CouchI18n
       #I18n.reload!
       #I18n.cache_store.clear if I18n.respond_to?(:cache_store) && I18n.cache_store.respond_to?(:clear)
     end
+
+    def self.deeper_keys_for_offset( offset )
+      return get_keys_by_level(0).map{|dl| {:name => dl, :offset => dl}} unless offset.present?
+      levels = offset.split('.')
+      get_keys_by_level(levels.size, :startkey => levels, :endkey => levels + [{}]).
+            map{|dl| {:name => dl, :offset => [offset, dl].join('.')}}
+    end
+
+    def self.higher_keys_for_offset( offset )
+      return [] unless offset.present?
+      higher_keys = []
+      levels = offset.split('.')
+      return [] unless levels.size > 1
+      # Add higher levels. Do not add the last level, since it is the current one => 0..-2
+      levels[0..-2].each_with_index do |level_name, i|
+        higher_keys<< {
+          :name => level_name,
+          :offset => levels[0..i].join('.')
+        }
+      end
+      higher_keys
+    end
   end
 end

data/app/views/couch_i18n/translations/_form.html.haml

@@ -1,4 +1,5 @@
 = form_for @translation, html: {class: 'form-horizontal'} do |f|
+  = hidden_field_tag 'offset', params[:offset]
   = render 'error_messages', :target => @translation
   .control-group
     = f.label :key, class: 'control-label'
@@ -13,4 +14,4 @@
     .controls
       = check_box_tag :is_json, 1, f.object.value.to_s =~ /^\{|^\[/
   .form-actions
-    = f.submit @submit || update_button_text
+    = f.submit local_assigns[:submit] || update_button_text

data/app/views/couch_i18n/translations/edit.html.haml

@@ -1,4 +1,4 @@
 - title t("couch_i18n.action.edit.title")
 = render 'form'
 - content_for :page_links do
-  = link_to link_to_index_content(:translations), couch_i18n.translations_path(:offset => params[:offset] || @translation.key.to_s.sub(/\.[\w\s-]+$/, ''))
+  = link_to link_to_index_content(:translations), couch_i18n.translations_path(:offset => params[:offset] || @translation.key.to_s.sub(/\.[\w\s-]+$/, '')), class: 'btn'

data/app/views/couch_i18n/translations/index.html.haml

@@ -2,15 +2,16 @@
   - title params[:offset]
 - else
   - title t("couch_i18n.action.index.title")
-- content_for :navbar do
-  %a.btn.btn-warning{data: {toggle: "modal"}, href: ".import-form"}= t('couch_i18n.import.label')
-  %a.btn.btn-success{data: {toggle: "modal"}, href: ".export-form"}= t('couch_i18n.export.label')
+.top-buttons
+  %a.btn.btn-warning{data: {toggle: "modal"}, href: "#import-form"}= t('couch_i18n.import.label')
+  %a.btn.btn-success{data: {toggle: "modal"}, href: "#export-form"}= t('couch_i18n.export.label')
   .pull-right
     = link_to t('couch_i18n.action.destroy.offset_link'), couch_i18n.destroy_offset_translations_path(:offset => params[:offset]), :method => :delete, :confirm => (defined?(:are_you_sure) ? are_you_sure : t('couch_i18n.general.are_you_sure')), class: [:btn, 'btn-danger']
 
-.modal.hide.import-form
+#import-form.modal.hide
   = form_tag({:action => :import}, :multipart => true) do
     .modal-header
+      %button.close{:type => "button", :data => {:dismiss => "modal"}, 'aria-hidden' => "true" } x
       %h3= t('couch_i18n.import.label')
     .modal-body
       %p= t('couch_i18n.import.description')
@@ -18,10 +19,11 @@
     .modal-footer
       %a.btn{data: {dismiss: :modal}, href: '#'}= t('couch_i18n.general.close')
       = submit_tag I18n.t('couch_i18n.import.button')
-.modal.hide.export-form
+#export-form.modal.hide
   = form_tag :action => :export do
     = hidden_field_tag :offset, params[:offset]
     .modal-header
+      %button.close{:type => "button", :data => {:dismiss => "modal"}, 'aria-hidden' => "true" } x
       - if params[:offset].present?
         %h3= t('couch_i18n.export.from_offset', offset: params[:offset])
       - else
@@ -68,15 +70,15 @@
         %tr{:class => cycle('odd', 'even')}
           %td
             - if partfinder? || valuefinder?
-              = link_to translation.key.sub(/^\./, ''), couch_i18n.edit_translation_path(translation)
+              = link_to translation.key.sub(/^\./, ''), couch_i18n.edit_translation_path(translation, offset: params[:offset])
             - else
-              = link_to translation.key[(params[:offset].try(:size) || 0)..-1].sub(/^\./, ''), couch_i18n.edit_translation_path(translation)
-          %td= link_to translation.value, couch_i18n.edit_translation_path(translation)
+              = link_to translation.key[(params[:offset].try(:size) || 0)..-1].sub(/^\./, ''), couch_i18n.edit_translation_path(translation, offset: params[:offset])
+          %td= link_to translation.value, couch_i18n.edit_translation_path(translation, offset: params[:offset])
           %td.boolean= boolean_show(translation.translated)
-          %td.action.edit= link_to link_to_edit_content(translation), couch_i18n.edit_translation_path(translation), class: [:btn]
-          %td.action.destroy= link_to link_to_destroy_content(translation),couch_i18n.translation_path(translation), :confirm => are_you_sure, :method => :delete, class: [:btn, 'btn-danger']
+          %td.action.edit= link_to link_to_edit_content(translation), couch_i18n.edit_translation_path(translation, offset: params[:offset]), class: 'btn btn-warning'
+          %td.action.destroy= link_to link_to_destroy_content(translation),couch_i18n.translation_path(translation, offset: params[:offset]), :confirm => are_you_sure, :method => :delete, class: [:btn, 'btn-danger']
 - else
   %h3= t("couch_i18n.general.none_found")
 
 - content_for :page_links do
-  = link_to link_to_new_content(:translation), couch_i18n.new_translation_path(:offset => params[:offset])
+  = link_to link_to_new_content(:translation), couch_i18n.new_translation_path(:offset => params[:offset]), class: 'btn btn-primary'

data/app/views/couch_i18n/translations/new.html.haml

@@ -1,4 +1,4 @@
 - title t("couch_i18n.action.new.title")
-= render 'form'
+= render 'form', submit: create_button_text
 - content_for :page_links do
-  = link_to link_to_index_content(:couch_i18n_translations), couch_i18n.translations_path(:offset => params[:offset])
+  = link_to link_to_index_content(:couch_i18n_translations), couch_i18n.translations_path(:offset => params[:offset]), class: 'btn'

data/app/views/couch_i18n/translations/new.html.haml~

@@ -0,0 +1,4 @@
+- title t("couch_i18n.action.new.title")
+= render 'form', submit: create_button_text
+- content_for :page_links do
+  = link_to link_to_index_content(:couch_i18n_translations), couch_i18n.translations_path(:offset => params[:offset])

data/app/views/layouts/couch_i18n/application.html.haml

@@ -10,26 +10,18 @@
     %meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0"}
     = yield :head
   %body
-    .navbar.navbar-fixed-top
-      .navbar-inner
-        .container
-          %a.btn.btn-navbar{data: {toggle: "collapse", target: ".nav-collapse"}} 
-            %span.icon-bar
-            %span.icon-bar
-            %span.icon-bar
-          %a.brand{href: couch_i18n.root_path}= yield :title
-          -#.nav-collapse
-            %ul.nav
-              %li= link_to 'Clear', couch_i18n.root_path
-          = yield :navbar
+    - if defined?(Cmtool)
+      = render 'cmtool/application/menu'
+    - else
+      .navbar.navbar-fixed-top
+        .navbar-inner
+          .container
+            %a.btn.btn-navbar{data: {toggle: "collapse", target: ".nav-collapse"}} 
+              %span.icon-bar
+              %span.icon-bar
+              %span.icon-bar
+            %a.brand{href: couch_i18n.root_path}= yield :title
     .container
       = render 'alerts'
       = yield
-
-    -#page-wrapper
-      #page-header
-        %h1= yield :title
-      #page-content
-        = render 'alerts'
-        = yield
-        #page-links= yield :page_links
+      .form-actions=yield :page_links

data/config/locales/couch_i18n.en.yml

@@ -18,6 +18,7 @@ en:
         button_text: Update
         successful: '%{model} is successfully updated'
       create:
+        button_text: Add
         successful: '%{model} is successfully created'
     export:
       execute: Execute

data/lib/couch_i18n/engine.rb

@@ -2,5 +2,15 @@ require 'i18n'
 module CouchI18n
   class Engine < ::Rails::Engine
     isolate_namespace CouchI18n
+    initializer 'couch_i18n.cmtool', after: 'cmtool.build_menu' do
+      if defined? Cmtool
+        require 'cmtool'
+        Cmtool::Menu.register do
+          append_to :site do
+            resource_link CouchI18n::Translation, label: :couch_i18n
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couch_i18n
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-21 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -62,7 +62,7 @@ files:
 - app/assets/javascripts/couch_i18n/structure.js
 - app/assets/stylesheets/couch_i18n/alerts.css.scss
 - app/assets/stylesheets/couch_i18n/application.css
-- app/assets/stylesheets/couch_i18n/bootstrap_and_override.css.less
+- app/assets/stylesheets/couch_i18n/bootstrap_and_override.css.sass
 - app/assets/stylesheets/couch_i18n/structure.css.scss
 - app/controllers/couch_i18n/application_controller.rb
 - app/controllers/couch_i18n/translations_controller.rb
@@ -75,6 +75,7 @@ files:
 - app/views/couch_i18n/translations/edit.html.haml
 - app/views/couch_i18n/translations/index.html.haml
 - app/views/couch_i18n/translations/new.html.haml
+- app/views/couch_i18n/translations/new.html.haml~
 - app/views/layouts/couch_i18n/application.html.haml
 - config/locales/couch_i18n.en.yml
 - config/routes.rb

data/app/assets/stylesheets/couch_i18n/bootstrap_and_override.css.less

@@ -1,5 +0,0 @@
-@import "twitter/bootstrap/bootstrap";
-
-body { padding-top: 60px; }
-
-@import "twitter/bootstrap/responsive";