awesome_translations 0.0.58 → 0.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97aa6b7fa7187a62074783131b5e97ce86c977a74a18407c02efae5bdfc80928
-  data.tar.gz: 15be14431991a55fcef0aade82bcff5c8952f7781f20f5853218d4a84c1389c2
+  metadata.gz: 630fd6805a59fe0e501a01e85fec405e0c74e969334a64183fd5e001a2a86f19
+  data.tar.gz: c3e9fc60d2af9574536759378db9891ba6bb6297696e79357280f1fc2feddddc
 SHA512:
-  metadata.gz: 3200002a0574f45b587fa8839e6ab9f11fc117c8c3e6382430982467539a6bfbf9d2d18d7da52891ab44acfd9beecac706f138fedbdfcb34a75ecb0c327599ca
-  data.tar.gz: 74d08ebb996d3f11892e6d7260d431532d1584c495195302b4bd454c9fb83954e80e8e464ba2ccc506a519a1f7f781ba3b456f7f3bf82699608dfc621e482b4e
+  metadata.gz: 37c3afd48491b25cebe63b263454e32845548c1aca9ddcc6a9cadbfb1a116ce8aa74899a8084ab74770ab639ed01287fb91d1ca6e9913d3ef29fba845fe53325
+  data.tar.gz: 7b612ecd73272de814ca2725fc10693468811ffddf6601f572da56718078b1f108ce3a7b7682ac05eafc4257a3b0a860f7eb6efa36c3c36fa304171a8f0375ff

data/Rakefile

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 
 

data/app/controllers/awesome_translations/groups_controller.rb

@@ -14,6 +14,7 @@ class AwesomeTranslations::GroupsController < AwesomeTranslations::ApplicationCo
     @group.handler_translations.each do |translation|
       values = values_from_translation(translation)
       next unless values
+
       save_values(translation, values)
     end
 

data/app/controllers/awesome_translations/handlers_controller.rb

@@ -16,6 +16,7 @@ class AwesomeTranslations::HandlersController < AwesomeTranslations::Application
     generator = AwesomeTranslations::CacheDatabaseGenerator.current
     generator.update_handlers do |handler_model|
       next unless handler_model.identifier == @handler.identifier
+
       generator.update_groups_for_handler(handler_model)
     end
 

data/app/helpers/awesome_translations/application_helper.rb

@@ -2,7 +2,6 @@ require "baza_models"
 
 module ::AwesomeTranslations::ApplicationHelper
   include BazaModels::Helpers::RansackerHelper
-  include SimpleFormRansackHelper
 
   def flash_message_class(type)
     type = type.to_s

data/app/models/awesome_translations/group.rb

@@ -1,7 +1,7 @@
 class AwesomeTranslations::Group
   attr_reader :handler, :id, :data
 
-  def self.find_by_handler_and_id(handler, id)
+  def self.find_by(handler:, id:)
     handler.groups.each do |group|
       return group if group.id == id.to_s
     end
@@ -13,7 +13,7 @@ class AwesomeTranslations::Group
     @handler = args.fetch(:handler)
     @id = args.fetch(:id)
     @data = args[:data] || {}
-    raise "Invalid ID: #{@id}" unless @id.present?
+    raise "Invalid ID: #{@id}" if @id.blank?
   end
 
   def translations(args = {})

data/app/models/awesome_translations/translated_value.rb

@@ -17,17 +17,20 @@ class AwesomeTranslations::TranslatedValue
   alias inspect to_s
 
   def array_translation?
-    return true if @key =~ /\[(\d+)\]\Z/
+    return true if /\[(\d+)\]\Z/.match?(@key)
+
     false
   end
 
   def array_key
     return unless (match = @key.match(/\A(.+)\[(\d+)\]\Z/))
+
     match[1]
   end
 
   def array_no
     return unless (match = @key.match(/\A(.+)\[(\d+)\]\Z/))
+
     match[2].to_i
   end
 

data/app/models/awesome_translations/translation.rb

@@ -11,7 +11,7 @@ class AwesomeTranslations::Translation
     @key_show = data[:key_show]
     @default = data[:default]
 
-    raise "Dir wasn't valid: '#{@dir}'." unless @dir.present?
+    raise "Dir wasn't valid: '#{@dir}'." if @dir.blank?
   end
 
   def last_key
@@ -23,17 +23,20 @@ class AwesomeTranslations::Translation
   end
 
   def array_translation?
-    return true if @key =~ /\[(\d+)\]\Z/
+    return true if /\[(\d+)\]\Z/.match?(@key)
+
     false
   end
 
   def array_key
     return unless (match = @key.match(/\A(.+)\[(\d+)\]\Z/))
+
     match[1]
   end
 
   def array_no
     return unless (match = @key.match(/\A(.+)\[(\d+)\]\Z/))
+
     match[2].to_i
   end
 
@@ -65,6 +68,7 @@ class AwesomeTranslations::Translation
   def finished?
     I18n.available_locales.each do |locale|
       next if value_for?(locale)
+
       return false
     end
 
@@ -94,14 +98,15 @@ class AwesomeTranslations::Translation
     return nil unless value_for?(locale)
 
     if array_translation?
-      I18n.with_locale(locale) { I18n.t(array_key)[array_no] }
+      I18n.with_locale(locale) { I18n.t(array_key, default: [])[array_no] }
     else
-      I18n.with_locale(locale) { I18n.t(@key) }
+      I18n.with_locale(locale) { I18n.t(@key, default: nil, fallback: false) }
     end
   end
 
   def file_line_content?
     return true if @full_path && @line_no && File.exist?(@full_path)
+
     false
   end
 

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

@@ -1,6 +1,6 @@
 <% content_for(:header_title) { "Duplicates" } %>
 
-<%= simple_form_for :duplicates do |f| %>
+<%= form_tag do %>
   <% count = 0 %>
 
   <div class="panel panel-default">
@@ -46,7 +46,7 @@
   <% if count > 0 %>
     <div class="panel panel-default">
       <div class="panel-body">
-        <%= f.button :submit, "Delete duplicates" %>
+        <input class="btn btn-primary" type="submit" value="Delete duplicates" />
       </div>
     </div>
   <% end %>

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

@@ -14,10 +14,15 @@
     </div>
   </div>
   <div class="panel-body">
-    <%= 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]}, autofocus: true %>
-      <%= f.button :submit, "Filter", class: ["btn", "btn-primary"] %>
-    <% end %>
+    <form method="get">
+      <div class="form-group">
+        <label for="q_translation_key_key_cont">
+          Key contains
+        </label>
+        <input class="form-control" id="q_translation_key_key_cont" name="q[translation_key_key_cont]" value="<%= params.dig(:q, :translation_key_key_cont) %>" />
+      </div>
+      <input class="btn btn-primary" type="submit" value="filter" />
+    </form>
   </div>
 </div>
 

data/app/views/awesome_translations/handler_translations/index.html.erb

@@ -7,12 +7,27 @@
     </div>
   </div>
   <div class="panel-body">
-    <%= simple_search_form_for @ransack do |f| %>
-      <%= f.input :translation_key_key_cont, label: "Key", autofocus: true %>
-      <%= f.input :handler_name_cont %>
-      <%= f.input :group_name_cont %>
-      <%= f.button :submit, "Filter", class: ["btn", "btn-primary"] %>
-    <% end %>
+    <form method="get">
+      <div class="form-group">
+        <label for="q_translation_key_key_cont">
+          Key contains
+        </label>
+        <input class="form-control" id="q_translation_key_key_cont" name="q[translation_key_key_cont]" value="<%= params.dig(:q, :translation_key_key_cont) %>" />
+      </div>
+      <div class="form-group">
+        <label for="q_handler_name_cont">
+          Handler name contains
+        </label>
+        <input class="form-control" id="q_handler_name_cont" name="q[handler_name_cont]" value="<%= params.dig(:q, :handler_name_cont) %>" />
+      </div>
+      <div class="form-group">
+        <label for="q_group_name_cont">
+          Group name contains
+        </label>
+        <input class="form-control" id="q_group_name_cont" name="q[group_name_cont]" value="<%= params.dig(:q, :group_name_cont) %>" />
+      </div>
+      <input class="btn btn-primary" type="submit" value="Filter" />
+    </form>
   </div>
 </div>
 

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

