cyberweb 0.8.17 → 0.9.32

data/lib/cyberweb/web_object/cmd.rb

@@ -0,0 +1,257 @@
+#!/usr/bin/ruby -w
+# Encoding: UTF-8
+# frozen_string_literal: true
+# =========================================================================== #
+# This file wraps over the functionality stored in the file
+# "cyberweb/cmd/cmd.rb".
+# =========================================================================== #
+# require 'cyberweb/cmd/cmd.rb'
+# =========================================================================== #
+require 'cyberweb/base/base.rb'
+
+module Cyberweb
+
+class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
+
+  require 'cyberweb/cmd/cmd.rb'
+
+  # ========================================================================= #
+  # === append_this_css
+  # ========================================================================= #
+  def append_this_css(i)
+    ::Cyberweb::Cmd.append_this_css(i)
+  end
+
+  # ========================================================================= #
+  # === append_to_cmd1
+  #
+  # This method will append to cmd1, by wrapping over a toplevel-method.
+  # ========================================================================= #
+  def append_to_cmd1(i = '')
+    ::Cyberweb.append_to_cmd1(i)
+  end; alias append_cmd1 append_to_cmd1 # === append_cmd1
+
+  # ========================================================================= #
+  # === append_to_cmd2
+  # ========================================================================= #
+  def append_to_cmd2(i = '')
+    ::Cyberweb.append_to_cmd2(i)
+  end
+
+  # ========================================================================= #
+  # === append_to_cmd3
+  # ========================================================================= #
+  def append_to_cmd3(i = '')
+    ::Cyberweb.append_to_cmd3(i)
+  end
+
+  # ========================================================================= #
+  # === append_to_cmd4
+  # ========================================================================= #
+  def append_to_cmd4(i = '')
+    ::Cyberweb.append_to_cmd4(i)
+  end
+
+  # ========================================================================= #
+  # === append_to_cmd5
+  # ========================================================================= #
+  def append_to_cmd5(i = '')
+    ::Cyberweb.append_to_cmd5(i)
+  end
+
+  # ========================================================================= #
+  # === cmd1_is
+  # ========================================================================= #
+  def cmd1_is(i)
+    Cyberweb.cmd1 = i
+  end; alias cmd_is cmd1_is # === cmd_is
+
+  # ========================================================================= #
+  # === cmd2_is
+  # ========================================================================= #
+  def cmd2_is(i)
+    Cyberweb.cmd2 = i
+  end
+
+  # ========================================================================= #
+  # === cmd3_is
+  # ========================================================================= #
+  def cmd3_is(i)
+    Cyberweb.cmd3 = i
+  end
+
+  # ========================================================================= #
+  # === cmd4_is
+  # ========================================================================= #
+  def cmd4_is(i)
+    Cyberweb.cmd4 = i
+  end
+
+  # ========================================================================= #
+  # === cmd5_is
+  # ========================================================================= #
+  def cmd5_is(i)
+    Cyberweb.cmd5 = i
+  end
+
+  # ========================================================================= #
+  # === cmd1?
+  #
+  # This method also has a constant as an "alias" to its value.
+  # ========================================================================= #
+  def cmd1?
+    ::Cyberweb.cmd1?
+  end; alias cmd?      cmd1? # === cmd?
+       alias command1? cmd1? # === command1?
+
+  # ========================================================================= #
+  # === cmd2?
+  # ========================================================================= #
+  def cmd2?
+    ::Cyberweb.cmd2?
+  end; alias cmd2?     cmd2? # === cmd2?
+       alias command2? cmd2? # === command2?
+       
+  # ========================================================================= #
+  # === cmd3?
+  # ========================================================================= #
+  def cmd3?
+    ::Cyberweb.cmd3?
+  end; alias cmd3?     cmd3? # === cmd3?
+       alias command3? cmd3? # === command3?
+
+  # ========================================================================= #
+  # === cmd4?
+  # ========================================================================= #
+  def cmd4?
+    ::Cyberweb.cmd4?
+  end; alias cmd4?     cmd4? # === cmd4?
+       alias command4? cmd4? # === command4?
+
+  # ========================================================================= #
+  # === cmd5?
+  # ========================================================================= #
+  def cmd5?
+    ::Cyberweb.cmd5?
+  end; alias cmd5?     cmd5? # === cmd5?
+       alias command5? cmd5? # === command5?
+
+  # ========================================================================= #
+  # === cmd1                                                        (cmd tag)
+  # ========================================================================= #
+  def cmd1(
+      content            = '',
+      css_rules_to_use   = Cyberweb.cmd1_css_rules?,
+      optional_id        = '',
+      optional_css_style = '',
+      &block
+    )
+    if block_given? and (yield == :no_break)
+      ee "#{::Cyberweb.cmd1(content, css_rules_to_use, optional_id, optional_css_style)}"
+    else
+      ee "#{::Cyberweb.cmd1(content, css_rules_to_use, optional_id, optional_css_style)}#{BR}"
+    end
+  end; alias cmd     cmd1 # === cmd
+       alias rc1     cmd1 # === rc1
+       alias command cmd1 # === command
+
+  # ========================================================================= #
+  # === cmd2
+  # ========================================================================= #
+  def cmd2(
+      content     = '',
+      css_rules_to_use = Cyberweb.cmd2_css_rules?,
+      optional_id        = '',
+      optional_css_style = '',
+      &block
+    )
+    if block_given? and (yield == :no_break)
+      ee "#{::Cyberweb.cmd2(content, css_rules_to_use, optional_id, optional_css_style)}"
+    else
+      ee "#{::Cyberweb.cmd2(content, css_rules_to_use, optional_id, optional_css_style)}#{BR}"
+    end
+  end; alias rc2      cmd2 # === rc2
+       alias command2 cmd2 # === command2
+
+  # ========================================================================= #
+  # === cmd3
+  # ========================================================================= #
+  def cmd3(
+      content = '',
+      css_rules_to_use = Cyberweb.cmd3_css_rules?,
+      optional_id        = '',
+      optional_css_style = '',
+      &block
+    )
+    if block_given? and (yield == :no_break)
+      ee "#{::Cyberweb.cmd3(content, css_rules_to_use, optional_id, optional_css_style)}"
+    else
+      ee "#{::Cyberweb.cmd3(content, css_rules_to_use, optional_id, optional_css_style)}#{BR}"
+    end
+  end; alias rc3      cmd3 # === rc3
+       alias command3 cmd3 # === command3
+
+  # ========================================================================= #
+  # === cmd4
+  # ========================================================================= #
+  def cmd4(
+      content = '',
+      css_rules_to_use = Cyberweb.cmd4_css_rules?,
+      optional_id        = '',
+      optional_css_style = '',
+      &block
+    )
+    if block_given? and (yield == :no_break)
+      ee "#{::Cyberweb.cmd4(content, css_rules_to_use, optional_id, optional_css_style)}"
+    else
+      ee "#{::Cyberweb.cmd4(content, css_rules_to_use, optional_id, optional_css_style)}#{BR}"
+    end
+  end; alias rc4      cmd4 # === rc4
+       alias command4 cmd4 # === command4
+
+  # ========================================================================= #
+  # === cmd5
+  # ========================================================================= #
+  def cmd5(
+      content = '',
+      css_rules_to_use = Cyberweb.cmd5_css_rules?,
+      optional_id        = '',
+      optional_css_style = '',
+      &block
+    )
+    if block_given? and (yield == :no_break)
+      ee "#{::Cyberweb.cmd5(content, css_rules_to_use, optional_id, optional_css_style)}"
+    else
+      ee "#{::Cyberweb.cmd5(content, css_rules_to_use, optional_id, optional_css_style)}#{BR}"
+    end
+  end; alias rc5      cmd5 # === rc5
+       alias command5 cmd5 # === command5
+
+  # ========================================================================= #
+  # === cmdbold
+  # ========================================================================= #
+  def cmdbold(i = '')
+    cmd(i, 'BOLD mars1em')
+  end
+
+  # ========================================================================= #
+  # === col_cmd
+  # ========================================================================= #
+  def col_cmd(
+      i           = '',
+      optional_id = ''
+    )
+    ee(
+      i, ::Cyberweb.internal_hash?[:col_cmd], optional_id
+    )
+  end; alias col col_cmd # === col
+
+  # ========================================================================= #
+  # === cmd_pre
+  # ========================================================================= #
+  def cmd_pre(i)
+    splitted = i.split(N)
+    splitted.each {|entry| cmd(entry) }
+  end; alias pre_cmd cmd_pre # === pre_cmd
+
+end; end

