awesome_translations 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c4b6a950611c10ecf5b8445f5fe3cc67f94f5cd
-  data.tar.gz: 482d380e3407d9aa0f2c868ffb875e081e6db616
+  metadata.gz: 62fc7814794eb69cf8aaff33ba387830a3fd9c94
+  data.tar.gz: c33d0d75d58c58ff93da097607cc3a1e6a04f695
 SHA512:
-  metadata.gz: 19eddaeb2fca2304b74d7cea1fb851c57e78cc70060bf576e81cfeb992402b6cd9f11e97d76b33828e2176b3640731f8e0ec42281ea52a396a22cf854126a0ad
-  data.tar.gz: 172639b51eebd86ea386bda69d228fd5872b0379711fa36c635a893188a5d28fa8f051c3f79849be956ede4809f58fb8b9e183eeb71d9ce33006cfaa321db69f
+  metadata.gz: 24c1d69337fee4fc06266e8ca627902ba63f7cfc3b6a4967cd61693e3274cb79ec81e0101743ff12fc44be349ea956f98f4eefe794ccb145539e9adf2fcbfed3
+  data.tar.gz: b5326f7d4a6efc4084a638f40cce829ab27ff4c7ab691f47cf7d7a5c02fcf049f971939b56e371a378ad30f26a7c75cd342aeffda8387ffebef5b2de2730098d

data/app/controllers/awesome_translations/caches_controller.rb

@@ -4,7 +4,12 @@ class AwesomeTranslations::CachesController < AwesomeTranslations::ApplicationCo
 
   def create
     cache_db_generator = AwesomeTranslations::CacheDatabaseGenerator.new(debug: true)
-    cache_db_generator.cache_translations
+
+    if params[:cache] && params[:cache][:type] == "yml"
+      cache_db_generator.cache_yml_translations
+    else
+      cache_db_generator.cache_translations
+    end
 
     flash[:notice] = "The cache was updated"
     redirect_to caches_path

data/app/controllers/awesome_translations/duplicates_controller.rb

