eitil 1.1.3 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1d078f5e3e79e4849d54692fcbfa418bec803333e69dcc6f4df72b09941ff31
-  data.tar.gz: 9e1232d63ae999afbbb5d0df2405fdb1ca038269096a73a8f8b82dc29de9ab1e
+  metadata.gz: 553e46e2412cfb314a151d30836ee432400c76a6df65f11a97bcedf5b7f988d1
+  data.tar.gz: 70e2e7fcc0318f80580a1354645b7cdf74361aff39e863a3f18ec688557a0dfd
 SHA512:
-  metadata.gz: 6d80703adbc3faf1be7faf8ffdbed5d70b7e04f9edbd7f88dba9baef9b5e3b7b79cf8091732d0e03aaa28fa0ec8efe66260da9d64ca595fd31b64f667e742160
-  data.tar.gz: cf450d841ca4f1a528ba3aa2d7be7a018b9a4ae08f2a16e491cec44ce69245e8f7a3193ce00824a3b7fda959917c0127d1528c979bce14a4b5c221a79b4bfdec
+  metadata.gz: ab78b467f0161f4d8e2af95eb734cfddea9acac0bb7b1cfffd50bff2d7debdcc8840d76f00a3e9f51c430bd0cf7796bf2cb11509536a788afd192adcb343b506
+  data.tar.gz: 21ed2ec339292a9b9349610c72179f7dd55bbf0fa6849be0b7f7c76d8b6ec11e2e1067da7135b277a161759eef136439d5b69248154a1aa5634830b15ff87977

data/eitil_core/README.md

@@ -10,8 +10,24 @@ 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
@@ -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)
 ```
 
 
@@ -140,6 +161,23 @@ args_to_ivars!(*local_vars)
 ```
 
 
+## Concerns
+
+```ruby
+
+require "eitil_core/array"
+
+```
+
+```ruby
+# require "eitil_core/array/slice_hashes"
+
+slice_hashes(*keys)
+# uses the given keys to slice each hash in the array of hashes
+# call as: [{"a"=>1, "b"=>2, "c"=>3}, {"a"=>1, "b"=>2, "c"=>3}].slice_hashes("a", "b")
+# => [{"a"=>1, "b"=>2}, {"a"=>1, "b"=>2}]
+```
+
 ## Concerns
 
 ```ruby
@@ -196,6 +234,24 @@ raise_error(_class_name, message = nil)
 ```
 
 
+## Files
+
+```ruby
+
+require "eitil_core/files"
+
+```
+
+```ruby
+# require "eitil_core/files/create_file"
+
+create_file(file_name, data, directory: nil, suffix: nil, file_type: nil, append: false)
+# writes data to a file (new or existing), with "#{Dir.home}/data" as default directory and with a timestamp as default suffix
+# call as: create_file('test_file', {a: 1, b: {c: 2}}, append: true)
+# => /Users/jurriaanschrofer/data/test_file__2021-06-30.17:30:49.json
+```
+
+
 ## Float
 
 ```ruby
@@ -377,6 +433,22 @@ set_ivars(*ivars)
 ```
 
 
