gloo-lang 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4841953991280e59438ad214524e7455f56f32ac40c32fe8dd098c50356fdda9
-  data.tar.gz: afee2eab8f28fa8c623b055aa1ecf2180de8d64f01db39573b011192e029a8d9
+  metadata.gz: d531b63b5915a6b08b376c0363e3077df486261991e3db9b505ff141d1245b64
+  data.tar.gz: f2b6bc778beac2fe00e846ea85376b2519e21cd824036ca18832592c134add90
 SHA512:
-  metadata.gz: cd8fd626bccda5ef52a36ade7b80dca1ceb725491ee06d17c51a889e879fbeedfd23205104b2ed7d1415ec473b960643dbf64a7ec364efbe2142a76c261e69f4
-  data.tar.gz: 49f3ec4f75fabff9cba8e743e8d6db5694639b543516488e15830bd28f3cc698da7b1ce42a601f4c868467f0e80eaa18c296747528e781c16170130068f170d8
+  metadata.gz: 888622b3913bff08e64a3621c93d1af29bd73076992bc50de1cc39daf2b925744c66ceaf2ef1b3eb67ffa780c93a7b50ae9c2a3e768127756a33a996b67d2789
+  data.tar.gz: c5c0a5bdb099ad613d7e70367ecd320a428e2b129c70fe75472ea5779170e91181fecf81245ae294a04a561b2425ceb5ad782c5630682ff629d5d1075aed43d8

data/lib/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

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/core/pn.rb

@@ -12,6 +12,7 @@ module GlooLang
       ROOT = 'root'.freeze
       IT = 'it'.freeze
       ERROR = 'error'.freeze
+      CONTEXT = '@'.freeze
 
       attr_reader :src, :elements
 
@@ -124,6 +125,21 @@ module GlooLang
         return @elements.count > 1
       end
 
+      # 
+      # Does the path start with the context?
+      # 
+      def includes_context?
+        return @src.start_with?( "#{CONTEXT}." )
+      end
+
+      # 
+      # Expand the context so we have the full path.
+      # 
+      def expand_context
+        # return unless @engine.heap.context
+        self.set_to( "#{@engine.heap.context}#{@src[1..-1]}" )
+      end
+
       #
       # Get the parent that contains the object referenced.
       #
@@ -180,6 +196,10 @@ module GlooLang
           Here.expand_here( @engine, self )
         end
 
+        if self.includes_context?
+          expand_context
+        end
+
         parent = self.get_parent
         return nil unless parent
 

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gloo-lang
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Eric Crane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-09 00:00:00.000000000 Z
+date: 2023-04-27 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