gloo-lang 1.3.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d53ee57cd043ef2df43c9f73c3e06dbbc4b4aab69bef954eacf10aa13c5635d
-  data.tar.gz: 01e5791a5ef73fe464af49f2fb050b0e1a83b6e4cccac7fff14ebd09da40af45
+  metadata.gz: 88ed378c66726646a394b8dd00de44f7d41c7ae31f141d95ece292d827caad81
+  data.tar.gz: 856f6958f2f55e5c4d6c1002d8ea89a297b7070ad55f9bc8b314bca268d57a95
 SHA512:
-  metadata.gz: 19517cd6d7ecc5e6954162dff72260e4b60239f38d32a6ce407830b1d4e469a8e3fd355e21c036f5a7c075ad5a677e759f4bb10e3b23cc4163abcf3bace93986
-  data.tar.gz: cbda84d465f7364102558978f6529c0b34ae2a15d8d7d6b2b87724dad49dd7d2e70b4b51817302e6adf7468499254563b86dc2bcb2f3304b86ee6a26cffaf104
+  metadata.gz: 94d5ce627bd7958eddb1308c4771b718ebf86f71ad6697bbf8e7031d628f7d478f6e0ec7d0995f0245f35a2f1d55f2495a31809c4f0fe6ca53931cb34864a055
+  data.tar.gz: 4920b8d24b4a13e5906d7c66e39ec3b61553c2bdec049ab7bd24ceac33a46cb9d22bb5c23a75539e503f047d1cd5c5e928923faec1d8b1c6889b3c3ffd94c966

data/lib/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.1

data/lib/gloo_lang/convert/string_to_date.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2023 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  String to Date.
+#
+require 'chronic'
+
+module GlooLang
+  module Convert
+    class StringToDate
+
+      #
+      # Convert the given string value to date.
+      #
+      def convert( value )
+        return Chronic.parse( value )
+      end
+
+    end
+  end
+end

data/lib/gloo_lang/convert/string_to_time.rb

@@ -0,0 +1,21 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2023 Eric Crane.  All rights reserved.
+#
+# Conversion tool:  String to Time.
+#
+require 'chronic'
+
+module GlooLang
+  module Convert
+    class StringToTime
+
+      #
+      # Convert the given string value to time.
+      #
+      def convert( value )
+        return Chronic.parse( value )
+      end
+
+    end
+  end
+end

data/lib/gloo_lang/objs/dt/date.rb

@@ -10,6 +10,7 @@ module GlooLang
 
       KEYWORD = 'date'.freeze
       KEYWORD_SHORT = 'date'.freeze
+      DEFAULT_FORMAT = '%Y.%m.%d'.freeze
 
       #
       # The name of the object type.
@@ -25,6 +26,21 @@ module GlooLang
         return KEYWORD_SHORT
       end
 
+      #
+      # Set the value with any necessary type conversions.
+      #
+      def set_value( new_value )
+        if DtTools.is_dt_type? new_value
+          self.value = new_value
+        else
+          self.value = @engine.converter.convert( new_value, 'Date', nil )
+        end
+
+        if DtTools.is_dt_type? self.value
+          self.value = self.value.strftime( DEFAULT_FORMAT )
+        end
+      end
+
       # ---------------------------------------------------------------------
       #    Messages
       # ---------------------------------------------------------------------
@@ -40,9 +56,8 @@ module GlooLang
       # Set to the current date.
       #
       def msg_now
-        t = DateTime.now.strftime( '%Y.%m.%d' )
-        self.value = t
-        @engine.heap.it.set_to t
+        self.set_value( DateTime.now )
+        @engine.heap.it.set_to self.value
       end
 
     end

data/lib/gloo_lang/objs/dt/datetime.rb

@@ -3,6 +3,7 @@
 #
 # A Date and Time object.
 #
+require 'active_support/all'
 
 module GlooLang
   module Objs
@@ -10,6 +11,7 @@ module GlooLang
 
       KEYWORD = 'datetime'.freeze
       KEYWORD_SHORT = 'dt'.freeze
+      DEFAULT_FORMAT = '%Y.%m.%d %I:%M:%S %P'.freeze
 
       #
       # The name of the object type.
@@ -29,14 +31,17 @@ module GlooLang
       # Set the value with any necessary type conversions.
       #
       def set_value( new_value )
