couch_i18n 0.0.4 → 0.0.5

data/README.rdoc

@@ -1,5 +1,7 @@
 = CouchI18n
 
+<b>Note this is a Rails >= 3.1 engine</b>
+
 This projects is created to make translations editable. It is created using
 the simply_stored gem. To use the web frontend please read the README section
 on this carefully. Important to know is that this system sits *on top* of the
@@ -15,30 +17,7 @@ Your Gemfile should look like:
   gem 'couch_i18n'
   gem 'kaminari'
 And in your config routes put:
-  namespace :couch_i18n do
-    root :to => "stores#index"
-    resources :stores do
-      collection do
-        post :export
-        post :import
-        delete :destroy_offset
-      end
-    end
-  end
-Or to put is at a different location:
-  namespace :translations, :module => :couch_i18n, :as => 'couch_i18n' do
-    root :to => "stores#index"
-    resources :stores do
-      collection do
-        post :export
-        post :import
-        delete :destroy_offset
-      end
-    end
-  end
-The intention is to make this a mountable application, but this will not happen 
-before Rails 3.1 is officially out. But beware of using this if your application
-will not be Rails 3.1 compatible.
+  mount CouchI18n::Engine => '/couch_i18n'
 
 == Security!!!
 By default there is no security activated for editing the translation. This is 
@@ -81,10 +60,10 @@ the following yamlL
     activemodel:
       models:
         couch_i18n:
-          store: Translation
+          translation: Translation
       attributes:
         couch_i18n:
-          store:
+          translation:
             key: Key
             value: Value
     action:
@@ -94,16 +73,18 @@ the following yamlL
         successful: %{model} successfully updated
       destroy:
         successful: %{model} successfully removed
-    chouch_i18n: 
-      store:
+    couch_i18n: 
+      translation:
         index title: Translations
         none found: No translations present
         new title: New translation
         show title: Translation
         edit title: Edit translation
         go to offset: Go to
-        got to zero offset: x
-        export: Export
+        go to zero offset: x
+        export: 
+          execute: Export
+          untranslated: Untranslated
         import: Import
         offset deleted: "%{count} translations with offset %{offset} are deleted"
         no proper import extension: Files with extension%{extension} cannot be imported
@@ -159,13 +140,16 @@ It should <tt>yield</tt> the following parts:
   !!!
   %html
     %head
-      %title= defined?(site_title) ? site_title : I18n.t('couch_i18n.store.site_title')
+      %title= defined?(site_title) ? site_title : I18n.t('couch_i18n.translation.site_title')
       = csrf_meta_tag
+      = stylesheet_link_tag 'couch_i18n/application'
+      = javascript_include_tag 'couch_i18n/application'
       = yield :head
     %body
       #page-wrapper
         #page-content
           %h1= yield :title
+          = render 'alerts'
           = yield
           #page-links= yield :page_links
 == TODO

data/app/assets/javascripts/{application.js → couch_i18n/application.js}

@@ -4,8 +4,6 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-<% unless options[:skip_javascript] -%>
-//= require <%= options[:javascript] %>
-//= require <%= options[:javascript] %>_ujs
-<% end -%>
+//= require jquery
+//= require jquery_ujs
 //= require_tree .

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

@@ -0,0 +1,2 @@
+$(function(){
+});

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

@@ -0,0 +1,32 @@
+$green: #729A37;
+$red: #D65819;
+.alert-message, #error_explanation{
+  margin: 10px 40px;
+  border-width: 2px;
+  border-style: solid;
+  background-repeat: no-repeat;
+  background-position: left center;
+  font-weight: bold;
+}
+.alert-message .message, #error_explanation .errors-content{
+  margin-left: 40px;
+  padding: 20px;
+}
+.notice{
+  background-color: lighten($green, 50%);
+  border-color: darken($green, 10%);
+  color: darken($green, 20%);
+  background-image: url('/assets/couch_i18n/notice.png');
+}
+.alert, #error_explanation{
+  background-color: lighten($red, 50%);
+  border-color: darken($red, 10%);
+  color: darken($red, 20%);
+  background-image: url('/assets/couch_i18n/alert.png');
+}
+.field_with_errors{
+  padding: 2px 5px;
+  background-color: $red;
+  display: table;
+  color: white;
+}

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

@@ -0,0 +1,69 @@
+html, body{
+  margin: 0;
+  padding: 0;
+}
+body{
+  background-color: #ddf;
+}
+h1, h2, h3, h4, h5, h6{
+  margin: 0;
+  padding: 0;
+}
+h1{
+  font-size: 22px;
+}
+#page-wrapper{
+  width: 922px;
+  margin: 10px auto;
+  border: 1px solid #555;
+  background-color: white;
+}
+#page-content{
+  padding: 8px;
+  a{
+    color: black;
+    text-decoration: none;
+  }
+  .destroy-link{
+    float: right;
+    a{
+      background-color: #800;
+      color: white;
+      font-weight: bold;
+      padding: 4px 10px;
+    }
+  }
+}
+tr.even{
+  background-color: #ddf;
+}
+#page-links{
+  margin-top: 8px;
+  margin-bottom: 8px;
+  a{
+    padding: 4px;
+    border: 1px dotted #555;
+    &:hover {
+      background-color: #ddd;
+      border-style: solid;
+    }
+  }
+}
+
+.offset-navigation-block{
+  border-style: double;
+  border-color: #444;
+  border-left-width: 0;
+  border-right-width: 0;
+  .offset-navigation-deeper, .offset-navigation-higher{
+    a{
+      padding: 4px;
+      border: 1px solid #aaa;
+      &:hover {
+        background-color: #ddd;
+        border-color: black;
+      }
+    }
+    padding: 8px;
+  }
+}

data/app/controllers/couch_i18n/application_controller.rb

@@ -1,4 +1,5 @@
 module CouchI18n
   class ApplicationController < ActionController::Base
+    layout 'couch_i18n/application'
   end
 end

data/app/controllers/couch_i18n/translations_controller.rb

