couch_i18n 0.3.0 → 0.3.1

data/lib/couch_i18n/active_model_errors.rb

@@ -12,7 +12,7 @@ module ActiveModel
       value = (attribute != :base ? @base.send(:read_attribute_for_validation, attribute) : nil)
 
       # Create key. Remove class in model name and add errors.messages
-      key = (@base.class.model_name.underscore.sub(/\w+$/, '').scan(/\w+/) + ['errors.messages', type]).join('.')
+      key = (@base.class.model_name.to_s.underscore.sub(/\w+$/, '').scan(/\w+/) + ['errors.messages', type]).join('.')
 
       options = {
         :model => @base.class.model_name.human,
@@ -33,7 +33,7 @@ module ActiveModel
       attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
 
       # Create key. Remove class in model name and add errors.messages
-      key = (@base.class.model_name.underscore.sub(/\w+$/, '').scan(/\w+/) + ['errors.conjunction.attribute_message']).join('.')
+      key = (@base.class.model_name.to_s.underscore.sub(/\w+$/, '').scan(/\w+/) + ['errors.conjunction.attribute_message']).join('.')
       I18n.t(key, {
         :default   => "%{attribute} %{message}",
         :attribute => attr_name,

data/lib/couch_i18n/backend.rb

@@ -74,11 +74,7 @@ module CouchI18n
       end
 
       def available_locales
-        locales = @store.keys.map { |k| k =~ /\./; $` }
-        locales.uniq!
-        locales.compact!
-        locales.map! { |k| k.to_sym }
-        locales
+        @available_locales ||= CouchI18n::Translation.get_translation_keys_by_level(0)
       end
 
     protected

data/lib/couch_i18n/engine.rb

@@ -5,6 +5,8 @@ module CouchI18n
     initializer 'couch_i18n.cmtool', after: 'cmtool.build_menu' do
       if defined? Cmtool
         require 'cmtool'
+        require 'couch_i18n/translation'
+
         Cmtool::Menu.register do
           append_to :site do
             resource_link CouchI18n::Translation, label: :couch_i18n

data/lib/couch_i18n/store.rb

@@ -1,5 +1,8 @@
 module CouchI18n
   class Store
+    KNOWN_DEFAULTS = {
+      'support.array' => %({"words_connector":", ","two_words_connector":" and ","last_word_connector":", and "})
+    }
 
     def available_locales
       CouchI18n::Translation.get_keys_by_level(0)
@@ -8,42 +11,51 @@ module CouchI18n
     # Now the store features
     def []=(key, value, options = {})
       key = key.to_s.gsub('/', '.')
-      existing = CouchI18n::Translation.find_by_key(key) rescue nil
-      translation = existing || CouchI18n::Translation.new(:key => key)
-      translation.value = value
-      translation.save
+      existing = CouchI18n::Translation.find_by_translation_key(key) rescue nil
+      translation = existing || CouchI18n::Translation.new(translation_key: key)
+      translation.translation_value = value
+      translation.save and Rails.cache.write("couch_i18n-#{key}", value)
+      value
     end
 
     # alias for read
     def [](key, options = {})
       key = key.to_s.gsub('/', '.')
+      key_without_locale = key.sub(/\w+\./, '')
+      old_database_name = get_couchrest_name
       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
-          translation = CouchI18n::Translation.find_by_key(key.to_s)
-          translation ||= CouchI18n::Translation.create(:key => key, :value => options[:default].presence || key.to_s.split('.').last, :translated => false)
+          translation = CouchI18n::Translation.find_by_translation_key(key.to_s)
+          translation ||= CouchI18n::Translation.create(translation_key: key, translation_value: options[:default].presence || KNOWN_DEFAULTS[key_without_locale].presence || key[/\w+$/].humanize, translated: false)
+        #rescue SimplyStored::RecordNotFound
+        #  binding.pry
         ensure
           set_couchrest_name old_database_name
         end
-        translation.value
+        translation.try(:translation_value)
       end
     end
 
-    def set_couchrest_name(name)
+    def set_couchrest_name(full_database_namename)
+      # we assume the database server is the same, just change the name
+      name = full_database_namename[/\w+$/]
       d = CouchPotato.database.couchrest_database
       d.instance_variable_set('@name', name)
-      d.instance_variable_set('@uri', "/#{name.gsub('/', '%2F')}")
+      #d.instance_variable_set('@uri', "/#{name.gsub('/', '%2F')}")
+      d.instance_variable_set('@path', "/#{CGI.escape(name)}")
       d.instance_variable_set('@bulk_save_cache', [])
-      d.instance_variable_set('@root', d.host + d.uri)
+      #d.instance_variable_set('@root', d.host + d.uri)
+      #CouchPotato.class_variable_set('@@__couchrest_database', CouchRest.database(CouchPotato.full_url_to_database(name, CouchPotato::Config.database_host)))
     end
 
     def get_couchrest_name
       CouchPotato.database.couchrest_database.name
     end
 
+    #DISABLE THIS FUNCTIONALITY, IT KILLS PERFORMANCE
     def keys
-      CouchI18n::Translation.all.map(&:key)
+      [] #@kyes ||= CouchI18n::Translation.all.map(&:translation_key)
     end
   end
 end

data/lib/couch_i18n/version.rb

@@ -0,0 +1,3 @@
+module CouchI18n
+  VERSION = "0.3.1"
+end

data/lib/couch_i18n.rb

@@ -1,8 +1,22 @@
+require 'couch_i18n/version'
 require "couch_i18n/engine"
 require 'couch_i18n/store'
 require 'couch_i18n/backend'
 require 'couch_i18n/active_model_errors'
+
+# Ugly fix for the updated json gem changes
+#module JSON
+#  class << self
+#    alias :old_parse :parse
+#    def parse(json, args = {})
+#      args[:create_additions] = true
+#      old_parse(json, args)
+#    end
+#  end
+#end
+
 module CouchI18n
+  @@__missing_key_handler = nil
   # 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 if true or ovveride_existing: true is given
   def self.import_from_yaml(options = {})
@@ -18,13 +32,13 @@ module CouchI18n
     flattened_hash = traverse_flatten_keys(yml_backend.send(:translations))
     available_translations = CouchI18n::Translation.all
     flattened_hash.each do |key, value|
-      available_translation = available_translations.find{|t| t.key == key}
+      available_translation = available_translations.find{|t| t.translation_key == key}
       if available_translation && options[:override_existing]
-        available_translation.value = value
+        available_translation.translation_value = value
         available_translation.translated = true
         available_translation.save
       else
-        available_translation = CouchI18n::Translation.create :key => key, :value => value
+        available_translation = CouchI18n::Translation.create translation_key: key, translation_value: value
       end
     end
   end
@@ -49,7 +63,7 @@ module CouchI18n
   # 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 = CouchI18n::Translation.all)
-    traverse_indent_keys(selection.map{|kv| [kv.key.split('.'), kv.value]})
+    traverse_indent_keys(selection.map{|kv| [kv.translation_key.split('.'), kv.translation_value]})
   end
 
   # Traversing helper for indent_keys
@@ -66,11 +80,18 @@ module CouchI18n
     h
   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("couch_i18n-#{t.key}", t.value)
-    end
+  def self.handle_missing_key(key)
+    missing_key_handler.call(key) if missing_key_handler
+  end
+
+  def self.missing_key_handler
+    @@__missing_key_handler
+  end
+
+  def self.missing_key(&blk)
+    raise "Assign a block to handle a missing key" unless blk.present?
+    raise "The missing key proc should handle the key as argument CouchI18n.missing_key{ |key| .... }" unless blk.arity == 1
+    @@__missing_key_handler = blk
   end
 end
 

metadata

@@ -1,46 +1,40 @@
 --- !ruby/object:Gem::Specification
 name: couch_i18n
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Benjamin ter Kuile
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2025-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simply_stored
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   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
@@ -50,61 +44,75 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/couch_i18n/active_model_errors.rb
-- lib/couch_i18n/backend.rb
-- lib/couch_i18n/engine.rb
-- lib/couch_i18n/store.rb
-- lib/couch_i18n.rb
-- lib/tasks/couch_i18n_tasks.rake
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - app/assets/images/couch_i18n/alert.png
 - app/assets/images/couch_i18n/notice.png
-- app/assets/javascripts/couch_i18n/application.js
+- app/assets/javascripts/couch_i18n/application.js.coffee
 - 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.sass
-- app/assets/stylesheets/couch_i18n/structure.css.scss
+- app/assets/stylesheets/couch_i18n/alerts.scss
+- app/assets/stylesheets/couch_i18n/application.sass
+- app/assets/stylesheets/couch_i18n/components/_buttons.sass
+- app/assets/stylesheets/couch_i18n/components/_forms.sass
+- app/assets/stylesheets/couch_i18n/components/_offset_navigation.sass
+- app/assets/stylesheets/couch_i18n/foundation_and_overrides.scss
+- app/assets/stylesheets/couch_i18n/structure.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
-- 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
+- app/views/couch_i18n/application/_alerts.html.slim
+- app/views/couch_i18n/application/_error_messages.html.slim
+- app/views/couch_i18n/translations/_form.html.slim
+- app/views/couch_i18n/translations/edit.html.slim
+- app/views/couch_i18n/translations/index.html.slim
+- app/views/couch_i18n/translations/new.html.slim
+- app/views/kaminari/couch_i18n/_first_page.html.erb
+- app/views/kaminari/couch_i18n/_first_page.html.slim
+- app/views/kaminari/couch_i18n/_gap.html.erb
+- app/views/kaminari/couch_i18n/_gap.html.slim
+- app/views/kaminari/couch_i18n/_last_page.html.erb
+- app/views/kaminari/couch_i18n/_last_page.html.slim
+- app/views/kaminari/couch_i18n/_next_page.html.erb
+- app/views/kaminari/couch_i18n/_next_page.html.slim
+- app/views/kaminari/couch_i18n/_page.html.erb
+- app/views/kaminari/couch_i18n/_page.html.slim
+- app/views/kaminari/couch_i18n/_paginator.html.erb
+- app/views/kaminari/couch_i18n/_paginator.html.slim
+- app/views/kaminari/couch_i18n/_prev_page.html.erb
+- app/views/kaminari/couch_i18n/_prev_page.html.slim
+- app/views/layouts/couch_i18n/application.html.slim
+- config/initializers/assets.rb
 - config/locales/couch_i18n.en.yml
 - config/routes.rb
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
+- lib/couch_i18n.rb
+- lib/couch_i18n/active_model_errors.rb
+- lib/couch_i18n/backend.rb
+- lib/couch_i18n/engine.rb
+- lib/couch_i18n/store.rb
+- lib/couch_i18n/version.rb
+- lib/tasks/couch_i18n_tasks.rake
 homepage: http://github.com/bterkuile/couch_i18n
 licenses: []
-post_install_message: 
+metadata: {}
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: couch_i18n
-rubygems_version: 1.8.24
-signing_key: 
-specification_version: 3
+rubygems_version: 3.6.2
+specification_version: 4
 summary: couch_i18n is an in database storage for I18n translations, tested for rails,
   with online management views
 test_files: []

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

@@ -1,10 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//= require jquery
-//= require jquery_ujs
-//= require bootstrap
-//= require_directory .

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

@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * 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_directory . 
-*/

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

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

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

@@ -1,6 +0,0 @@
--if target.errors.any?
-  #errorExplanation
-    %h2= t('couch_i18n.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

@@ -1,17 +0,0 @@
-= 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'
-    .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 local_assigns[:submit] || update_button_text

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

@@ -1,4 +0,0 @@
-- 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-]+$/, '')), class: 'btn'

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

@@ -1,84 +0,0 @@
-- if params[:offset].present?
-  - title params[:offset]
-- else
-  - title t("couch_i18n.action.index.title")
-.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']
-
-#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')
-      = 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')
-#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
-        %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
-  .btn-toolbar
-    - for offset in @available_higher_offsets
-      .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?
-        = link_to I18n.t('couch_i18n.general.go_to_zero_offset'), :offset => nil
-      = text_field_tag :offset, params[:offset], :size => 60
-      = "(#{@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?, 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
-      .btn-group
-        = link_to(offset[:name], {:offset => offset[:offset], untranslated: params[:untranslated]}, class: :btn)
-- if @translations.any?
-  = paginate @translations, :right => 3, :left => 3
-  %table.table.table-striped
-    %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
-            - if partfinder? || valuefinder?
-              = 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, 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, 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]), class: 'btn btn-primary'

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

@@ -1,4 +0,0 @@
-- 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]), class: 'btn'

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

@@ -1,4 +0,0 @@
-- 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

@@ -1,27 +0,0 @@
-!!!
-%html
-  %head
-    %title= defined?(site_title) ? site_title : I18n.t('couch_i18n.general.site_title')
-    /[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
-    - 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
-      .form-actions=yield :page_links