-        unless new_value.is_a? DateTime
+        if DtTools.is_dt_type? new_value
+          self.value = new_value
+        else
           self.value = @engine.converter.convert( new_value, 'DateTime', nil )
-          return
         end
 
-        self.value = new_value
+        if DtTools.is_dt_type? self.value
+          self.value = self.value.strftime( DEFAULT_FORMAT )
+        end
       end
-
+    
       # ---------------------------------------------------------------------
       #    Messages
       # ---------------------------------------------------------------------
@@ -45,16 +50,69 @@ module GlooLang
       # Get a list of message names that this object receives.
       #
       def self.messages
-        return super + %w[now]
+        return super + %w[now is_today is_future is_past is_yesterday is_tomorrow is_this_week]
+      end
+
+      #
+      # Tell the datetime to check if it is today.
+      #
+      def msg_is_today
+        today = DtTools.is_today?( self.value )
+        @engine.heap.it.set_to today
+        return today
+      end
+
+      #
+      # Tell the datetime to check if it is in the future.
+      #
+      def msg_is_future
+        today = DtTools.is_future?( self.value )
+        @engine.heap.it.set_to today
+        return today
+      end
+
+      #
+      # Tell the datetime to check if it is in the past.
+      #
+      def msg_is_past
+        today = DtTools.is_past?( self.value )
+        @engine.heap.it.set_to today
+        return today
+      end
+
+      #
+      # Tell the datetime to check if it is yesterday.
+      #
+      def msg_is_yesterday
+        today = DtTools.is_yesterday?( self.value )
+        @engine.heap.it.set_to today
+        return today
+      end
+
+      #
+      # Tell the datetime to check if it is tomorrow.
+      #
+      def msg_is_tomorrow
+        today = DtTools.is_tomorrow?( self.value )
+        @engine.heap.it.set_to today
+        return today
+      end
+
+      #
+      # Tell the datetime to check if it is this week.
+      #
+      def msg_is_this_week
+        today = DtTools.is_this_week?( self.value )
+        @engine.heap.it.set_to today
+        return today
       end
 
       #
       # Set to the current date and time.
       #
       def msg_now
-        t = DateTime.now.strftime( '%Y.%m.%d %I:%M:%S %P' )
-        self.value = t
-        @engine.heap.it.set_to t
+        self.set_value( DateTime.now )
+        @engine.heap.it.set_to self.value
       end
 
     end

data/lib/gloo_lang/objs/dt/dt_tools.rb

@@ -0,0 +1,100 @@
+# Author::    Eric Crane  (mailto:eric.crane@mac.com)
+# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
+#
+# A Date and Time object.
+#
+
+class DtTools
+
+  # ---------------------------------------------------------------------
+  #    Type helpers
+  # ---------------------------------------------------------------------
+
+  # 
+  # Is the given object a base Date Time object?
+  # True for DateTime and Time
+  # 
+  def self.is_dt_type? obj
+    return true if obj.is_a? ::DateTime
+    return true if obj.is_a? ::Time
+    return false
+  end
+
+  # ---------------------------------------------------------------------
+  #    Language helpers
+  # ---------------------------------------------------------------------
+
+  # 
+  # Get the beginning of the week.
+  # 
+  def self.beginning_of_week
+    return Time.now.beginning_of_week( start_day = :sunday )
+  end
+
+  # 
+  # Is the date in the next 10 days?
+  # 
+  def self.in_next_ten_days?( dt )
+    return false if DtTools.is_past?( dt )
+    dt < 10.days.from_now.end_of_day
+  end
+
+  # 
+  # Is the date in the past?
+  # 
+  def self.is_past?( dt )
+      dt < Time.now.beginning_of_day
+  end
+
+  # 
+  # Is the date in the future?
+  # 
+  def self.is_future?( dt )
+      dt > Time.now.end_of_day
+  end
+
+  # 
+  # Is the given date today?
+  # 
+  def self.is_today?( dt )
+    return false if dt.blank?
+    dt = Chronic.parse( dt ) if dt.is_a? String
+    return false if dt <= ::Time.now.beginning_of_day
+    return false if dt >= ::Time.now.end_of_day
+    return true
+  end
+
+  # 
+  # Is the given date tomorrow?
+  # 
+  def self.is_tomorrow?( dt )
+    return false if dt.blank?
+    dt = Chronic.parse( dt ) if dt.is_a? String
+    return false if dt <= ( ::Time.now.beginning_of_day + 1.day )
+    return false if dt >= ( ::Time.now.end_of_day + 1.day )
+    return true
+  end
+
+  # 
+  # Is the given date yesterday?
+  # 
+  def self.is_yesterday?( dt )
+    return false if dt.blank?
+    dt = Chronic.parse( dt ) if dt.is_a? String
+    return false if dt <= ( ::Time.now.beginning_of_day - 1.day )
+    return false if dt >= ( ::Time.now.end_of_day - 1.day )
+    return true
+  end
+
+  # 
+  # Is the given date this week?
+  # 
+  def self.is_this_week?( dt )
+    return false if dt.blank?
+    dt = Chronic.parse( dt ) if dt.is_a?( String )
+    return false if dt <= ::Time.now.beginning_of_week( start_day = :sunday )
+    return false if dt >= ::Time.now.end_of_week( start_day = :sunday )
+    return true
+  end
+  
+end

