gloo-lang 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42b1ca8c03074ae64ac797bfcdc72b17479cabead579fb94dd8232cbeef3fc6a
-  data.tar.gz: 34c0a1d8d4aabfd76f8d34d170de91760030ce15f49cdbceacad202cd43dfa55
+  metadata.gz: 78f880bdd4bdd4c5b796b0bc6a273df959ea129075750649d8c76e1f039d916b
+  data.tar.gz: df8cca545850962ae5151e3307ece3ff9e2cbeed1588c213326cb0ebfdb9c223
 SHA512:
-  metadata.gz: 8578816796520b92afdc8671fd914d2612dd5a512b6cc03bff9602ea3f9851902fe61753a59c58526e2aedafbe4f00eb6647c25df49cfbbf046d4c02545ad5b8
-  data.tar.gz: 132b981e50798bfdada690d892ddb67677d001036b08faa058c705317bf995006c2d40e022ca79269d45610e0535f9b0f2422f77f6b48b79b03c04f95ec67958
+  metadata.gz: 3bc34b8d10b6ce580189f868834170015a9d8f5305a02fc99705788c95a852d7e593d8326c3304e4b9a2bbd85faaa4b43b44e37271ac6d7399424b7b3a5a248f
+  data.tar.gz: 0fd7f6347b859d8a945452eaa23f63742c49db49d5c2eb102a28ab3ddee362ef210c83cbbfb004bdae848303a02e514f13318901361660c2a9ff3be6d6ebca1c

data/lib/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gloo-lang
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Eric Crane
@@ -309,9 +309,7 @@ files:
 - lib/gloo_lang/objs/ctrl/each.rb
 - lib/gloo_lang/objs/ctrl/repeat.rb
 - lib/gloo_lang/objs/data/markdown.rb
-- lib/gloo_lang/objs/data/mysql.rb
 - lib/gloo_lang/objs/data/query.rb
-- lib/gloo_lang/objs/data/sqlite.rb
 - lib/gloo_lang/objs/data/table.rb
 - lib/gloo_lang/objs/dt/date.rb
 - lib/gloo_lang/objs/dt/datetime.rb

data/lib/gloo_lang/objs/data/mysql.rb

@@ -1,192 +0,0 @@
-# Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
-#
-# A MySQL database connection.
-#
-#
-# https://github.com/brianmario/mysql2
-# https://www.rubydoc.info/gems/mysql2/0.2.3/Mysql2/Client
-#
-# Connection Parameters
-#   user     = opts[:username]
-#   pass     = opts[:password]
-#   host     = opts[:host] || 'localhost'
-#   port     = opts[:port] || 3306
-#   database = opts[:database]
-#   socket   = opts[:socket]
-#   flags    = opts[:flags] || 0
-#
-require 'mysql2'
-
-module GlooLang
-  module Objs
-    class Mysql < GlooLang::Core::Obj
-
-      KEYWORD = 'mysql'.freeze
-      KEYWORD_SHORT = 'mysql'.freeze
-
-      HOST = 'host'.freeze
-      DB = 'database'.freeze
-      USER = 'username'.freeze
-      PASSWD = 'password'.freeze
-
-      #
-      # The name of the object type.
-      #
-      def self.typename
-        return KEYWORD
-      end
-
-      #
-      # The short name of the object type.
-      #
-      def self.short_typename
-        return KEYWORD_SHORT
-      end
-
-      # ---------------------------------------------------------------------
-      #    Children
-      # ---------------------------------------------------------------------
-
-      #
-      # Does this object have children to add when an object
-      # is created in interactive mode?
-      # This does not apply during obj load, etc.
-      #
-      def add_children_on_create?
-        return true
-      end
-
-      #
-      # Add children to this object.
-      # This is used by containers to add children needed
-      # for default configurations.
-      #
-      def add_default_children
-        fac = $engine.factory
-        fac.create_string HOST, nil, self
-        fac.create_string DB, nil, self
-        fac.create_string USER, nil, self
-        fac.create_string PASSWD, nil, self
-      end
-
-      # ---------------------------------------------------------------------
-      #    Messages
-      # ---------------------------------------------------------------------
-
-      #
-      # Get a list of message names that this object receives.
-      #
-      def self.messages
-        return super + [ 'verify' ]
-      end
-
-      #
-      # SSH to the host and execute the command, then update result.
-      #
-      def msg_verify
-        return unless connects?
-
-        $engine.heap.it.set_to true
-      end
-
-      # ---------------------------------------------------------------------
-      #    DB functions (all database connections)
-      # ---------------------------------------------------------------------
-
-      #
-      # Open a connection and execute the SQL statement.
-      # Return the resulting data.
-      #
-      def query( sql, params = nil )
-        h = {
-          host: host_value,
-          database: db_value,
-          username: user_value,
-          password: passwd_value
-        }
-        client = Mysql2::Client.new( h )
-        return client.query( sql ) unless params
-
-        pst = client.prepare( sql )
-        return pst.execute( *params )
-      end
-
-      # ---------------------------------------------------------------------
-      #    Private functions
-      # ---------------------------------------------------------------------
-
-      private
-
-      #
-      # Get the host from the child object.
-      # Returns nil if there is none.
-      #
-      def host_value
-        o = find_child HOST
-        return nil unless o
-
-        o = GlooLang::Objs::Alias.resolve_alias( o )
-        return o.value
-      end
-
-      #
-      # Get the Database name from the child object.
-      # Returns nil if there is none.
-      #
-      def db_value
-        o = find_child DB
-        return nil unless o
-
-        o = GlooLang::Objs::Alias.resolve_alias( o )
-        return o.value
-      end
-
-      #
-      # Get the Username from the child object.
-      # Returns nil if there is none.
-      #
-      def user_value
-        o = find_child USER
-        return nil unless o
-
-        o = GlooLang::Objs::Alias.resolve_alias( o )
-        return o.value
-      end
-
-      #
-      # Get the Password name from the child object.
-      # Returns nil if there is none.
-      #
-      def passwd_value
-        o = find_child PASSWD
-        return nil unless o
-
-        o = GlooLang::Objs::Alias.resolve_alias( o )
-        return o.value
-      end
-
-      #
-      # Try the connection and make sure it works.
-      # Returns true if we can establish a connection.
-      #
-      def connects?
-        begin
-          h = {
-            host: host_value,
-            database: db_value,
-            username: user_value,
-            password: passwd_value
-          }
-          Mysql2::Client.new( h )
-        rescue => e
-          $engine.err e.message
-          $engine.heap.it.set_to false
-          return false
-        end
-        return true
-      end
-
-    end
-  end
-end