@@ -0,0 +1,143 @@
+module CouchI18n
+  class TranslationsController < CouchI18n::ApplicationController
+    def index
+      @available_higher_offsets = []
+      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
+        @translations = CouchI18n::Translation.with_offset(params[:offset], :page => params[:page], :per_page => 30)
+        @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
+        @translations = CouchI18n::Translation.all(:page => params[:page], :per_page => 30)
+        @available_deeper_offsets = CouchI18n::Translation.get_keys_by_level(0).
+          map{|dl| {:name => dl, :offset => dl}}
+      end
+    end
+
+    def show
+      @translation = CouchI18n::Translation.find(params[:id])
+    end
+
+    def new
+      @translation = CouchI18n::Translation.new :key => params[:offset]
+    end
+
+    def create
+      @translation = CouchI18n::Translation.new params[:translation]
+      if @translation.value.present? && params[:is_json].present?
+        @translation.value = JSON.parse(@translation.value)
+      end
+      if @translation.save
+        redirect_to({:action => :index, :offset => @translation.key.to_s.sub(/\.[\w\s-]+$/, '')}, :notice => I18n.t('action.create.successful', :model => CouchI18n::Translation.model_name.human))
+      else
+        render :action => :new
+      end
+    end
+
+    # GET /couch_i18n/translations/:id/edit
+    def edit
+      @translation = CouchI18n::Translation.find(params[:id])
+    end
+
+    # PUT /couch_i18n/translations/:id
+    def update
+      @translation = CouchI18n::Translation.find(params[:id])
+      @translation.translated = true
+      if params[:translation]["value"].present? && params[:is_json].present?
+        params[:translation]["value"] = JSON.parse(params[:translation]["value"])
+      end
+      if @translation.update_attributes(params[:translation])
+        redirect_to({:action => :index, :offset => @translation.key.to_s.sub(/\.[\w\s-]+$/, '')}, :notice => I18n.t('action.update.successful', :model => CouchI18n::Translation.model_name.human))
+      else
+        render :action => :edit
+      end
+    end
+
+    def destroy
+      @translation = CouchI18n::Translation.find(params[:id])
+      if @translation.destroy
+        flash[:notice] = I18n.t('action.destroy.successful', :model => CouchI18n::Translation.model_name.human)
+      end
+      redirect_to({:action => :index, :offset => @translation.key.to_s.sub(/\.\w+$/, '')})
+    end
+
+    # POST /couch_i18n/translations/export
+    # Export to yml, csv or json
+    def export
+      if params[:offset].present?
+        if params[:untranslated].present?
+          @translations = CouchI18n::Translation.unstranslated_with_offset(params[:offset])
+        else
+          @translations = CouchI18n::Translation.with_offset(params[:offset])
+        end
+      else
+        if params[:untranslated].present?
+          @translations = CouchI18n::Translation.untranslated
+        else
+          @translations = CouchI18n::Translation.all
+        end
+      end
+      base_filename = "export#{Time.now.strftime('%Y%m%d%H%M')}"
+      if params[:exportformat] == 'csv'
+        response.headers['Content-Type'] = 'text/csv'
+        response.headers['Content-Disposition'] = %{attachment; filename="#{base_filename}.csv"}
+        render :text => @translations.map{|s| [s.key, s.value.to_json].join(',')}.join("\n")
+      elsif params[:exportformat] == 'json'
+        response.headers['Content-Type'] = 'application/json'
+        response.headers['Content-Disposition'] = %{attachment; filename="#{base_filename}.json"}
+        # render :text => CouchI18n.indent_keys(@translations).to_json # for indented json
+        render :json => @translations.map{|s| {s.key => s.value}}.to_json
+      else #yaml
+        response.headers['Content-Type'] = 'application/x-yaml'
+        response.headers['Content-Disposition'] = %{attachment; filename="#{base_filename}.yml"}
+        render :text => CouchI18n.indent_keys(@translations).to_yaml
+      end
+    end
+
+    # POST /couch_i18n/translations/import
+    # Import yml files
+    def import
+      redirect_to({:action => :index, :offset => params[:offset]}, :alert => I18n.t('couch_i18n.translation.no import file given')) and return unless params[:importfile].present?
+      filename = params[:importfile].original_filename
+      extension = filename.sub(/.*\./, '')
+      if extension == 'yml'
+        hash = YAML.load_file(params[:importfile].tempfile.path) rescue nil
+        redirect_to({:action => :index, :offset => params[:offset]}, :alert => I18n.t('couch_i18n.translation.cannot parse yaml')) and return unless hash
+        CouchI18n.traverse_flatten_keys(hash).each do |key, value|
+          existing = CouchI18n::Translation.find_by_key(key)
+          if existing
+            if existing.value != value
+              existing.value = value
+              existing.translated = true
+              existing.save
+            end
+          else
+            CouchI18n::Translation.create :key => key, :value => value
+          end
+        end 
+      else
+        redirect_to({:action => :index, :offset => params[:offset]}, :alert => I18n.t('couch_i18n.translation.no proper import extension', :extension => extension)) and return 
+      end
+      redirect_to({:action => :index, :offset => params[:offset]}, :notice => I18n.t('couch_i18n.translation.file imported', :filename => filename))
+    end
+
+    # Very dangarous action, please handle this with care, large removals are supported!
+    # DELETE /couch_i18n/translations/destroy_offset?...
+    def destroy_offset
+      if params[:offset].present?
+        @translations = CouchI18n::Translation.with_offset(params[:offset])
+      else
+        @translations = CouchI18n::Translation.all
+      end
+      @translations.map(&:destroy)
+      redirect_to({:action => :index}, :notice => I18n.t('couch_i18n.translation.offset deleted', :count => @translations.size, :offset => params[:offset]))
+    end
+  end
+end

data/app/helpers/couch_i18n/application_helper.rb

@@ -1,4 +1,37 @@
 module CouchI18n
   module ApplicationHelper
+    def title(msg)
+       content_for :title do
+         msg
+       end
+    end
+
+    def link_to_new_content(obj)
+      t('New')
+    end
+    def link_to_edit_content(obj = nil)
+      t('Edit')
+    end
+    def link_to_show_content(obj = nil)
+      t('Show')
+    end
+    def link_to_index_content(singular_name)
+      t('Back')
+    end
+    def link_to_destroy_content(obj = nil)
+      t('Delete')
+    end
+    def update_button_text(obj = nil)
+      t('Save')
+    end
+    def create_button_text(obj = nil)
+      t('Create')
+    end
+    def boolean_show(truefalse)
+      truefalse ? t('boolean true') : t('boolean false')
+    end
+    def are_you_sure(obj = nil)
+      t('Are you sure')
+    end
   end
 end

data/app/models/couch_i18n/translation.rb

@@ -0,0 +1,51 @@
+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(doc){
+      if(doc.ruby_class && doc.ruby_class == 'CouchI18n::Translation') {
+        emit(doc.key.split('.').slice(0, -1), 1);
+      }
+    }|, :type => :raw, :reduce => '_sum'
+
+    view :untranslated_view, :key => :key, :conditions => "!doc['translated']"
+
+    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
+
+    def self.untranslated(*args)
+      database.view(untranslated_view(*args))
+    end
+
+    def self.untranslated_with_offset(offset, options = {})
+      CouchI18n::Translation.untranslated("#{offset}.".."#{offset}.ZZZZZZZZZ", options)
+    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/application/_alerts.html.haml

@@ -0,0 +1,6 @@
+- if flash[:notice]
+  .alert-message.notice
+    .message= flash[:notice]
+- if flash[:alert]
+  .alert-message.alert
+    .message= flash[:alert]

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

@@ -0,0 +1,6 @@
+-if target.errors.any?
+  #errorExplanation
+    %h2= t('Errors title', :count => target.errors.count)
+    %ul
+      - target.errors.full_messages.each do |msg|
+        %li= msg

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

@@ -0,0 +1,13 @@
+= form_for @translation 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
+    = f.submit @submit || update_button_text

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

@@ -0,0 +1,4 @@
+- title t("couch_i18n.translation.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

@@ -0,0 +1,54 @@
+- if params[:offset].present?
+  - title params[:offset]
+- else
+  - title t("couch_i18n.translation.index title")
+.destroy-link
+  = link_to t('couch_i18n.translation.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.translation.are you sure'))
+.import-form
+  = form_tag({:action => :import}, :multipart => true) do
+    = file_field_tag :importfile
+    = submit_tag I18n.t('couch_i18n.translation.import')
+.export-form
+  = form_tag :action => :export do
+    = hidden_field_tag :offset, params[:offset]
+    = select_tag :exportformat, options_for_select(%w[yml csv json], params[:exportformat])
+    = check_box_tag :untranslated
+    = label_tag :untranslated, t('couch_i18n.translation.export.untranslated')
+    = submit_tag I18n.t('couch_i18n.translation.export.execute')
+.offset-navigation-block.block
+  .offset-navigation-higher
+    - for offset in @available_higher_offsets
+      = link_to offset[:name], :offset => offset[:offset]
+  .offset-navigation-form
+    = form_tag({}, :method => :get )do
+      - if params[:offset].present?
+        = link_to I18n.t('couch_i18n.translation.go to zero offset'), :offset => nil
+      = text_field_tag :offset, params[:offset], :size => 60
+      = "(#{@translations.total_entries})"
+      = submit_tag I18n.t('couch_i18n.translation.go to offset')
+  .offset-navigation-deeper
+    - for offset in @available_deeper_offsets
+      = link_to offset[:name], :offset => offset[:offset]
+- if @translations.any?
+  = paginate @translations, :right => 3, :left => 3
+  %table.index-table
+    %thead
+      %tr
+        %th= CouchI18n::Translation.human_attribute_name(:key)
+        %th= CouchI18n::Translation.human_attribute_name(:value)
+        %th= CouchI18n::Translation.human_attribute_name(:translated)
+        %th.action.edit
+        %th.action.destroy
+    %tbody
+      - @translations.each do |translation|
+        %tr{:class => cycle('odd', 'even')}
+          %td= 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
+- else
+  %h3= t("translation.none found")
+
+- content_for :page_links do
+  = link_to link_to_new_content(:translation), couch_i18n.new_translation_path(:offset => params[:offset])

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

@@ -3,10 +3,14 @@
   %head
     %title= defined?(site_title) ? site_title : I18n.t('couch_i18n.store.site_title')
     = csrf_meta_tag
+    = stylesheet_link_tag 'couch_i18n/application'
+    = javascript_include_tag 'couch_i18n/application'
     = yield :head
   %body
     #page-wrapper
-      #page-content
+      #page-header
         %h1= yield :title
+      #page-content
+        = render 'alerts'
         = yield
         #page-links= yield :page_links

data/config/routes.rb

@@ -0,0 +1,10 @@
+CouchI18n::Engine.routes.draw do
+  root :to => "translations#index"
+  resources :translations do
+    collection do
+      post :export
+      post :import
+      delete :destroy_offset
+    end
+  end
+end

data/lib/couch_i18n/backend.rb

@@ -1,7 +1,7 @@
 require 'i18n/backend/base'
 require 'active_support/json'
 require 'active_support/ordered_hash' # active_support/json/encoding uses ActiveSupport::OrderedHash but does not require it
