awesome_translations 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b767303de03d7364fb0c7212a3e6904a76cd248
-  data.tar.gz: cd3acf8f7db3af66c9d94b503b398004a329bc65
+  metadata.gz: 1e38f021130a42dcbfd6a8c4b1086e0b72b31d02
+  data.tar.gz: dbc8589d666e8d0c23a1205e30c7f4ecd5b2be0c
 SHA512:
-  metadata.gz: a763bd92feb3e84d48da83086a1b0535a3c986ea38968a99711a315a149b045d89de41a43901537f28d136c92407d3780f7981aafdc016383811b7ee9f8e9d1f
-  data.tar.gz: ba665effaa13e98405710640ff9cb6a22193127428a73d1f6a9c92f61e93ed12da92144ccd60bb2407024a4bdb757817fa2de0244e50ac53339f9d92bb19d288
+  metadata.gz: 79b1753082fd74b2339619fdf0e02d4235a2e562969c3dc9c3868475ad881ba31acc381761e6603101261ccebf7e6385f85d9df5787a3befbdf410e8b969e49c
+  data.tar.gz: f8d5168cd39a568a2ca103ede459e3cf4039824de56d15e4380cf82936ebd2e0fc2e62a098bb50354d0260a01f1a287f5284b31eca68d7f4f64760389156ee7f

data/README.md

@@ -1,6 +1,6 @@
-[![Build Status](https://api.shippable.com/projects/544232fcb904a4b21567a417/badge?branchName=master)](https://app.shippable.com/projects/544232fcb904a4b21567a417/builds/latest)
 [![Code Climate](https://codeclimate.com/github/kaspernj/awesome_translations/badges/gpa.svg)](https://codeclimate.com/github/kaspernj/awesome_translations)
 [![Test Coverage](https://codeclimate.com/github/kaspernj/awesome_translations/badges/coverage.svg)](https://codeclimate.com/github/kaspernj/awesome_translations)
+[![Build Status](https://img.shields.io/shippable/544232fcb904a4b21567a417.svg)](https://app.shippable.com/projects/544232fcb904a4b21567a417/builds/latest)
 
 # AwesomeTranslations
 

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

@@ -0,0 +1,15 @@
+# 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/assets/stylesheets/awesome_translations/layout.css.scss

@@ -37,6 +37,11 @@ table.main-table {
     border-top: 1px solid black;
     border-bottom: 1px solid black;
     padding: 10px;
+
+    .menu-item {
+      float: left;
+      margin-right: 12px;
+    }
   }
 
   td.main-content {
@@ -49,3 +54,17 @@ table.main-table {
 table > thead > tr > th {
   text-align: left;
 }
+
+.button {
+  padding: 10px;
+  background-color: lightgrey;
+  border: 1px solid black;
+  border-radius: 5px;
+  color: black;
+  text-decoration: none;
+
+  &:link, &:visited, &:hover, &:active {
+    color: black;
+    text-decoration: none;
+  }
+}

data/app/controllers/awesome_translations/caches_controller.rb

@@ -0,0 +1,12 @@
+class AwesomeTranslations::CachesController < AwesomeTranslations::ApplicationController
+  def index
+  end
+
+  def create
+    cache_db_generator = AwesomeTranslations::CacheDatabaseGenerator.new(debug: false)
+    cache_db_generator.cache_translations
+
+    flash[:notice] = "The cache was updated"
+    redirect_to caches_path
+  end
+end

data/app/controllers/awesome_translations/groups_controller.rb

@@ -6,11 +6,11 @@ class AwesomeTranslations::GroupsController < AwesomeTranslations::ApplicationCo
   end
 
   def show
-    @translations = @group.translations
+    @translations = @group.handler_translations
   end
 
   def update
-    @group.translations.each do |translation|
+    @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]
@@ -31,13 +31,23 @@ class AwesomeTranslations::GroupsController < AwesomeTranslations::ApplicationCo
     redirect_to handler_group_path(@handler, @group)
   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)
+
+    redirect_to handler_group_path(@handler.identifier, @group.identifier)
+  end
+
 private
 
   def set_handler
-    @handler = AwesomeTranslations::Handler.find(params[:handler_id])
+    @handler = AwesomeTranslations::CacheDatabaseGenerator::Handler.find_by(identifier: params[:handler_id])
   end
 
   def set_group
-    @group = AwesomeTranslations::Group.find_by_handler_and_id(@handler, params[:id])
+    @group = @handler.groups.find_by(identifier: params[:id])
   end
 end

data/app/controllers/awesome_translations/handlers_controller.rb

@@ -1,17 +1,35 @@
 class AwesomeTranslations::HandlersController < AwesomeTranslations::ApplicationController
-  before_filter :set_handler
+  before_filter :set_handler, only: [:show, :update_groups_cache]
 
   def index
-    @handlers = AwesomeTranslations::Handler.all
+    @handlers = AwesomeTranslations::CacheDatabaseGenerator::Handler.order(:name)
+  end
+
+  def update_cache
+    generator = AwesomeTranslations::CacheDatabaseGenerator.current
+    generator.update_handlers
+
+    redirect_to handlers_path
+  end
+
+  def update_groups_cache
+    generator = AwesomeTranslations::CacheDatabaseGenerator.current
+    generator.update_handlers do |handler, handler_model|
+      next unless handler_model.identifier == @handler.identifier
+      generator.update_groups_for_handler(handler, handler_model)
+    end
+
+    redirect_to handler_path(@handler.identifier)
   end
 
   def show
-    @groups = @handler.groups
+    @groups = @handler.groups.order(:name)
   end
 
 private
 
   def set_handler
-    @handler = AwesomeTranslations::Handler.find(params[:id]) if params[:id]
+    @handler = AwesomeTranslations::CacheDatabaseGenerator::Handler.find_by(identifier: params[:id])
+    raise "No such handler: #{params[:id]}" unless @handler
   end
 end

data/app/controllers/awesome_translations/migrations_controller.rb

@@ -0,0 +1,26 @@
+class AwesomeTranslations::MigrationsController < AwesomeTranslations::ApplicationController
+  def new
+  end
+
+  def create
+    params[:m].each do |translation_value_id, check_value|
+      next unless check_value == "1"
+
+      translation_value = AwesomeTranslations::CacheDatabaseGenerator::TranslationValue.find(translation_value_id)
+      translation_value.migrate_to_awesome_translations_namespace!
+    end
+
+    redirect_to new_migration_path
+  end
+
+private
+
+  helper_method :translations_to_migrate
+  def translations_to_migrate
+    @translations_to_migrate ||= AwesomeTranslations::CacheDatabaseGenerator::TranslationValue
+      .joins(:translation_key)
+      .includes(:translation_key)
+      .joins("INNER JOIN handler_translations ON handler_translations.translation_key_id = translation_keys.id")
+      .where("translation_values.file_path NOT LIKE '%/config/locales/awesome_translations/%'")
+  end
+end

data/app/controllers/awesome_translations/translate_migrations_controller.rb

@@ -0,0 +1,10 @@
+class AwesomeTranslations::TranslateMigrationsController < AwesomeTranslations::BaseController
+  def index
+  end
+
+  def show
+  end
+
+  def udpate
+  end
+end

data/app/helpers/awesome_translations/application_helper.rb

@@ -1,5 +1,13 @@
 module AwesomeTranslations::ApplicationHelper
   def helper_t(key, args = {})
-    AwesomeTranslations::GlobalTranslator.translate(key, caller_number: 1, translation_args: [args])
+    AwesomeTranslations::GlobalTranslator.translate(key, helper: true, caller_number: 1, translation_args: [args])
+  end
+
+  def path_without_root(path)
+    path.gsub(/\A#{Regexp.escape(Rails.root.to_s)}(\/|)/, "")
+  end
+
+  def path_without_root_or_locales(path)
+    path_without_root(path).gsub(/\Aconfig\/locales(\/|)/, "")
   end
 end

data/app/models/awesome_translations/group.rb

@@ -10,7 +10,10 @@ class AwesomeTranslations::Group
   end
 
   def initialize(args)
-    @handler, @id, @data = args[:handler], args[:id], args[:data]
+    @handler = args.fetch(:handler)
+    @id = args.fetch(:id)
+    @data = args[:data] || {}
+    raise "Invalid ID: #{@id}" unless @id.present?
   end
 
   def translations(args = {})
@@ -18,21 +21,21 @@ class AwesomeTranslations::Group
 
     args.each do |key, value|
       if key == :finished
-        translations_list = translations_list.select { |translation| translation.finished? } if value
+        translations_list = translations_list.select(&:finished?) if value
       elsif key == :unfinished
-        translations_list = translations_list.select { |translation| translation.unfinished? } if value
+        translations_list = translations_list.select(&:unfinished?) if value
       else
         raise "Unknown key: #{key}"
       end
     end
 
-    return translations_list
+    translations_list
   end
 
   def translations_count(args = {})
     count = 0
     translations(args).each { count += 1 }
-    return count
+    count
   end
 
   def to_param
@@ -44,11 +47,7 @@ class AwesomeTranslations::Group
   end
 
   def name
-    if @data && @data[:name].present?
-      return @data[:name].presence
-    end
-
-    return id
+    @data[:name].presence || id.presence
   end
 
   def to_s

data/app/models/awesome_translations/translated_value.rb

@@ -4,13 +4,18 @@ class AwesomeTranslations::TranslatedValue
   attr_accessor :file, :locale, :key, :value
 
   def initialize(data)
-    @file, @locale, @key, @value = data[:file], data[:locale], data[:key], data[:value]
+    @file = data.fetch(:file)
+    @locale = data.fetch(:locale)
+    @key = data.fetch(:key)
+    @value = data.fetch(:value)
   end
 
   def to_s
     "<AwesomeTranslations::TranslatedValue file=\"#{@file}\" locale=\"#{@locale}\" key=\"#{@key}\" value=\"#{@value}\">"
   end
 
+  alias inspect to_s
+
   def array_translation?
     if @key.match(/\[(\d+)\]\Z/)
       return true
@@ -20,27 +25,19 @@ class AwesomeTranslations::TranslatedValue
   end
 
   def array_key
-    if match = @key.match(/\A(.+)\[(\d+)\]\Z/)
-      return match[1]
-    end
-
-    return nil
+    return unless (match = @key.match(/\A(.+)\[(\d+)\]\Z/))
+    match[1]
   end
 
   def array_no
-    if match = @key.match(/\A(.+)\[(\d+)\]\Z/)
-      return match[2].to_i
-    end
-
-    return nil
+    return unless (match = @key.match(/\A(.+)\[(\d+)\]\Z/))
+    match[2].to_i
   end
 
-  alias inspect to_s
-
   def save!
     dir = File.dirname(@file)
-    FileUtils.mkdir_p(dir) unless File.exists?(dir)
-    File.open(@file, "w") { |fp| fp.write("#{@locale}:\n") } unless File.exists?(@file)
+    FileUtils.mkdir_p(dir) unless File.exist?(dir)
+    File.open(@file, "w") { |fp| fp.write("#{@locale}:\n") } unless File.exist?(@file)
 
     translations = YAML.load(File.read(@file))
     translations ||= {}

data/app/models/awesome_translations/translation.rb

@@ -1,10 +1,14 @@
 class AwesomeTranslations::Translation
-  attr_reader :default, :dir, :key, :file_path, :line_no
+  attr_reader :default, :dir, :key, :key_show, :file_path, :line_no, :full_path
 
   def initialize(data)
     @data = data
-    @dir, @file_path, @full_path, @line_no = data[:dir], data[:file_path], data[:full_path], data[:line_no]
-    @key, @key_show = data[:key], data[:key_show]
+    @dir = data[:dir]
+    @file_path = data[:file_path]
+    @full_path = data[:full_path]
+    @line_no = data[:line_no]
+    @key = data[:key]
+    @key_show = data[:key_show]
     @default = data[:default]
 
     raise "Dir wasn't valid: '#{@dir}'." unless @dir.present?
@@ -27,23 +31,13 @@ class AwesomeTranslations::Translation
   end
 
   def array_key
-    if match = @key.match(/\A(.+)\[(\d+)\]\Z/)
-      return match[1]
-    end
-
-    return nil
+    return unless (match = @key.match(/\A(.+)\[(\d+)\]\Z/))
+    match[1]
   end
 
   def array_no
-    if match = @key.match(/\A(.+)\[(\d+)\]\Z/)
-      return match[2].to_i
-    end
-
-    return nil
-  end
-
-  def id
-    raise "stub!"
+    return unless (match = @key.match(/\A(.+)\[(\d+)\]\Z/))
+    match[2].to_i
   end
 
   def to_param
@@ -68,7 +62,7 @@ class AwesomeTranslations::Translation
       )
     end
 
-    return result
+    result
   end
 
   def finished?
@@ -77,7 +71,7 @@ class AwesomeTranslations::Translation
       return false
     end
 
-    return true
+    true
   end
 
   def unfinished?
@@ -95,9 +89,9 @@ class AwesomeTranslations::Translation
 
   def value_for?(locale)
     if array_translation?
-      I18n.with_locale(locale) { return I18n.exists?(array_key) && I18n.t(array_key)[array_no].present? }
+      I18n.with_locale(locale) { I18n.exists?(array_key) && I18n.t(array_key)[array_no].present? }
     else
-      I18n.with_locale(locale) { return I18n.exists?(@key) }
+      I18n.with_locale(locale) { I18n.exists?(@key) }
     end
   end
 
@@ -107,9 +101,9 @@ class AwesomeTranslations::Translation
     return nil unless value_for?(locale)
 
     if array_translation?
-      I18n.with_locale(locale) { return I18n.t(array_key)[array_no] }
+      I18n.with_locale(locale) { I18n.t(array_key)[array_no] }
     else
-      I18n.with_locale(locale) { return I18n.t(@key) }
+      I18n.with_locale(locale) { I18n.t(@key) }
     end
   end
 

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

@@ -0,0 +1,3 @@
+%h1 Cache
+
+= link_to "Update cache", caches_path, method: :post, data: {confirm: "Are you sure?"}, class: "button"

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

@@ -1,4 +1,5 @@
-%h1= "Show group: #{@group.name}"
+- 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?"} }
 
 = form_for :group, url: handler_group_path(@handler, @group), method: :put do |f|
   %table.translations
@@ -13,7 +14,7 @@
             .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.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

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

@@ -1,4 +1,5 @@
-%h1 Handlers
+- content_for(:header_title) { Handlers }
+- content_for(:header_right) { link_to "Update", update_cache_handlers_path, method: :post, class: "button", data: {confirm: "Are you sure?"} }
 
 %table
   %thead
@@ -7,7 +8,7 @@
   %tbody
     - @handlers.each do |handler|
       %tr
-        %td= link_to handler.name, handler_path(handler)
+        %td= link_to handler.name, handler_path(handler.identifier)
     - if @handlers.empty?
       %tr
         %td.error{colspan: 1} No handlers were found.

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

@@ -1,4 +1,5 @@
-%h1= "Show handler: #{@handler.name}"
+- content_for(:header_title) { "Show handler: #{@handler.name}" }
+- content_for(:header_right) { link_to "Update groups", update_groups_cache_handler_path(@handler.identifier), method: :post, class: "button", data: {confirm: "Are you sure?"} }
 
 %table
   %thead
@@ -7,12 +8,12 @@
     %th Finished
     %th Unfinished
   %tbody
-    - @groups.each do |group|
+    - @groups.includes(handler_translations: :translation_key).each do |group|
       %tr
-        %td= link_to group.name, handler_group_path(@handler, group)
-        %td= group.translations_count
-        %td= group.translations_count(finished: true)
-        %td= group.translations_count(unfinished: true)
+        %td= link_to group.name, handler_group_path(@handler.identifier, group.identifier)
+        %td= group.handler_translations.count
+        %td= group.handler_translations.select(&:finished?).length
+        %td= group.handler_translations.select(&:unfinished?).length
     - if @groups.empty?
       %tr
-        %td.error{colspan: 2} No groups were found.
+        %td.error{colspan: 4} No groups were found.

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

@@ -0,0 +1,21 @@
+- content_for(:header_title) { "Migrate translations into AwesomeTranslations" }
+
+= form_for :migration, url: migrations_path do |f|
+  %table
+    %thead
+      %tr
+        %th{colspan: 2} Key
+        %th File
+        %th New file
+    %tbody
+      - translations_to_migrate.each do |translation|
+        %tr
+          %td= check_box_tag("m[#{translation.id}]", 1, true)
+          %td= translation.key
+          %td= path_without_root_or_locales(translation.file_path)
+          %td= path_without_root_or_locales(translation.calculated_translation_file_path)
+      - if translations_to_migrate.empty?
+        %tr
+          %td{colspan: 4} No translations were found
+
+  = f.submit "Migrate"

data/app/views/layouts/awesome_translations/application.html.haml

@@ -19,6 +19,17 @@
       %tr
         %td.main-menu
           .menu-item= link_to "Handlers", handlers_path
+          .menu-item= link_to "Migrate", new_migration_path
+          .menu-item= link_to "Cache", caches_path
       %tr
         %td.main-content
+          %table{width: "100%"}
+            %tbody
+              %tr
+                %td
+                  - if content_for(:header_title)
+                    %h1= content_for(:header_title)
+                %td{align: "right", width: "170px"}
+                  = content_for(:header_right)
+
           = yield

data/config/initializers/cache_models.rb

@@ -0,0 +1 @@
+AwesomeTranslations::CacheDatabaseGenerator.new.init_database

data/config/routes.rb

@@ -1,7 +1,16 @@
 AwesomeTranslations::Engine.routes.draw do
+  resources :caches
+
   resources :handlers, only: [:index, :show] do
-    resources :groups, only: [:show, :update]
+    post :update_cache, on: :collection
+    post :update_groups_cache, on: :member
+
+    resources :groups, only: [:show, :update] do
+      post :update_translations_cache, on: :member
+    end
   end
 
+  resources :migrations, only: [:new, :create]
+
   root to: "handlers#index"
 end

data/db/baza_translations_migrations/20150902155200_create_translation_keys.rb

@@ -0,0 +1,14 @@
+class CreateTranslationKeys < BazaMigrations::Migration
+  def change
+    create_table :translation_keys do |t|
+      t.belongs_to :handler
+      t.belongs_to :group
+      t.string :key
+      t.timestamps
+    end
+
+    add_index :translation_keys, :key
+    add_index :translation_keys, :group_id
+    add_index :translation_keys, :handler_id
+  end
+end

data/db/baza_translations_migrations/20150907070909_create_groups.rb

@@ -0,0 +1,13 @@
+class CreateGroups < BazaMigrations::Migration
+  def change
+    create_table :groups do |t|
+      t.belongs_to :handler
+      t.string :identifier
+      t.string :name
+      t.timestamps
+    end
+
+    add_index :groups, :identifier
+    add_index :groups, :handler_id
+  end
+end

data/db/baza_translations_migrations/20150907090900_create_handlers.rb

@@ -0,0 +1,11 @@
+class CreateHandlers < BazaMigrations::Migration
+  def change
+    create_table :handlers do |t|
+      t.string :identifier
+      t.string :name
+      t.timestamps
+    end
+
+    add_index :handlers, :identifier
+  end
+end

data/db/baza_translations_migrations/20150908085500_create_translation_values.rb

@@ -0,0 +1,14 @@
+class CreateTranslationValues < BazaMigrations::Migration
+  def change
+    create_table :translation_values do |t|
+      t.belongs_to :translation_key
+      t.string :file_path
+      t.string :locale
+      t.string :value
+      t.timestamps
+    end
+
+    add_index :translation_values, :translation_key_id
+    add_index :translation_values, :locale
+  end
+end

data/db/baza_translations_migrations/20150908090800_create_handler_translations.rb

@@ -0,0 +1,21 @@
+class CreateHandlerTranslations < BazaMigrations::Migration
+  def change
+    create_table :handler_translations do |t|
+      t.belongs_to :handler
+      t.belongs_to :translation_key
+      t.belongs_to :group
+      t.string :key_show
+      t.string :file_path
+      t.integer :line_no
+      t.string :full_path
+      t.string :dir
+      t.string :default
+      t.timestamps
+    end
+
+    add_index :handler_translations, :handler_id
+    add_index :handler_translations, :translation_key_id
+    add_index :handler_translations, :group_id
+    add_index :handler_translations, :file_path
+  end
+end

data/lib/awesome_translations/cache_database_generator/group.rb

@@ -0,0 +1,16 @@
+class AwesomeTranslations::CacheDatabaseGenerator::Group < BazaModels::Model
+  belongs_to :handler, class_name: "AwesomeTranslations::CacheDatabaseGenerator::Handler"
+
+  has_many :handler_translations, dependent: :destroy, foreign_key: "group_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation"
+  has_many :translation_keys, dependent: :destroy, foreign_key: "group_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
+
+  validates_presence_of :name, :handler
+
+  def at_handler
+    @at_handler ||= handler.at_handler
+  end
+
+  def at_group
+    @at_group ||= AwesomeTranslations::Group.find_by_handler_and_id(at_handler, identifier)
+  end
+end

data/lib/awesome_translations/cache_database_generator/handler.rb

@@ -0,0 +1,9 @@
+class AwesomeTranslations::CacheDatabaseGenerator::Handler < BazaModels::Model
+  has_many :groups, dependent: :destroy, foreign_key: "handler_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::Group"
+
+  validates_presence_of :name
+
+  def at_handler
+    @at_handler ||= AwesomeTranslations::Handler.find(identifier)
+  end
+end