couch_i18n 0.1.0 → 0.2.0

data/Rakefile

@@ -5,7 +5,15 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rdoc/task'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rdoc/rdoc'
+  require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
+end
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -15,7 +23,10 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+end
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 require 'rake/testtask'
@@ -28,4 +39,4 @@ Rake::TestTask.new(:test) do |t|
 end
 
 
-task :default => :test
+task :default => :spec

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

@@ -55,8 +55,13 @@ tr.even{
   border-color: #444;
   border-left-width: 0;
   border-right-width: 0;
+  padding: 5px 0;
+  margin-top: 5px;
   .offset-navigation-deeper, .offset-navigation-higher{
     a{
+      float: left;
+      margin-right: 5px;
+      margin-top: 5px;
       padding: 4px;
       border: 1px solid #aaa;
       &:hover {
@@ -64,6 +69,11 @@ tr.even{
         border-color: black;
       }
     }
-    padding: 8px;
   }
+  .offset-navigation-form{
+    margin-top: 5px;
+  }
+}
+.clearing{
+  clear: both;
 }

data/app/controllers/couch_i18n/translations_controller.rb

@@ -2,21 +2,37 @@ 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('.')}}
+      @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)
+      elsif params[:valuefinder].present?
+        @translations = CouchI18n::Translation.find_all_by_value(params[:offset], page: params[:page], per_page: per_page)
       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}}
+        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
       end
     end
 
@@ -138,5 +154,12 @@ module CouchI18n
       @translations.map(&:destroy)
       redirect_to({:action => :index}, :notice => I18n.t('couch_i18n.translation.offset deleted', :count => @translations.size, :offset => params[:offset]))
     end
+
+    private
+
+    def untranslated?
+      params[:untranslated].presence
+    end
+    helper_method :untranslated?
   end
 end

data/app/helpers/couch_i18n/application_helper.rb

@@ -6,6 +6,14 @@ module CouchI18n
        end
     end
 
+    def partfinder?
+      params[:partfinder].present?
+    end
+
+    def valuefinder?
+      params[:valuefinder].present?
+    end
+
     def link_to_new_content(obj)
       t('couch_i18n.action.new.label')
     end

data/app/models/couch_i18n/translation.rb

@@ -29,7 +29,7 @@ module CouchI18n
           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"]
@@ -42,16 +42,29 @@ module CouchI18n
       CouchI18n::Translation.find_all_by_key("#{offset}.".."#{offset}.ZZZZZZZZZ", options)
     end
 
-    def self.find_all_by_key_part(part)
-      database.view(by_key_part(key: part, reduce: false, include_docs: true))
+    # 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(*args)
-      database.view(untranslated_view(*args))
+    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("#{offset}.".."#{offset}.ZZZZZZZZZ", options)
+      CouchI18n::Translation.untranslated(options.merge(key: "#{offset}.".."#{offset}.ZZZZZZZZZ"))
     end
 
     # Expire I18n when record is update

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

@@ -6,11 +6,13 @@
   = 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
   = 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
   = 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')
@@ -19,16 +21,22 @@
   .offset-navigation-higher
     - for offset in @available_higher_offsets
       = link_to offset[:name], :offset => offset[:offset]
+    .clearing
   .offset-navigation-form
     = form_tag({}, :method => :get )do
       - if params[:offset].present?
         = link_to I18n.t('couch_i18n.general.go_to_zero_offset'), :offset => nil
       = text_field_tag :offset, params[:offset], :size => 60
-      = "(#{@translations.total_entries})"
-      = submit_tag I18n.t('couch_i18n.general.go_to_offset')
+      = "(#{@translations.total_count})"
+      %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
     - for offset in @available_deeper_offsets
       = link_to offset[:name], :offset => offset[:offset]
+    .clearing
 - if @translations.any?
   = paginate @translations, :right => 3, :left => 3
   %table.index-table
@@ -42,7 +50,11 @@
     %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
+            - if partfinder? || valuefinder?
+              = link_to translation.key.sub(/^\./, ''), couch_i18n.edit_translation_path(translation)
+            - 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)
           %td.boolean= boolean_show(translation.translated)
           %td.action.edit= link_to link_to_edit_content(translation), couch_i18n.edit_translation_path(translation)

data/config/locales/couch_i18n.en.yml

@@ -0,0 +1,49 @@
+---
+en:
+  couch_i18n:
+    action:
+      edit:
+        title: Edit translation
+      destroy:
+        label: Delete
+        offset_link: Delete all from offset
+      edit:
+        label: Edit
+      index:
+        label: Translations
+        title: Translations
+      new:
+        label: New
+      update:
+        button_text: Update
+    export:
+      execute: Execute
+      untranslated: Untranslated
+      label: Export
+    general:
+      are_you_sure: 'Are you sure?'
+      boolean_false: 'no'
+      boolean_true: 'yes'
+      go_to_offset: Go to offset
+      go_to_zero_offset: x
+      find_part: Find key part
+      find_value: Find value
+      none_found: No translations found
+      site_title: CouchI18n translations
+      untranslated_title: Untranslated
+    import:
+      button: Import
+      label: Import
+  activemodel:
+    models:
+      couch_i18n:
+        translation: Translation
+      plural:
+        couch_i18n:
+          translation: Translations
+    attributes:
+      couch_i18n:
+        translation:
+          key: Key
+          value: Value
+          translated: 'Translated?'

data/lib/couch_i18n/backend.rb

@@ -1,7 +1,5 @@
 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 +50,6 @@ 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

data/lib/couch_i18n/engine.rb

@@ -1,5 +1,6 @@
+require 'i18n'
 module CouchI18n
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
     isolate_namespace CouchI18n
   end
 end

data/lib/couch_i18n/store.rb

@@ -17,7 +17,7 @@ module CouchI18n
     # alias for read
     def [](key, options = {})
       key = key.to_s.gsub('/', '.')
-      Rails.cache.fetch(key) do
+      Rails.cache.fetch("couch_i18n-#{key}") do
         old_database_name = get_couchrest_name
         begin
           set_couchrest_name CouchPotato::Config.database_name # Set database to original configured name

data/lib/couch_i18n.rb

@@ -4,8 +4,11 @@ require 'couch_i18n/backend'
 require 'couch_i18n/active_model_errors'
 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
-  def self.import_from_yaml
+  # be added. Translations already stored in the couchdb database are not overwritten if true or ovveride_existing: true is given
+  def self.import_from_yaml(options = {})
+    options = {:override_existing => true} if options.is_a?(TrueClass)
+    options = {:override_existing => false} if options.is_a?(FalseClass)
+    options = {:override_existing => false}.merge!(options)
     raise "I18.backend not a I18n::Backend::Chain" unless I18n.backend.is_a?(I18n::Backend::Chain)
     # 
     yml_backend = I18n.backend.backends.last
@@ -13,8 +16,16 @@ module CouchI18n
     raise "Last backend not a I18n::Backend::Simple" unless yml_backend.is_a?(I18n::Backend::Simple)
     yml_backend.load_translations
     flattened_hash = traverse_flatten_keys(yml_backend.send(:translations))
+    available_translations = CouchI18n::Translation.all
     flattened_hash.each do |key, value|
-      CouchI18n::Translation.create :key => key, :value => value
+      available_translation = available_translations.find{|t| t.key == key}
+      if available_translation && options[:override_existing]
+        available_translation.value = value
+        available_translation.translated = true
+        available_translation.save
+      else
+        available_translation = CouchI18n::Translation.create :key => key, :value => value
+      end
     end
   end
 
@@ -58,9 +69,11 @@ module CouchI18n
   # 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)
+      Rails.cache.write("couch_i18n-#{t.key}", t.value)
     end
   end
 end
+
 # Now extend the I18n backend
 I18n.backend = I18n::Backend::Chain.new(CouchI18n::Backend.new(CouchI18n::Store.new), I18n.backend) unless Rails.env == 'test'
+I18n.load_path += Dir.glob(File.join(File.dirname(__FILE__), '..', 'config', 'locales', '*'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couch_i18n
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-28 00:00:00.000000000Z
+date: 2012-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70199467348060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70199467348060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simply_stored
-  requirement: &70199467347600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70199467347600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: couch_i18n is an in database storage for I18n translations, tested for
   rails, with online management views
 email: bterkuile@gmail.com
@@ -64,6 +74,7 @@ files:
 - app/views/couch_i18n/translations/index.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
 - MIT-LICENSE
 - Rakefile
@@ -88,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: couch_i18n
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: couch_i18n is an in database storage for I18n translations, tested for rails,