-
+require "i18n/backend/cache"
 module CouchI18n
   class Backend
     # This is a basic backend for key value stores. It receives on
@@ -52,7 +52,7 @@ module CouchI18n
       attr_accessor :store
 
       include I18n::Backend::Base, I18n::Backend::Flatten
-
+      include I18n::Backend::Cache
       def initialize(store, subtrees=true)
         @store, @subtrees = store, subtrees
       end
@@ -89,7 +89,7 @@ module CouchI18n
       def lookup(locale, key, scope = [], options = {})
         key   = normalize_flat_keys(locale, key, scope, options[:separator])
         value = @store["#{locale}.#{key}"]
-        #value = ActiveSupport::JSON.decode(value) if value
+        value = ActiveSupport::JSON.decode(value) rescue value
         value.is_a?(Hash) ? value.deep_symbolize_keys : value
       end
     end

data/lib/couch_i18n/engine.rb

@@ -1,6 +1,5 @@
 module CouchI18n
   class Engine < Rails::Engine
-    # Commented out be be used in rails < 3.1
-    #isolate_namespace CouchI18n
+    isolate_namespace CouchI18n
   end
 end

data/lib/couch_i18n/store.rb

@@ -1,69 +1,30 @@
-# First comment out backend declaration in config/initializers/i18n_backend.rb
-# this looks like:
-#   #I18n.backend = I18n::Backend::Chain.new(I18n::Backend::KeyValue.new(CouchI18n::Store), I18n.backend)
-# Then load the translations: 
-#   I18n.t('New')
-# Then create the translations
-#   I18n.t('New');I18n.backend.send(:translations).flatten_keys.each{|k, v| CouchI18n::Store.create(:key => k, :value => v)}
 module CouchI18n
   class Store
-    include SimplyStored::Couch
-    per_page_method :limit_value
 
-    property :key
-    property :value
-
-    validates_uniqueness_of :key
-
-    after_save :reload_i18n
-
-    view :all_documents, :key => :key
-    view :by_key, :key => :key
-
-    view :with_key_array, :map => %|function(doc){
-      if(doc.ruby_class && doc.ruby_class == 'CouchI18n::Store') {
-        emit(doc.key.split('.').slice(0,-1), 1);
-      }
-    }|, :type => :raw, :reduce => '_sum'
-
-    def self.available_locales
-      get_keys_by_level
-    end
-
-    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
+    def available_locales
+      CouchI18n::Translation.get_keys_by_level(0)
     end
 
     # Now the store features
-    def self.[]=(key, value, options = {})
+    def []=(key, value, options = {})
       key = key.to_s
-      existing = find_by_key(key) rescue nil
-      translation = existing || new(:key => key)
+      existing = CouchI18n::Translation.find_by_key(key) rescue nil
+      translation = existing || CouchI18n::Translation.new(:key => key)
       translation.value = value
       translation.save
     end
 
-    # Shorthand for selecting all stored with a given offset
-    def self.with_offset(offset, options = {})
-      find_all_by_key("#{offset}.".."#{offset}.ZZZZZZZZZ", options)
-    end
-
     # alias for read
-    def self.[](key, options=nil)
-      find_by_key(key.to_s).try(:value) rescue nil
+    def [](key, options=nil)
+      Rails.cache.fetch(key) do
+        translation = CouchI18n::Translation.find_by_key(key.to_s)
+        translation ||= CouchI18n::Translation.create(:key => key, :value => key.to_s.split('.').last, :translated => false)
+        translation.value
+      end
     end
 
-    def self.keys
-      all.map(&:key)
-    end
-
-    private
-
-    def reload_i18n
-      I18n.reload!
-      I18n.cache_store.clear if I18n.respond_to?(:cache_store) && I18n.cache_store.respond_to?(:clear)
+    def keys
+      CouchI18n::Translation.all.map(&:key)
     end
   end
 end

data/lib/couch_i18n.rb

@@ -1,8 +1,6 @@
-require "i18n/backend/cache"
 require "couch_i18n/engine"
 require 'couch_i18n/store'
 require 'couch_i18n/backend'
-I18n::Backend::KeyValue.send(:include, I18n::Backend::Cache)
 module CouchI18n
   # This method imports yaml translations to the couchdb version. When run again new ones will
   # be added. Translations already stored in the couchdb database are not overwritten
@@ -15,7 +13,7 @@ module CouchI18n
     yml_backend.load_translations
     flattened_hash = traverse_flatten_keys(yml_backend.send(:translations))
     flattened_hash.each do |key, value|