+## String
+
+```ruby
+
+require "eitil_core/string"
+
+```
+
+```ruby
+# require "eitil_core/string/strip_base64_header"
+
+strip_base64_header
+# uses a regex to remove leading base64 header data if present, e.g. "data:image/jpeg;base64,"
+```
+
+
 ## TypeCheckers
 
 ```ruby

data/eitil_core/lib/eitil_core.rb

@@ -2,6 +2,8 @@
 # require "eitil_core"
 
 # core class patches
+require "eitil_core/string"
+require "eitil_core/array"
 require "eitil_core/hash"
 require "eitil_core/float"
 require "eitil_core/datetime"
@@ -12,6 +14,7 @@ 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"
 
@@ -23,4 +26,4 @@ require "eitil_core/setters"
 require "eitil_core/validations"
 require "eitil_core/lookups"
 require "eitil_core/concerns"
-
+require "eitil_core/files"

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/array.rb

@@ -0,0 +1,2 @@
+
+require "eitil_core/array/slice_hashes"

data/eitil_core/lib/eitil_core/array/slice_hashes.rb

@@ -0,0 +1,18 @@
+
+# require "eitil_core/array/slice_hashes"
+
+class Array
+
+  def slice_hashes(*keys)
+    
+    return self if self.empty?
+
+    unless self.all? { |item| item.is_a? Hash }
+      raise ArgumentError, "Array#slice_hashes requires that all array items are Hash instances"
+    end
+
+    self.map { |item| item.slice(*keys) }
+
+  end
+
+end

data/eitil_core/lib/eitil_core/files.rb

@@ -0,0 +1,2 @@
+
+require "eitil_core/files/create_file"

data/eitil_core/lib/eitil_core/files/create_file.rb

@@ -0,0 +1,28 @@
+
+# require "eitil_core/files/create_file"
+
+Kernel.module_eval do
+
+  def create_file(file_name, data, directory: nil, suffix: nil, file_type: nil, append: false)
+    
+    directory = directory || "#{Dir.home}/data"
+    suffix    = suffix    || DateTime.now.prettify
+    file_type = file_type || "json"
+
+    if file_type = "json"
+      data = JSON.pretty_generate(data)
+    end
+
+    path = "#{directory}/#{file_name}_#{suffix}.#{file_type}"
+
+    if append and Dir[path].present?
+      File.open(path, "a+") { |f| f << data }
+      return path
+    end
+
+    File.write(path, data)
+    return path
+    
+  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_core/lib/eitil_core/safe_executions.rb

@@ -1,3 +1,4 @@
 
 require "eitil_core/safe_executions/safe_send"
-require "eitil_core/safe_executions/safe_call"
+require "eitil_core/safe_executions/safe_call"
+require "eitil_core/safe_executions/safe_rescue"

data/eitil_core/lib/eitil_core/safe_executions/safe_rescue.rb

@@ -0,0 +1,37 @@
+
+# require "eitil_core/safe_executions/safe_rescue"
+
+Kernel.module_eval do
+
+  # WORK IN PROCESS
+  # => accept a second block, prefarabbly not as proc, with code to be exceuted in case of rescue
+  # => or would it be possible to patch the 'rescue' keyword itself, so that we don't have to accept
+  # blocks as arguments?
+
+  def safe_rescue(error, &blk)
+
+    unless blk
+      raise ArgumentError, "a block should be passed"
+    end
+
+    unless error.is_a?(Class) or error.is_a?(String)
+      raise ArgumentError, "the given 'error' should either be a constant or string"
+    end
+
+    if error.is_a?(Class)
+      error_const = error
+
+    elsif error.is_a?(String) and Object.const_defined?(error)
+      error_const = error.constantize
+
+    elsif error.is_a?(String)
+      error_const = Object.const_set(error, Class.new(StandardError))
+
+    end
+
+    blk.call  
+
+    rescue error_const
+  end
+
+end

data/eitil_core/lib/eitil_core/string.rb

@@ -0,0 +1,4 @@
+
+# require "eitil_core/string"
+
+require "eitil_core/string/strip_base64_header"

data/eitil_core/lib/eitil_core/string/strip_base64_header.rb

@@ -0,0 +1,12 @@
+
+# require "eitil_core/string/strip_base64_header"
+
+require "eitil_store/regex/regex"
+
+class String
+
+  def strip_base64_header
+    return self.gsub(EitilStore::Regex::LeadingBase64Data, '')
+  end
+
+end

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_store/lib/eitil_store/regex/regex.rb

@@ -37,5 +37,8 @@ module EitilStore
     # Validates US ZIP Code (basic and extended format)
     ZIPCode = /\A(\d{5}\z)|(\d{5}-\d{4}\z)/
 
+    # LeadingBase64Data, e.g. "data:image/jpeg;base64,"
+    LeadingBase64Data = /^data:image\/[a-z]+;base64,/
+
   end
 end

data/eitil_wrapper/README.md

@@ -59,7 +59,7 @@ The Eitil jobs wrapper enables you to create perform_now and perform_later jobs
 
 The macro new_job accepts a :method as argument and defines a new method :method_job. The newly defined :method_job, when called, performs the orginal :method in the background. The new_job macro accepts both instance methods and singleton methods, which are defined within there own method scope. 
 
-In contrast, the new_job_debugger macro defines a new :method_job_debugger method, which performs in the foreground.
+In contrast, the new_job_now macro defines a new :method_job_now method, which performs in the foreground.
 
 ```ruby
 # require "eitil_wrapper/jobs/new_job"
@@ -70,11 +70,11 @@ new_job(_method, *args, **kwargs)
 ```
 
 ```ruby
-# require "eitil_wrapper/jobs/new_job_debugger"
+# require "eitil_wrapper/jobs/new_job_now"
 
