effective_resources 2.19.11 → 2.19.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fc5b41757668d88d0ae83b6a52f332ad18e645658909bf80c69b3fa47dd3b98
-  data.tar.gz: 55830a5d7d49dfea77885a2741dd06f335f6dbbc6cf80b86beccc39b720e9535
+  metadata.gz: 5c3b294943394c17234dc15366796c5f67b89f6dd040d054ee864fdbfc462e9a
+  data.tar.gz: c3c8654723ffbd11ad5756d051e9bf1d810acf071defb65155410ef42e5eb917
 SHA512:
-  metadata.gz: ef99fd38dede8d87305ef660a87cc95ea64b9307812d80b7dd14cd2f2b4da7dd5e8532ac2ddf9e39521cdd637ab5027a4c8534bb1a8bc5ee134576a148d16f24
-  data.tar.gz: 7527c0b651f37c1046299286e8165bb4a3670e879227b4be7ce83c6fb3c742eab7876f2c54138f1cd25bad281b13a69d2da5085c3b629d38f3a7d34e5fb07dd7
+  metadata.gz: a6c58fe8690a02c8f843cf6843ae98ff892a4f79c374e9a1c843307e9a0a732e4f2a2edae5021c64c25784f27731ded2d8f6a96209795e942d97f50f851b10af
+  data.tar.gz: 7e01d7dc9735a2fbb6c21816ae737f680131cc91daf560b814034f606fb27d6c93248f5e7517d40b13eee6bc2ae9150a5864c4d9f821ee31e9ef11cfa2d94806

data/app/models/effective/attribute.rb

@@ -47,6 +47,7 @@ module Effective
         when :text        ; :string
         when :time        ; :time
         when :uuid        ; :uuid
+        when :url         ; :url
         when FalseClass   ; :boolean
         when (defined?(Integer) ? Integer : Fixnum) ; :integer
         when Float        ; :decimal
@@ -83,7 +84,7 @@ module Effective
           date = if digits.first.length == 4  # 2017-01-10
             (Time.zone.local(*digits) rescue nil)
           else # 01/10/2016
-            year = digits.find { |d| d.length == 4}
+            year = digits.find { |d| d.length == 4 }
             digits = [year] + (digits - [year])
             (Time.zone.local(*digits) rescue nil)
           end
@@ -127,6 +128,15 @@ module Effective
         value.kind_of?(Integer) ? value : (value.to_s.gsub(/[^0-9|\-|\.]/, '').to_f * 100.0).round
       when :string
         value.to_s
+      when :url
+        return nil unless value.kind_of?(String)
+
+        if value.downcase.start_with?('http://', 'https://')
+          value
+        elsif value.include?('.')
+          "https://#{value}"
+        end
+
       when :email
         return nil unless value.kind_of?(String)
 

data/app/models/effective/resources/relation.rb

@@ -299,7 +299,7 @@ module Effective
               .where(ActiveStorage::Blob.arel_table[:filename].matches("%#{term}%"))
 
           when :date, :datetime
-            if value.kind_of?(String)
+            if value.kind_of?(String) && term.respond_to?(:strftime)
               end_at = (
                 case (value.to_s.scan(/(\d+)/).flatten).length
                 when 1 ; term.end_of_year     # Year
@@ -323,8 +323,9 @@ module Effective
               else
                 relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", value.beginning_of_day, value.end_of_day)
               end
+            elsif term.respond_to?(:strftime) == false && operation.to_s.include?('days_ago') == false
+              relation.none # It's an invalid entered date 
             end
-
           when :effective_obfuscation
             term = Attribute.new(as, klass: (associated(name).try(:klass) || klass)).parse(value, name: name)
             relation.where(attribute.eq((value == term ? 0 : term)))
@@ -338,9 +339,13 @@ module Effective
             relation.with_role(term)
 
           when :time
-            timed = relation.where("EXTRACT(hour from #{sql_column}) = ?", term.utc.hour)
-            timed = timed.where("EXTRACT(minute from #{sql_column}) = ?", term.utc.min) if term.min > 0
-            timed
+            if term.respond_to?(:strftime)
+              timed = relation.where("EXTRACT(hour from #{sql_column}) = ?", term.utc.hour)
+              timed = timed.where("EXTRACT(minute from #{sql_column}) = ?", term.utc.min) if term.min > 0
+              timed
+            else
+              relation.none # It's an invalid entered date 
+            end
         end
 
         return searched if searched

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.19.11'.freeze
+  VERSION = '2.19.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.19.11
+  version: 2.19.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-15 00:00:00.000000000 Z
+date: 2024-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails