awesome_translations 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e38f021130a42dcbfd6a8c4b1086e0b72b31d02
-  data.tar.gz: dbc8589d666e8d0c23a1205e30c7f4ecd5b2be0c
+  metadata.gz: ee1fd468bc911c56d14d80fc86df302a0d887b75
+  data.tar.gz: 32c3948ae1606de73d4a263c9a17ce23d026483c
 SHA512:
-  metadata.gz: 79b1753082fd74b2339619fdf0e02d4235a2e562969c3dc9c3868475ad881ba31acc381761e6603101261ccebf7e6385f85d9df5787a3befbdf410e8b969e49c
-  data.tar.gz: f8d5168cd39a568a2ca103ede459e3cf4039824de56d15e4380cf82936ebd2e0fc2e62a098bb50354d0260a01f1a287f5284b31eca68d7f4f64760389156ee7f
+  metadata.gz: efeaa1afcac446d77b68d7041c52abce595ab0571ad11cffefc06de3bcfa0f49bd1c4089ce7f36c022dcce05e478464f3ef03bd1fdf34e939ec53af99c37d803
+  data.tar.gz: 9a9b52aaeecd6d93a765c83f42161bbe4cf6ae07a0bbc996e7278c9826e4f494a182822b672c97eb0d6315c854d26037cea0a2c37b5609c3cf1f3043b52f0116

data/Rakefile

@@ -1,23 +1,25 @@
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'AwesomeTranslations'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title    = "AwesomeTranslations"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.rdoc")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+load "rails/tasks/engine.rake"
 
 
 
 Bundler::GemHelper.install_tasks
 
+require "best_practice_project"
+BestPracticeProject.load_tasks

data/app/assets/javascripts/awesome_translations/application.js.coffee

@@ -1,15 +1,3 @@
-# This is a manifest file that'll be compiled into application.js, which will include all the files
-# listed below.
-#
-# Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-# or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-#
-# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-# compiled file.
-#
-# Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-# about supported directives.
-#
 #= require jquery
 #= require jquery_ujs
 #= require_tree .

data/app/controllers/awesome_translations/application_controller.rb

@@ -1,4 +1,9 @@
-module AwesomeTranslations
-  class ApplicationController < ActionController::Base
+class AwesomeTranslations::ApplicationController < ActionController::Base
+  before_action :init_cache
+
+private
+
+  def init_cache
+    AwesomeTranslations::CacheDatabaseGenerator.current
   end
 end

data/app/controllers/awesome_translations/clean_ups_controller.rb

@@ -0,0 +1,33 @@
+class AwesomeTranslations::CleanUpsController < AwesomeTranslations::ApplicationController
+  def new
+  end
+
+  def create
+    ids = []
+    params[:c].each do |translation_value_id, check_value|
+      ids << translation_value_id.to_i if check_value == "1"
+    end
+
+    translation_values = AwesomeTranslations::CacheDatabaseGenerator::TranslationValue
+      .where(id: ids)
+
+    translation_values.each do |translation_value|
+      AwesomeTranslations::TranslationMigrator.new(translation_value: translation_value).execute
+      translation_value.destroy!
+    end
+
+    redirect_to [:new, :clean_up]
+  end
+
+private
+
+  helper_method :translations_to_clean_up
+  def translations_to_clean_up
+    @translations_to_migrate ||= AwesomeTranslations::CacheDatabaseGenerator::TranslationValue
+      .joins(:translation_key)
+      .includes(:translation_key)
+      .joins("LEFT JOIN handler_translations ON handler_translations.translation_key_id = translation_keys.id")
+      .where("handler_translations.id IS NULL")
+      .where("translation_values.file_path LIKE '%/config/locales/awesome_translations/%'")
+  end
+end

data/app/controllers/awesome_translations/groups_controller.rb

@@ -1,30 +1,21 @@
 class AwesomeTranslations::GroupsController < AwesomeTranslations::ApplicationController
-  before_filter :set_handler
-  before_filter :set_group
+  before_action :set_handler
+  before_action :set_group
 
   def index
   end
 
   def show
-    @translations = @group.handler_translations
+    @ransack_params = params[:q] || {}
+    @ransack = @group.handler_translations.ransack(@ransack_params)
+    @translations = @ransack.result
   end
 
   def update
     @group.handler_translations.each do |translation|
-      if translation.array_translation?
-        next unless params[:t].key?(translation.array_key)
-        values = params[:t][translation.array_key][translation.array_no.to_s]
-        next unless values
-      else
-        next unless params[:t].key?(translation.key)
-        values = params[:t][translation.key]
-      end
-
-      values.each do |locale, value|
-        translated_value = translation.translated_value_for_locale(locale)
-        translated_value.value = value
-        translated_value.save!
-      end
+      values = values_from_translation(translation)
+      next unless values
+      save_values(translation, values)
     end
 
     I18n.backend.reload!
@@ -32,13 +23,10 @@ class AwesomeTranslations::GroupsController < AwesomeTranslations::ApplicationCo
   end
 
   def update_translations_cache
-    handler = AwesomeTranslations::Handler.find(@handler.identifier)
-    group = AwesomeTranslations::Group.find_by_handler_and_id(handler, @group.identifier)
-
     generator = AwesomeTranslations::CacheDatabaseGenerator.current
-    generator.update_translations_for_group(@handler, group, @group)
+    generator.update_translations_for_group(@handler, @group)
 
-    redirect_to handler_group_path(@handler.identifier, @group.identifier)
+    redirect_to handler_group_path(@handler, @group)
   end
 
 private
@@ -50,4 +38,20 @@ private
   def set_group
     @group = @handler.groups.find_by(identifier: params[:id])
   end
+
+  def values_from_translation(translation)
+    if translation.array_translation?
+      params[:t][translation.array_key][translation.array_no.to_s] if params[:t].key?(translation.array_key)
+    elsif params[:t].key?(translation.key)
+      params[:t][translation.key]
+    end
+  end
+
+  def save_values(translation, values)
+    values.each do |locale, value|
+      translated_value = translation.translated_value_for_locale(locale)
+      translated_value.value = value
+      translated_value.save!
+    end
+  end
 end

data/app/controllers/awesome_translations/handlers_controller.rb

@@ -1,5 +1,5 @@
 class AwesomeTranslations::HandlersController < AwesomeTranslations::ApplicationController
-  before_filter :set_handler, only: [:show, :update_groups_cache]
+  before_action :set_handler, only: [:show, :update_groups_cache]
 
   def index
     @handlers = AwesomeTranslations::CacheDatabaseGenerator::Handler.order(:name)
@@ -9,17 +9,17 @@ class AwesomeTranslations::HandlersController < AwesomeTranslations::Application
     generator = AwesomeTranslations::CacheDatabaseGenerator.current
     generator.update_handlers
 
-    redirect_to handlers_path
+    redirect_to :handlers
   end
 
   def update_groups_cache
     generator = AwesomeTranslations::CacheDatabaseGenerator.current
-    generator.update_handlers do |handler, handler_model|
+    generator.update_handlers do |handler_model|
       next unless handler_model.identifier == @handler.identifier
-      generator.update_groups_for_handler(handler, handler_model)
+      generator.update_groups_for_handler(handler_model)
     end
 
-    redirect_to handler_path(@handler.identifier)
+    redirect_to @handler
   end
 
   def show

data/app/models/awesome_translations/group.rb

@@ -32,20 +32,10 @@ class AwesomeTranslations::Group
     translations_list
   end
 
-  def translations_count(args = {})
-    count = 0
-    translations(args).each { count += 1 }
-    count
-  end
-
   def to_param
     id
   end
 
-  def param_key
-    id
-  end
-
   def name
     @data[:name].presence || id.presence
   end

data/app/models/awesome_translations/handler.rb

@@ -1,4 +1,6 @@
 class AwesomeTranslations::Handler
+  delegate :translations, to: :instance
+
   def self.all
     AwesomeTranslations::Handlers.list
   end
@@ -23,10 +25,6 @@ class AwesomeTranslations::Handler
     id
   end
 
-  def param_key
-    id
-  end
-
   def name
     @data.fetch(:name)
   end
@@ -39,10 +37,6 @@ class AwesomeTranslations::Handler
     const.new
   end
 
-  def translations
-    instance.translations
-  end
-
   def groups
     const.new.groups
   end

data/app/models/awesome_translations/translated_value.rb

@@ -17,11 +17,8 @@ class AwesomeTranslations::TranslatedValue
   alias inspect to_s
 
   def array_translation?
-    if @key.match(/\[(\d+)\]\Z/)
-      return true
-    else
-      return false
-    end
+    return true if @key =~ /\[(\d+)\]\Z/
+    false
   end
 
   def array_key
@@ -41,8 +38,19 @@ class AwesomeTranslations::TranslatedValue
 
     translations = YAML.load(File.read(@file))
     translations ||= {}
-
     translations[@locale.to_s] ||= {}
+
+    insert_translation_into_hash(translations)
+
+    update_models
+
+    I18n.load_path << file unless I18n.load_path.include?(file)
+    File.open(file, "w") { |fp| fp.write(YAML.dump(translations)) }
+  end
+
+private
+
+  def insert_translation_into_hash(translations)
     current = translations[@locale.to_s]
 
     key_parts = key.split(".")
@@ -53,23 +61,29 @@ class AwesomeTranslations::TranslatedValue
       if index == last_index
         if @value.empty?
           current.delete(key_part)
+        elsif array_translation?
+          match = key_part.match(/\A(.+)\[(\d+)\]\Z/)
+          current_array = current[match[1]] || []
+          current_array[array_no] = value
+          current[match[1]] = current_array
         else