@@ -14,20 +14,43 @@
     </div>
   </div>
   <div class="panel-body">
-    <%= simple_search_form_for @ransack, url: @handler do |f| %>
+    <form method="get">
       <div class="row">
         <div class="col-md-4">
-          <%= f.input :name_cont, autofocus: true %>
+          <div class="form-group">
+            <label for="q_name_cont">
+              Name contains
+            </label>
+            <input class="form-control" id="q_name_cont" name="q[name_cont]" type="text" value="<%= params.dig(:q, :name_cont) %>" />
+          </div>
         </div>
         <div class="col-md-4">
-          <%= f.input :with_translations, label: "With translations", collection: with_translations_collection %>
+          <div class="form-group">
+            <label for="q_with_translations">
+              With translations
+            </label>
+            <select class="form-control" id="q_with_translations" name="q[with_translations]">
+              <option />
+              <%= options_for_select(with_translations_collection, params.dig(:q, :with_translations)) %>
+            </select>
+          </div>
         </div>
         <div class="col-md-4">
-          <%= f.input :with_missing_translations, label: "Missing translations", collection: with_missing_translations_collection %>
+          <div class="form-group">
+            <label for="q_with_missing_translations">
+              Missing translations
+            </label>
+
+            <select class="form-control" name="q[with_missing_translations]" id="q_with_missing_translations">
+              <option />
+              <%= options_for_select(with_missing_translations_collection, params.dig(:q, :with_missing_translations)) %>
+            </select>
+          </div>
         </div>
       </div>
-      <%= f.button :submit, "Filter", class: ["btn", "btn-primary"] %>
-    <% end %>
+
+      <input class="btn btn-primary" value="Filter" type="submit" />
+    </form>
   </div>
 </div>
 

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

@@ -1,6 +1,6 @@
 <% content_for(:header_title) { "Movals" } %>
 
-<%= simple_form_for :movals do |f| %>
+<%= form_tag do %>
   <% count = 0 %>
 
   <div class="panel panel-default">
@@ -46,7 +46,7 @@
   <% if count > 0 %>
     <div class="panel panel-default">
       <div class="panel-body">
-        <%= f.button :submit, "Move" %>
+        <input class="btn btn-primary" type="submit" value="Move" />
       </div>
     </div>
   <% end %>

data/lib/awesome_translations.rb

@@ -11,6 +11,6 @@ module AwesomeTranslations
   end
 
   def self.load_object_extensions
-    ::Object.__send__(:include, AwesomeTranslations::ObjectExtensions)
+    ::Object.include AwesomeTranslations::ObjectExtensions
   end
 end

data/lib/awesome_translations/cache_database_generator.rb

@@ -74,7 +74,7 @@ class AwesomeTranslations::CacheDatabaseGenerator
   end
 
   def cache_yml_translations
-    cache_translations_in_dir(Rails.root.join("config", "locales"))
+    cache_translations_in_dir(Rails.root.join("config/locales"))
   end
 
   def cache_handler_translations
@@ -86,7 +86,7 @@ class AwesomeTranslations::CacheDatabaseGenerator
   end
 
   def self.database_path
-    @database_path ||= Rails.root.join("db", "awesome_translations.sqlite3").to_s
+    @database_path ||= Rails.root.join("db/awesome_translations.sqlite3").to_s
   end
 
   def database_path

data/lib/awesome_translations/cache_database_generator/group.rb

@@ -13,7 +13,7 @@ class AwesomeTranslations::CacheDatabaseGenerator::Group < BazaModels::Model
   end
 
   def at_group
-    @at_group ||= AwesomeTranslations::Group.find_by_handler_and_id(at_handler, identifier)
+    @at_group ||= AwesomeTranslations::Group.find_by(handler: at_handler, id: identifier)
   end
 
   def to_param

data/lib/awesome_translations/cache_database_generator/handler_translation.rb

@@ -34,11 +34,13 @@ class AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation < BazaMode
 
   def array_key
     return unless (match = key.match(/\A(.+)\[(\d+)\]\Z/))
+
     match[1]
   end
 
   def array_no
     return unless (match = key.match(/\A(.+)\[(\d+)\]\Z/))
+
     match[2].to_i
   end
 end

data/lib/awesome_translations/config.rb

@@ -4,10 +4,10 @@ class AwesomeTranslations::Config
   def initialize
     @ignored_paths = [
       Rails.root.join(".git").to_s,
-      Rails.root.join("config", "locales").to_s,
+      Rails.root.join("config/locales").to_s,
       Rails.root.join("log").to_s,
-      Rails.root.join("public", "packs-test").to_s,
-      Rails.root.join("public", "packs").to_s,
+      Rails.root.join("public/packs-test").to_s,
+      Rails.root.join("public/packs").to_s,
       Rails.root.join("node_modules").to_s,
       Rails.root.join("tmp").to_s,
       Rails.root.join("storage").to_s,

data/lib/awesome_translations/engine.rb

@@ -1,7 +1,3 @@
-require "sass-rails"
-require "simple_form"
-require "simple_form_ransack"
-
 module AwesomeTranslations; end
 
 class AwesomeTranslations::Engine < ::Rails::Engine

data/lib/awesome_translations/erb_inspector.rb

@@ -34,6 +34,7 @@ private
 
     Dir.foreach(full_path) do |file|
       next if file == "." || file == ".."
+
       file_path = path.clone
       file_path << "/" unless file_path.empty?
       file_path << file

data/lib/awesome_translations/global_translator.rb

@@ -1,28 +1,13 @@
 class AwesomeTranslations::GlobalTranslator
-  RUBY_2 = RUBY_VERSION.starts_with?("2")
-
   def self.call_information(caller_number)
-    if RUBY_2
-      # This is much faster than the other solution
-      call = caller_locations(caller_number + 2, caller_number + 2).first
-
-      {
-        method: call.label,
-        path: call.absolute_path,
-        line_no: call.lineno
-      }
-    else
-      call = caller[caller_number + 1]
-      file_info = call.match(/\A(.+):(\d+):in `(.+?)'/)
-
-      raise "Could not get previous file name from: #{caller[0]}" if file_info[1].blank?
-
-      {
-        method: file_info[3],
-        path: file_info[1],
-        line_no: file_info[2]
-      }
-    end
+    # This is much faster than the other solution
+    call = caller_locations(caller_number + 2, caller_number + 2).first
+
+    {
+      method: call.label,
+      path: call.absolute_path,
+      line_no: call.lineno
+    }
   end
 
   def self.translate(key, args, &blk)
@@ -99,6 +84,7 @@ private
         root = engine.root.to_s
 
         next unless @_previous_file.starts_with?(root)
+
         @_previous_file = @_previous_file.gsub(/\A#{Regexp.escape(root)}\//, "")
         break
       end

data/lib/awesome_translations/handlers.rb

@@ -11,6 +11,7 @@ class AwesomeTranslations::Handlers
 
         const_name_snake = "#{match[1]}_handler"
         next if const_name_snake == "base_handler"
+
         const_name_camel = StringCases.snake_to_camel(const_name_snake)
 
         handler = AwesomeTranslations::Handler.new(

data/lib/awesome_translations/handlers/file_handler.rb

@@ -27,6 +27,7 @@ class AwesomeTranslations::Handlers::FileHandler < AwesomeTranslations::Handlers
       file = erb_inspector.file(group.data.fetch(:root_path), group.data.fetch(:file_path))
       file.translations.each do |translation|
         next if translations_found.key?(translation.full_key)
+
         translations_found[translation.full_key] = true
         yielder << translation.model
       end

data/lib/awesome_translations/handlers/model_handler.rb

@@ -12,7 +12,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 }
+      model_inspector = AwesomeTranslations::ModelInspector.model_classes.find { |model_inspector_i| model_inspector_i.clazz.name == group.name }
       raise "No inspector by that name: #{group.name}" unless model_inspector
 
       model_names(model_inspector).each { |translation| yielder << translation }

data/lib/awesome_translations/handlers/validations_handler.rb

@@ -12,7 +12,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 }
+      model_inspector = AwesomeTranslations::ModelInspector.model_classes.find { |model_inspector_i| model_inspector_i.clazz.name == group.name }
       raise "No inspector by that name: #{group.name}" unless model_inspector
 
       model_inspector.clazz._validators.each do |attribute_name, validators|