couch_i18n 0.2.0 → 0.2.1

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

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

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

@@ -1,2 +1,3 @@
 $(function(){
+  $('input[type=submit]').addClass('btn').addClass('btn-primary');
 });

data/app/assets/stylesheets/couch_i18n/application.css

@@ -3,5 +3,5 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require_tree . 
-*/
+ *= require_directory . 
+*/

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

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

data/app/assets/stylesheets/couch_i18n/structure.css.scss

@@ -1,16 +1,13 @@
 html, body{
-  margin: 0;
-  padding: 0;
 }
 body{
-  background-color: #ddf;
 }
 h1, h2, h3, h4, h5, h6{
-  margin: 0;
-  padding: 0;
 }
 h1{
-  font-size: 22px;
+}
+form{
+  margin-bottom: 0; /* bootstrap fix */
 }
 #page-wrapper{
   width: 922px;
@@ -34,9 +31,6 @@ h1{
     }
   }
 }
-tr.even{
-  background-color: #ddf;
-}
 #page-links{
   margin-top: 8px;
   margin-bottom: 8px;
@@ -49,7 +43,9 @@ tr.even{
     }
   }
 }
-
+.untranslated-label{
+  display: inline;
+}
 .offset-navigation-block{
   border-style: double;
   border-color: #444;
@@ -77,3 +73,12 @@ tr.even{
 .clearing{
   clear: both;
 }
+
+.pagination{
+  ul{
+    list-style: none;
+    li{
+      float: left;
+    }
+  }
+}

data/app/controllers/couch_i18n/application_controller.rb

@@ -6,7 +6,9 @@ module CouchI18n
     private
 
     def authorize_user
-      if respond_to?(:current_user) && current_user.present? && current_user.respond_to?(:is_admin) && !current_user.is_admin.present?
+      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?
         redirect_to '/', :alert => I18n.t('couch_i18n.general.not_authorized')
       end
     end

data/app/models/couch_i18n/translation.rb

@@ -18,7 +18,7 @@ module CouchI18n
       if(doc.ruby_class && doc.ruby_class == 'CouchI18n::Translation') {
         emit(doc.key.split('.').slice(0, -1), 1);
       }
-    }|, type: :raw, reduce_function: :_sum
+    }|, type: :raw, reduce_function: '_sum'
 
     view :untranslated_view, key: :key, conditions: "!doc['translated']"
     view :by_value, key: :value
@@ -69,9 +69,9 @@ module CouchI18n
 
     # Expire I18n when record is update
     def reload_i18n
-      Rails.cache.write(key, value)
-      I18n.reload!
-      I18n.cache_store.clear if I18n.respond_to?(:cache_store) && I18n.cache_store.respond_to?(:clear)
+      Rails.cache.write("couch_i18n-#{key}", value)
+      #I18n.reload!
+      #I18n.cache_store.clear if I18n.respond_to?(:cache_store) && I18n.cache_store.respond_to?(:clear)
     end
   end
 end

data/app/models/couch_i18n/translation.rb~

