awesome_translations 0.0.57 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9b94ef91440571e20b5449c6ee2cbcde310a1a6f
-  data.tar.gz: 1e7a3cbe89d9fe1b2a93d6368bcbdcf4f8ba4c6c
+SHA256:
+  metadata.gz: 8982155c60a5db849fe01b8007859a18edf3efb1895417bfef73e4dd525a317e
+  data.tar.gz: 58e47453d01189a483d665074ab374e770dd8fd1d96878626bbae5de64bcb0a4
 SHA512:
-  metadata.gz: e0178ff4789c64a1a567e2c1f19f3e658fe7654b12f3a7ce39b588e261116473892673bb0ecf5edb4b10d61d96a1315855391f8bc20ecb6aa4d2e0bc17d45234
-  data.tar.gz: 48e1da2055e05f3d8052f831e07bce331e0b774fe9e7879381479bb9fa693d9985d953c873760ec36444c7f91dba59620f1fc6a8a0b9464f1b4e963a54f6c8df
+  metadata.gz: 87904a819f4834458e15cf6c0d470104e2dbb380d9a5cbef0b3d31eb560905b395c0ae0cc7e767f430819ce2766d661f9d2d347b7830397546ca1e89e47dba9f
+  data.tar.gz: 91964d3d6c9916fe493d596f554792e2fa29c6eed492546123fc9483cc0496d780d1d51d22adde6de5513c95da56e98c6f59f67e829f05fa388749a408f44579

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/clean_ups_controller.rb

@@ -26,7 +26,7 @@ private
       .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(handler_translations: {id: nil})
       .where("translation_values.file_path LIKE '%/config/locales/awesome_translations/%'")
   end
 end

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,24 +17,27 @@ 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
 
   def save!
     dir = File.dirname(@file)
     FileUtils.mkdir_p(dir) unless File.exist?(dir)
-    File.open(@file, "w") { |fp| fp.write("#{@locale}:\n") } unless File.exist?(@file)
+    File.write(@file, "#{@locale}:\n") unless File.exist?(@file)
 
     translations = YAML.safe_load(File.read(@file))
     translations ||= {}
@@ -45,7 +48,7 @@ class AwesomeTranslations::TranslatedValue
     update_models
 
     I18n.load_path << file unless I18n.load_path.include?(file)
-    File.open(file, "w") { |fp| fp.write(YAML.dump(translations)) }
+    File.write(file, YAML.dump(translations))
   end
 
 private

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/cache_database_generator/group.rb

@@ -3,8 +3,15 @@ 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"
+  has_many :handler_translations,
+    dependent: :destroy,
+    foreign_key: "group_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation"
+
+  has_many :translation_keys,
+    dependent: :destroy,
+    foreign_key: "group_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
 
   validates_presence_of :name, :handler
 
@@ -13,7 +20,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.rb

@@ -1,6 +1,13 @@
 class AwesomeTranslations::CacheDatabaseGenerator::Handler < BazaModels::Model
-  has_many :groups, dependent: :destroy, foreign_key: "handler_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::Group"
-  has_many :handler_translations, dependent: :destroy, foreign_key: "handler_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation"
+  has_many :groups,
+    dependent: :destroy,
+    foreign_key: "handler_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::Group"
+
+  has_many :handler_translations,
+    dependent: :destroy,
+    foreign_key: "handler_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation"
 
   validates_presence_of :name
 

data/lib/awesome_translations/cache_database_generator/handler_translation.rb

@@ -1,7 +1,15 @@
 class AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation < BazaModels::Model
-  belongs_to :group, foreign_key: "group_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::Group"
-  belongs_to :handler, foreign_key: "handler_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::Handler"
-  belongs_to :translation_key, foreign_key: "translation_key_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
+  belongs_to :group,
+    foreign_key: "group_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::Group"
+
+  belongs_to :handler,
+    foreign_key: "handler_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::Handler"
+
+  belongs_to :translation_key,
+    foreign_key: "translation_key_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
 
   validates_presence_of :handler, :translation_key
 
@@ -34,11 +42,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/cache_database_generator/translation_key.rb

@@ -1,15 +1,15 @@
 class AwesomeTranslations::CacheDatabaseGenerator::TranslationKey < BazaModels::Model
-  belongs_to :group, foreign_key: "group_id"
-  belongs_to :handler, foreign_key: "handler_id"
+  belongs_to :group, foreign_key: "group_id" # rubocop:disable Rails/RedundantForeignKey
+  belongs_to :handler, foreign_key: "handler_id" # rubocop:disable Rails/RedundantForeignKey
 
   has_many :handler_translations,
     dependent: :destroy,
-    foreign_key: "translation_key_id",
+    foreign_key: "translation_key_id", # rubocop:disable Rails/RedundantForeignKey
     class_name: "AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation"
 
   has_many :translation_values,
     dependent: :destroy,
-    foreign_key: "translation_key_id",
+    foreign_key: "translation_key_id", # rubocop:disable Rails/RedundantForeignKey
     class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationValue"
 
   validates_presence_of :group, :handler

data/lib/awesome_translations/cache_database_generator/translation_value.rb

@@ -1,5 +1,7 @@
 class AwesomeTranslations::CacheDatabaseGenerator::TranslationValue < BazaModels::Model
-  belongs_to :translation_key, foreign_key: "translation_key_id", class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
+  belongs_to :translation_key,
+    foreign_key: "translation_key_id", # rubocop:disable Rails/RedundantForeignKey
+    class_name: "AwesomeTranslations::CacheDatabaseGenerator::TranslationKey"
 
   validates_presence_of :translation_key
 

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/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/controller_translate_functionality.rb

@@ -7,8 +7,8 @@ module AwesomeTranslations::ControllerTranslateFunctionality
   end
 
   module Methods
-    def controller_t(key, args = {}, &blk)
-      AwesomeTranslations::GlobalTranslator.translate(key, translation_args: [args], caller_number: 1, action_in_key: false, &blk)
+    def controller_t(key, *args, **opts, &blk)
+      AwesomeTranslations::GlobalTranslator.translate(key, action_in_key: false, caller_number: 1, translation_args: args, translation_opts: opts, &blk)
     end
   end
 end

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/file_inspector.rb

@@ -50,19 +50,19 @@ class AwesomeTranslations::ErbInspector::FileInspector
 private
 
   def parse_content_liquid(line_no, line, translations_found, yielder)
-    line.scan(/\"([^\"]+?)\"\s+\|\s+t\s*(\%}|\}\}|\|)/) do |match|
+    line.scan(/"([^"]+?)"\s+\|\s+t\s*(%}|\}\}|\|)/) do |match|
       add_translation(line_no, "t", match[0], translations_found, yielder)
     end
 
-    line.scan(/\'([^\']+?)\'\s+\|\s+t\s*(\%}|\}\}|\|)/) do |match|
+    line.scan(/'([^']+?)'\s+\|\s+t\s*(%}|\}\}|\|)/) do |match|
       add_translation(line_no, "t", match[0], translations_found, yielder)
     end
 
-    line.scan(/\"([^\"]+?)\"\s+\|\s+val:\s*\"([^\"]+?)\"\s*,\s*(.+?)\s*\|\s+t\s*/) do |match|
+    line.scan(/"([^"]+?)"\s+\|\s+val:\s*"([^"]+?)"\s*,\s*(.+?)\s*\|\s+t\s*/) do |match|
       add_translation(line_no, "t", match[0], translations_found, yielder)
     end
 
-    line.scan(/'([^\"]+?)'\s+\|\s+val:\s*'([^\"]+?)'\s*,\s*(.+?)\s*\|\s+t\s*/) do |match|
+    line.scan(/'([^"]+?)'\s+\|\s+val:\s*'([^"]+?)'\s*,\s*(.+?)\s*\|\s+t\s*/) do |match|
       add_translation(line_no, "t", match[0], translations_found, yielder)
     end
   end

data/lib/awesome_translations/erb_inspector/translation_inspector.rb

@@ -27,7 +27,7 @@ class AwesomeTranslations::ErbInspector::TranslationInspector
   end
 
   def global?
-    !relative? && !key.include?(".")
+    !relative? && key.exclude?(".")
   end
 
   def relative?
@@ -49,16 +49,16 @@ private
         is_mailer = true
       elsif @full_key.start_with?("app/views/")
         # Remove "app/views" from view-translations since that doesn't get used in keys.
-        @full_key.gsub!(/\Aapp\/views\//, "")
+        @full_key.delete_prefix!("app/views/")
       elsif @full_key.start_with?("app/controllers")
         # Remove "app/controllers" from controller-translations since that doesn't get used in keys.
         @full_key.gsub!(/\Aapp\/controllers(\/?)/, "")
         is_controller = true
       elsif @full_key.start_with?("app/cells")
-        @full_key.gsub!(/\Aapp\/cells\//, "")
+        @full_key.delete_prefix!("app/cells/")
       elsif @full_key.start_with?("app/")
         # Remove "app" from controller- and helper-translations since that doesn't get used.
-        @full_key.gsub!(/\Aapp\//, "")
+        @full_key.delete_prefix!("app/")
       end
 
       @full_key.tr!("/", ".")
@@ -66,7 +66,7 @@ private
       @full_key << file_key(@file_path)
       @full_key << ".#{@last_method}" if (is_mailer || is_controller) && @last_method && @method != "controller_t"
       @full_key << "."
-      @full_key << @key.gsub(/\A\./, "")
+      @full_key << @key.delete_prefix(".")
     elsif @method == "I18n-js.t" || @method == "t" || @method == "helper_t" || @method == "controller_t"
       @full_key = @key
     else
@@ -81,10 +81,10 @@ private
     key = key.match(/\A(.+?)\./)[1]
 
     # Remove leading "_" from partials
-    key = key.gsub(/\A_/, "")
+    key.delete_prefix!("_")
 
     # Remove '_controller' from controllers
-    key = key.gsub(/_controller\Z/, "")
+    key.delete_suffix!("_controller")
 
     key
   end
@@ -92,7 +92,7 @@ private
   def generate_dir
     parts = %w[config locales awesome_translations]
 
-    key_parts = @full_key.split(".").reject(&:blank?)
+    key_parts = @full_key.split(".").compact_blank
     key_parts.pop
 
     @dir = Rails.root.join(*(parts + key_parts)).to_s

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