eitil 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da8ee05892ab05d923342f6ed43e13665bba39fb04cf896bb74f1914892252fd
-  data.tar.gz: 372286a8ac0c7c01d0c33e7f37b6335a8045834e31e31e0a93a4ddbc1656d882
+  metadata.gz: 1f2aa00902c0c436b26613f26555b6d583907285491dac4178b03ad0916be42d
+  data.tar.gz: ccb82971dcdeaa31c03716f942ace584d40183bded78c25a92b9df0800b97998
 SHA512:
-  metadata.gz: 5c1dddb52e1efcb4eb8272050792fd81ec9f4281b46bafb444bece9ba0c54c1407d5f78c6ea8354760093680c3a7546c76bd7591185f4628394b4974df0e4634
-  data.tar.gz: 0d69428c5db0e7aea257d0a85fb8a658bae7789672718bbcadea24b11b9089faa2979d3fee67fb02176663685e17c2c1e124aa4bcf63bbe867e124ffe7cf5343
+  metadata.gz: 6502c6a8df10c45af6234c1f49e7fcc4f8960c27693d09d797bfa5bb2a217dd576297fb0be5afc3c02a30a6556da1e2ff139741a69f91fccd2c595cee8a7be4c
+  data.tar.gz: 686b771909c542bc6ef2a5d6657161353af8535754f23a2396c91ce6ede9590b0c6d4033c7acf1a80d1090f084ca57c90d97d97f8b4d7d2f07ae8b675dbdba28

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/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_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

@@ -6,13 +6,16 @@ module EitilIntegrate::RubyXL
     class << self
 
       def format_data
-        format_time_strings
+        # format_time_strings
         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_wrapper/README.md

@@ -190,7 +190,15 @@ 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 include EitilWrapper::RequestLogger::ControllerMixin. This calls a background job which writes to the file.
+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/lib/eitil/all.rb

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

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.1.0'
+  VERSION = '1.1.5'
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eitil
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-16 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