cruj_cruj_cruj_visagio 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce74d578d9c053b19922fc0ede3bc55f18ead413799ae59acd868d52cb1c1ae4
-  data.tar.gz: e1492be6699e682cf252a9e4693bb38717a7da1c1f1cf590952e3edd09a95aa5
+  metadata.gz: 897d93cc6090fdcf792337edfc8b4093554513608250d85bd862c6a5f441b8ad
+  data.tar.gz: 108e146fcfea55ddc1de41fdd057baba1950ca71c78107942882137c9bc3f4cb
 SHA512:
-  metadata.gz: fae9e50d46d085364adf3153518eaac4d13c41a7dea09c1a80261e344310933f43154efe1839740a3b63757431c01c8691c321edf7d0f54a3cce1447663b347f
-  data.tar.gz: e7ee1644a1e586b531eb718eda9aadc44add939d692e6c0d2da00415fe0dcbedd6b318169e2c103affa315963c0dd75f32bae1c61794f6062b69c9c585de08b6
+  metadata.gz: 7f0c69d085fdd6d10e541307f0849629ac140e74e06d97a6a0cabf7224aeb96620ca63dbccc0529811b03e563f990392543cd04a7194004f8f585565118bd120
+  data.tar.gz: e3caac92c7a2c21182f6cc0cc6211d296dc3b503cf97a08e237b031e18246c96a177957191279c593f2648aba3e3f069d9be206f063ff727811c78842feabca1

data/app/controllers/cruj_cruj_cruj_controller.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 class CrujCrujCrujController < ApplicationController
   include ActionView::Helpers::NumberHelper
 
-  before_action :before_index , only: [:index]
-  before_action :before_new   , only: [:new]
+  before_action :before_index, only: [:index]
+  before_action :before_new, only: [:new]
   before_action :before_create, only: [:create]
-  before_action :before_edit  , only: [:edit]
+  before_action :before_edit, only: [:edit]
   before_action :before_update, only: [:update]
   before_action :before_destroy, only: [:destroy]
 
   before_action :find_all_resources, only: [:index]
-  before_action :build_resource    , only: [:new, :create]
-  before_action :find_resource     , only: [:edit, :update, :destroy]
+  before_action :build_resource, only: %i[new create]
+  before_action :find_resource, only: %i[edit update destroy]
 
   helper_method :namespace_url, :namespaces, :model_class, :snake_case_model_name,
                 :resource_url,
@@ -20,6 +22,7 @@ class CrujCrujCrujController < ApplicationController
                 :filter_for
 
   def index; end
+
   def new; end
 
   def create
@@ -52,12 +55,13 @@ class CrujCrujCrujController < ApplicationController
     @q.sorts = default_sort if @q.sorts.blank?
 
     filename = CrujCrujCruj::Services::ImportRules.export_template(form_fields, @q.result)
-    send_file(filename, filename: l(:export_template_filename), type: "application/vnd.ms-excel")
+    send_file(filename, type: 'application/vnd.ms-excel')
   end
 
   def import
     if params[:file].blank?
-      redirect_to url_for(action: :index, controller: params[:controller]), {flash: {error: l(:no_file_to_import_error_message)}}
+      redirect_to url_for(action: :index, controller: params[:controller]),
+                  { flash: { error: l(:no_file_to_import_error_message) } }
       return
     end
 
@@ -67,19 +71,24 @@ class CrujCrujCrujController < ApplicationController
       redirect_to url_for(action: :index, controller: params[:controller]), notice: l(:import_success_message)
       return
     end
-    redirect_to url_for(action: :index, controller: params[:controller]), flash: { import_errors: errors.join('<br />') }
+    redirect_to url_for(action: :index, controller: params[:controller]),
+                flash: { import_errors: errors.join('<br />') }
   end
 
   protected
 
-  def before_index 
-    params["q"] && params["q"].permit!
+  def before_index
+    params['q'] && params['q'].permit!
   end
 
   def before_new; end
+
   def before_create; end
+
   def before_edit; end
+
   def before_update; end
+
   def before_destroy; end
 
   def find_all_resources
@@ -140,7 +149,7 @@ class CrujCrujCrujController < ApplicationController
 
   def resource_url(resource)
     if Rails::VERSION::MAJOR >= 4
