eitil 1.0.4 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bf167d056adee32eeba94ac5282d6a9890575a309c775bd53da822f4817501e
-  data.tar.gz: '08bbebecb6e9d84567d522d9c7b62e23ff8b3a6e3b3b1fee5639a58aa9f6bc68'
+  metadata.gz: b566e2911d13c9952ef93916e929e1bf4666790e2d07934ccc3cb7d00f421319
+  data.tar.gz: d492741da447ce1777c79a07c1968acc611f558eec690d933c3e8eff94422f4b
 SHA512:
-  metadata.gz: cab736bd8a72ba50468f017d91f12fabe1a8a8887bb892797c7466296227fb763e413a5ae372c535ef134963181414ac8ef3d7cae497d708b178f05a93c03ce1
-  data.tar.gz: dc057b62c574bea1b96e4074c9af724cf3ad59d957f9a62790cbe63ec998503c1ae1a1b5f253388d293ab1bfb5eeeb41b7f247dc61e1b635dacadc7bf644ddd0
+  metadata.gz: 27376302a08134d0f7b14d55c4dda41eabd230b93cd1bce4f719d12505241e817779fc4feaa83e03443cc910516e33e477c10760ed9be7d5c543b2b53d98e2ae
+  data.tar.gz: 2fe73ac66fe0ef8bfc64260fc95e05f4a5c8dee3c8f7afb2c376da25fc65b1b93ab8da6b008bbb5d31537789d1c8b697258f87dbf9bde956f3c849ffa7e46bd1

data/eitil_core/README.md

@@ -214,6 +214,49 @@ safe_to_i
 ```
 
 
+## Formatters
+
+```ruby
+
+require "eitil_core/formatters"
+
+```
+
+```ruby
+# require "eitil_core/formatters/sql"
+
+Date.today.strfsql
+# => "2021-06-23"
+
+Date.today.strfsql(:date)
+# => "2021-06-23"
+
+DateTime.now.strfsql
+# => "2021-06-23 13:15:37.945083"
+
+DateTime.now.strfsql(:datetime)
+# => "2021-06-23 13:15:37.945083"
+
+DateTime.now.strfsql(:date)
+# => "2021-06-23"
+
+DateTime.now.strfsql(:time)
+# => "13:16:23"
+
+Time.now.strfsql
+# => "13:16:23"
+
+Time.now.strfsql(:datetime)
+# => "2021-06-23 13:15:37.945083"
+
+Time.now.strfsql(:date)
+# => "2021-06-23"
+
+Time.now.strfsql(:time)
+# => "13:16:23"
+```
+
+
 ## Hash
 
 ```ruby

data/eitil_core/lib/eitil_core.rb

@@ -8,6 +8,7 @@ require "eitil_core/datetime"
 
 # multi class patches
 require "eitil_core/type_checkers"
+require "eitil_core/formatters"
 require "eitil_core/mocks"
 
 # rails class patches

data/eitil_core/lib/eitil_core/application_controller/slice_params.rb

@@ -1,6 +1,9 @@
 
 # require "eitil_core/application_controller/slice_params"
 
+# require "eitil_core/railtie" to run the dynamic dispatch as an init hook during boot
+require "eitil_core/railtie"
+
 module EitilCore
   module ApplicationController
     module SliceParams

data/eitil_core/lib/eitil_core/application_record/all_associations.rb

@@ -1,6 +1,9 @@
 
 # require "eitil_core/application_record/all_associations"
 
+# require "eitil_core/railtie" to run the dynamic dispatch as an init hook during boot
+require "eitil_core/railtie"
+
 module EitilCore
   module ApplicationRecord
     module AllAssociations

data/eitil_core/lib/eitil_core/application_record/find_by_like.rb

@@ -1,6 +1,9 @@
 
 # require "eitil_core/application_record/find_by_like"
 
+# require "eitil_core/railtie" to run the dynamic dispatch as an init hook during boot
+require "eitil_core/railtie"
+
 module EitilCore
   module ApplicationRecord
     module FindByLike

data/eitil_core/lib/eitil_core/application_record/where_like.rb

@@ -1,6 +1,9 @@
 
 # require "eitil_core/application_record/where_like"
 
+# require "eitil_core/railtie" to run the dynamic dispatch as an init hook during boot
+require "eitil_core/railtie"
+
 module EitilCore
   module ApplicationRecord
     module WhereLike

data/eitil_core/lib/eitil_core/formatters.rb

@@ -0,0 +1,4 @@
+
+# require "eitil_core/formatters"
+
+require "eitil_core/formatters/sql"

data/eitil_core/lib/eitil_core/formatters/sql.rb

@@ -0,0 +1,72 @@
+
+# require "eitil_core/formatters/sql"
+
+
+class Date
+
+  def strfsql(type = :date)
+    
+    type = type.kind_of?(String) ? type.to_sym : type
+    
+    case type
+
+    when :date
+      return self.strftime "%Y-%m-%d"
+
+    end
+    return
+
+  end
+
+end
+
+
+class DateTime
+
+  def strfsql(type = :datetime)
+    
+    type = type.kind_of?(String) ? type.to_sym : type
+
+    case type
+    
+    when :datetime
+      return self.strftime "%Y-%m-%d %H:%M:%S.%6N"
+    
+    when :date
+      return self.strftime "%Y-%m-%d"
+
+    when :time
+      return self.strftime "%H:%M:%S"
+
+    end
+    return
+
+  end
+
+end
+
+
+class Time
+
+  def strfsql(type = :time)
+    
+    type = type.kind_of?(String) ? type.to_sym : type
+    
+    case type
+
+    when :datetime
+      return self.strftime "%Y-%m-%d %H:%M:%S.%6N"
+    
+    when :date
+      return self.strftime "%Y-%m-%d"
+
+    when :time
+      return self.strftime "%H:%M:%S"
+
+    end
+    return
+
+  end
+
+end
+

data/eitil_core/lib/eitil_core/railtie.rb

@@ -1,7 +1,4 @@
 
-require "rails"
-require "eitil_core"
-
 module EitilCore
 
   class Railtie < Rails::Railtie

data/eitil_integrate/lib/eitil_integrate/application_exporter.rb

@@ -17,6 +17,7 @@ require_relative "application_exporter/setters"
 require_relative "application_exporter/selectors"
 require_relative "application_exporter/lookups"
 require_relative "application_exporter/infos"
+require_relative "application_exporter/log_state"
 
 # the AutoSum module, which is a seperately functioning module (service)
 require_relative "application_exporter/auto_sum"

data/eitil_integrate/lib/eitil_integrate/application_exporter/auto_sum/format_data.rb

@@ -10,9 +10,12 @@ module EitilIntegrate::RubyXL
         format_ints_to_floats
       end
 
-      def format_time_strings
-        @hash.transform_values! { |array| array.map { |item| incomplete_time_string?(item) ? "#{item}:00" : item } }
-      end
+      # outcommented method in favour of AutoSum#chronic_sum_array: no longer accept days, since the method excepts
+      # either hh:mm or hh:mm:ss
+
+      # def format_time_strings
+        # @hash.transform_values! { |array| array.map { |item| incomplete_time_string?(item) ? "#{item}:00" : item } }
+      # end
 
       def incomplete_time_string?(string)
         string.is_a?(String) && string.length == 5 && string.scan(/\d{2}:\d{2}/)

data/eitil_integrate/lib/eitil_integrate/application_exporter/auto_sum/sum_data.rb

@@ -22,15 +22,30 @@ module EitilIntegrate::RubyXL
       end
 
       def chronic_sum_array(array)
-        sum     = array.map { |item| ChronicDuration.parse(item) }.compact.sum
-        hours   = format_time(sum / (60 * 60))
-        sum     = sum % (60 * 60)
-        minutes = format_time(sum / 60)
-        seconds = format_time(sum % 60)
-
-        # currently doesn't return seconds, since those will never 
-        # be set (?) and screw the consistency of data formatting
-        ["#{hours}:#{minutes}"]
+        
+        #total minutes, hours and days
+        tm, th, td = [0]*3
+        
+        array.each do |time_string|
+
+          # add empty 0's, to avoid defining nil values when time values are absent
+          h, m, s = *time_string.split(':').map(&:to_i), *[0]*3
+          tm += m; th += h
+
+        end
+        
+        # parsing times into maxes (60 m, 24 h, ∞ days)
+        th += tm / 60
+        tm =  tm % 60
+        td += th / 24
+        th =  th % 24
+
+        # formatting strings
+        sd = td.to_s
+        sh = th.to_s.rjust(2,'0')
+        sm = tm.to_s.rjust(2,'0')
+
+        [[sd, sh, sm].join(':')]
       end
 
       def format_time(time)

data/eitil_integrate/lib/eitil_integrate/application_exporter/default_export.rb

@@ -34,6 +34,7 @@ module EitilIntegrate::RubyXL
 
     def process_export
       style_file
+      log_state
       save_file
     end
 

data/eitil_integrate/lib/eitil_integrate/application_exporter/initialize.rb

@@ -4,15 +4,13 @@
 require "eitil_core/setters/set_ivars"
 require "eitil_core/argument_helpers/all_kwargs_to_ivars"
 
-# EitilIntegrate::RubyXL::ApplicationExporter
-
 module EitilIntegrate
   module RubyXL
     class ApplicationExporter
 
       include ActionView::Helpers::NumberHelper
 
-      attr_accessor :book, :sheet, :x, :y, :start_date, :end_date, :date_range
+      attr_accessor :book, :sheet, :x, :y, :start_date, :end_date, :date_range, :write_log
 
       def initialize(attributes={})
         all_kwargs_to_ivars binding, :attributes  

data/eitil_integrate/lib/eitil_integrate/application_exporter/log_state.rb

@@ -0,0 +1,81 @@
+
+# require "eitil_integrate/application_exporter/log_state"
+
+module EitilIntegrate::RubyXL
+    class ApplicationExporter
+
+      private
+
+      def log_state 
+
+        return unless write_log == true
+
+        # create_log_sheet
+        book.add_worksheet('log')
+
+        # manage sheets
+        previous_sheet = @sheet.sheet_name
+        @sheet         = @book["log"]
+
+        # manage coordinates
+        previous_x = @x
+        @x         = 0
+
+        # log everything we want to log
+        report_state
+
+        # style logs
+        style_first_x_columns_width(1, 40)
+        style_first_column_bold
+
+        # restore what was previously active
+        @sheet = @book[previous_sheet]
+        @x     = previous_x
+
+      end
+
+      def report_state
+        instance_variables.each do |ivar|
+
+          variable_name  = ivar.to_s
+          variable_value = format_value(instance_variable_get(ivar))
+
+          array_to_row [variable_name, variable_value]
+
+        end
+      end
+
+      # formatting the values to a human readably format is important, because otherwise Excel warns
+      # users on safety when opening the file.
+      def format_value(value)
+        value_class = value.class
+
+        if value_class == Hash
+          value.map {|k,v| "#{k.to_s.split('_').map(&:capitalize).join(' ')}: #{v}"}.join(' // ')
+
+        elsif value_class == Array && value.all? { |item| item.class.superclass == ApplicationRecord }
+          "#{value.class} #{value.map(&:id).join(', ')}"
+
+        elsif value_class.superclass == ApplicationRecord
+         "#{value.class} ##{value.id}"
+
+        elsif value_class.superclass == ActiveRecord::Relation
+          "#{value.class.to_s.split('::').first} #{value.ids.to_s.delete('[]')}"
+
+        elsif value_class.superclass == ActiveRecord::Associations::CollectionProxy
+          "#{value.class.to_s.split('::').first} #{value.ids.to_s.delete('[]')}"
+
+        elsif value_class == RubyXL::Workbook
+          value_class.name
+
+        elsif value_class == RubyXL::Worksheet
+          value_class.name
+
+        else
+          value.to_s
+
+        end
+      end
+
+  end
+end