-new_job_debugger(_method, *args, **kwargs)
-# assuming a method :hello_world, call as: new_job_debugger :hello_world
-# => defines :hello_world_job_debugger
+new_job_now(_method, *args, **kwargs)
+# assuming a method :hello_world, call as: new_job_now :hello_world
+# => defines :hello_world_job_now
 ```
 
 

data/eitil_wrapper/lib/eitil_wrapper/jobs.rb

@@ -1,4 +1,4 @@
 
 require "eitil_wrapper/jobs/new_job"
-require "eitil_wrapper/jobs/new_job_debugger"
+require "eitil_wrapper/jobs/new_job_now"
 require "eitil_wrapper/jobs/single_method_job"

data/eitil_wrapper/lib/eitil_wrapper/jobs/{new_job_debugger.rb → new_job_now.rb}

@@ -1,5 +1,5 @@
 
-# require "eitil_wrapper/jobs/new_job_debugger"
+# require "eitil_wrapper/jobs/new_job_now"
 
 require "eitil_wrapper/jobs/single_method_job"
 
@@ -14,10 +14,10 @@ Kernel.module_eval do
   # being that 'id' works for objects that have a database record, while '_self'
   # works for non database supported instanes, such as an Exporter instance.
 
-  def new_job_debugger(_method, *args, **kwargs)
+  def new_job_now(_method, *args, **kwargs)
 
     if instance_methods(false).include? _method
-      define_method "#{_method}_job_debugger" do |_self = nil, *args, **kwargs|
+      define_method "#{_method}_job_now" do |_self = nil, *args, **kwargs|
         
         EitilWrapper::SingleMethodJob.perform_now(
           *args, _class: self.class.to_s, _method: _method.to_s, id: safe_send(:id), _self: self.to_json, **kwargs
@@ -25,7 +25,7 @@ Kernel.module_eval do
       end
 
     elsif singleton_methods(false).include? _method      
-      define_singleton_method "#{_method}_job_debugger" do |*args, **kwargs|
+      define_singleton_method "#{_method}_job_now" do |*args, **kwargs|
        
         EitilWrapper::SingleMethodJob.perform_now(
           *args, _class: to_s, _method: _method.to_s, **kwargs

data/eitil_wrapper/lib/eitil_wrapper/railtie.rb

@@ -36,7 +36,20 @@ module EitilWrapper
                 else
                   _class.constantize
                 end
-              object.send _method, *args, **kwargs
+
+              if args.present? and kwargs.present?
+                object.send _method, *args, **kwargs
+
+              elsif args.present?
+                object.send _method, *args
+
+              elsif kwargs.present?
+                object.send _method, **kwargs
+
+              else
+                object.send _method
+              end
+
       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" if Rails.env.development?
+    # 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/version.rb

@@ -1,5 +1,5 @@
 module Eitil
   
-  VERSION = '1.1.3'
+  VERSION = '1.1.8'
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eitil
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.8
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-07-06 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
@@ -97,12 +101,16 @@ files:
 - eitil_core/lib/eitil_core/argument_helpers/args_to_h_bang.rb
 - eitil_core/lib/eitil_core/argument_helpers/args_to_ivars.rb
 - eitil_core/lib/eitil_core/argument_helpers/args_to_ivars_bang.rb
+- eitil_core/lib/eitil_core/array.rb
+- eitil_core/lib/eitil_core/array/slice_hashes.rb
 - eitil_core/lib/eitil_core/concerns.rb
 - eitil_core/lib/eitil_core/concerns/include_concerns_of.rb
 - eitil_core/lib/eitil_core/datetime.rb
 - eitil_core/lib/eitil_core/datetime/prettify.rb
 - eitil_core/lib/eitil_core/errors.rb
 - eitil_core/lib/eitil_core/errors/raise_error.rb
+- eitil_core/lib/eitil_core/files.rb
+- eitil_core/lib/eitil_core/files/create_file.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
@@ -119,9 +127,12 @@ files:
 - eitil_core/lib/eitil_core/railtie.rb
 - eitil_core/lib/eitil_core/safe_executions.rb
 - eitil_core/lib/eitil_core/safe_executions/safe_call.rb
+- eitil_core/lib/eitil_core/safe_executions/safe_rescue.rb
 - eitil_core/lib/eitil_core/safe_executions/safe_send.rb
 - eitil_core/lib/eitil_core/setters.rb
 - eitil_core/lib/eitil_core/setters/set_ivars.rb
+- eitil_core/lib/eitil_core/string.rb
+- eitil_core/lib/eitil_core/string/strip_base64_header.rb
 - eitil_core/lib/eitil_core/type_checkers.rb
 - eitil_core/lib/eitil_core/type_checkers/is_num_or_nan.rb
 - eitil_core/lib/eitil_core/validations.rb
@@ -171,7 +182,7 @@ files:
 - eitil_wrapper/lib/eitil_wrapper/decorators/controller_decorator.rb
 - eitil_wrapper/lib/eitil_wrapper/jobs.rb
 - eitil_wrapper/lib/eitil_wrapper/jobs/new_job.rb
-- eitil_wrapper/lib/eitil_wrapper/jobs/new_job_debugger.rb
+- eitil_wrapper/lib/eitil_wrapper/jobs/new_job_now.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