-      namespace_url + [resource] + [ resource.respond_to?(:type) ? {"type" => resource.type} : {} ]
+      namespace_url + [resource] + [resource.respond_to?(:type) ? { 'type' => resource.type } : {}]
     else
       namespace_url + [resource]
     end
@@ -151,7 +160,7 @@ class CrujCrujCrujController < ApplicationController
   end
 
   def exclude_index_attributes
-    %w(^id$ _id created_at updated_at)
+    %w[^id$ _id created_at updated_at]
   end
 
   def index_filter_attributes
@@ -159,7 +168,9 @@ class CrujCrujCrujController < ApplicationController
   end
 
   def default_sort
-    index_filter_attributes.map { |ifa| ifa.is_a?(Array) ? "#{ifa[0].split('_')[0..-2].join("_")} asc" : "#{ifa.split('_')[0..-2].join("_")} asc" }
+    index_filter_attributes.map do |ifa|
+      ifa.is_a?(Array) ? "#{ifa[0].split('_')[0..-2].join('_')} asc" : "#{ifa.split('_')[0..-2].join('_')} asc"
+    end
   end
 
   def exclude_index_filter_attributes
@@ -176,11 +187,11 @@ class CrujCrujCrujController < ApplicationController
     else
       possible_values[send("format_field_#{field.class.name.downcase}", field)]
     end
-  rescue
+  rescue StandardError
     field.name
   end
 
-  def format_field_nilclass(field)
+  def format_field_nilclass(_field)
     ''
   end
 
@@ -188,18 +199,18 @@ class CrujCrujCrujController < ApplicationController
     field
   end
 
-  def format_field_trueclass(field)
+  def format_field_trueclass(_field)
     t(:true_field)
   end
 
-  def format_field_falseclass(field)
+  def format_field_falseclass(_field)
     t(:false_field)
   end
 
   def format_field_fixnum(field)
     number_with_delimiter(field)
   end
-  
+
   def format_field_integer(field)
     number_with_delimiter(field)
   end
@@ -210,13 +221,13 @@ class CrujCrujCrujController < ApplicationController
 
   def filter_for(attribute)
     if attribute.is_a? Array
-      send("filter_for_enum", attribute[0], attribute[1])
+      send('filter_for_enum', attribute[0], attribute[1])
     elsif column = model_class.columns_hash[attribute.to_s]
       send("filter_for_#{column.type}", attribute)
     else
       send("filter_for_#{attribute}")
     end
-  rescue
+  rescue StandardError
     "#{attribute}_cont"
   end
 
@@ -229,47 +240,47 @@ class CrujCrujCrujController < ApplicationController
   end
 
   def filter_for_project
-    "project_name_cont"
+    'project_name_cont'
   end
 
   def filter_for_tracker
-    "tracker_name_cont"
+    'tracker_name_cont'
   end
 
   def filter_for_group
-    "group_lastname_cont"
+    'group_lastname_cont'
   end
 
   def filter_for_status
-    "status_name_cont"
+    'status_name_cont'
   end
 
   def filter_for_issue_status
-    "issue_status_name_cont"
+    'issue_status_name_cont'
   end
 
   def filter_for_status_to
-    "status_to_name_cont"
+    'status_to_name_cont'
   end
 
   def filter_for_status_from
-    "status_from_name_cont"
+    'status_from_name_cont'
   end
 
   def filter_for_custom_field
-    "custom_field_name_cont"
+    'custom_field_name_cont'
   end
 
   def filter_for_author
-    "author_firstname_or_author_lastname_cont"
+    'author_firstname_or_author_lastname_cont'
   end
 
   def filter_for_principal
-    "principal_firstname_or_principal_lastname_cont"
+    'principal_firstname_or_principal_lastname_cont'
   end
 
   def filter_for_role
-    "role_name_cont"
+    'role_name_cont'
   end
 
   def filter_for_enum(attribute, values)

data/config/locales/en.yml

@@ -9,6 +9,9 @@ en:
   label_name: Name
   label_type: Type
 
+  no_file_to_import_error_message: No file was uploaded. Please try again after uploading a file.
+  column_invalid_rows: "The column %{column} was invalid in the following rows: %{rows}"
+
   project_name_cont: Project Name contains
   tracker_name_cont: Tracker Name contains
   custom_field_name_cont: Custom Field Name contains

data/config/locales/pt-BR.yml

@@ -9,6 +9,9 @@ pt-BR:
   label_name: Nome
   label_type: Tipo
 