data/lib/cyberweb/web_object/display_output_and_report.rb

@@ -19,4 +19,103 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
     add(i)
   end
 
+  # ========================================================================= #
+  # === e                                                             (e tag)
+  #
+  # This is essentially sbr(), which stands for "string span", and
+  # "breakline". It is like "puts" in regular ruby really, so a newline
+  # will be shown (registered onto the main string).
+  #
+  # Note that the method must be able to respond to more than one
+  # argument too.
+  #
+  # This method must be able to respond to the following code as well:
+  #
+  #   e('This text should now be editable.') { :editable }
+  #
+  # ========================================================================= #
+  def e(
+      i                  = '',
+      optional_css_class = '',
+      optional_the_id    = '',
+      optional_css_style = ''
+    )
+    _ = ''.dup
+    _ << string_s2(i, optional_css_class, optional_the_id, optional_css_style)
+    # ======================================================================= #
+    # Handle blocks next.
+    # ======================================================================= #
+    if block_given?
+      yielded = yield
+      case yielded
+      # ===================================================================== #
+      # === :editable
+      #
+      # This will also set spellcheck to false, because I find it to be
+      # very annoying otherwise.
+      # ===================================================================== #
+      when :editable
+        index = _.index('>')
+        _ = _.dup if _.frozen?
+        _[index,0] = ' contenteditable="true" spellcheck="false"'
+      end
+    end
+    # ======================================================================= #
+    # Next we have to distinguish between e() and le(), since as of
+    # January 2023.
+    # ======================================================================= #
+    method_name = Cyberweb.return_the_method_name_from_this_array(caller())
+    # ======================================================================= #
+    # We handle only two cases here so far - p_default and p_default_le.
+    # If we ever want to add more cases, we should extend this comment
+    # as well.
+    # ======================================================================= #
+    case method_name
+    # ======================================================================= #
+    # === div_default
+    # ======================================================================= #
+    when 'div_default'
+      addnl(_.dup)
+      br # And the <br> tag.
+    # ======================================================================= #
+    # === p_default
+    # ======================================================================= #
+    when 'p_default'
+      addnl(_.dup)
+      br # And the <br> tag.
+    # ======================================================================= #
+    # === div_default_le
+    # ======================================================================= #
+    when 'div_default_le'
+      addnl(
+        string_s2(
+          i,
+          "#{optional_css_class} l1em",
+          optional_the_id,
+          optional_css_style
+        )
+      )
+      br # And the <br> tag.
+    # ======================================================================= #
+    # === p_default_le
+    #
+    # Display the content of the p {} tag next.
+    # ======================================================================= #
+    when 'p_default_le'
+      addnl(
+        string_s2(
+          i,
+          "#{optional_css_class} l1em",
+          optional_the_id,
+          optional_css_style
+        )
+      )
+      br # And the <br> tag.
+    else
+      addnl(_.dup)
+      br # And the <br> tag.
+    end
+  end; alias ebr e # === ebr
+       alias sbr e # === sbr
+
 end; end