data/eitil_integrate/lib/eitil_integrate/application_exporter/lookups.rb

@@ -22,15 +22,21 @@ module EitilIntegrate::RubyXL
       end
 
       def exporter_infos
-        exporter_constants.map { |_c| { "#{_c}": _c.info || {} } }.inject &:merge
+        exporter_constants.map { |_c| { "#{_c.to_s.remove("Exporter")}": _c.info || {} } }.inject &:merge
       end
       
-      alias_method :taxonomy, :exporter_infos
-
       def exporter_info(exporter, info)
         exporter_infos[exporter]&.dig(info)
       end
 
+      # returns the exporter_infos, without the datatypes – for taxonomy purpuses, the field
+      # names are often sufficient
+      def exporter_taxonomy
+        exporter_infos.transform_values do |settings|
+          settings.transform_values { |info| info.first.is_a?(Hash) ? info.first.keys : info }
+        end
+      end
+
       def exporter_params
         exporter_infos.transform_values { |v| [v[:required], v[:optional]].flatten.compact }
       end

data/eitil_integrate/lib/eitil_integrate/railtie.rb

@@ -1,7 +1,4 @@
 
-require "rails"
-require "eitil_integrate"
-
 module EitilIntegrate
 
   class Railtie < Rails::Railtie

data/eitil_store/lib/eitil_store/railtie.rb

@@ -1,7 +1,4 @@
 
-require "rails"
-require "eitil_store"
-
 module EitilStore
 
   class Railtie < Rails::Railtie

data/eitil_support/lib/eitil_support/railtie.rb

@@ -1,7 +1,4 @@
 
-require "rails"
-require "eitil_support"
-
 module EitilSupport
 
   class Railtie < Rails::Railtie

data/eitil_wrapper/README.md