-          if array_translation?
-            match = key_part.match(/\A(.+)\[(\d+)\]\Z/)
-            current_array = current[match[1]] || []
-            current_array[array_no] = value
-            current[match[1]] = current_array
-          else
-            current[key_part] = value
-          end
+          current[key_part] = value
         end
       else
         current[key_part] ||= {}
         current = current[key_part]
       end
     end
+  end
 
-    I18n.load_path << file unless I18n.load_path.include?(file)
-    File.open(file, "w") { |fp| fp.write(YAML.dump(translations)) }
+  def update_models
+    translation_key = AwesomeTranslations::CacheDatabaseGenerator::TranslationKey
+      .find_or_create_by!(key: key)
+
+    translation_value = AwesomeTranslations::CacheDatabaseGenerator::TranslationValue
+      .find_or_initialize_by(locale: locale, translation_key: translation_key)
+
+    translation_value.value = value
+    translation_value.save!
   end
 end

data/app/models/awesome_translations/translation.rb

@@ -15,7 +15,7 @@ class AwesomeTranslations::Translation
   end
 
   def last_key
-    key.to_s.split('.').last
+    key.to_s.split(".").last
   end
 
   def key_show_with_fallback
@@ -23,11 +23,8 @@ class AwesomeTranslations::Translation
   end
 
   def array_translation?
-    if @key.match(/\[(\d+)\]\Z/)
-      return true
-    else
-      return false
-    end
+    return true if @key =~ /\[(\d+)\]\Z/
+    false
   end
 
   def array_key
@@ -74,10 +71,6 @@ class AwesomeTranslations::Translation
     true
   end
 
-  def unfinished?
-    !finished?
-  end
-
   def translated_value_for_locale(locale)
     AwesomeTranslations::TranslatedValue.new(
       file: "#{dir}/#{locale}.yml",
@@ -108,11 +101,8 @@ class AwesomeTranslations::Translation
   end
 
   def file_line_content?
-    if @full_path && @line_no && File.exists?(@full_path)
-      return true
-    else
-      return false
-    end
+    return true if @full_path && @line_no && File.exist?(@full_path)
+    false
   end
 
   def file_line_content

data/app/views/awesome_translations/clean_ups/new.html.haml

@@ -0,0 +1,18 @@
+- content_for(:header_title) { "Clean Up" }
+
+= form_for :clean_ups, url: clean_ups_path do |f|
+  %table
+    %thead
+      %th{colspan: 2} Key
+      %th File
+    %tbody
+      - translations_to_clean_up.each do |translation|
+        %tr.translation-value{data: {id: translation.id}}
+          %td= check_box_tag("c[#{translation.id}]", 1, true)
+          %td= translation.key
+          %td= path_without_root_or_locales(translation.file_path)
+      - if translations_to_clean_up.empty?
+        %tr
+          %td{colspan: 3} No translations were found
+
+  = f.submit "Delete"

data/app/views/awesome_translations/groups/show.html.haml

@@ -1,5 +1,12 @@
-- content_for(:header_title) { "Show group: #{@group.name}" }
-- content_for(:header_right) { link_to "Update translations", update_translations_cache_handler_group_path(@handler.identifier, @group.identifier), method: :post, class: "button", data: {confirm: "Are you sure?"} }
+- content_for(:header_title) { "Show group: #{truncate(@group.name.reverse, length: 45).reverse}" }
+- content_for(:header_right) do
+  = link_to "Update translations", [:update_translations_cache, @handler, @group], method: :post, class: "button", data: {confirm: "Are you sure?"}
+
+= simple_form_for :q, method: :get do |f|
+  = f.input :translation_key_key_cont, label: "Key contains", input_html: {value: @ransack_params[:translation_key_key_cont]}
+  = f.button :submit, "Filter"
+
+%br
 
 = form_for :group, url: handler_group_path(@handler, @group), method: :put do |f|
   %table.translations
@@ -14,7 +21,8 @@
             .translation-key-text= translation.key_show_with_fallback
 
           - I18n.available_locales.each do |locale|
-            %td.translation= text_field "t", "#{translation.key}[#{locale}]", class: "translation-input", lang: locale, value: translation.translation_value(locale: locale)
+            %td.translation
+              = text_field "t", "#{translation.key}[#{locale}]", class: "translation-input", lang: locale, value: translation.translation_value(locale: locale)
 
         - if translation.file_line_content? || translation.default.present?
           %tr.line-content-row
@@ -23,7 +31,7 @@
                 - if translation.file_line_content?
                   %pre= translation.file_line_content
                 - elsif translation.default.present?
-                  = "Default: #{translation.default}"
+                  Default: #{translation.default}
           %tr
             %td.line-spacer{colspan: 1 + I18n.available_locales.length}
       - if @translations.empty?

data/app/views/awesome_translations/handlers/index.html.haml

@@ -8,7 +8,7 @@
   %tbody
     - @handlers.each do |handler|
       %tr
-        %td= link_to handler.name, handler_path(handler.identifier)
+        %td= link_to handler.name, handler_path(handler)
     - if @handlers.empty?
       %tr
         %td.error{colspan: 1} No handlers were found.