eitil 1.1.10 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5c1c1ee54335f5ad56dd65d816c372052e0b02be349300d15a47a47408a017f
-  data.tar.gz: e1b373a202a34300f4b877e2ab89a6f28d739a40cf923ba61fd4ea507e370c83
+  metadata.gz: 9169ee405f0792178972ef43031a8b55964a86e48eb99ec64732244726d2bdc5
+  data.tar.gz: b6886726f1057ffbbd7eb16826f770abbe47c6f9367d3d130f6a6ab14d98b892
 SHA512:
-  metadata.gz: 6fe74d9b49355983dc8f6ef637493181e5865d75d180f07f9ca841118e39f3bd07da1fdc75c35522c6372bf51ca83aefbfb2e2d20d5b92ce80b0d9dbbc1d494f
-  data.tar.gz: e001e4b2972ac791ddc6e342ce1bf9677272186627798b927b8200dbb32329ab17313afa3492b5b7c4ecfda549ee4dd22b3173343642d8946809766a8dda852a
+  metadata.gz: '0945980b87480c770a183030185edfa08b2f376a696bf0c5df688ac1908bfbc7690f23b2af0856089a3f322cb3256f416a08391378867d2bbfa3ab7ca0ff566a'
+  data.tar.gz: f4ecc28c0ad65ad1ec2572d11e82ffc3b212f83b74a5b1b5eb5a04aca8efa66134e8729f5913d050cdaad7cc5d5524f63b2af54957a422f37b1a0a4977e35a4f

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

@@ -7,7 +7,12 @@ class Array
 
   def to_relation
     
-    return self unless self.present?
+    # Return an empty ActiveRecord_Relation instance when no objects are present,
+    # instead of returning the empty array itself. The reason being, that when you
+    # always return an association, you won't run into problems with undefined methods
+    # called later on, expecting an association instead of an array.
+
+    return ApplicationRecord.none 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"

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

@@ -9,7 +9,7 @@ Kernel.module_eval do
     suffix    = suffix    || DateTime.now.prettify
     file_type = file_type || "json"
 
-    if file_type = "json"
+    if file_type == "json"
       data = JSON.pretty_generate(data)
     end
 

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

@@ -34,18 +34,26 @@ module EitilIntegrate::RubyXL
 
         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
+        # ALERT: the outcomment below is made to skip formatting days at all, so that
+        # – following eitje business logic – we currently only return an hh:mm notation
+
+        # # 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(':')]
+        # ALERT: the outcomment below is made to skip formatting days at all, so that
+        # – following eitje business logic – we currently only return an hh:mm notation
+
+        # [[sd, sh, sm].join(':')]
+        [[sh, sm].join(':')]
       end
 
       def format_time(time)

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

@@ -35,6 +35,9 @@ module EitilWrapper
       def inherited(subclass)
         super
         subclass.use_eitil_scopes
+
+        rescue => e
+          puts "default scopes failed for #{subclass} because of #{e.class} and '#{e.to_s.split(' ').first}'"
       end
 
       def use_eitil_scopes  

data/lib/eitil/version.rb

@@ -1,5 +1,5 @@
 module Eitil
   
-  VERSION = '1.1.10'
+  VERSION = '1.1.14'
   
 end

metadata

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