arel_rest 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 248cd74204296375871f7e5de8358609ebf10042f25b2bd542fac98ccc69f332
-  data.tar.gz: ece38b072cff0716453e5a97b1a4f8a1296a3366e7ac06e64d3d6297f9dbbf18
+  metadata.gz: b16fe311f54f93f520d73d38d672b532d1ede2908aec026d130ff51eecc208d7
+  data.tar.gz: 3b7f1dd29124f3241a33d12d3081879a06196a8ec5843b9533cd31555014c0ae
 SHA512:
-  metadata.gz: 54b64f1e8678c878a5152d9a24479602380f2a612483ac6370d9218e24e927c40f64a80bed6f4684390054c8b57862851aa5bd5712355c8af9c48aca74143293
-  data.tar.gz: 85054aa333add5050dcb2e2edbda9de70da7422d255a0f33f7df324d19da550f0972a9acab3687618f09cda9a4cb72b5a3d0187992be3d14477ddf688f2eb528
+  metadata.gz: 891a2f435f9bcc3c34a00ffe03d89e63f38092dd1caca5bb07f0ed65e87d51c421ea61ab511fcdf49846956f8fd97fc98461eb6980c22a270dee341436ba8833
+  data.tar.gz: 7c9a0a7858e2a44b735923e76a0d7149788dcf553826410240123ebb4494bdf0a8ecacd8fd96fad5f3f7d3d01ec0918de26852afdabc04040d21a4d328125bdb

data/lib/predications/between_operator.rb

@@ -6,38 +6,19 @@ module ArelRest::Predications
         column = query[:attribute].split(".")[1]
 
         range = Range.new(
-          transform_data_for_first(query[:values][0]),
-          transform_data_for_last(query[:values][1])
+          try_transform_date(query[:values][0]),
+          try_transform_date(query[:values][1])
           )
         table[column].between(range)
       end
 
       private
 
-      def transform_data_for_first(first)
-        # Try obtein date in format iso8601
-        case first
-        when /^\d{4}-\d{2}-\d{2}$/ # somente com data
-          Time.use_zone(ArelRest.time_zone) { Time.zone.parse(first).beginning_of_day }
-        when /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/ # com data e hora
-          Time.use_zone(ArelRest.time_zone) { Time.zone.parse(first) }
-        when /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(Z|[+-]\d{2}:\d{2})$/ # com data, hora e fuso horário
-          Time.use_zone(ArelRest.time_zone) { Time.zone.parse(first) }
-        else
-          first
-        end
-      end
-
-      def transform_data_for_last(last)
-        case last
-        when /^\d{4}-\d{2}-\d{2}$/ # somente com data
-          Time.use_zone(ArelRest.time_zone) { Time.zone.parse(last).beginning_of_day }
-        when /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/ # com data e hora
-          Time.use_zone(ArelRest.time_zone) { Time.zone.parse(last) }
-        when /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(Z|[+-]\d{2}:\d{2})$/ # com data, hora e fuso horário
-          Time.use_zone(ArelRest.time_zone) { Time.zone.parse(last) }
-        else
-          last
+      def try_transform_date(date)
+        begin
+          Time.use_zone(ArelRest.time_zone) { Time.parse(date)}
+        rescue StandardError => e
+          date
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_rest
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Luiz Filipe, Lucas Hunter, Leonardo Baptista, Rafael C. Abreu