+  no_file_to_import_error_message: Nenhum arquivo foi submetido. Tente novamente depois de escolher um arquivo.
+  column_invalid_rows: "A coluna %{column} está inválida nas seguintes fileiras: %{rows}"
+
   project_name_cont: Nome do projeto contém
   tracker_name_cont: Nome do tipo da tarefa contém
   custom_field_name_cont: Nome do campo customizado contém

data/lib/cruj_cruj_cruj/services/import_rules.rb

@@ -1,8 +1,8 @@
-#encoding: utf-8
+# frozen_string_literal: true
+
 module CrujCrujCruj
   module Services
     class ImportRules
-
       def self.export_template(fields, data)
         package          = Axlsx::Package.new
         workbook         = package.workbook
@@ -10,7 +10,8 @@ module CrujCrujCruj
         parameters_sheet_name = 'PARAMETERS'
 
         workbook.add_worksheet(name: 'TEMPLATE') do |sheet|
-          title = sheet.styles.add_style(bg_color: 'FF007E7A', fg_color: 'FFFFFFFF', sz: 12,  b: true, border: {style: :thin, color: 'FF000000'})
+          title = sheet.styles.add_style(bg_color: 'FF007E7A', fg_color: 'FFFFFFFF', sz: 12, b: true,
+                                         border: { style: :thin, color: 'FF000000' })
 
           fields.each_with_index do |field, idx|
             validation  = field[:data_validation][:validation]
@@ -18,10 +19,16 @@ module CrujCrujCruj
             add_data_validation(sheet, idx + 1, validation, allow_blank, parameters_sheet_name) if validation
           end
 
-          sheet.add_row (([:id] |fields.map { |field| field[:field_name] }).map { |t| I18n.t("#{t}_label") }), style: title
+          sheet.add_row (([:id] | fields.map do |field|
+                                    field[:field_name]
+                                  end).map { |t| I18n.t("#{t}_label") }), style: title
 
-          data.map { |resource| [resource.id].concat(fields.map { |field| resource_field_value(resource, field) }) }.each do |row|
-            sheet.add_row row, types: row.map{ |_| :string }
+          data.map do |resource|
+            [resource.id].concat(fields.map do |field|
+                                   resource_field_value(resource, field)
+                                 end)
+          end.each do |row|
+            sheet.add_row row, types: row.map { |_| :string }
           end
         end
 
@@ -36,37 +43,45 @@ module CrujCrujCruj
         spreadsheet = Roo::Spreadsheet.open(file.path, extension: :xlsx)
 
         errors = []
-        
-        if Rails::VERSION::MAJOR < 4
-          invalid_rows = validate_id_array(spreadsheet, clazz)
-        else
-          invalid_rows = validate_id(spreadsheet, clazz)
+
+        invalid_rows = if Rails::VERSION::MAJOR < 4
+                         validate_id_array(spreadsheet, clazz)
+                       else
+                         validate_id(spreadsheet, clazz)
+                       end
+        unless invalid_rows.blank?
+          errors << I18n.t(:column_invalid_rows, column: :id,
+                                                 rows: invalid_rows.first(25).join(', '))
         end
-        errors << I18n.t(:column_invalid_rows, column: :id, rows: invalid_rows.first(25).join(', ')) unless invalid_rows.blank?
 
         fields.each_with_index do |field, idx|
           col = idx + 1
           unless field[:data_validation][:allow_blank]
             invalid_rows = validate_not_blank(col, spreadsheet)
-            errors << I18n.t(:column_invalid_rows, column: field[:field_name], rows: invalid_rows.first(25).join(', ')) unless invalid_rows.blank?
+            unless invalid_rows.blank?
+              errors << I18n.t(:column_invalid_rows, column: field[:field_name],
+                                                     rows: invalid_rows.first(25).join(', '))
+            end
           end
 
-          if field[:data_validation][:validation]
-            invalid_rows = validate_in_array(col, field_validation_values(field), spreadsheet)
-            errors << I18n.t(:column_invalid_rows, column: field[:field_name], rows: invalid_rows.first(25).join(', ')) unless invalid_rows.blank?
+          next unless field[:data_validation][:validation]
+
+          invalid_rows = validate_in_array(col, field_validation_values(field), spreadsheet)
+          unless invalid_rows.blank?
+            errors << I18n.t(:column_invalid_rows, column: field[:field_name],
+                                                   rows: invalid_rows.first(25).join(', '))
           end
         end
 
         return errors unless errors.blank?
 