data/lib/gloo_lang/objs/data/sqlite.rb

@@ -1,159 +0,0 @@
-# Author::    Eric Crane  (mailto:eric.crane@mac.com)
-# Copyright:: Copyright (c) 2020 Eric Crane.  All rights reserved.
-#
-# A Sqlite3 database connection.
-#
-# https://www.rubydoc.info/gems/sqlite3/1.3.11
-# https://www.devdungeon.com/content/ruby-sqlite-tutorial
-#
-# db.results_as_hash = true
-#   Set results to return as Hash object.
-#   This is slower but offers a huge convenience.
-#   Consider turning it off for high performance situations.
-#   Each row will have the column name as the hash key.
-#
-# # Alternatively, to only get one row and discard the rest,
-# replace `db.query()` with `db.get_first_value()`.
-#
-require 'sqlite3'
-
-module GlooLang
-  module Objs
-    class Sqlite < GlooLang::Core::Obj
-
-      KEYWORD = 'sqlite'.freeze
-      KEYWORD_SHORT = 'sqlite'.freeze
-
-      DB = 'database'.freeze
-      DEFAULT_DB = 'test.db'.freeze
-
-      DB_REQUIRED_ERR = 'The database name is required!'.freeze
-      DB_NOT_FOUND_ERR = 'The database file was not found!'.freeze
-
-      #
-      # The name of the object type.
-      #
-      def self.typename
-        return KEYWORD
-      end
-
-      #
-      # The short name of the object type.
-      #
-      def self.short_typename
-        return KEYWORD_SHORT
-      end
-
-      # ---------------------------------------------------------------------
-      #    Children
-      # ---------------------------------------------------------------------
-
-      #
-      # Does this object have children to add when an object
-      # is created in interactive mode?
-      # This does not apply during obj load, etc.
-      #
-      def add_children_on_create?
-        return true
-      end
-
-      #
-      # Add children to this object.
-      # This is used by containers to add children needed
-      # for default configurations.
-      #
-      def add_default_children
-        fac = $engine.factory
-        fac.create_string DB, DEFAULT_DB, self
-      end
-
-      # ---------------------------------------------------------------------
-      #    Messages
-      # ---------------------------------------------------------------------
-
-      #
-      # Get a list of message names that this object receives.
-      #
-      def self.messages
-        return super + [ 'verify' ]
-      end
-
-      #
-      # Verify access to the Sqlite database specified.
-      #
-      def msg_verify
-        name = db_value
-        if name.empty?
-          $engine.err DB_REQUIRED_ERR
-          $engine.heap.it.set_to false
-          return
-        end
-
-        unless File.exist? name
-          $engine.err DB_NOT_FOUND_ERR
-          $engine.heap.it.set_to false
-          return
-        end
-
-        return unless connects?
-
-        $engine.heap.it.set_to true
-      end
-
-      # ---------------------------------------------------------------------
-      #    DB functions (all database connections)
-      # ---------------------------------------------------------------------
-
-      #
-      # Open a connection and execute the SQL statement.
-      # Return the resulting data.
-      #
-      def query( sql, params = nil )
-        name = db_value
-        unless name
-          $engine.err DB_REQUIRED_ERR
-          return
-        end
-
-        db = SQLite3::Database.open name
-        db.results_as_hash = true
-        return db.query( sql, params )
-      end
-
-      # ---------------------------------------------------------------------
-      #    Private functions
-      # ---------------------------------------------------------------------
-
-      private
-
-      #
-      # Get the Database file from the child object.
-      # Returns nil if there is none.
-      #
-      def db_value
-        o = find_child DB
-        return nil unless o
-
-        return o.value
-      end
-
-      #
-      # Try the connection and make sure it works.
-      # Returns true if we can connect and do a query.
-      #
-      def connects?
-        begin
-          db = SQLite3::Database.open db_value
-          sql = "SELECT COUNT(name) FROM sqlite_master WHERE type='table'"
-          db.get_first_value sql
-        rescue => e
-          $engine.err e.message
-          $engine.heap.it.set_to false
-          return false
-        end
-        return true
-      end
-
-    end
-  end
-end