worker_tools 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f8781038bd01108da06e6c7449cb29faaa45fdd8
-  data.tar.gz: eed78607ccda5d5b0ed7ad5030a42b8dc286fcea
+SHA256:
+  metadata.gz: a1660c965e25b8331d1aa6a7643f5bee9f0441c02a6593ce71028c7e89ea4c14
+  data.tar.gz: 06c98881c9cf9a1f8c1312a8fbbff6bdc3c4471203cdb0678f89cd8570e4c8e4
 SHA512:
-  metadata.gz: cc5633debc66182adff1af028ae0034937be1d369abbaabdbc731da5e792480db6074b602e951efaf4ec1889d0586fd175b44df4945eff8819d637cdfec171c8
-  data.tar.gz: d6dcb02514729dcf459df1eaee5f40df1a792731336aea56a8b92541418163227b17144174285075e5365f98546c0a2607534c5b62845bee1e0982c94dd9bb39
+  metadata.gz: d3b7e56590008364884c685285be80264c435ff4b6129649e9c8f1b26ae01d4655c352390896cf2e5ca8726ba537933812cf15eedc6cae73be8de60d8e8a1178
+  data.tar.gz: fcb3b2479c852071296443df0cdca53aba6ace592231a14011436013b52591650c2b558d0955c067ef37a4ae16bce4f873f62fbe9681841ba047b686ede87544

data/.travis.yml

@@ -2,4 +2,5 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.1
-before_install: gem install bundler -v 1.14.6
+  - 2.7.0
+before_install: gem install bundler -v 2.1.4

data/README.md

