ruby-nuggets 0.9.1 → 0.9.2

data/lib/nuggets/util/log_parser/apache.rb

@@ -1,106 +1,4 @@
-#--
-###############################################################################
-#                                                                             #
-# A component of ruby-nuggets, some extensions to the Ruby programming        #
-# language.                                                                   #
-#                                                                             #
-# Copyright (C) 2007-2012 Jens Wille                                          #
-#                                                                             #
-# Authors:                                                                    #
-#     Jens Wille <jens.wille@gmail.com>                                       #
-#                                                                             #
-# ruby-nuggets is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU Affero General Public License as published by    #
-# the Free Software Foundation; either version 3 of the License, or (at your  #
-# option) any later version.                                                  #
-#                                                                             #
-# ruby-nuggets is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License #
-# for more details.                                                           #
-#                                                                             #
-# You should have received a copy of the GNU Affero General Public License    #
-# along with ruby-nuggets. If not, see <http://www.gnu.org/licenses/>.        #
-#                                                                             #
-###############################################################################
-#++
+require 'nuggets/log_parser/apache'
+module Util; LogParser = ::Nuggets::LogParser; end
 
-require 'nuggets/util/log_parser'
-
-module Util
-
-  module LogParser
-
-    module Apache
-
-      extend self
-
-      DEFAULT_RE = %r{(.*?)}
-
-      DIRECTIVES = {
-        'h' => [:ip,        %r{(\d+(?:\.\d+){3}|[\w.-]+)}],
-        'l' => [:auth,      DEFAULT_RE],
-        'u' => [:username,  DEFAULT_RE],
-        't' => [:datetime,  %r{\[(.*?)\]}],
-        'r' => [:request,   DEFAULT_RE],
-        'R' => [:request,   %r{(.*?)(?:"|\z)}],
-        's' => [:status,    %r{(\d+)}],
-        'b' => [:bytecount, %r{(-|\d+)}],
-        'v' => [:domain,    DEFAULT_RE],
-        'i' => [nil,        DEFAULT_RE],
-      }
-
-      DIRECTIVES_RE = %r{%.*?(?:\{(.*?)\})?([#{DIRECTIVES.keys.join}])([\s\\"]*)}
-
-      ORDER = []
-
-      class << self
-
-        def register(name, format)
-          base = const_set(name, Module.new)
-
-          re, items = parse_format(format)
-          base.const_set(:RE,    re)
-          base.const_set(:ITEMS, items)
-
-          ORDER << base
-          LogParser.register(base, self)
-        end
-
-        def parse_format(format)
-          re, items = '\A', []
-
-          format.scan(DIRECTIVES_RE) { |h, c, e|
-            i, r = DIRECTIVES[c]
-            re << r.source << e.gsub(/\s/, '\\s')
-            items << i ||= h.downcase.tr('-', '_').to_sym
-          }
-
-          [Regexp.new(re), items]
-        end
-
-        def detect_type(line)
-          ORDER.find { |type| line =~ type::RE }
-        end
-
-      end
-
-      [ [:Combined, '%h %l %u %t "%r" %>s %b "%{Referer}i" "%{User-agent}i"'],
-        [:Common,   '%h %l %u %t "%r" %>s %b'],
-        [:Minimal,  '%h %l %u %t "%R']
-      ].each { |name, format| register(name, format) }
-
-      def parse_line(line, entry = {})
-        if md = self::RE.match(line)
-          self::ITEMS.each_with_index { |k, i| entry[k] = md[i + 1] }
-          yield if block_given?
-        end
-
-        entry
-      end
-
-    end
-
-  end
-
-end
+warn "#{__FILE__}: Util::LogParser::Apache is deprecated, use Nuggets::LogParser::Apache instead."

data/lib/nuggets/util/log_parser/rails.rb

@@ -1,224 +1,4 @@
-#--
-###############################################################################
-#                                                                             #
-# A component of ruby-nuggets, some extensions to the Ruby programming        #
-# language.                                                                   #
-#                                                                             #
-# Copyright (C) 2007-2012 Jens Wille                                          #
-#                                                                             #
-# Authors:                                                                    #
-#     Jens Wille <jens.wille@gmail.com>                                       #
-#                                                                             #
-# ruby-nuggets is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU Affero General Public License as published by    #
-# the Free Software Foundation; either version 3 of the License, or (at your  #
-# option) any later version.                                                  #
-#                                                                             #
-# ruby-nuggets is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License #
-# for more details.                                                           #
-#                                                                             #
-# You should have received a copy of the GNU Affero General Public License    #
-# along with ruby-nuggets. If not, see <http://www.gnu.org/licenses/>.        #
-#                                                                             #
-###############################################################################
-#++
+require 'nuggets/log_parser/rails'
+module Util; LogParser = ::Nuggets::LogParser; end
 
-require 'nuggets/util/log_parser'
-
-module Util
-
-  module LogParser
-
-    module Rails
-
-      LogParser.register(self)
-
-      # Log line prefix
-      PREFIX_RE = %r{
-        \A
-        (?:
-          \[
-            (\d+)                #  pid
-            :
-            (.*?)                #  host
-          \]
-          \s
-        )?
-        \s*
-      }x
-
-      # Log entry separator
-      SEPARATOR_RE = %r{
-        \s+\|\s+
-      }x
-
-      # Log line patterns
-      ITEMS = [
-        [:processing, {
-          :re => %r{
-            #{PREFIX_RE}         #  pid, host
-            Processing\s+
-            (\w+)                #  controller
-            \#
-            (\w+)                #  action
-            \s+
-            \(
-              for\s+
-              (.*?)              #  ip
-              \s+at\s+
-              (.*?)              #  datetime
-            \)
-            \s+
-            \[
-              (\w+)              #  request_method
-            \]
-          }xo,
-          :keys => [:controller, :action, :ip, :datetime, :request_method]
-        }],
-        [:session_id, {
-          :re => %r{
-            #{PREFIX_RE}         #  pid, host
-            Session\sID:\s+
-            (\S+)                #  sid
-          }xo,
-          :keys => [:sid]
-        }],
-        [:parameters, {
-          :re => %r{
-            #{PREFIX_RE}         #  pid, host
-            Parameters:\s+
-            (\{.*\})             #  params
-          }xo,  #}
-          :proc => lambda { |entry, md|
-            entry[:params_hash] = md[3].hash
-            entry[:params] = begin
-              eval("$SAFE = 3\n#{md[3].gsub(/#<.*?>/, '%q{\&}')}", nil, __FILE__, __LINE__)  # !!!
-            rescue SyntaxError, SecurityError
-              {}
-            end
-          }
-        }],
-        [:client_info, {
-          :re => %r{
-            #{PREFIX_RE}         #  pid, host
-            Client\sinfo:\s+
-            UA\s+=\s+
-            (.*?)                #  user_agent
-            #{SEPARATOR_RE}
-            LANG\s+=\s+
-            (.*)                 #  accept_language
-          }xo,
-          :keys => [:user_agent, :accept_language]
-        }],
-        [:referer, {
-          :re => %r{
-            #{PREFIX_RE}         #  pid, host
-            Referer:\s+
-            (.*)                 #  referer
-          }xo,
-          :keys => [:referer]
-        }],
-        [:meta, {
-          :re => %r{
-            #{PREFIX_RE}         #  pid, host
-            Meta:\s+
-            User\s+=\s+
-            (.*?)                #  user_id
-            #{SEPARATOR_RE}
-            Institution\s+=\s+
-            (.*)                 #  institution_id
-          }xo,
-          :keys => [:user_id, :institution_id]
-        }],
-        [:stats, {
-          :re => %r{
-            #{PREFIX_RE}         #  pid, host
-            Stats:\s+
-            (.*)                 # flags
-          }xo,
-          :proc => lambda { |entry, md|
-            entry[:flags] = md[3].split(SEPARATOR_RE)
-          }
-        }],
-        [:oauth, {
-          :re => %r{
-            #{PREFIX_RE}         #  pid, host
-            OAuth:\s+
-            Token\s+=\s+
-            (.*?)#(.*?)          #  token_type, token
-            #{SEPARATOR_RE}
-            User\s+=\s+
-            (.*?)                #  user_id
-            #{SEPARATOR_RE}
-            Client\s+=\s+
-            (.*)                 #  client_id
-          }xo,
-          :keys => [:token_type, :token, :user_id, :client_id]
-        }],
-        [:benchmark, {
-          :re => %r{
-            #{PREFIX_RE}         #  pid, host
-            Completed\sin\s+
-            (\S+)                #  runtime
-            .*?
-            (?:                  #- OPTIONAL
-              #{SEPARATOR_RE}
-              Rendering:\s+
-              (\S+)              #  rendering_runtime
-              .*?
-            )?
-            (?:                  #- OPTIONAL
-              #{SEPARATOR_RE}
-              DB:\s+
-              (\S+)              #  db_runtime
-              .*?
-            )?
-            (?:                  #- OPTIONAL
-              #{SEPARATOR_RE}
-              Mem:\s+
-              \S+
-              .*?
-            )?
-            #{SEPARATOR_RE}
-            (.*?)                #  status
-            \s+
-            \[
-              (.*)               #  request_uri
-            \]
-          }xo,
-          :keys => [:runtime, :rendering_runtime, :db_runtime, :status, :request_uri]
-        }]
-      ]
-
-      ITEMS.each { |_, item|
-        item[:proc] ||= lambda { |entry, md|
-          item[:keys].each_with_index { |k, i|
-            entry[k] = md[i + 3]  # 1 = pid, 2 = host
-          }
-        }
-      }
-
-      def parse_line(line, entry = {})
-        ITEMS.each { |key, item|
-          if md = item[:re].match(line)
-            if key == :processing
-              yield if block_given?
-              entry[:pid], entry[:host] = md[1], md[2]
-            end
-
-            item[:proc][entry, md]
-
-            break
-          end
-        }
-
-        entry
-      end
-
-    end
-
-  end
-
-end
+warn "#{__FILE__}: Util::LogParser::Rails is deprecated, use Nuggets::LogParser::Rails instead."

data/lib/nuggets/util/log_parser.rb

@@ -1,73 +1,4 @@
-#--
-###############################################################################
-#                                                                             #
-# A component of ruby-nuggets, some extensions to the Ruby programming        #
-# language.                                                                   #
-#                                                                             #
-# Copyright (C) 2007-2012 Jens Wille                                          #
-#                                                                             #
-# Authors:                                                                    #
-#     Jens Wille <jens.wille@gmail.com>                                       #
-#                                                                             #
-# ruby-nuggets is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU Affero General Public License as published by    #
-# the Free Software Foundation; either version 3 of the License, or (at your  #
-# option) any later version.                                                  #
-#                                                                             #
-# ruby-nuggets is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License #
-# for more details.                                                           #
-#                                                                             #
-# You should have received a copy of the GNU Affero General Public License    #
-# along with ruby-nuggets. If not, see <http://www.gnu.org/licenses/>.        #
-#                                                                             #
-###############################################################################
-#++
+require 'nuggets/log_parser'
+module Util; LogParser = ::Nuggets::LogParser; end
 
-require 'zlib'
-
-module Util
-
-  module LogParser
-
-    extend self
-
-    GZ_EXT_RE = %r{\.gz\z}
-
-    def self.register(base, *modules)
-      base.send(:include, *modules << self)
-      base.extend(base)
-    end
-
-    def parse(input)
-      entry = {}
-
-      input.each { |line| parse_line(line, entry) {
-        unless entry.empty?
-          yield entry.dup
-          entry.clear
-        end
-      } }
-
-      yield entry unless entry.empty?
-    end
-
-    def parse_line(line, entry = {})
-      # Yield when entry complete. Preferrably return +entry+.
-      raise NotImplementedError, 'must be implemented by type'
-    end
-
-    def parse_file(file, &block)
-      block ||= (entries = []; lambda { |entry| entries << entry })
-
-      (file =~ GZ_EXT_RE ? Zlib::GzipReader : File).open(file) { |f|
-        block.arity == 1 ? parse(f, &block) : block[f, method(:parse)]
-      }
-
-      entries
-    end
-
-  end
-
-end
+warn "#{__FILE__}: Util::LogParser is deprecated, use Nuggets::LogParser instead."

data/lib/nuggets/util/midos.rb

@@ -0,0 +1,4 @@
+require 'nuggets/midos'
+module Util; Midos = ::Nuggets::Midos; end
+
+warn "#{__FILE__}: Util::Midos is deprecated, use Nuggets::Midos instead."

data/lib/nuggets/util/mysql.rb

@@ -1,211 +1,4 @@
-#--
-###############################################################################
-#                                                                             #
-# A component of ruby-nuggets, some extensions to the Ruby programming        #
-# language.                                                                   #
-#                                                                             #
-# Copyright (C) 2007-2013 Jens Wille                                          #
-#                                                                             #
-# Authors:                                                                    #
-#     Jens Wille <jens.wille@gmail.com>                                       #
-#                                                                             #
-# ruby-nuggets is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU Affero General Public License as published by    #
-# the Free Software Foundation; either version 3 of the License, or (at your  #
-# option) any later version.                                                  #
-#                                                                             #
-# ruby-nuggets is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License #
-# for more details.                                                           #
-#                                                                             #
-# You should have received a copy of the GNU Affero General Public License    #
-# along with ruby-nuggets. If not, see <http://www.gnu.org/licenses/>.        #
-#                                                                             #
-###############################################################################
-#++
+require 'nuggets/mysql'
+module Util; MySQL = ::Nuggets::MySQL; end
 
-require 'strscan'
-
-module Util
-
-  module MySQL
-
-    class Parser
-
-      DEFAULT_NAME  = '__DEFAULT__'
-      DEFAULT_TABLE = '__DEFAULT__'
-
-      USE_RE           = /\AUSE\s+`(.+?)`/i
-      CREATE_TABLE_RE  = /\ACREATE\s+TABLE\s+`(.+?)`/i
-      TABLE_COLUMN_RE  = /\A\s+`(.+?)`/
-      FINISH_TABLE_RE  = /\A\).*;\Z/
-      INSERT_VALUES_RE = /\AINSERT\s+INTO\s+`(.+?)`\s+(?:\((.+?)\)\s+)?VALUES\s*(.*);\Z/i
-      CLEAN_COLUMNS_RE = /[\s`]+/
-
-      def self.parse(input, &block)
-        parser = new.parse(input, &block)
-        block_given? ? parser : parser.tables
-      end
-
-      def initialize
-        reset
-      end
-
-      def reset
-        @name         = DEFAULT_NAME
-        @table        = DEFAULT_TABLE
-        @tables       = {}
-        @columns      = Hash.new { |h, k| h[k] = [] }
-        @value_parser = ValueParser.new
-      end
-
-      attr_reader :tables
-
-      def parse(input, &block)
-        unless block
-          tables, block = @tables, lambda { |_, name, table, columns, values|
-            ((tables[name] ||= {})[table] ||= []) << fields = {}
-
-            values.each_with_index { |value, index|
-              if column = columns[index]
-                fields[column] = value
-              end
-            }
-          }
-        end
-
-        name, table, columns, value_parser, block_given =
-          @name, @table, @columns, @value_parser, block_given?
-
-        input.each { |line|
-          case line
-            when USE_RE
-              name = $1
-              yield :use, name if block_given
-            when CREATE_TABLE_RE
-              table = $1
-            when TABLE_COLUMN_RE
-              columns[table] << $1 if table
-            when FINISH_TABLE_RE
-              yield :table, name, table, columns[table] if block_given
-              table = nil
-            when INSERT_VALUES_RE
-              _table, _columns, _values = $1, $2, $3
-
-              _columns = _columns.nil? ? columns[_table] :
-                _columns.gsub(CLEAN_COLUMNS_RE, '').split(',')
-
-              value_parser.parse(_values) { |values|
-                block[:insert, name, _table, _columns, values]
-              } unless _columns.empty?
-          end
-        }
-
-        @name, @table = name, table
-
-        self
-      end
-
-    end
-
-    class ValueParser
-
-      AST = Struct.new(:value)
-
-      def self.parse(input)
-        new.parse(input)
-      end
-
-      def parse(input)
-        @input = StringScanner.new(input)
-
-        rows, block_given = [], block_given?
-
-        while result = parse_row
-          row = result.value
-          block_given ? yield(row) : rows << row
-          break unless @input.scan(/,\s*/)
-        end
-
-        @input.scan(/;/)  # optional
-
-        error('Unexpected data') unless @input.eos?
-
-        rows unless block_given
-      end
-
-      def parse_row
-        return unless @input.scan(/\(/)
-
-        row = []
-
-        while result = parse_value
-          row << result.value
-          break unless @input.scan(/,\s*/)
-        end
-
-        error('Unclosed row') unless @input.scan(/\)/)
-
-        AST.new(row)
-      end
-
-      def parse_value
-        parse_string ||
-        parse_number ||
-        parse_keyword
-      end
-
-      def parse_string
-        return unless @input.scan(/'/)
-
-        string = ''
-
-        while contents = parse_string_content || parse_string_escape
-          string << contents.value
-        end
-
-        error('Unclosed string') unless @input.scan(/'/)
-
-        AST.new(string)
-      end
-
-      def parse_string_content
-        if @input.scan(/[^\\']+/)
-          AST.new(@input.matched)
-        end
-      end
-
-      def parse_string_escape
-        if @input.scan(/\\[abtnvfr]/)
-          AST.new(eval(%Q{"#{@input.matched}"}))
-        elsif @input.scan(/\\.|''/)
-          AST.new(@input.matched[-1, 1])
-        end
-      end
-
-      def parse_number
-        if @input.scan(/-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/)
-          AST.new(eval(@input.matched))
-        end
-      end
-
-      def parse_keyword
-        if @input.scan(/null/i)
-          AST.new(nil)
-        end
-      end
-
-      def error(message)
-        if @input.eos?
-          raise "Unexpected end of input (#{message})."
-        else
-          raise "#{message} at #{$.}:#{@input.pos}: #{@input.peek(16).inspect}"
-        end
-      end
-
-    end
-
-  end
-
-end
+warn "#{__FILE__}: Util::MySQL is deprecated, use Nuggets::MySQL instead."