eitil 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b08b15e6b8d62cb06ba02b964c2996d06a2ab6a0384a3a6767d11aab994284b
-  data.tar.gz: e8bc13ea50e38201fae4272419b04f82c79ad6f2a4e7179055cc88bfcdff006a
+  metadata.gz: 56c74ebd746f3df95bb5db69eea9c32c894c3a360c4f3da75d2fd5e776834800
+  data.tar.gz: a61655e6fab7305708443fe00918513cf42ebd04bddf9f5114b7f346edc8a347
 SHA512:
-  metadata.gz: ff6a6f68bb479e8aa3c0e3ef71aedb34261da883913ca822d199527a605bd5bf0b94d62dff061ac5cfeea62e8e7f5cb9f39244813cdc9ba4af0bdf7b804ee1b4
-  data.tar.gz: 11763dbe1d14866880c06827601a0f4bf0c7bcc7fa460e0d76a7ee40b9819ad04afe7bf0a7c0cce1cbd7fc90a638ec3b4c1d46e301c8a75eb847b0e5157beddb
+  metadata.gz: 247df55a479fa73e45cba14dc6dd902b8e334d7ec4f9faa4a67142015489498abbd1a17b3f08053326837e47677e1886a5e2663e3d496ae0e98ba5a20feffefc
+  data.tar.gz: 5844f97ccf79c3ccb7e4c9f7724fc2b9ff005e51e703477d4734b692b7180e4257fb81744a7a12ed4b292ab793fecb89f6d5f95d4f4866ddca6524ba4c57aeba

data/eitil_core/README.md

@@ -10,10 +10,26 @@ EitilCore extends the core classes of Ruby and Rails.
 
 ```ruby
 
-require "eitil_core/application_controller"
+require "eitil_core/active_record"
 
 ```
 
+```ruby
+# require "eitil_core/active_record/hash_to_relation"
+
+[].to_relation
+# converts an array of ActiveRecord instances to an ActiveRecord_Relation instance
+# call as: [#<instance1>,<instance2>].to_relation
+```
+
+## ApplicationController
+
+```ruby
+
+require "eitil_core/application_controller"
+require "eitil_core/application_controller/permit_model_atts"
+```
+
 ```ruby
 # require "eitil_core/application_controller/slice_params"
 
@@ -21,6 +37,11 @@ slice_params(*args)
 # slices request params, converts them to JSON and symbolizes the keys
 # call as: slice_params :id, :user
 # => { id: 1, user: 69 }
+
+permit_model_atts(*models, include: nil, except: nil)
+# calls params.permit and automatically permits the columns of all given models (one or more)
+# also accepts additional permits (include: nil) or allows you to reject column values (except: nil)
+# call as: params.permit_model_atts(BillingInfo, BillingIntegration, except: :credit_card)
 ```
 
 
@@ -214,6 +235,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,9 +8,11 @@ require "eitil_core/datetime"
 
 # multi class patches
 require "eitil_core/type_checkers"
+require "eitil_core/formatters"
 require "eitil_core/mocks"
 
 # rails class patches
+require "eitil_core/active_record"
 require "eitil_core/application_record"
 require "eitil_core/application_controller"
 

data/eitil_core/lib/eitil_core/active_record.rb

@@ -0,0 +1,2 @@
+
+require "eitil_core/active_record/hash_to_relation"

data/eitil_core/lib/eitil_core/active_record/hash_to_relation.rb

@@ -0,0 +1,27 @@
+
+# require "eitil_core/active_record/hash_to_relation"
+
+require "eitil_core/errors/raise_error"
+
+class Array
+
+  def to_relation
+    
+    return self unless self.present?
+
+    unless self.all? { |item| item.class.ancestors.include? ApplicationRecord }
+      raise_error "InvalidArrayError", ".to_relation requires that all array items are model instances"
+    end
+
+    unless self.each_cons(2).all? { |el1, el2| el1.class == el2.class }
+      raise_error "InvalidArrayError", ".to_relation requires that all array items are instances of the same model"
+    end
+
+    _class = self.first.class
+    ids    = self.map(&:id)
+
+    return _class.where(id: ids)
+
+  end
+
+end

