eitil 1.1.34 → 1.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfe9b499c92cf50def38b6ff67a2aeec1966bc6a05d6cba5e4b7d8dfefb38dfd
-  data.tar.gz: 116a83f8965db21f455c5e36b8f253023b550f4c0ead34ecc14eb5ed7e04e894
+  metadata.gz: 6a10cacbe01eb49c8964a1dc6e2061e4b0aa80b0345d6560bf4353384146c61a
+  data.tar.gz: 1ca77ced97a199df79116b3023e3501b7072b5a680aca33fb142e303bba4136e
 SHA512:
-  metadata.gz: 86bf0a0faaaac7509647519dd200d767063bcab69759a8a9ebf36c0be406bae574923ebb3618113c7e3fb22228d71eb3e2970b998e6989a38ab5b9c49c12a2bc
-  data.tar.gz: 506b2a290c2323ff6c43453205d461ccb89c17a81dd08ff25f09e34a4826e4ccefa3909dff47bbf6e504ce44cb82059c89be40569f4038ac524c8f1317237c71
+  metadata.gz: 4c579863550638fe0f4792406fb99b1ca21d577ae0c8e2e3794b9a9999862e547190ce10730f06415339b9f18b5965660afcf906833619a29b2c2c903183e0c5
+  data.tar.gz: c21f9c314e5861d0b9d64147280ac184c353f7c9516a460f73b27d609d6839b681e8f5a7e5dd9b327c1b0acf636bdc154066e086d395726efbe975c8e17914ae

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

@@ -17,7 +17,7 @@ module EitilIntegrate::RubyXL
       end
 
       def try_float_conversion
-        @hash.transform_values! { |array| array.map { |item| item.is_num? ? item.to_f : item } }
+        @hash.transform_values! { |array| array.map { |item| item.is_num? ? to_float(item) : item } }
       end
 
       def drop_nil_values
@@ -37,6 +37,12 @@ module EitilIntegrate::RubyXL
         value_is_a_int || value_is_a_float || value_is_a_time_string
       end
 
+      def to_float(object)
+        # Implemented a new to_float method, which replaces .to_f, because "7.5".to_f 
+        # would correctly return 7.5, but "7,5" would incorrectly return 7.0.
+        object.is_a?(String) ? object.gsub(',','.').to_f : object.to_f
+      end
+
       def value_is_a_int
         @value.is_a? Integer
       end

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

@@ -31,9 +31,13 @@ module EitilIntegrate::RubyXL
 
       # 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 }
+      def exporter_taxonomy        
+        parameter_fields = exporter_infos.transform_values { |v| v.select { |k,v| k == :required || k == :optional } }
+
+        parameter_fields.transform_values do |setting_collection|        
+          setting_collection.transform_values do |setting|
+            setting.map { |key| key.is_a?(Hash) ? key.keys : key }.flatten
+          end
         end
       end
 

data/eitil_store/lib/eitil_store/regex/regex.rb

@@ -16,7 +16,7 @@ module EitilStore
     UUID = /\A(\h{32}|\h{8}-\h{4}-\h{4}-\h{4}-\h{12})\z/
 
     # IsNum comes from the Rubinius source code and identifies both integers and floats correctly.
-    IsNum = /^\s*[+-]?((\d+_?)*\d+(\.(\d+_?)*\d+)?|\.(\d+_?)*\d+)(\s*|([eE][+-]?(\d+_?)*\d+)\s*)$/
+    IsNum = /^\s*[+-]?((\d+_?)*\d+([.,](\d+_?)*\d+)?|\.(\d+_?)*\d+)(\s*|([eE][+-]?(\d+_?)*\d+)\s*)$/
 
     # Validates Credit Card numbers, Checks if it contains 16 numbers in groups of 4 separated by -, space or nothing
     CreditCard = /\A(\d{4}-){3}\d{4}\z|\A(\d{4}\s){3}\d{4}\z|\A\d{16}\z/

data/eitil_wrapper/lib/eitil_wrapper/callbacks/helper_methods.rb

@@ -14,6 +14,8 @@ module EitilWrapper
 
       def inherited(subclass)
         super
+
+        return if Eitil.skip_callback_helper_methods_for_models.include?(subclass.to_s.to_sym)
         subclass.use_eitil_callback_helper_methods
 
         rescue => e

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

@@ -36,6 +36,8 @@ module EitilWrapper
 
       def inherited(subclass)
         super
+
+        return if Eitil.skip_default_scopes_for_models.include?(subclass.to_s.to_sym)
         subclass.use_eitil_scopes
 
         rescue => e

data/lib/eitil/railtie.rb

@@ -1,4 +1,6 @@
 
+
+
 # Constants
 
 module Eitil
@@ -9,8 +11,53 @@ module Eitil
 
 end
 
+
+
 # Configuration
 
+module Eitil 
+  class Railtie < ::Rails::Railtie   
+    
+    # The following configuration has its own special place in the boot sequence:
+    # on the one hand, it should run before the initialization of Eitil (gem), but
+    # read config assigned by the main app – which is only loaded AFTER all gems have
+    # been initialized.
+
+    # Therefore, we only require the specified file from the main app, after defining
+    # the possible configurations for the Eitil railtie. This way we escape the boot
+    # sequence's dedault order.
+
+    config.before_initialize do |eitil|
+
+      Eitil.mattr_accessor :controller_ivars, 
+                           :skip_default_scopes_for_models,
+                           :skip_callback_helper_methods_for_models
+
+      Eitil.controller_ivars ||= []
+      Eitil.skip_default_scopes_for_models ||= []
+      Eitil.skip_callback_helper_methods_for_models ||= []
+
+      def Eitil.set_config(&block)
+        yield Eitil
+      end
+
+      config_path = Rails.root + 'config/initializers/eitil.rb'
+    
+      if File.exists? config_path
+        puts "Loading Eitil config from #{config_path}..."
+        load config_path
+      else
+        puts "Eitil config not found at #{config_path}, resorting to defaults..."
+      end
+
+    end
+  end
+end
+
+
+
+# Loading
+
 module Eitil
   
   class Railtie < ::Rails::Railtie   
@@ -27,12 +74,4 @@ module Eitil
 
   end
 
-  mattr_accessor :controller_ivars
-
-  self.controller_ivars ||= []
-
-  def self.set_config(&block)
-    yield self
-  end
-
 end

data/lib/eitil/version.rb

@@ -1,5 +1,5 @@
 module Eitil
   
-  VERSION = '1.1.34'
+  VERSION = '1.1.38'
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eitil
 version: !ruby/object:Gem::Version
-  version: 1.1.34
+  version: 1.1.38
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails