rails-i18nterface 0.2.0 → 0.2.1

data/README.md

@@ -2,6 +2,7 @@
 
 [![Dependency Status](https://gemnasium.com/mose/rails-i18nterface.png)](https://gemnasium.com/mose/rails-i18nterface)
 [![Build Status](https://secure.travis-ci.org/mose/rails-i18nterface.png?branch=master)](http://travis-ci.org/mose/rails-i18nterface)
+[![Coverage Status](https://coveralls.io/repos/mose/rails-i18nterface/badge.png?branch=master)](https://coveralls.io/r/mose/rails-i18nterface)
 [![Code Climate](https://codeclimate.com/github/mose/rails-i18nterface.png)](https://codeclimate.com/github/mose/rails-i18nterface)
 [![Gem Version](https://badge.fury.io/rb/rails-i18nterface.png)](http://badge.fury.io/rb/rails-i18nterface)
 
@@ -123,4 +124,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-```
+```

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

@@ -278,7 +278,7 @@ ul.paging {
 	display: block;
   margin: 0;
 }
-ul.paging li{
+ul.paging li {
 	display: block;
 	margin: 0;
 	float: left;
@@ -292,9 +292,9 @@ ul.paging li.selected a {
   text-decoration: none;
   border-radius: 5px;
 }
-ul.paging li a{
-	line-height:1em;
-	padding:0.5em 0.5em;
+ul.paging li a {
+	line-height: 1em;
+	padding: 0.5em 0.5em;
   min-width: 20px;
   text-decoration: none;
   font-weight: bold;
@@ -306,6 +306,10 @@ ul.paging li a:hover {
 ul.paging li.selected a:hover {
   background: #000;
 }
+li.gap {
+  padding: 0 1em;
+  letter-spacing: .5em;
+}
 /*forms filter*/
 #searchbox .sep {
   margin-left: 40px;

data/app/controllers/rails_i18nterface/translate_controller.rb

@@ -11,16 +11,9 @@ module RailsI18nterface
     def index
       @dbvalues = {}
       @keys = RailsI18nterface::Keys.new(Rails.root, @from_locale, @to_locale)
-      @files = @keys.files
-      @yaml_keys = @keys.yaml_keys
-      @all_keys = @keys.all_keys
-      @deep_keys = to_deep_hash(@all_keys)
-      filter_by_key_pattern
-      filter_by_text_pattern
-      filter_by_translated_or_changed
-      sort_keys
+      @keys.apply_filters(params)
       paginate_keys
-      @total_entries = @all_keys.size
+      @total_entries = @keys.all_keys.size
       @page_title = 'Translate'
       @show_filters = ['all', 'untranslated', 'translated']
     end
@@ -57,94 +50,15 @@ module RailsI18nterface
 
     private
 
-
-    def lookup(locale, key)
-      I18n.backend.send(:lookup, locale, key)
-    end
-    helper_method :lookup
-
-    def filter_by_translated_or_changed
-      params[:filter] ||= 'all'
-      return if params[:filter] == 'all'
-      @all_keys.reject! do |key|
-        case params[:filter]
-        when 'untranslated'
-          lookup(@to_locale, key).present?
-        when 'translated'
-          lookup(@to_locale, key).blank?
-        else
-          raise "Unknown filter '#{params[:filter]}'"
-        end
-      end
-    end
-
-    def filter_by_key_pattern
-      return if params[:key_pattern].blank?
-      @all_keys.reject! do |key|
-        case params[:key_type]
-        when 'starts_with'
-          if params[:key_pattern] == '.'
-            key.match(/\./)
-          else
-            !key.starts_with?(params[:key_pattern])
-          end
-        when 'contains'
-          key.index(params[:key_pattern]).nil?
-        else
-          raise "Unknown key_type '#{params[:key_type]}'"
-        end
-      end
-    end
-
-    def filter_by_text_pattern
-      return if params[:text_pattern].blank?
-      @all_keys.reject! do |key|
-        lookup_key = lookup(@from_locale, key)
-        case params[:text_type]
-        when 'contains'
-          !lookup_key.present? || !lookup_key.to_s.downcase.index(params[:text_pattern].downcase)
-        when 'equals'
-          !lookup_key.present? || lookup_key.to_s.downcase != params[:text_pattern].downcase
-        else
-          raise "Unknown text_type '#{params[:text_type]}'"
-        end
-      end
-    end
-
-    def sort_keys
-      params[:sort_by] ||= 'key'
-      case params[:sort_by]
-      when 'key'
-        @all_keys.sort!
-      when 'text'
-        @all_keys.sort! do |key1, key2|
-          if lookup(@from_locale, key1).present? && lookup(@from_locale, key2).present?
-            lookup(@from_locale, key1).to_s.downcase <=> lookup(@from_locale, key2).to_s.downcase
-          elsif lookup(@from_locale, key1).present?
-            -1
-          else
-            1
-          end
-        end
-      else
-        raise "Unknown sort_by '#{params[:sort_by]}'"
-      end
-    end
-
     def paginate_keys
       params[:page] ||= 1
-      @paginated_keys = @all_keys[offset, per_page]
+      @paginated_keys = @keys.all_keys[offset, @per_page]
     end
 
     def offset
-      (params[:page].to_i - 1) * per_page
+      (params[:page].to_i - 1) * @per_page
     end
 
-    def per_page
-      params[:per_page] ? params[:per_page].to_i : 50
-    end
-    helper_method :per_page
-
     def init_translations
       I18n.backend.send(:init_translations) unless I18n.backend.initialized?
     end
@@ -153,17 +67,16 @@ module RailsI18nterface
       I18n.backend.send(:init_translations) rescue false
     end
 
-    def default_locale
-      I18n.default_locale
-    end
-
     def set_locale
-      session[:from_locale] ||= default_locale
-      session[:to_locale] ||= :en
+      session[:from_locale] ||= I18n.default_locale
+      session[:to_locale] ||= I18n.default_locale
+      session[:per_page] ||= 50
       session[:from_locale] = params[:from_locale] if params[:from_locale].present?
-      session[:to_locale] = params[:to_locale] if params[:to_locale].present?
+      session[:to_locale] = params[:to_locale] if params[:tolocale].present?
+      session[:per_page] = params[:per_page].to_i if params[:per_page].present?
       @from_locale = session[:from_locale].to_sym
       @to_locale = session[:to_locale].to_sym
+      @per_page = session[:per_page]
     end
 
   end

data/app/helpers/rails_i18nterface/translate_helper.rb

@@ -3,6 +3,10 @@
 module RailsI18nterface
   module TranslateHelper
 
+    def lookup(locale, key)
+      I18n.backend.send(:lookup, locale, key)
+    end
+
     def simple_filter(labels, param_name = 'filter', selected_value = nil)
       selected_value ||= params[param_name]
       filter = []

data/app/views/rails_i18nterface/translate/_pagination.html.erb

@@ -6,12 +6,64 @@
 <% if n_pages > 1 %>
 <div class="clearfix">
 	<ul class="paging">
-	  <% (1..n_pages).each do |page_number| %>
-	    <% if current_page == page_number %>
-	      <li class="selected"><%= link_to(page_number, params.merge(:page => page_number), :title => "Page #{page_number}" ) %></li>
-	    <% else %>
-	      <li><%= link_to(page_number, params.merge(:page => page_number), :title => "Page #{page_number}") %></li>
-	    <% end %>
+		<% if n_pages > 18 %>
+			<% if current_page < 8 %>
+				<% (1..8).each do |page_number| %>
+			    <% if current_page == page_number %>
+			      <li class="selected">
+			      	<%= link_to(page_number, params.merge(:page => page_number), :title => "Page #{page_number}" ) %>
+			      </li>
+			    <% else %>
+			      <li><%= link_to(page_number, params.merge(:page => page_number), :title => "Page #{page_number}") %></li>
+			    <% end %>
+	      <% end %>
+	      <li class="gap">...</li>
+	      <li>
+	      	<%= link_to(n_pages, params.merge(:page => n_pages), :title => "Page #{n_pages}" ) %>
+	      </li>
+			<% elsif current_page > n_pages - 8 %>
+				<li>
+	      	<%= link_to(1, params.merge(:page => 1), :title => "Page 1" ) %>
+	      </li>
+	      <li class="gap">...</li>
+				<% ((n_pages - 8)..n_pages).each do |page_number| %>
+			    <% if current_page == page_number %>
+			      <li class="selected">
+			      	<%= link_to(page_number, params.merge(:page => page_number), :title => "Page #{page_number}" ) %>
+			      </li>
+			    <% else %>
+			      <li><%= link_to(page_number, params.merge(:page => page_number), :title => "Page #{page_number}") %></li>
+			    <% end %>
+	      <% end %>
+			<% else %>
+	      <li>
+	      	<%= link_to(1, params.merge(:page => 1), :title => "Page 1" ) %>
+	      </li>
+	      <li class="gap">...</li>
+	      <% ((current_page - 4)..(current_page + 4)).each do |page_number| %>
+			    <% if current_page == page_number %>
+			      <li class="selected">
+			      	<%= link_to(page_number, params.merge(:page => page_number), :title => "Page #{page_number}" ) %>
+			      </li>
+			    <% else %>
+			      <li><%= link_to(page_number, params.merge(:page => page_number), :title => "Page #{page_number}") %></li>
+			    <% end %>
+	      <% end %>
+	      <li class="gap">...</li>
+	      <li>
+	      	<%= link_to(n_pages, params.merge(:page => n_pages), :title => "Page #{n_pages}" ) %>
+	      </li>
+			<% end %>
+		<% else %>
+		  <% (1..n_pages).each do |page_number| %>
+		    <% if current_page == page_number %>
+		      <li class="selected">
+		      	<%= link_to(page_number, params.merge(:page => page_number), :title => "Page #{page_number}" ) %>
+		      </li>
+		    <% else %>
+		      <li><%= link_to(page_number, params.merge(:page => page_number), :title => "Page #{page_number}") %></li>
+		    <% end %>
+		  <% end %>
 	  <% end %>
 	</ul>
 </div>

data/app/views/rails_i18nterface/translate/index.html.erb

@@ -12,7 +12,7 @@
     <%= link_to @page_title, root_path %></a>
     <div class="center">
      <label>Show:</label> <%=  simple_filter(@show_filters).html_safe %>
-      Found <strong><%= @total_entries %></strong> messages
+      Found <strong><%= @keys.all_keys.size %></strong> messages
       <%= link_to "Reload messages", translate_reload_path(params) %>
     </div>
   </h1>
@@ -21,7 +21,8 @@
   <% end %>
 </div>
 <div id="searchbox">
-
+  Per page
+  <%= text_field_tag(:per_page, session[:per_page], size: 2) %>
    <%= select_tag(:key_type, options_for_select([["Key contains", 'contains'], ["Key starts with", 'starts_with']], params[:key_type])) %>
    <%= text_field_tag(:key_pattern, params[:key_pattern], :size => 50, :id => "key_pattern_value", :class => "text-default") %>
 
@@ -35,15 +36,15 @@
 <% end %>
 
 <div id="namespaces">
-  <%= build_namespace(@deep_keys).html_safe %>
+  <%= build_namespace(@keys.namespaces).html_safe %>
 </div>
 
 <div id="inside">
   <div class="paging">
-    <%= render :partial => 'pagination', :locals => {:total_entries => @total_entries, :per_page => per_page} %>
+    <%= render :partial => 'pagination', :locals => {:total_entries => @keys.all_keys.size, :per_page => @per_page} %>
   </div>
 
-  <% if @total_entries > 0 %>
+  <% if @keys.all_keys.size > 0 %>
   <%= form_tag(translate_path, method: :put) do %>
     <div>
         <%= hidden_field_tag(:filter, params[:filter], :id => "hid_filter") %>
@@ -72,11 +73,11 @@
       	<p class="edit-form">
   		  <% if n_lines > 1 %>
           <div class="right">
-              <% if @files[key] %>
+              <% if @keys.files[key] %>
                 <div class="files">
-                  <div class="count">found in <%= @files[key].count %> files</div>
+                  <div class="count">found in <%= @keys.files[key].count %> files</div>
                   <div class="filelist">
-                    <div><%= @files[key].join("</div><div>").html_safe %></div>
+                    <div><%= @keys.files[key].join("</div><div>").html_safe %></div>
                   </div>
                 </div>
               <% end %>
@@ -96,11 +97,11 @@
   		    </div>
         <% else %>
           <div class="right">
-            <% if @files[key] %>
+            <% if @keys.files[key] %>
               <div class="files">
-                <div class="count">found in <%= @files[key].count %> files</div>
+                <div class="count">found in <%= @keys.files[key].count %> files</div>
                 <div class="filelist">
-                  <div><%= @files[key].join("</div><div>").html_safe %></div>
+                  <div><%= @keys.files[key].join("</div><div>").html_safe %></div>
                 </div>
               </div>
             <% end %>
@@ -127,7 +128,7 @@
   <% end %>
 
   <div class="paging clear">
-    <%= render :partial => 'pagination', :locals => {:total_entries => @total_entries, :per_page => per_page} %>
+    <%= render :partial => 'pagination', :locals => {:total_entries => @keys.all_keys.size, :per_page => @per_page} %>
   </div>
 
 </div>

data/lib/rails-i18nterface.rb

@@ -6,7 +6,6 @@ require 'rails-i18nterface/cache'
 require 'rails-i18nterface/yamlfile'
 require 'rails-i18nterface/sourcefiles'
 require 'rails-i18nterface/keys'
-require 'rails-i18nterface/storage'
 
 module RailsI18nterface
 end

data/lib/rails-i18nterface/cache.rb

@@ -3,38 +3,32 @@
 module RailsI18nterface
   module Cache
 
-    def cache_save(obj, uri, options={})
+    def cache_save(obj, uri)
       FileUtils.rm uri if File.exists? uri
       File.open(uri, 'wb') do |f|
         Marshal.dump(obj, f)
       end
+      obj
     end
 
-    def cache_load(uri, file, &process)
-      mtime = File.mtime(file)
-      if cached?(uri) && uptodate?(uri, file)
-        File.open(uri) do |f|
-          Marshal.load f
-        end
+    def cache_load(uri, options={}, &process)
+      if File.file? uri
+        load uri
+      elsif block_given?
+        cache_save(yield(options), uri)
       else
-        if block_given?
-          obj = yield
-          cache_save(obj, uri)
-          File.utime(mtime, mtime, uri)
-          obj
-        else
-          nil
-        end
+        nil
       end
     end
 
-    def cached?(uri)
-      File.file? uri
-    end
+    private
 
-    def uptodate?(uri, file)
-      File.mtime(uri) == File.mtime(file)
+    def load(uri)
+      File.open(uri) do |f|
+        Marshal.load f
+      end
     end
 
+
   end
 end

data/lib/rails-i18nterface/keys.rb

@@ -5,20 +5,81 @@ module RailsI18nterface
 
     include Utils
 
-    attr_accessor :files, :keys
+    attr_accessor :files, :keys, :namespaces
     attr_reader :yaml_keys, :all_keys
 
     def initialize(root_dir, from, to)
       @root_dir = root_dir
-      @files = RailsI18nterface::Sourcefiles.extract_files(root_dir)
+      @files = RailsI18nterface::Sourcefiles.load_files(root_dir)
       @yaml_keys = i18n_keys(I18n.default_locale)
       @from_locale = from
       @to_locale = to
       @all_keys = (@files.keys.map(&:to_s) + @yaml_keys).uniq
+      @namespaces = deep_sort(to_deep_hash(@all_keys))
     end
 
-    def reload
-      @files = RailsI18nterface::Sourcefiles.extract_files(root_dir)
+    def apply_filters(params)
+      params[:filter] ||= 'all'
+      filter_by_translated(params[:filter]) if params[:filter] != 'all'
+      filter_by_key_pattern(params[:key_type], params[:key_pattern]) if !params[:key_pattern].blank?
+      filter_by_text_pattern(params[:text_type], params[:text_pattern]) if !params[:text_pattern].blank?
+      sort_keys(params[:sort_by])
+    end
+
+    def filter_by_translated(filter)
+      @all_keys.reject! do |key|
+        if filter == 'untranslated'
+          lookup(@to_locale, key).present?
+        else #translated
+          lookup(@to_locale, key).blank?
+        end
+      end
+    end
+
+    def filter_by_key_pattern(type, pattern)
+      @all_keys.reject! do |key|
+        if type == 'starts_with'
+          if pattern == '.'
+            key.match(/\./)
+          else
+            !key.starts_with?(pattern)
+          end
+        else #contains
+          key.index(pattern).nil?
+        end
+      end
+    end
+
+    def filter_by_text_pattern(type, pattern)
+      @all_keys.reject! do |key|
+        lookup_key = lookup(@from_locale, key)
+        if type == 'contains'
+          !lookup_key.present? || !lookup_key.to_s.downcase.index(pattern.downcase)
+        else #equals
+          !lookup_key.present? || lookup_key.to_s.downcase != pattern.downcase
+        end
+      end
+    end
+
+    def sort_keys(order)
+      order ||= 'key'
+      if order == 'key'
+        @all_keys.sort!
+      else #text
+        @all_keys.sort! do |key1, key2|
+          if lookup(@from_locale, key1).present? && lookup(@from_locale, key2).present?
+            lookup(@from_locale, key1).to_s.downcase <=> lookup(@from_locale, key2).to_s.downcase
+          elsif lookup(@from_locale, key1).present?
+            -1
+          else
+            1
+          end
+        end
+      end
+    end
+
+    def reload(root_dir)
+      @files = RailsI18nterface::Sourcefiles.refresh(root_dir)
       @yaml_keys = i18n_keys(I18n.default_locale)
       @all_keys = (@files.keys.map(&:to_s) + @yaml_keys).uniq
     end
@@ -47,6 +108,10 @@ module RailsI18nterface
       @files.keys.reject { |key, file| contains_key?(yaml_keys, key) }
     end
 
+    def lookup(locale, key)
+      I18n.backend.send(:lookup, locale, key)
+    end
+
     def self.translated_locales
       I18n.available_locales.reject do |locale|
         [:root, I18n.default_locale.to_sym].include?(locale)