data/eitil_core/lib/eitil_core/application_controller.rb

@@ -1,2 +1,3 @@
 
 require "eitil_core/application_controller/slice_params"
+require "eitil_core/application_controller/permit_model_atts"

data/eitil_core/lib/eitil_core/application_controller/permit_model_atts.rb

@@ -0,0 +1,27 @@
+
+# require "eitil_core/application_controller/permit_model_atts"
+
+module ActionController
+  class Parameters
+
+    def permit_model_atts(*models, include: nil, except: nil)
+      
+      models  = models.is_a?(Array) ? models : [models]
+      except  = except.is_a?(Array) ? except : [except]
+      include = include.is_a?(Array) ? include : [include]
+
+      columns = models.map do |model|
+        model.columns_hash.keys.map &:to_sym
+      end.flatten.uniq
+
+      default_reject  = %i( id updated_at created_at )
+      given_reject    = except.map { |key| key&.to_sym }
+      accepted_values = columns + include - default_reject - given_reject     
+
+      return self.permit(*accepted_values)
+    end
+
+  end
+end
+
+ 

data/eitil_core/lib/eitil_core/application_record.rb

@@ -2,3 +2,4 @@
 require "eitil_core/application_record/where_like"
 require "eitil_core/application_record/find_by_like"
 require "eitil_core/application_record/all_associations"
+require "eitil_core/application_record/model_atts"

data/eitil_core/lib/eitil_core/application_record/model_atts.rb

@@ -0,0 +1,19 @@
+
+# require "eitil_core/application_record/model_atts"
+
+# require "eitil_core/railtie" to run the dynamic dispatch as an init hook during boot
+require "eitil_core/railtie"
+
+module EitilCore
+  module ApplicationRecord
+    module ModelAtts
+
+      def model_atts
+        columns = self.columns_hash.keys.map(&:to_sym)
+        reject  = %i( id updated_at created_at )
+        columns - reject
+      end
+
+    end
+  end
+end

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

@@ -21,6 +21,10 @@ module EitilCore
           ::ApplicationRecord.send(:extend, EitilCore::ApplicationRecord::AllAssociations)
         end
 
+        if Object.const_defined?('EitilCore::ApplicationRecord::ModelAtts')
+          ::ApplicationRecord.send(:extend, EitilCore::ApplicationRecord::ModelAtts)
+        end
+
         # ApplicationController
 
         if Object.const_defined?('EitilCore::ApplicationController::SliceParams')

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/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.1'
+  VERSION = '1.1.6'
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eitil
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.6
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,11 +82,15 @@ files:
 - Rakefile
 - eitil_core/README.md
 - eitil_core/lib/eitil_core.rb
+- eitil_core/lib/eitil_core/active_record.rb
+- eitil_core/lib/eitil_core/active_record/hash_to_relation.rb
 - eitil_core/lib/eitil_core/application_controller.rb
+- eitil_core/lib/eitil_core/application_controller/permit_model_atts.rb
 - eitil_core/lib/eitil_core/application_controller/slice_params.rb
 - eitil_core/lib/eitil_core/application_record.rb
 - eitil_core/lib/eitil_core/application_record/all_associations.rb
 - eitil_core/lib/eitil_core/application_record/find_by_like.rb
+- eitil_core/lib/eitil_core/application_record/model_atts.rb
 - eitil_core/lib/eitil_core/application_record/where_like.rb
 - eitil_core/lib/eitil_core/argument_helpers.rb
 - eitil_core/lib/eitil_core/argument_helpers/all_args_to_ivars.rb
@@ -105,6 +109,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 +144,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