data/lib/gloo_lang/objs/dt/time.rb

@@ -10,6 +10,7 @@ module GlooLang
 
       KEYWORD = 'time'.freeze
       KEYWORD_SHORT = 'time'.freeze
+      DEFAULT_FORMAT = '%I:%M:%S %P'.freeze
 
       #
       # The name of the object type.
@@ -25,6 +26,21 @@ module GlooLang
         return KEYWORD_SHORT
       end
 
+      #
+      # Set the value with any necessary type conversions.
+      #
+      def set_value( new_value )
+        if DtTools.is_dt_type? new_value
+          self.value = new_value
+        else
+          self.value = @engine.converter.convert( new_value, 'Time', nil )
+        end
+
+        if DtTools.is_dt_type? self.value
+          self.value = self.value.strftime( DEFAULT_FORMAT )
+        end
+      end
+
       # ---------------------------------------------------------------------
       #    Messages
       # ---------------------------------------------------------------------
@@ -40,9 +56,8 @@ module GlooLang
       # Set to the current time.
       #
       def msg_now
-        t = DateTime.now.strftime( '%I:%M:%S %P' )
-        self.value = t
-        @engine.heap.it.set_to t
+        self.set_value( DateTime.now )
+        @engine.heap.it.set_to self.value
       end
 
     end

data/lib/gloo_lang/objs/web/http_post.rb

@@ -114,8 +114,11 @@ module GlooLang
         @engine.log.debug "posting to: #{uri}"
         body = self.body_as_json
         @engine.log.debug "posting body: #{body}"
-        data = GlooLang::Objs::HttpPost.post_json( uri, body, skip_ssl_verify? )
-        self.update_result data
+        result = GlooLang::Objs::HttpPost.post_json( uri, body, skip_ssl_verify? )
+        @engine.log.debug result.code
+        @engine.log.debug result.message
+
+        self.update_result result.body
       end
 
       # ---------------------------------------------------------------------
@@ -135,10 +138,7 @@ module GlooLang
           request.content_type = 'application/json'
           request.body = body
 
-          result = http.request request # Net::HTTPResponse object
-          @engine.log.debug result.code
-          @engine.log.debug result.message
-          return result.body
+          return http.request( request )  # returns Net::HTTPResponse object
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo-lang
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.1
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-12 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,9 +214,11 @@ files:
 - lib/gloo_lang/app/platform.rb
 - lib/gloo_lang/app/settings.rb
 - lib/gloo_lang/convert/converter.rb
+- lib/gloo_lang/convert/string_to_date.rb
 - lib/gloo_lang/convert/string_to_datetime.rb
 - lib/gloo_lang/convert/string_to_decimal.rb
 - lib/gloo_lang/convert/string_to_integer.rb
+- lib/gloo_lang/convert/string_to_time.rb
 - lib/gloo_lang/core/baseo.rb
 - lib/gloo_lang/core/dictionary.rb
 - lib/gloo_lang/core/error.rb
@@ -264,6 +266,7 @@ files:
 - lib/gloo_lang/objs/data/table.rb
 - lib/gloo_lang/objs/dt/date.rb
 - lib/gloo_lang/objs/dt/datetime.rb
+- lib/gloo_lang/objs/dt/dt_tools.rb
 - lib/gloo_lang/objs/dt/time.rb
 - lib/gloo_lang/objs/ror/erb.rb
 - lib/gloo_lang/objs/ror/eval.rb