@@ -0,0 +1,77 @@
+module CouchI18n
+  class Translation
+    include SimplyStored::Couch
+    per_page_method :limit_value
+
+    property :key
+    property :value
+    property :translated, type: :boolean, default: true
+
+    validates_uniqueness_of :key
+
+    after_save :reload_i18n
+
+    view :all_documents, :key => :key
+    view :by_key, :key => :key
+
+    view :with_key_array, map_function: %|function(doc){
+      if(doc.ruby_class && doc.ruby_class == 'CouchI18n::Translation') {
+        emit(doc.key.split('.').slice(0, -1), 1);
+      }
+    }|, type: :raw, reduce_function: '_sum'
+
+    view :untranslated_view, key: :key, conditions: "!doc['translated']"
+    view :by_value, key: :value
+    view :by_key_part, type: :custom, map_function: %|function(doc){
+      if(doc.ruby_class && doc.ruby_class == 'CouchI18n::Translation') {
+        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
+      data.map{|h| h['key'][level].try(:to_sym)}.compact
+    end
+
+    # Shorthand for selecting all stored with a given offset
+    def self.with_offset(offset, options = {})
+      CouchI18n::Translation.find_all_by_key("#{offset}.".."#{offset}.ZZZZZZZZZ", options)
+    end
+
+    # Find all 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_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(by_key_part(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)))
+      with_pagination_options options.merge(total_entries: total_entries) do |options|
+        database.view(untranslated_view(options))
+      end
+    end
+
+    def self.untranslated_with_offset(offset, options = {})
+      CouchI18n::Translation.untranslated(options.merge(key: "#{offset}.".."#{offset}.ZZZZZZZZZ"))
+    end
+
+    # Expire I18n when record is update
+    def reload_i18n
+      Rails.cache.write(key, value)
+      I18n.reload!
+      I18n.cache_store.clear if I18n.respond_to?(:cache_store) && I18n.cache_store.respond_to?(:clear)
+    end
+  end
+end

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

@@ -1,13 +1,16 @@
-= form_for @translation do |f|
+= form_for @translation, html: {class: 'form-horizontal'} do |f|
   = render 'error_messages', :target => @translation
-  .field
-    = f.label :key
-    = f.text_field :key, :size => 70
-  .field
-    = f.label :value
-    = f.text_field :value, :size => 70
-  .field
-    = label_tag :is_json
-    = check_box_tag :is_json, 1, ['{', '['].include?(@translation.value.to_s.first)
-  .actions
+  .control-group
+    = f.label :key, class: 'control-label'
+    .controls
+      = f.text_field :key, :size => 70, class: 'input-xxlarge'
+  .control-group
+    = f.label :value, class: 'control-label'
+    .controls
+      = f.text_field :value, :size => 70, class: 'input-xxlarge'
+  .control-group
+    = label_tag :is_json, t('couch_i18n.general.is_json'), class: 'control-label'
+    .controls
+      = check_box_tag :is_json, 1, f.object.value.to_s =~ /^\{|^\[/
+  .form-actions
     = f.submit @submit || update_button_text

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

@@ -1,4 +1,4 @@
-- title t("couch_i18n.action..edit.title")
+- 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-]+$/, ''))

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

@@ -2,26 +2,42 @@
   - title params[:offset]
 - else
   - title t("couch_i18n.action.index.title")
-.destroy-link
-  = 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'))
-.import-form
+- 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')
+  .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
   = form_tag({:action => :import}, :multipart => true) do
-    = label_tag :importfile, t('couch_i18n.import.label')
-    = file_field_tag :importfile
-    = submit_tag I18n.t('couch_i18n.import.button')
-.export-form
+    .modal-header
+      %h3= t('couch_i18n.import.label')
+    .modal-body
+      %p= t('couch_i18n.import.description')
+      = file_field_tag :importfile
+    .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
   = form_tag :action => :export do
     = hidden_field_tag :offset, params[:offset]
-    = label_tag :exportformat, t('couch_i18n.export.label')
-    = select_tag :exportformat, options_for_select(%w[yml csv json], params[:exportformat])
-    = check_box_tag :untranslated
-    = label_tag :untranslated, t('couch_i18n.export.untranslated')
-    = submit_tag I18n.t('couch_i18n.export.execute')
+    .modal-header
+      - if params[:offset].present?
+        %h3= t('couch_i18n.export.from_offset', offset: params[:offset])
+      - else
+        %h3= t('couch_i18n.export.label')
+    .modal-body
+      = select_tag :exportformat, options_for_select(%w[yml csv json], params[:exportformat])
+      = check_box_tag :untranslated
+      = label_tag :untranslated, t('couch_i18n.export.untranslated'), class: 'untranslated-label'
+    .modal-footer
+      %a.btn{data: {dismiss: :modal}, href: '#'}= t('couch_i18n.general.close')
+      = submit_tag I18n.t('couch_i18n.export.execute')
 .offset-navigation-block.block
-  .offset-navigation-higher
+  .btn-toolbar
     - for offset in @available_higher_offsets
-      = link_to offset[:name], :offset => offset[:offset]
-    .clearing
+      .btn-group
+        = link_to offset[:name], {:offset => offset[:offset], untranslated: params[:untranslated]}, class: :btn
   .offset-navigation-form
     = form_tag({}, :method => :get )do
       - if params[:offset].present?
@@ -31,15 +47,15 @@
       %input{:type => :submit, :name => :commit, :value => I18n.t('couch_i18n.general.go_to_offset')}
       %input{:type => :submit, :name => :partfinder, :value => I18n.t('couch_i18n.general.find_part')}
       %input{:type => :submit, :name => :valuefinder, :value => I18n.t('couch_i18n.general.find_value')}
-      = check_box_tag :untranslated, 1, untranslated?    
-      = label_tag :untranslated, I18n.t('couch_i18n.general.untranslated_label')
-  .offset-navigation-deeper
+      = check_box_tag :untranslated, 1, untranslated?, id: :untranslated_listing
+      = label_tag :untranslated_listing, I18n.t('couch_i18n.general.untranslated_label'), class: 'untranslated-label'
+  .btn-toolbar
     - for offset in @available_deeper_offsets
-      = link_to offset[:name], :offset => offset[:offset]
-    .clearing
+      .btn-group
+        = link_to(offset[:name], {:offset => offset[:offset], untranslated: params[:untranslated]}, class: :btn)
 - if @translations.any?
   = paginate @translations, :right => 3, :left => 3
-  %table.index-table
+  %table.table.table-striped
     %thead
       %tr
         %th= CouchI18n::Translation.human_attribute_name(:key)
@@ -57,8 +73,8 @@
               = 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)
           %td.boolean= boolean_show(translation.translated)
