cyberweb 0.6.17 → 0.7.9

data/lib/cyberweb/web_object/javascript_and_jquery.rb

@@ -10,15 +10,6 @@ module Cyberweb
 
 class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
 
-  # ========================================================================= #
-  # === addnl_javascript_code
-  # ========================================================================= #
-  def addnl_javascript_code(i)
-    addn(
-      return_javascript(i)
-    )
-  end
-
   # ========================================================================= #
   # === ejavascript
   #
@@ -345,4 +336,13 @@ EOF
        alias enable_drag   do_use_jquery # === enable_drag
        alias enable_jquery do_use_jquery # === enable_jquery
 
+  # ========================================================================= #
+  # === addnl_javascript_code
+  # ========================================================================= #
+  def addnl_javascript_code(i)
+    addn(
+      return_javascript(i)
+    )
+  end
+
 end; end

data/lib/cyberweb/web_object/link.rb

@@ -11,77 +11,37 @@ module Cyberweb
 class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
 
   # ========================================================================= #
-  # === self_abr
-  #
-  # This method is similar to abr(), but it will automatically use
-  # content: :self as-is.
-  # ========================================================================= #
-  def self_abr(
-      remote_url,
-      optional_hash = {}
-    )
-    if optional_hash.is_a? String
-      optional_hash = {
-        content: optional_hash
-      }
-    end
-    abr(remote_url, optional_hash)
-  end; alias abr_self self_abr # ===  abr_self
-
-  # ========================================================================= #
-  # === pretty_link
-  #
-  # This method will first pass the input into BeautifulUrl,
-  # and then use the result given from BeautifulUrl as the
-  # remote URL.
-  #
-  # The key idea here is that we can build up links towards
-  # remote URLs, all handled by the BeautifulUrl namespace.
-  #
-  # One advantage of this approach is that we have to change
-  # a remote URL only once, if it ever changes, so we do not
-  # have to change all local links that may have outdated
-  # entries as such.
-  #
-  # Invocation example:
-  #
-  #   pretty_link('Jules Bordet')
-  #
-  # ========================================================================= #
-  def pretty_link(i, optional_css_class = '')
-    remote_URL = beautiful_URL(i)
-    return string_a(remote_URL, content: i, css_class: optional_css_class)
-  end
-
-  # ========================================================================= #
-  # === simple_link
+  # === a                                                   (a tag, link tag)
   #
-  # A simplified wrapper around link().
-  #
-  # This is simpler since we only have to provide one URL; and optionally
-  # a second argument denoting the css-class in use.
-  #
-  # Usage example:
-  #
-  #   simple_link 'https://gamefaqs.gamespot.com/pc/565051-alone-in-the-dark-3/faqs/8459','mars2em'
+  # This method essentially refers to the <a> tag.
   #
+  # If the first input argument is a Symbol then we will tap into
+  # BeautifulUrl,via Cyberweb.beautiful_url().
   # ========================================================================= #
-  def simple_link(
-      link_hyperref,
-      optional_css_class = '',
-      make_newline       = 1
-    )
-    link(
-      link_hyperref,
-      desc:      link_hyperref,
-      css_class: optional_css_class
+  def a(
+      i           = '',
+      option_hash = {}
     )
-    case make_newline
-    when 1, true
-      br
+    if i.is_a? Symbol
+      i = beautiful_url(i)
+      # ===================================================================== #
+      # Also check if the second argument is a String. In this case we
+      # must modify it. Example for input that fulfils this criterium:
+      #
+      #   remote_link(:hydrogenase, 'Hydrogenase')+
+      #
+      # ===================================================================== #
+      if option_hash.is_a? String
+        option_hash = { content: option_hash }
+      end
     end
-  end; alias si_link     simple_link # === si_link
-       alias hyperlink   simple_link # === hyperlink
+    addn(
+      string_link(i, option_hash)
+    )
+  end; alias link        a # === a
+       alias link_to     a # === link_to
+       alias alink       a # === alink
+       alias remote_link a # === remote_link
 
   # ========================================================================= #
   # === linkbr                                                      (abr tag)
@@ -158,13 +118,88 @@ class WebObject < ::Cyberweb::Base # === Cyberweb::WebObject
         # =================================================================== #
         if uses_sinatra?
           i = i.to_s
-          i = File.basename(i.delete_suffix(File.extname(i)))
+          i = File.basename(
+                i.delete_suffix(File.extname(i))
+              )
         end
       end
     end
     abr(i, hash)
   end; alias roebe_local_link roebe_internal_link # === roebe_local_link
 
+  # ========================================================================= #
+  # === self_abr
+  #
+  # This method is similar to abr(), but it will automatically use
+  # content: :self as-is.
+  # ========================================================================= #
+  def self_abr(
+      remote_url,
+      optional_hash = {}
+    )
+    if optional_hash.is_a? String
+      optional_hash = {
+        content: optional_hash
+      }
+    end
+    abr(remote_url, optional_hash)
+  end; alias abr_self self_abr # ===  abr_self
+
+  # ========================================================================= #
+  # === pretty_link
+  #
+  # This method will first pass the input into BeautifulUrl,
+  # and then use the result given from BeautifulUrl as the
+  # remote URL.
+  #
+  # The key idea here is that we can build up links towards
+  # remote URLs, all handled by the BeautifulUrl namespace.
+  #
+  # One advantage of this approach is that we have to change
+  # a remote URL only once, if it ever changes, so we do not
+  # have to change all local links that may have outdated
+  # entries as such.
+  #
+  # Invocation example:
+  #
+  #   pretty_link('Jules Bordet')
+  #
+  # ========================================================================= #
+  def pretty_link(i, optional_css_class = '')
+    remote_URL = beautiful_URL(i)
+    return string_a(remote_URL, content: i, css_class: optional_css_class)
+  end
+
+  # ========================================================================= #
+  # === simple_link
+  #
+  # A simplified wrapper around link().
+  #
+  # This is simpler since we only have to provide one URL; and optionally
+  # a second argument denoting the css-class in use.
+  #
+  # Usage example:
+  #
+  #   simple_link 'https://gamefaqs.gamespot.com/pc/565051-alone-in-the-dark-3/faqs/8459','mars2em'
+  #
+  # ========================================================================= #
+  def simple_link(
+      link_hyperref,
+      optional_css_class = '',
+      make_newline       = 1
+    )
+    link(
+      link_hyperref,
+      desc:      link_hyperref,
+      css_class: optional_css_class
+    )
+    case make_newline
+    when 1, true
+      br
+    end
+  end; alias si_link     simple_link # === si_link
+       alias hyperlink   simple_link # === hyperlink
+
   # ========================================================================= #
   # === link_in_page
   #