data/lib/cyberweb/web_object/html_tags.rb

@@ -14,6 +14,112 @@ module Cyberweb
 
 class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
 
+  # ========================================================================= #
+  # === textarea
+  #
+  # This method essentially creates a HTML <textarea> tag.
+  #
+  # Usage example:
+  #
+  #   textarea('foobar','bblack1 pad1em','textarea_id')
+  #
+  # This method also works via a block. Example for this:
+  #
+  #   add_textfield {{
+  #      width:  50,
+  #      height: 50
+  #    }}
+  #
+  # ========================================================================= #
+  def textarea(
+      default_content = '', # (1) content
+      css_class       = '', # (2) css-class
+      the_id          = '', # (3) the id
+      css_style       = '', # (4) css_style
+      n_cols          = 25, # (5) n columns
+      n_rows          =  8, # (6) n rows
+      javascript      = '', # (7) javascript
+      name            = '', # (8) name
+      &block
+    )
+    addnl(
+      ::Cyberweb.string_textarea(
+        default_content,
+        css_class,
+        the_id,
+        css_style,
+        n_cols,
+        n_rows,
+        javascript,
+        name,
+        &block
+      )
+    )
+  end; alias string_textarea textarea # === string_textarea
+       alias textview        textarea # === textview
+       alias add_write_area  textarea # === add_write_area
+       alias add_textfield   textarea # === add_textfield
+
+  # ========================================================================= #
+  # === p                                                             (p tag)
+  #
+  # This method handles the creation of <p> tags ultimately.
+  # ========================================================================= #
+  def p(
+      optional_css_class = '',
+      the_id             = '',
+      optional_css_style = '',
+      &block
+    )
+    # ======================================================================= #
+    # === Handle Hashes next
+    # ======================================================================= #
+    if optional_css_class.is_a? Hash
+      # ===================================================================== #
+      # === :id
+      # ===================================================================== #
+      if optional_css_class.has_key? :id
+        the_id = optional_css_class.delete(:id)
+      end
+      # ===================================================================== #
+      # === :css_style
+      #
+      # Must come before :css_class.
+      # ===================================================================== #
+      if optional_css_class.has_key? :css_style
+        optional_css_style = optional_css_class.delete(:css_style)
+      end
+      # ===================================================================== #
+      # === :css_class
+      #
+      # Must come after :id.
+      # ===================================================================== #
+      if optional_css_class.has_key? :css_class
+        optional_css_class = optional_css_class.delete(:css_class)
+      # ===================================================================== #
+      # === :class
+      # ===================================================================== #
+      elsif optional_css_class.has_key? :class
+        optional_css_class = optional_css_class.delete(:class)
+      end
+      if optional_css_class.is_a?(Hash) and
+        optional_css_class.empty?
+        optional_css_class = ''
+      end
+    end
+    addn(
+      '<p'+
+      css_class_or_no_class(optional_css_class)+
+      id_or_no_id(the_id.to_s)+
+      css_style_or_no_style(optional_css_style)+
+      '>'
+    )
+    if block_given?
+      yield
+      addn('</p>')
+    end
+  end
+
   require 'cyberweb/html_tags/input.rb'
   # ========================================================================= #
   # === input                                                     (input tag)