@@ -124,10 +124,6 @@ If you only want the logger functions, without worrying about persisting a model
   end
 ```
 
-## Module RocketchatErrorNotifier
-
-[rocketchat_error_notifier](/lib/worker_tools/rocketchat_error_notifier.rb)
-
 ## Module SlackErrorNotifier
 
 [slack_error_notifier](/lib/worker_tools/slack_error_notifier.rb)
@@ -212,4 +208,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/i22-di
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/worker_tools/basics.rb

@@ -42,6 +42,7 @@ module WorkerTools
       self.class.read_wrappers.map do |wrapper|
         symbolized_method = "with_wrapper_#{wrapper}".to_sym
         raise "Missing wrapper #{wrapper}" unless respond_to?(symbolized_method)
+
         symbolized_method
       end
     end
@@ -60,7 +61,7 @@ module WorkerTools
     end
 
     def finalize
-      model.update_attributes!(
+      model.update!(
         state: 'complete',
         information: information
       )
@@ -76,6 +77,7 @@ module WorkerTools
 
     def with_wrappers(wrapper_symbols, &block)
       return yield if wrapper_symbols.blank?
+
       current_wrapper_symbol = wrapper_symbols.shift
       send(current_wrapper_symbol) { with_wrappers(wrapper_symbols, &block) }
     end
@@ -87,6 +89,7 @@ module WorkerTools
       return @model_id if @model_id.is_a?(model_class)
       return model_class.find(@model_id) if @model_id
       raise 'Model not available' unless create_model_if_not_available
+
       t = model_class.new
       t.kind = model_kind if t.respond_to?(:kind=)
       t.save!(validate: false)

data/lib/worker_tools/csv_input.rb

@@ -54,6 +54,7 @@ module WorkerTools
     def csv_input_columns_check(csv_rows_enum)
       # override and return true if you do not want this check to be performed
       return csv_input_columns_array_check(csv_rows_enum) if csv_input_columns.is_a?(Array)
+
       csv_input_columns_hash_check(csv_rows_enum)
     end
 
@@ -61,6 +62,7 @@ module WorkerTools
       expected_columns_length = csv_input_columns.length
       actual_columns_length = csv_rows_enum.first.length
       return if expected_columns_length == actual_columns_length
+
       raise "The number of columns (#{actual_columns_length}) is not the expected (#{expected_columns_length})"
     end
 
@@ -105,6 +107,7 @@ module WorkerTools
     #     =>  { tenant: 1, area: 0}
     def csv_input_mapping_order(header_names)
       return csv_input_columns.map.with_index { |n, i| [n, i] }.to_h if csv_input_columns.is_a?(Array)
+
       csv_input_mapping_order_for_hash(header_names)
     end
 
@@ -115,6 +118,7 @@ module WorkerTools
         h[k] = filtered_column_names.index { |n| case n when matchable then true end }
       end
       return mapping unless csv_input_include_other_columns
+
       csv_input_mapping_order_with_other_columns(mapping, filtered_column_names)
     end
 
@@ -131,7 +135,7 @@ module WorkerTools
     end
 
     def csv_rows_enum
-      @csv_rows_enum ||= CSV.foreach(csv_input_file_path, csv_input_csv_options)
+      @csv_rows_enum ||= CSV.foreach(csv_input_file_path, **csv_input_csv_options)
     end
 
     def csv_input_headers_present
@@ -168,12 +172,14 @@ module WorkerTools
 
         @rows_enum.with_index.each do |values, index|
           next if index.zero? && @headers_present
+
           yield values_to_row(values)
         end
       end
 
       def values_to_row(values)
         return values_to_row_according_to_mapping(values) if @mapping_order
+
         values_to_row_according_to_position(values)
       end
 

data/lib/worker_tools/recorder.rb

@@ -45,11 +45,13 @@ module WorkerTools
 
     def format_log_message(message)
       return error_to_text(message, log_error_trace_lines) if message.is_a?(Exception)
+
       message
     end
 
     def format_info_message(message)
       return error_to_text(message, info_error_trace_lines) if message.is_a?(Exception)
+
       message
     end
 

data/lib/worker_tools/slack_error_notifier.rb

@@ -83,7 +83,7 @@ module WorkerTools
 
     def slack_error_notifier_attachments_fields
       [
-        { title: 'Application', value: Rails.application.class.parent_name, short: true },
+        { title: 'Application', value: Rails.application.class.module_parent_name, short: true },
         { title: 'Environment', value: Rails.env, short: true }
       ]
     end

data/lib/worker_tools/version.rb

@@ -1,3 +1,3 @@
 module WorkerTools
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/worker_tools/xlsx_input.rb

@@ -59,6 +59,7 @@ module WorkerTools
     def xlsx_input_columns_check(xlsx_rows_enum)
       # override and return true if you do not want this check to be performed
       return xlsx_input_columns_array_check(xlsx_rows_enum) if xlsx_input_columns.is_a?(Array)
+
       xlsx_input_columns_hash_check(xlsx_rows_enum)
     end
 
@@ -66,6 +67,7 @@ module WorkerTools
       expected_columns_length = xlsx_input_columns.length
       actual_columns_length = xlsx_rows_enum.first.length
       return if expected_columns_length == actual_columns_length
+
       raise "The number of columns (#{actual_columns_length}) is not the expected (#{expected_columns_length})"
     end
 
@@ -97,6 +99,7 @@ module WorkerTools
     #     =>  { tenant: 1, area: 0}
     def xlsx_input_mapping_order(header_names)
       return xlsx_input_columns.map.with_index { |n, i| [n, i] }.to_h if xlsx_input_columns.is_a?(Array)
+
       xlsx_input_mapping_order_for_hash(header_names)
     end
 
@@ -107,6 +110,7 @@ module WorkerTools
         h[k] = filtered_column_names.index { |n| case n when matchable then true end }
       end
       return mapping unless xlsx_input_include_other_columns
+
       xlsx_input_mapping_order_with_other_columns(mapping, filtered_column_names)
     end
 
@@ -155,6 +159,7 @@ module WorkerTools
 
         @rows_enum.with_index.each do |values, index|
           next if index.zero? # headers
+
           yield values_to_row(values)
         end
       end

data/lib/worker_tools/xlsx_output.rb

@@ -61,6 +61,7 @@ module WorkerTools
 
     def xlsx_insert_headers(spreadsheet, headers)
       return unless headers
+
       iterator =
         if headers.is_a? Hash
           headers.values
@@ -83,6 +84,7 @@ module WorkerTools
     def xlsx_iterators(iterable, compare_hash = nil)
       if iterable.is_a? Hash
         raise 'parameter compare_hash should be a hash, too.' if compare_hash.nil? || !compare_hash.is_a?(Hash)
+
         iterable.values_at(*compare_hash.keys)
       else
         iterable
@@ -94,6 +96,7 @@ module WorkerTools
 
       xlsx_iterators(styles, headers).each_with_index do |format, index|
         next unless format
+
         spreadsheet.change_column_width(index, format[:width])
         spreadsheet.change_text_wrap(index, format[:text_wrap])
       end

data/worker_tools.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'worker_tools/version'
 
@@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the "allowed_push_host"
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless spec.respond_to?(:metadata)
+
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
@@ -26,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'rocketchat-notifier', '>= 0.1.2'
   spec.add_dependency 'roo'
   spec.add_dependency 'rubyXL'
   spec.add_dependency 'slack-notifier'
@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rubocop', '0.52.1'
+  spec.add_development_dependency 'rubocop', '0.71.0'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - fsainz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-18 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rocketchat-notifier
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +184,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.71.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.71.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +241,6 @@ files:
 - lib/worker_tools/csv_input.rb
 - lib/worker_tools/csv_output.rb
 - lib/worker_tools/recorder.rb
-- lib/worker_tools/rocketchat_error_notifier.rb
 - lib/worker_tools/slack_error_notifier.rb
 - lib/worker_tools/version.rb
 - lib/worker_tools/xlsx_input.rb
@@ -281,8 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A collection of modules to help writing common worker tasks)

data/lib/worker_tools/rocketchat_error_notifier.rb

@@ -1,68 +0,0 @@
-module WorkerTools
-  module RocketchatErrorNotifier
-    def with_wrapper_rocketchat_error_notifier(&block)
-      block.yield
-    rescue StandardError => e
-      rocketchat_error_notify(e) if rocketchat_error_notifier_enabled
-      raise
-    end
-
-    def rocketchat_error_notifier_enabled
-      Rails.env.production?
-    end
-
-    def rocketchat_error_notifier_emoji
-      ':red_circle:'
-    end
-
-    def rocketchat_error_notifier_receivers
-      # Ex: '@all'
-    end
-
-    def rocketchat_error_notifier_event
-      'Worker Error Notifier'
-    end
-
-    def rocketchat_error_notifier_title
-      # Example with a link:
-      #
-      # For urls a default_url_options[:host] might be necessary.
-      # In this example I just copy it from existing action_mailer defaults.
-      #
-      # import = rocketchat_error_notifier_model
-      # host = Rails.application.config.action_mailer.default_url_options[:host]
-      # url = Rails.application.routes.url_helpers.import_url(import, host: host, protocol: :https)
-      # kind = I18n.t(import.kind, scope: 'import.kinds')
-      # text = "##{import.id} *#{kind}*"
-      # "[#{text}](#{url})"
-      klass = model.class.model_name.human
-      kind = I18n.t("activerecord.attributes.#{model.class.name.underscore}.kinds.#{model.kind}")
-      "#{klass} #{kind} ##{model.id}"
-    end
-
-    def rocketchat_error_notifier_error_details(error)
-      details = "#{error.class}: #{error.message}\n"
-      details << error.backtrace[0..10].join("\n")
-    end
-
-    def rocketchat_error_notifier_message
-      message = []
-      message << rocketchat_error_notifier_receivers
-      message << rocketchat_error_notifier_title
-      message.compact.join(' - ')
-    end
-
-    def rocketchat_error_notifier_attachment(error)
-      { collapsed: true, title: 'Error', text: rocketchat_error_notifier_error_details(error) }
-    end
-
-    def rocketchat_error_notify(error)
-      RocketChatNotifier.notify(
-        rocketchat_error_notifier_message,
-        emoji: rocketchat_error_notifier_emoji,
-        event: "#{rocketchat_error_notifier_event} (#{Rails.env})",
-        attachment: rocketchat_error_notifier_attachment(error)
-      )
-    end
-  end
-end