-          %td.action.edit= link_to link_to_edit_content(translation), couch_i18n.edit_translation_path(translation)
-          %td.action.destroy= link_to link_to_destroy_content(translation),couch_i18n.translation_path(translation), :confirm => are_you_sure, :method => :delete
+          %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']
 - else
   %h3= t("couch_i18n.general.none_found")
 

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

@@ -2,12 +2,31 @@
 %html
   %head
     %title= defined?(site_title) ? site_title : I18n.t('couch_i18n.general.site_title')
-    = csrf_meta_tag
+    /[if lt IE 9]
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
+    = csrf_meta_tags
     = stylesheet_link_tag 'couch_i18n/application'
     = javascript_include_tag 'couch_i18n/application'
+    %meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0"}
     = yield :head
   %body
-    #page-wrapper
+    .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
+    .container
+      = render 'alerts'
+      = yield
+
+    -#page-wrapper
       #page-header
         %h1= yield :title
       #page-content

data/config/locales/couch_i18n.en.yml

@@ -4,11 +4,11 @@ en:
     action:
       edit:
         title: Edit translation
+        label: Edit
       destroy:
         label: Delete
         offset_link: Delete all from offset
-      edit:
-        label: Edit
+        successful: '%{model} is successfully removed'
       index:
         label: Translations
         title: Translations
@@ -16,10 +16,14 @@ en:
         label: New
       update:
         button_text: Update
+        successful: '%{model} is successfully updated'
+      create:
+        successful: '%{model} is successfully created'
     export:
       execute: Execute
       untranslated: Untranslated
       label: Export
+      from_offset: 'Export from offset: "%{offset}"'
     general:
       are_you_sure: 'Are you sure?'
       boolean_false: 'no'
@@ -30,10 +34,13 @@ en:
       find_value: Find value
       none_found: No translations found
       site_title: CouchI18n translations
-      untranslated_title: Untranslated
+      untranslated_label: Untranslated
+      close: Close
+      is_json: 'Is JSON?'
     import:
       button: Import
       label: Import
+      description: If you import keys, existing keys will be overwritten
   activemodel:
     models:
       couch_i18n:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couch_i18n
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -62,11 +62,13 @@ 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/structure.css.scss
 - app/controllers/couch_i18n/application_controller.rb
 - app/controllers/couch_i18n/translations_controller.rb
 - app/helpers/couch_i18n/application_helper.rb
 - app/models/couch_i18n/translation.rb
+- app/models/couch_i18n/translation.rb~
 - app/views/couch_i18n/application/_alerts.html.haml
 - app/views/couch_i18n/application/_error_messages.html.haml
 - app/views/couch_i18n/translations/_form.html.haml