@@ -0,0 +1,29 @@
+class AwesomeTranslations::DuplicatesController < AwesomeTranslations::ApplicationController
+  def index
+    @duplicates = AwesomeTranslations::CacheDatabaseGenerator::TranslationValue
+      .select("translation_values.*, duplicate_translation_values.id AS duplicate_id")
+      .joins("
+        INNER JOIN translation_values AS duplicate_translation_values ON
+          duplicate_translation_values.translation_key_id = translation_values.translation_key_id
+      ")
+      .where("translation_values.id < duplicate_translation_values.id")
+      .where("translation_values.locale = duplicate_translation_values.locale")
+  end
+
+  def create
+    ids = []
+    params[:d].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 :back
+  end
+end

data/app/controllers/awesome_translations/movals_controller.rb

@@ -0,0 +1,21 @@
+class AwesomeTranslations::MovalsController < AwesomeTranslations::ApplicationController
+  def index
+    @movals = AwesomeTranslations::CacheDatabaseGenerator::TranslationValue
+      .select("translation_values.*, handler_translations.id AS handler_translation_id")
+      .joins("
+        INNER JOIN handler_translations ON
+          handler_translations.translation_key_id = translation_values.translation_key_id
+      ")
+      .where("translation_values.file_path NOT LIKE handler_translations.dir || '%'")
+      .group("translation_values.id")
+  end
+
+  def create
+    params[:m].each do |translation_value_id, _handler_translation_id|
+      translation_value = AwesomeTranslations::CacheDatabaseGenerator::TranslationValue.find(translation_value_id)
+      translation_value.migrate_to_awesome_translations_namespace!
+    end
+
+    redirect_to :back
+  end
+end

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

@@ -1,3 +1,4 @@
 %h1 Cache
 
-= bb_btn caches_path, "Update cache", method: :post, data: {confirm: "Are you sure?"}, class: "btn-primary"
+= bb_btn caches_path, "Update cache", :confirm, method: :post, class: "btn-primary"
+= bb_btn caches_path(cache: {type: "yml"}), "Update YML cache", :confirm, method: :post

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

@@ -0,0 +1,29 @@
+- content_for(:header_title) { "Duplicates" }
+
+= simple_form_for :duplicates do |f|
+  - count = 0
+
+  = bb_panel table: true do
+    %thead
+      %tr
+        %th
+        %th Key
+        %th Path
+        %th Other path
+    %tbody
+      - @duplicates.each do |duplicate|
+        - count += 1
+        - other = AwesomeTranslations::CacheDatabaseGenerator::TranslationValue.find(duplicate.duplicate_id)
+
+        %tr
+          %td= check_box_tag "d[#{other.id}]", 1, true
+          %td= duplicate.key
+          %td= path_without_root_or_locales duplicate.file_path
+          %td= path_without_root_or_locales other.file_path
+      - if count == 0
+        %tr
+          %td{colspan: 4} No duplicates was found
+
+  - if count > 0
+    = bb_panel do
+      = f.button :submit, "Delete duplicates"

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

@@ -0,0 +1,29 @@
+- content_for(:header_title) { "Movals" }
+
+= simple_form_for :movals do |f|
+  - count = 0
+
+  = bb_panel table: true do
+    %thead
+      %tr
+        %th
+        %th Key
+        %th Path
+        %th Right path
+    %tbody
+      - @movals.each do |moval|
+        - handler_translation = AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation.find(moval.handler_translation_id)
+        - count += 1
+
+        %tr
+          %td= check_box_tag "m[#{moval.id}]", handler_translation.id, true
+          %td= moval.key
+          %td= path_without_root_or_locales moval.file_path
+          %td= path_without_root_or_locales "#{handler_translation.dir}/#{moval.locale}.yml"
+      - if count <= 0
+        %tr
+          %td{colspan: 4} No wrongly placed translations was found
+
+  - if count > 0
+    = bb_panel do
+      = f.button :submit, "Move"

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

@@ -28,7 +28,9 @@
             %li= link_to "Handlers", handlers_path
             %li= link_to "Translations", handler_translations_path
             %li= link_to "Clean Up", new_clean_up_path
+            %li= link_to "Duplicates", duplicates_path
             %li= link_to "Migrate", new_migration_path
+            %li= link_to "Movals", movals_path
             %li= link_to "Cache", caches_path
 
     .container

data/config/routes.rb

@@ -1,6 +1,7 @@
 AwesomeTranslations::Engine.routes.draw do
   resources :caches
   resources :clean_ups, only: [:new, :create]
+  resources :duplicates, only: [:index, :create]
 
   resources :handlers, only: [:index, :show] do
     post :update_cache, on: :collection
@@ -13,6 +14,7 @@ AwesomeTranslations::Engine.routes.draw do
 
   resources :handler_translations, only: :index
   resources :migrations, only: [:new, :create]
+  resources :movals, only: [:index, :create]
 
   root to: "handlers#index"
 end

data/lib/awesome_translations/cache_database_generator.rb

@@ -23,6 +23,8 @@ class AwesomeTranslations::CacheDatabaseGenerator
     @initialized = true
     @db = Baza::Db.new(type: :sqlite3, path: database_path, debug: false, type_translation: true)
 
+    BazaModels.primary_db = @db
+
     AwesomeTranslations::CacheDatabaseGenerator::Group.db = @db
     AwesomeTranslations::CacheDatabaseGenerator::Group.table_name = "groups"
 
@@ -241,12 +243,10 @@ private
 
         translation_value = AwesomeTranslations::CacheDatabaseGenerator::TranslationValue.find_or_initialize_by(
           translation_key_id: translation_key.id,
-          locale: locale
-        )
-        translation_value.assign_attributes(
-          file_path: file_path,
-          value: value
+          locale: locale,
+          file_path: file_path
         )
+        translation_value.assign_attributes(value: value)
         translation_value.save!
 
         @translation_values_found[translation_value.id] = true

data/lib/awesome_translations/handlers/model_handler.rb

@@ -13,7 +13,7 @@ class AwesomeTranslations::Handlers::ModelHandler < AwesomeTranslations::Handler
   def translations_for_group(group)
     ArrayEnumerator.new do |yielder|
       model_inspector = AwesomeTranslations::ModelInspector.model_classes.find { |model_inspector| model_inspector.clazz.name == group.name }
-      raise "No inspector by that name: #{model_inspector.clazz.name}" unless model_inspector
+      raise "No inspector by that name: #{group.name}" unless model_inspector
 
       model_names(model_inspector).each { |translation| yielder << translation }
       active_record_attributes(model_inspector).each { |translation| yielder << translation }

data/lib/awesome_translations/handlers/validations_handler.rb

@@ -13,7 +13,7 @@ class AwesomeTranslations::Handlers::ValidationsHandler < AwesomeTranslations::H
   def translations_for_group(group)
     ArrayEnumerator.new do |yielder|
       model_inspector = AwesomeTranslations::ModelInspector.model_classes.find { |model_inspector| model_inspector.clazz.name == group.name }
-      raise "No inspector by that name: #{model_inspector.clazz.name}" unless model_inspector
+      raise "No inspector by that name: #{group.name}" unless model_inspector
 
       model_inspector.clazz._validators.each do |attribute_name, validators|
         validators.each do |validator|

data/lib/awesome_translations/model_inspector.rb

@@ -92,8 +92,8 @@ class AwesomeTranslations::ModelInspector
   end
 
   def self.find_subclasses(clazz, &blk)
-    return if @scanned[clazz]
-    @scanned[clazz] = true
+    return if @scanned[clazz.name]
+    @scanned[clazz.name] = true
 
     clazz.subclasses.each do |subclass|
       blk.call ::AwesomeTranslations::ModelInspector.new(subclass)

data/lib/awesome_translations/version.rb

@@ -1,3 +1,3 @@
 module AwesomeTranslations
-  VERSION = "0.0.32".freeze
+  VERSION = "0.0.33".freeze
 end

data/spec/controllers/groups_controller_spec.rb

@@ -9,6 +9,8 @@ describe AwesomeTranslations::GroupsController do
   let(:date_time_path) { Rails.root.join("config", "locales", "awesome_translations", "date_time", "da.yml").to_s }
 
   before do
+    AwesomeTranslations::CacheDatabaseGenerator.current.cache_translations
+
     FileUtils.rm_f(model_locales_path) if File.exist?(model_locales_path)
     FileUtils.rm_f(date_time_path) if File.exist?(date_time_path)
 

data/spec/controllers/handlers_controller_spec.rb

@@ -12,6 +12,7 @@ describe AwesomeTranslations::HandlersController do
   end
 
   it "#show" do
+    AwesomeTranslations::CacheDatabaseGenerator.current.cache_translations
     get :show, id: "model_handler"
     expect(response).to be_success
   end
@@ -23,6 +24,7 @@ describe AwesomeTranslations::HandlersController do
   end
 
   it "#update_groups_cache" do
+    AwesomeTranslations::CacheDatabaseGenerator.current.cache_translations
     request.env["HTTP_REFERER"] = handler_path("rails_handler")
     post :update_groups_cache, id: "rails_handler"
     expect(response).to redirect_to handler_path("rails_handler")