couch_i18n 0.0.2 → 0.0.3

data/README.rdoc

@@ -57,3 +57,11 @@ And in _config/authorization_rules.rb_ put your personalized version of:
 Beware that a permission denied message will appear when the server is restarted
 this way. This is because the current user is set in ApplicationController which
 is not part of the CouchI18n controller stack.
+
+== TODO
+Here my todo list for this project. Makes it insightful for everybody what is on
+the planning of being made.
+* Check on locale inclusion with are you sure? force creation of new locale. Mostly a stupic mistake omitting these.
+* Add grouped deletes. Dangerous, but controllable using the declarative_authorization example
+* Add grouped search/replaces to move one group of translations to another section. Same comment as above
+* Search through values. If anyone has a better idea than searching by ruby through all the translations or adding lucene please feel free.

data/app/controllers/couch_i18n/stores_controller.rb

@@ -11,7 +11,7 @@ module CouchI18n
             :offset => @levels[0..i].join('.')
           }
         end
-        @couch_i18n_stores = CouchI18n::Store.find_all_by_key(params[:offset]..(params[:offset] + '\u9999'), :page => params[:page], :per_page => 30)
+        @couch_i18n_stores = CouchI18n::Store.find_all_by_key("#{params[:offset]}.".."#{params[:offset]}.\u9999", :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
@@ -32,7 +32,7 @@ module CouchI18n
     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+$/, '')}, :notice => I18n.t('action.create.successful', :model => CouchI18n::Store.model_name.human))
+        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
@@ -43,7 +43,7 @@ module CouchI18n
     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+$/, '')}, :notice => I18n.t('action.update.successful', :model => CouchI18n::Store.model_name.human))
+        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

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

@@ -1,4 +1,4 @@
 - 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])
+  = 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/lib/couch_i18n/store.rb

@@ -58,6 +58,7 @@ module CouchI18n
 
     def reload_i18n
       I18n.reload!
+      I18n.cache_store.clear if I18n.respond_to?(:cache_store) && I18n.cache_store.respond_to?(:clear)
     end
   end
 end

data/lib/couch_i18n.rb

@@ -1,5 +1,7 @@
+require "i18n/backend/cache"
 require "couch_i18n/engine"
 require 'couch_i18n/store'
+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
@@ -7,6 +9,7 @@ module CouchI18n
     raise "I18.backend not a I18n::Backend::Chain" unless I18n.backend.is_a?(I18n::Backend::Chain)
     # 
     yml_backend = I18n.backend.backends.last
+
     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))
@@ -14,7 +17,6 @@ module CouchI18n
       CouchI18n::Store.create :key => key, :value => value
     end
   end
-  private
 
   # Recursive flattening.
   def self.traverse_flatten_keys(store, obj, path = nil)
@@ -22,10 +24,10 @@ module CouchI18n
     when Hash
      obj.each{|k, v| traverse_flatten_keys(store, v, [path, k].compact.join('.'))}
     when Array
-      store[path.underscore.tr(' ', '_')] = obj.to_json
+      store[path] = obj.to_json
       #obj.each_with_index{|v, i| traverse_flatten_keys(store, v, [path, i].compact.join('.'))}
     else
-      store[path.underscore.tr(' ', '_')] = obj
+      store[path] = obj
     end
     return store
   end
@@ -33,3 +35,4 @@ end
 
 # Now extend the I18n backend
 I18n.backend = I18n::Backend::Chain.new(I18n::Backend::KeyValue.new(CouchI18n::Store), I18n.backend)
+I18n.cache_store = ActiveSupport::Cache.lookup_store(:memory_store)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Benjamin ter Kuile
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 +02:00
+date: 2011-05-16 00:00:00 +02:00
 default_executable: 
 dependencies: []