-      CouchI18n::Store.create :key => key, :value => value
+      CouchI18n::Translation.create :key => key, :value => value
     end
   end
 
@@ -26,7 +24,7 @@ module CouchI18n
      obj.each{|k, v| traverse_flatten_keys(v, store, [path, k].compact.join('.'))}
     when Array
       # Do not store array for now. There is no good solution yet
-      # store[path] = obj # Keeyp arrays intact
+      store[path] = obj # Keeyp arrays intact
       # store[path] = obj.to_json
       # obj.each_with_index{|v, i| traverse_flatten_keys(store, v, [path, i].compact.join('.'))}
     else
@@ -38,7 +36,7 @@ module CouchI18n
   # This will return an indented strucutre of a collection of stores. If no argument is given
   # by default all the translations are indented. So a command:
   #   CouchI18n.indent_keys.to_yaml will return one big yaml string of the translations
-  def self.indent_keys(selection = Store.all)
+  def self.indent_keys(selection = CouchI18n::Translation.all)
     traverse_indent_keys(selection.map{|kv| [kv.key.split('.'), kv.value]})
   end
 
@@ -49,13 +47,19 @@ module CouchI18n
         h[pair.first.first] = pair.last
       else
         h[pair.first.first] ||= {}
+        next unless h[pair.first.first].is_a?(Hash) # In case there is a translation en.a: A, en.a.b: B this is invalid
         traverse_indent_keys([[pair.first[1..-1], pair.last]], h[pair.first.first])
       end
     end
     h
   end
-end
 
+  # Add all translations to the cache to avoid one by one loading and caching
+  def self.cache_all
+    CouchI18n::Translation.all.each do |t|
+      Rails.cache.write(t.key, t.value)
+    end
+  end
+end
 # Now extend the I18n backend
-I18n.backend = I18n::Backend::Chain.new(CouchI18n::Backend.new(CouchI18n::Store), I18n.backend)
-I18n.cache_store = ActiveSupport::Cache.lookup_store(:memory_store)
+I18n.backend = I18n::Backend::Chain.new(CouchI18n::Backend.new(CouchI18n::Store.new), I18n.backend)

metadata

@@ -2,7 +2,7 @@
 name: couch_i18n
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Benjamin ter Kuile
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-21 00:00:00 +02:00
+date: 2011-07-10 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,16 +28,25 @@ files:
 - lib/couch_i18n/store.rb
 - lib/couch_i18n.rb
 - lib/tasks/couch_i18n_tasks.rake
-- app/controllers/couch_i18n/stores_controller.rb
+- app/models/couch_i18n/translation.rb
 - app/controllers/couch_i18n/application_controller.rb
-- app/assets/javascripts/application.js
-- app/assets/stylesheets/application.css
+- app/controllers/couch_i18n/translations_controller.rb
+- app/assets/javascripts/couch_i18n/structure.js
+- app/assets/javascripts/couch_i18n/application.js
+- app/assets/images/couch_i18n/alert.png
+- app/assets/images/couch_i18n/notice.png
+- app/assets/stylesheets/couch_i18n/alerts.css.scss
+- app/assets/stylesheets/couch_i18n/structure.css.scss
+- app/assets/stylesheets/couch_i18n/application.css
 - app/helpers/couch_i18n/application_helper.rb
-- app/views/couch_i18n/stores/_form.html.haml
-- app/views/couch_i18n/stores/index.html.haml
-- app/views/couch_i18n/stores/edit.html.haml
-- app/views/couch_i18n/stores/new.html.haml
+- 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
+- app/views/couch_i18n/translations/index.html.haml
+- app/views/couch_i18n/translations/edit.html.haml
+- app/views/couch_i18n/translations/new.html.haml
 - app/views/layouts/couch_i18n/application.html.haml
+- config/routes.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc

data/app/controllers/couch_i18n/stores_controller.rb

@@ -1,127 +0,0 @@
-module CouchI18n
-  class StoresController < ApplicationController
-    def index
-      @available_higher_offsets = []
-      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
-        @couch_i18n_stores = CouchI18n::Store.with_offset(params[:offset], :page => params[:page], :per_page => 30)
-        @available_deeper_offsets = CouchI18n::Store.get_keys_by_level(@levels.size, :startkey => @levels, :endkey => @levels + [{}]).
-          map{|dl| {:name => dl, :offset => [params[:offset], dl].join('.')}}
-      else
-        @couch_i18n_stores = CouchI18n::Store.all(:page => params[:page], :per_page => 30)
-        @available_deeper_offsets = CouchI18n::Store.get_keys_by_level(0).
-          map{|dl| {:name => dl, :offset => dl}}
-      end
-    end
-
-    def show
-      @couch_i18n_store = CouchI18n::Store.find(params[:id])
-    end
-
-    def new
-      @couch_i18n_store = CouchI18n::Store.new :key => params[:offset]
-    end
-
-    def create
-      @couch_i18n_store = CouchI18n::Store.new params[:couch_i18n_store]
-      if @couch_i18n_store.save
-        redirect_to({:action => :index, :offset => @couch_i18n_store.key.to_s.sub(/\.[\w\s-]+$/, '')}, :notice => I18n.t('action.create.successful', :model => CouchI18n::Store.model_name.human))
-      else
-        render :action => :new
-      end
-    end
-
-    # GET /couch_i18n/stores/:id/edit
-    def edit
-      @couch_i18n_store = CouchI18n::Store.find(params[:id])
-    end
-
-    # PUT /couch_i18n/stores/:id
-    def update
-      @couch_i18n_store = CouchI18n::Store.find(params[:id])
-      if @couch_i18n_store.update_attributes(params[:couch_i18n_store])
-        redirect_to({:action => :index, :offset => @couch_i18n_store.key.to_s.sub(/\.[\w\s-]+$/, '')}, :notice => I18n.t('action.update.successful', :model => CouchI18n::Store.model_name.human))
-      else
-        render :action => :edit
-      end
-    end
-
-    def destroy
-      @couch_i18n_store = CouchI18n::Store.find(params[:id])
-      if @couch_i18n_store.destroy
-        flash[:notice] = I18n.t('action.destroy.successful', :model => CouchI18n::Store.model_name.human)
-      end
-      redirect_to({:action => :index, :offset => @couch_i18n_store.key.to_s.sub(/\.\w+$/, '')})
-    end
-
-    # POST /couch_i18n/stores/export
-    # Export to yml, csv or json
-    def export
-      if params[:offset].present?
-        @couch_i18n_stores = CouchI18n::Store.with_offset(params[:offset])
-      else
-        @couch_i18n_stores = CouchI18n::Store.all
-      end
-      base_filename = "export#{Time.now.strftime('%Y%m%d%H%M')}"
-      if params[:exportformat] == 'csv'
-        response.headers['Content-Type'] = 'text/csv'
-        response.headers['Content-Disposition'] = %{attachment; filename="#{base_filename}.csv"}
-        render :text => @couch_i18n_stores.map{|s| [s.key, s.value.to_json].join(',')}.join("\n")
-      elsif params[:exportformat] == 'json'
-        response.headers['Content-Type'] = 'application/json'
-        response.headers['Content-Disposition'] = %{attachment; filename="#{base_filename}.json"}
-        # render :text => CouchI18n.indent_keys(@couch_i18n_stores).to_json # for indented json
-        render :json => @couch_i18n_stores.map{|s| {s.key => s.value}}.to_json
-      else #yaml
-        response.headers['Content-Type'] = 'application/x-yaml'
-        response.headers['Content-Disposition'] = %{attachment; filename="#{base_filename}.yml"}
-        render :text => CouchI18n.indent_keys(@couch_i18n_stores).to_yaml
-      end
-    end
-
-    # POST /couch_i18n/stores/import
-    # Import yml files
-    def import
-      redirect_to({:action => :index, :offset => params[:offset]}, :alert => I18n.t('couch_i18n.store.no import file given')) and return unless params[:importfile].present?
-      filename = params[:importfile].original_filename
-      extension = filename.sub(/.*\./, '')
-      if extension == 'yml'
-        hash = YAML.load_file(params[:importfile].tempfile.path) rescue nil
-        redirect_to({:action => :index, :offset => params[:offset]}, :alert => I18n.t('couch_i18n.store.cannot parse yaml')) and return unless hash
-        CouchI18n.traverse_flatten_keys(hash).each do |key, value|
-          existing = CouchI18n::Store.find_by_key(key)
-          if existing
-            if existing.value != value
-              existing.value = value
-              existing.save
-            end
-          else
-            CouchI18n::Store.create :key => key, :value => value
-          end
-        end 
-      else
-        redirect_to({:action => :index, :offset => params[:offset]}, :alert => I18n.t('couch_i18n.store.no proper import extension', :extension => extension)) and return 
-      end
-      redirect_to({:action => :index, :offset => params[:offset]}, :notice => I18n.t('couch_i18n.store.file imported', :filename => filename))
-    end
-
-    # Very dangarous action, please handle this with care, large removals are supported!
-    # DELETE /couch_i18n/stores/destroy_offset?...
-    def destroy_offset
-      if params[:offset].present?
-        @couch_i18n_stores = CouchI18n::Store.with_offset(params[:offset])
-      else
-        @couch_i18n_stores = CouchI18n::Store.all
-      end
-      @couch_i18n_stores.map(&:destroy)
-      redirect_to({:action => :index}, :notice => I18n.t('couch_i18n.store.offset deleted', :count => @couch_i18n_stores, :offset => params[:offset]))
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-= form_for @couch_i18n_store do |f|
-  = render 'shared/error_messages', :target => @couch_i18n_store
-  .field
-    = f.label :key
-    = f.text_field :key, :size => 70
-  .field
-    = f.label :value
-    = f.text_field :value, :size => 70
-  .actions
-    = f.submit @submit || update_button_text

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