@@ -740,66 +846,6 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
     )
   end; alias input_entry input_field # === input_entry
 
-  # ========================================================================= #
-  # === p                                                             (p tag)
-  #
-  # This method handles the creation of <p> tags ultimately.
-  # ========================================================================= #
-  def p(
-      optional_css_class = '',
-      the_id             = '',
-      optional_css_style = '',
-      &block
-    )
-    # ======================================================================= #
-    # === Handle Hashes next
-    # ======================================================================= #
-    if optional_css_class.is_a? Hash
-      # ===================================================================== #
-      # === :id
-      # ===================================================================== #
-      if optional_css_class.has_key? :id
-        the_id = optional_css_class.delete(:id)
-      end
-      # ===================================================================== #
-      # === :css_style
-      #
-      # Must come before :css_class.
-      # ===================================================================== #
-      if optional_css_class.has_key? :css_style
-        optional_css_style = optional_css_class.delete(:css_style)
-      end
-      # ===================================================================== #
-      # === :css_class
-      #
-      # Must come after :id.
-      # ===================================================================== #
-      if optional_css_class.has_key? :css_class
-        optional_css_class = optional_css_class.delete(:css_class)
-      # ===================================================================== #
-      # === :class
-      # ===================================================================== #
-      elsif optional_css_class.has_key? :class
-        optional_css_class = optional_css_class.delete(:class)
-      end
-      if optional_css_class.is_a?(Hash) and
-        optional_css_class.empty?
-        optional_css_class = ''
-      end
-    end
-    addn(
-      '<p'+
-      css_class_or_no_class(optional_css_class)+
-      id_or_no_id(the_id.to_s)+
-      css_style_or_no_style(optional_css_style)+
-      '>'
-    )
-    if block_given?
-      yield
-      addn('</p>')
-    end
-  end
-
   # ========================================================================= #
   # === add_this_div
   # ========================================================================= #
@@ -1299,44 +1345,6 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
     end
   end
 
-  # ========================================================================= #
-  # === textarea
-  #
-  # This create a <textarea> tag.
-  #
-  # Example:
-  #
-  #   textarea('foobar','bblack1 pad1em','textarea_id')
-  #
-  # ========================================================================= #
-  def textarea(
-      default_content = '', # 1) content
-      css_class       = '', # 2) css-class
-      the_id          = '', # 3) the id
-      css_style       = '', # 4) css_style
-      n_cols          = 25, # 5) n columns
-      n_rows          = 8,  # 6) n rows
-      javascript      = '', # 7) javascript
-      name            = '', # 8) name
-      &block
-    )
-    addnl(
-      ::Cyberweb.string_textarea(
-        default_content,
-        css_class,
-        the_id,
-        css_style,
-        n_cols,
-        n_rows,
-        javascript,
-        name,
-        &block
-      )
-    )
-  end; alias string_textarea textarea # === string_textarea
-       alias textview        textarea # === textview
-       alias add_write_area  textarea # === add_write_area
-
   # ========================================================================= #
   # === ctextarea
   # ========================================================================= #