-
         (2..spreadsheet.last_row).each do |i|
           row = spreadsheet.row(i)
           id  = row[0]
           resource = id ? clazz.find(id) : clazz.new
 
           fields.each_with_index do |field, idx|
-            resource.send("#{field[:field_name]}=", row_value(row, idx+1, field, spreadsheet))
+            resource.send("#{field[:field_name]}=", row_value(row, idx + 1, field, spreadsheet))
             resource.save!
           end
         end
@@ -74,13 +89,11 @@ module CrujCrujCruj
         {}
       end
 
-      protected
-
-
       def self.add_data_validation(sheet, column_number, validation, allowBlank, parameters_sheet_name)
         column_letter = number2column(column_number)
         values_size   = validation.is_a?(Array) ? validation.size : validation[:clazz].all.count
-        sheet.add_data_validation("#{column_letter}2:#{column_letter}1048576", type: :list, allowBlank: allowBlank, formula1: "#{parameters_sheet_name}!$#{column_letter}$2:$#{column_letter}$#{values_size+1}")
+        sheet.add_data_validation("#{column_letter}2:#{column_letter}1048576", type: :list, allowBlank: allowBlank,
+                                                                               formula1: "#{parameters_sheet_name}!$#{column_letter}$2:$#{column_letter}$#{values_size + 1}")
       end
 
       def self.create_validations(fields, workbook, parameters_sheet_name)
@@ -91,7 +104,7 @@ module CrujCrujCruj
 
           cols_values.map { |values| values.size }.max.times do |i|
             row = cols_values.map { |v| v[i] }
-            sheet.add_row row, types: row.map{ |_| :string }
+            sheet.add_row row, types: row.map { |_| :string }
           end
         end
       end
@@ -120,7 +133,7 @@ module CrujCrujCruj
       end
 
       def self.number2column(number)
-        Hash.new {|hash,key| hash[key] = hash[key - 1].next }.merge({0 => "A"})[number]
+        Hash.new { |hash, key| hash[key] = hash[key - 1].next }.merge({ 0 => 'A' })[number]
       end
 
       def self.validate_id(spreadsheet, clazz)
@@ -133,7 +146,7 @@ module CrujCrujCruj
 
       def self.validate_not_blank(col, spreadsheet)
         (2..spreadsheet.last_row)
-          .map { |i| {i => !spreadsheet.row(i)[col].blank? } }
+          .map { |i| { i => !spreadsheet.row(i)[col].blank? } }
           .select { |e| !e.values.first }
           .map { |e| e.keys.first }
       end
@@ -146,12 +159,19 @@ module CrujCrujCruj
       end
 
       def self.fetch(row, col, spreadsheet)
-        spreadsheet.celltype(row, col + 1) == :float ? spreadsheet.send(:cell_to_csv, row, col + 1, spreadsheet.default_sheet) : row[col]
+        if spreadsheet.celltype(row,
+                                col + 1) == :float
+          spreadsheet.send(:cell_to_csv, row, col + 1,
+                           spreadsheet.default_sheet)
+        else
+          row[col]
+        end
       end
 
       def self.row_value(row, col, field, spreadsheet)
         if field[:data_validation][:validation] && !field[:data_validation][:validation].is_a?(Array)
-          field[:data_validation][:validation][:clazz].send("find_by_#{field[:data_validation][:validation][:field]}", fetch(row, col, spreadsheet))
+          field[:data_validation][:validation][:clazz].send("find_by_#{field[:data_validation][:validation][:field]}",
+                                                            fetch(row, col, spreadsheet))
         else
           fetch(row, col, spreadsheet)
         end

data/lib/cruj_cruj_cruj/version.rb

@@ -1,3 +1,3 @@
 module CrujCrujCruj
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cruj_cruj_cruj_visagio
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Visagio
@@ -107,7 +107,6 @@ files:
 - app/assets/javascripts/cruj_cruj_cruj/application.js
 - app/assets/stylesheets/cruj_cruj_cruj/application.css
 - app/controllers/cruj_cruj_cruj_controller.rb
-- app/helpers/search_helper.rb
 - app/views/cruj_cruj_cruj/_filters.html.erb
 - app/views/cruj_cruj_cruj/_import_export_template.html.erb
 - app/views/cruj_cruj_cruj/_list_table.html.erb