@@ -179,3 +179,27 @@ Scopes are generated through the columns of your model's database table. Which s
 ```
 
 
+
+
+
+## EitilWrapper::RequestLogger
+
+```ruby
+
+require "eitil_wrapper/request_logger"
+
+```
+
+The RequestLogger wrapper logs request params in /log/request_logger.log, which offers the opportunity to pry into webhooks while developing. In order to track a controller, simply add the following. This calls a background job which writes to the file.
+
+```ruby
+
+include EitilWrapper::RequestLogger::ControllerMixin
+before_action :log_request
+
+```
+
+
+
+
+

data/eitil_wrapper/lib/eitil_wrapper.rb

@@ -4,4 +4,5 @@ require "eitil_wrapper"
 require "eitil_wrapper/jobs"
 require "eitil_wrapper/scopes"
 require "eitil_wrapper/routes"
-require "eitil_wrapper/decorators"
+require "eitil_wrapper/decorators"
+require "eitil_wrapper/request_logger"

data/eitil_wrapper/lib/eitil_wrapper/jobs/single_method_job.rb

@@ -2,6 +2,9 @@
 # somehow leads to errors in the initialization process. Ideally, this code would be
 # defined in eitil_wrapper/jobs/single_method_job.rb and dispatched in eitil_wrapper/railtie.rb
 
+# require "eitil_wrapper/railtie" to run the dynamic dispatch as an init hook during boot
+require "eitil_wrapper/railtie"
+
 module EitilWrapper
   module CreateSingleMethodJob
   end

data/eitil_wrapper/lib/eitil_wrapper/railtie.rb

@@ -1,22 +1,17 @@
 
-require "rails"
-require "eitil_wrapper"
-
 module EitilWrapper
 
   class Railtie < Rails::Railtie
 
+    # Dynamic dispatching after initialization of Rails classes.
+
     initializer "my_railtie.configure_rails_initialization", options: :after do |app|
 
-      # Dynamic dispatching after initialization of Rails classes.
 
-      # Scopes
-      
       if Object.const_defined?('EitilWrapper::Scopes::DefaultScopes')
         ::ApplicationRecord.send(:extend, EitilWrapper::Scopes::DefaultScopes)
       end
 
-      # Jobs
 
       if Object.const_defined?('EitilWrapper::CreateSingleMethodJob')
         
@@ -44,6 +39,28 @@ module EitilWrapper
               object.send _method, *args, **kwargs
       end; end; end; end
 
+
+      if Object.const_defined?('EitilWrapper::RequestLogger::CreateLoggerJob')
+
+        module ::EitilWrapper
+          module RequestLogger
+            class LoggerJob < ::ApplicationJob
+
+            def perform(logger_object)
+              
+            # set path for logger
+            $request_logger_path ||= "#{Rails.root}/log/request_logger.log"
+
+            # create logger, if not present
+            if Dir[$request_logger_path].blank? || $request_logger.blank?
+              $request_logger = Logger.new($request_logger_path)
+            end
+
+            # add logger_object to logger
+            $request_logger.info(logger_object) 
+
+      end; end; end; end; end
+
     end
   end
 end

data/eitil_wrapper/lib/eitil_wrapper/request_logger.rb

@@ -0,0 +1,5 @@
+
+# require "eitil_wrapper/request_logger"
+
+require_relative "request_logger/controller_mixin"
+require_relative "request_logger/logger_job"

data/eitil_wrapper/lib/eitil_wrapper/request_logger/controller_mixin.rb

@@ -0,0 +1,48 @@
+
+# require "eitil_wrapper/request_logger/controller_mixin"
+
+require_relative "logger_job"
+
+module EitilWrapper
+  module RequestLogger
+    module ControllerMixin
+
+      private
+
+      def log_request
+        $request_logger_path ||= "#{Rails.root}/log/request_logger.log"
+        EitilWrapper::RequestLogger::LoggerJob.perform_later(request_logger_object)
+      end
+      
+      def request_logger_object
+        
+        log_request = {
+          path:       request.env["REQUEST_PATH"],
+          method:     request.env["REQUEST_METHOD"],
+          query_str:  request.env["QUERY_STRING"], 
+        }
+       
+        log_params = {
+          params:     params.as_json
+        }
+
+        log_attributes = {
+          time:       Time.now.strftime("%Y-%m-%d %H:%M:%S")
+        }
+
+        log = {
+          request:    log_request,
+          params:     log_params,
+          attributes: log_attributes
+        }
+
+        log_time = log_attributes[:time]
+        log_strf = log.deep_symbolize_keys.to_s   
+        # log_strf may be hashed through eval(log_strf)
+
+        return log_strf
+      end    
+   
+    end
+  end
+end

data/eitil_wrapper/lib/eitil_wrapper/request_logger/logger_job.rb

@@ -0,0 +1,17 @@
+
+# require "eitil_wrapper/request_logger/logger_job"
+
+# require "eitil_wrapper/railtie" to run the dynamic dispatch as an init hook during boot
+require "eitil_wrapper/railtie"
+
+# ISSUE: this code is currently defined eitil_wrapper/railtie.rb, since module inclusion 
+# somehow leads to errors in the initialization process. Ideally, this code would be
+# defined in eitil_wrapper/request_logger/logger_job.rb and dispatched in eitil_wrapper/railtie.rb
+
+module EitilWrapper
+  module RequestLogger
+    module CreateLoggerJob
+
+    end
+  end
+end

data/eitil_wrapper/lib/eitil_wrapper/scopes/default_scopes.rb

@@ -1,3 +1,9 @@
+
+# require "eitil_wrapper/scopes/default_scopes"
+
+# require "eitil_wrapper/railtie" to run the dynamic dispatch as an init hook during boot
+require "eitil_wrapper/railtie"
+
 module EitilWrapper
   module Scopes
     module DefaultScopes

data/lib/eitil/all.rb

@@ -6,10 +6,11 @@ Eitil::Layers.each do |layer|
   
   begin
     require "#{layer}/railtie"
-    puts "succesfully required #{layer}/railtie"
+    require "#{layer}"
+    puts "succesfully required #{layer} and #{layer}/railtie" if Rails.env.development?
 
   rescue LoadError => e    
-    puts "failed to require #{layer}/railtie"
+    puts "failed to require #{layer} and #{layer}/railtie"
     puts "message: #{e.message}"
     # binding.pry
     

data/lib/eitil/railtie.rb

@@ -1,6 +1,4 @@
 
-require 'eitil/railtie'
-
 # Constants
 
 module Eitil
@@ -10,16 +8,20 @@ module Eitil
 
 end
 
-
 # Configuration
 
 module Eitil
   
   class Railtie < ::Rails::Railtie   
     
-    # Add lib dirs to $LOAD_PATH, making them available in your main app.
     Eitil::Layers.each do |layer|
+
+      # Add lib dirs to $LOAD_PATH, making them available in your main app.
       $LOAD_PATH << "#{Eitil::Root}/#{layer}/lib"
+
+      # Load railtie into main app, enabling on the fly inclusion of dispatches.
+      require "#{layer}/railtie"
+      
     end
 
   end

data/lib/eitil/version.rb

@@ -1,5 +1,5 @@
 module Eitil
   
-  VERSION = '1.0.4'
+  VERSION = '1.1.4'
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eitil
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.4
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,8 @@ files:
 - eitil_core/lib/eitil_core/errors/raise_error.rb
 - eitil_core/lib/eitil_core/float.rb
 - eitil_core/lib/eitil_core/float/safe_to_i.rb
+- eitil_core/lib/eitil_core/formatters.rb
+- eitil_core/lib/eitil_core/formatters/sql.rb
 - eitil_core/lib/eitil_core/hash.rb
 - eitil_core/lib/eitil_core/hash/auto_dig.rb
 - eitil_core/lib/eitil_core/lookups.rb
@@ -138,6 +140,7 @@ files:
 - eitil_integrate/lib/eitil_integrate/application_exporter/helpers.rb
 - eitil_integrate/lib/eitil_integrate/application_exporter/infos.rb
 - eitil_integrate/lib/eitil_integrate/application_exporter/initialize.rb
+- eitil_integrate/lib/eitil_integrate/application_exporter/log_state.rb
 - eitil_integrate/lib/eitil_integrate/application_exporter/lookups.rb
 - eitil_integrate/lib/eitil_integrate/application_exporter/selectors.rb
 - eitil_integrate/lib/eitil_integrate/application_exporter/setters.rb
@@ -171,6 +174,9 @@ files:
 - eitil_wrapper/lib/eitil_wrapper/jobs/new_job_debugger.rb
 - eitil_wrapper/lib/eitil_wrapper/jobs/single_method_job.rb
 - eitil_wrapper/lib/eitil_wrapper/railtie.rb
+- eitil_wrapper/lib/eitil_wrapper/request_logger.rb
+- eitil_wrapper/lib/eitil_wrapper/request_logger/controller_mixin.rb
+- eitil_wrapper/lib/eitil_wrapper/request_logger/logger_job.rb
 - eitil_wrapper/lib/eitil_wrapper/routes.rb
 - eitil_wrapper/lib/eitil_wrapper/routes/extended_resources.rb
 - eitil_wrapper/lib/eitil_wrapper/scopes.rb