@@ -1,4 +0,0 @@
-- title t("couch_i18n.store.edit title")
-= render 'form'
-- content_for :page_links do
-  = link_to link_to_index_content(:couch_i18n_stores), couch_i18n_stores_path(:offset => params[:offset] || @couch_i18n_store.key.to_s.sub(/\.[\w\s-]+$/, ''))

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

@@ -1,46 +0,0 @@
-- title t("couch_i18n.store.index title")
-.destroy-link
-  = link_to t('couch_i18n.store.destroy offset link'), destroy_offset_couch_i18n_stores_path(:offset => params[:offset]), :method => :delete, :confirm => (defined?(:are_you_sure) ? are_you_sure : t('couch_i18n.store.are you sure'))
-.import-form
-  = form_tag({:action => :import}, :multipart => true) do
-    = file_field_tag :importfile
-    = submit_tag I18n.t('couch_i18n.store.import')
-.export-form
-  = form_tag :action => :export do
-    = hidden_field_tag :offset, params[:offset]
-    = select_tag :exportformat, options_for_select(%w[yml csv json], params[:exportformat])
-    = submit_tag I18n.t('couch_i18n.store.export')
-.offset-navigation-block.block
-  .offset-navigation-higher
-    - for offset in @available_higher_offsets
-      = link_to offset[:name], :offset => offset[:offset]
-  .offset-navigation-form
-    = form_tag({}, :method => :get )do
-      - if params[:offset].present?
-        = link_to I18n.t('couch_i18n.store.go to zero offset'), :offset => nil
-      = text_field_tag :offset, params[:offset], :size => 60
-      = "(#{@couch_i18n_stores.total_entries})"
-      = submit_tag I18n.t('couch_i18n.store.go to offset')
-  .offset-navigation-deeper
-    - for offset in @available_deeper_offsets
-      = link_to offset[:name], :offset => offset[:offset]
-- if @couch_i18n_stores.any?
-  = paginate @couch_i18n_stores, :right => 3, :left => 3
-  %table.index-table
-    %thead
-      %tr
-        %th= CouchI18n::Store.human_attribute_name(:key)
-        %th= CouchI18n::Store.human_attribute_name(:value)
-        %th
-    %tbody
-      - @couch_i18n_stores.each do |couch_i18n_store|
-        %tr
-          %td= link_to couch_i18n_store.key[(params[:offset].try(:size) || 0)..-1].sub(/^\./, ''), edit_couch_i18n_store_path(couch_i18n_store)
-          %td= link_to couch_i18n_store.value, edit_couch_i18n_store_path(couch_i18n_store)
-          %td= link_to link_to_edit_content(couch_i18n_store), edit_couch_i18n_store_path(couch_i18n_store)
-          %td= link_to link_to_destroy_content(couch_i18n_store),couch_i18n_store_path(couch_i18n_store), :confirm => are_you_sure, :method => :delete
-- else
-  %h3= t("couch_i18n_store.none found")
-
-- content_for :page_links do
-  = link_to link_to_new_content(:couch_i18n_store), new_couch_i18n_store_path(:offset => params[:offset])