data/lib/cyberweb/web_object/images.rb

@@ -10,6 +10,40 @@ module Cyberweb
 
 class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
 
+  # ========================================================================= #
+  # === raw_image
+  #
+  # The first argument to this method should be the path to the file at
+  # hand. This can also be a remote image.
+  #
+  # Note that this method deliberately does NOT check whether the ID is
+  # unique or not. You have to solve this prior to calling this method
+  # if you wish to avoid duplicate IDs.
+  # ========================================================================= #
+  def raw_image(
+      i                  = '',
+      optional_css_class = '',
+      optional_the_id    = '',
+      optional_css_style = '',
+      alt_text           = '',
+      optional_width     = nil,
+      optional_height    = nil
+    )
+    result = '<img src="'+i+'"'+
+             css_class_or_no_class(optional_css_class)+
+             id_or_no_id(optional_the_id, i)+
+             css_style_or_no_style(optional_css_style)+
+             alt_text_or_no_alt_text(alt_text).dup
+    if optional_width
+      result << ' width="'+optional_width.to_s+'"'
+    end
+    if optional_height
+      result << ' height="'+optional_height.to_s+'"'
+    end
+    result << '>'
+    return result
+  end
+
   # ========================================================================= #
   # === simpler_string_image                                         (sg tag)
   #
@@ -59,7 +93,22 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
     #     "#{IMG_DIR}CHEERING_PERSON.png"
     # ======================================================================= #
     if i.is_a? Symbol
-      i = ::Cyberweb.image_url(i) # This has the path.
+      i = ::Cyberweb.image_url(i).dup # This has the path.
+      if i.start_with? RUBY_SITE_DIR
+        # =================================================================== #
+        # Work on e. g.:
+        #
+        #  /usr/lib/ruby/site_ruby/3.2.0/cyberweb/images/standard_images/AUSRUFUNGSZEICHEN.png
+        #
+        # =================================================================== #
+        i.sub!(
+          /#{RUBY_SITE_DIR}/,
+          rds(
+            relative_path?+
+            '/programming/ruby/src/cyberweb/lib/'
+          )
+        )
+      end
     end
     optional_width  = nil
     optional_height = nil
@@ -198,7 +247,9 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
     # Next we prepend the path to the local directory. This is, however
     # had, NOT the case if i begins with the substring 'http'.
     # ======================================================================= #
-    if may_we_prepend_the_path and !i.start_with?('http')
+    if may_we_prepend_the_path and !i.start_with?('http') and
+      !i.start_with?('../') and # This line was added in January 2023.
+      !i.start_with?('/programming/ruby/src/')
       i = "#{return_path_to_the_images_directory}"\
           "#{i}"
     end
@@ -503,40 +554,6 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
        alias embed_remote_img   remote_img # === embed_remote_img
        alias remote_image       remote_img # === remote_image
 
-  # ========================================================================= #
-  # === raw_image
-  #
-  # The first argument to this method should be the path to the file at
-  # hand. This can also be a remote image.
-  #
-  # Note that this method deliberately does NOT check whether the ID is
-  # unique or not. You have to solve this prior to calling this method
-  # if you wish to avoid duplicate IDs.
-  # ========================================================================= #
-  def raw_image(
-      i                  = '',
-      optional_css_class = '',
-      optional_the_id    = '',
-      optional_css_style = '',
-      alt_text           = '',
-      optional_width     = nil,
-      optional_height    = nil
-    )
-    result = '<img src="'+i+'"'+
-             css_class_or_no_class(optional_css_class)+
-             id_or_no_id(optional_the_id, i)+
-             css_style_or_no_style(optional_css_style)+
-             alt_text_or_no_alt_text(alt_text).dup
-    if optional_width
-      result << ' width="'+optional_width.to_s+'"'
-    end
-    if optional_height
-      result << ' height="'+optional_height.to_s+'"'
-    end
-    result << '>'
-    return result
-  end
-
   # ========================================================================= #
   # === img_base64
   # ========================================================================= #