rkwalify 1.4.0.pre.beta → 1.4.0

data/lib/kwalify/main.rb

@@ -1,9 +1,8 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 require 'yaml'
 require 'erb'
@@ -81,11 +80,10 @@ module Kwalify
     def execute(argv=ARGV)
       ## parse command-line options
       filenames = _parse_argv(argv)
-
       ## help or version
       if @options[:help] || @options[:version]
         action = @options[:action]
-        s = ''
+        s = String.new
         s << _version() << "\n"           if @options[:version]
         s << _usage()                     if @options[:help] && !action
         s << _describe_properties(action) if @options[:help] && action
@@ -129,7 +127,7 @@ module Kwalify
         exit 1
       rescue Kwalify::KwalifyError => ex
         raise ex if main.debug?
-        $stderr.puts "ERROR: #{ex.to_s}"
+        $stderr.puts "ERROR: #{ex}"
         exit 1
       #rescue => ex
       #  if main.debug?

data/lib/kwalify/messages.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/meta-validator.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -65,7 +65,7 @@ module Kwalify
         pat = (val =~ /\A\/(.*)\/([mi]?[mi]?)\z/ ? $1 : val)
         begin
           Regexp.compile(pat)
-        rescue RegexpError => ex
+        rescue RegexpError => _ex
           errors << validate_error(:pattern_syntaxerr, rule, "#{path}/pattern", val)
         end
       end
@@ -91,9 +91,8 @@ module Kwalify
         val =  hash['assert']
         #val =~ /\bval\b/ or errors << validate_error(:assert_noval, rule, "#{path}/assert", val)
         begin
-          # WAS: eval "proc { |val| #{val} }"
-          eval "proc { |val| #{val} }" #   proc { |val| val > 10 }
-        rescue ::SyntaxError => ex
+          RubyVM::InstructionSequence.compile("proc { |val| #{val} }")
+        rescue SyntaxError
           errors << validate_error(:assert_syntaxerr, rule, "#{path}/assert", val)
         end
       end

data/lib/kwalify/parser/base.rb

@@ -1,9 +1,8 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 require 'strscan'
 require 'kwalify/errors'
@@ -83,7 +82,7 @@ class Kwalify::BaseParser
     ch = _getch()
     ch == '"' || ch == "'" or raise "assertion error"
     endch = ch
-    s = ''
+    s = String.new
     while !(ch = _getch()).nil? && ch != endch
       if ch != '\\'
         s << ch

data/lib/kwalify/parser/yaml.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -521,7 +521,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
       else  # indicator == '>'
         if !text.empty? && spaces.length == indent
           if s.sub!(/\r?\n((\r?\n)+)\z/, '\1')
-            nil
+            # Ruby will return "nil"
           elsif is_folded
             s.sub!(/\r?\n\z/, ' ')
           end
@@ -536,7 +536,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
     end
     ## chomping
     if chomping == '+'
-      nil
+      # Ruby will return "nil"
     elsif chomping == '-'
       s.sub!(/(\r?\n)+\z/, '')
     else
@@ -599,7 +599,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
     scan('[')
     skip_spaces_and_comments()
     if scan(']')
-      nil
+      # Ruby will return "nil"
     else
       rule = seq_rule ? seq_rule.sequence[0] : nil                         #*V
       uniq_table = rule ? rule._uniqueness_check_table() : nil             #*V
@@ -638,7 +638,7 @@ class Kwalify::Yaml::Parser < Kwalify::BaseParser
     scan('{')
     skip_spaces_and_comments()
     if scan('}')
-      nil
+      # Ruby will return "nil"
     else
       path.push(nil)
       is_merged = false

data/lib/kwalify/rule.rb

@@ -1,9 +1,8 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 require 'kwalify/messages'
 require 'kwalify/errors'
@@ -74,12 +73,13 @@ module Kwalify
     end
 
 
-    keys = %w[type name desc required pattern enum assert range length
-              ident unique default sequence mapping class]
-    #table = keys.inject({}) {|h, k| h[k.intern] = "_init_#{k}_value".intern; h }
-    table = {}; keys.each {|k| table[k.intern] = :"_init_#{k}_value" }
-    @@dispatch_table = table
-
+    # Dispatch table maps schema keys to their initialization methods.
+    # This allows dynamic method lookup for _init_<key>_value methods.
+    SCHEMA_KEYS = %w[type name desc required pattern enum assert range length
+                     ident unique default sequence mapping class].freeze
+    @@dispatch_table = SCHEMA_KEYS.each_with_object({}) do |key, table|
+      table[key.intern] = :"_init_#{key}_value"
+    end.freeze
 
     protected
 
@@ -163,7 +163,7 @@ module Kwalify
       flag += Regexp::MULTILINE  if opt.include?("m")
       begin
         @regexp = Regexp.compile(pat, flag)
-      rescue RegexpError => ex
+      rescue RegexpError => _ex
         #* key=:pattern_syntaxerr  msg="has regexp error."
         raise schema_error(:pattern_syntaxerr, rule, path, val)
       end
@@ -206,10 +206,9 @@ module Kwalify
         raise schema_error(:assert_noval, rule, path, val)
       end
       begin
-        # WAS: @assert_proc = eval "proc { |val| #{val} }"
-        @assert_proc = ->(val, expr) { binding.local_variable_set(:val, val); eval(expr) }
-        # OR: @assert_proc = ->(val, &block) { block.call(val) }
-      rescue ::SyntaxError => ex
+        # Store expression as string, evaluate at validation time
+        @assert_expr = val
+      rescue ::SyntaxError => _ex
         #* key=:assert_syntaxerr  msg="expression syntax error."
         raise schema_error(:assert_syntaxerr, rule, path, val)
       end
@@ -473,7 +472,7 @@ module Kwalify
     protected
 
 
-    def _inspect(str="", level=0, done={})
+    def _inspect(str = String.new, level = 0, done = {})
       done[self.__id__] = true
       str << ("  " * level) << "name:    #{@name}\n"         unless @name.nil?
       str << ("  " * level) << "desc:    #{@desc}\n"         unless @desc.nil?

data/lib/kwalify/templates/genclass-java.eruby

@@ -2,7 +2,7 @@
 
     ###
     ### $Rev$
-    ### $Release 1.4.0-beta $
+    ### $Release 1.4.0 $
     ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
     ###
 

data/lib/kwalify/templates/genclass-php.eruby

@@ -2,7 +2,7 @@
 
     ###
     ### $Rev$
-    ### $Release 1.4.0-beta $
+    ### $Release 1.4.0 $
     ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
     ###
 

data/lib/kwalify/templates/genclass-ruby.eruby

@@ -2,7 +2,7 @@
 
     ###
     ### $Rev$
-    ### $Release 1.4.0-beta $
+    ### $Release 1.4.0 $
     ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
     ###
 

data/lib/kwalify/types.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/util/assert-text-equal.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -29,7 +29,7 @@ class Test::Unit::TestCase  # :nodoc:
       expfile.write(expected); expfile.flush()
       actfile = Tempfile.new(".actual.")
       actfile.write(actual);   actfile.flush()
-      diff = `diff #{diffopt} #{expfile.path} #{actfile.path}`
+      diff = system("diff", *diffopt, expfile.path, actfile.path)
     ensure
       expfile.close(true) if expfile
       actfile.close(true) if actfile

data/lib/kwalify/util/hash-interface.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/util/hashlike.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -27,13 +27,14 @@ module Kwalify
       #end
       #++
 
-      def key?(key)
-        instance_variables().include?("@#{key}")
-      end
       if Object.method_defined?('instance_variable_defined?')
         def key?(key)
           instance_variable_defined?("@#{key}")
         end
+      else
+        def key?(key)
+          instance_variables().include?("@#{key}")
+        end
       end
 
       def each   # not necessary

data/lib/kwalify/util/option-parser.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/util/ordered-hash.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### Release 1.4.0-beta
+### Release 1.4.0
 ### $COPYRIGHT$
 ###
 

data/lib/kwalify/util/testcase-helper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 

data/lib/kwalify/util.rb

@@ -1,9 +1,9 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
+# frozen_string_literal: true
 
 module Kwalify
 
@@ -17,18 +17,19 @@ module Kwalify
     ## ex.
     ##   untabified_str = YamlHelper.untabify(tabbed_str)
     ##
-    def untabify(str, width=8)
+
+    def untabify(str, width = 8)
       return str if str.nil?
-      list = str.split("\t", -1)   # if 2nd arg is negative then split() doesn't remove tailing empty strings
+      list = str.split("\t", -1)
       last = list.pop
-      sb = ''
+      sb = String.new
       list.each do |s|
         column = (n = s.rindex(?\n)) ? s.length - n - 1 : s.length
         n = width - (column % width)
         sb << s << (' ' * n)
       end
       sb << last if last
-      return sb
+      sb
     end
 
 
@@ -121,7 +122,7 @@ module Kwalify
       hashlist.each do |hash|
         key = hash[primarykey]
         unless key
-          riase "primary key '#{key}' not found."
+          raise "primary key '#{key}' not found."
         end
         if flag_duplicate_check && hashtable.key?(key)
           raise "primary key '#{key}' duplicated (value '#{hashtable[key]}')"

data/lib/kwalify/validator.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 
@@ -37,16 +37,23 @@ module Kwalify
   ##     end
   ##   end
   ##
+
+  def self.logger
+    @logger ||= Object.new.tap do |obj|
+      def obj.method_missing(*); end
+    end
+  end
+
   class Validator
     include Kwalify::ErrorHelper
 
-
-    def initialize(hash_or_rule, &block)
+    def initialize(hash_or_rule, logger: nil, &block)
       obj = hash_or_rule
       @rule = (obj.nil? || obj.is_a?(Rule)) ? obj : Rule.new(obj)
+      @logger = logger || Kwalify.logger
       @block = block
     end
-    attr_reader :rule
+    attr_reader :rule, :logger
 
 
     def _inspect
@@ -55,8 +62,10 @@ module Kwalify
 
 
     def validate(value)
+      @logger.debug("Starting validation") if @logger
       path = '';  errors = [];  done = {};  uniq_table = nil
       _validate(value, @rule, path, errors, done, uniq_table)
+      @logger.debug("Validation complete: #{errors.length} errors") if @logger
       return errors
     end
 
@@ -199,15 +208,6 @@ module Kwalify
     public :_validate_unique
 
 
-    def _validate_assert(value, rule, path, errors)
-      assert_error("rule=#{rule._inspect}") unless rule.assert_proc
-      unless rule.assert_proc.call(value)
-        #* key=:assert_failed  msg="assertion expression failed (%s)."
-        errors << validate_error(:assert_failed, rule, path, value, [rule.assert])
-      end
-    end
-
-
     def _validate_enum(value, rule, path, errors)
       assert_error("rule=#{rule._inspect}") unless rule.enum
       unless rule.enum.include?(value)
@@ -277,6 +277,31 @@ module Kwalify
     end
 
 
+# DUP def
+#    def _validate_assert(value, rule, path, errors)
+#      assert_error("rule=#{rule._inspect}") unless rule.assert_proc
+#      unless rule.assert_proc.call(value)
+#        #* key=:assert_failed  msg="assertion expression failed (%s)."
+#        errors << validate_error(:assert_failed, rule, path, value, [rule.assert])
+#      end
+#    end
+
+
+    def _validate_assert(value, rule, path, errors)
+      assert_error("rule=#{rule._inspect}") unless rule.assert
+      local_val = value
+      begin
+        result = eval(rule.assert, binding)
+        unless result
+          #* key=:assert_failed  msg="assertion expression failed (%s)."
+          errors << validate_error(:assert_failed, rule, path, 
+            value, [rule.assert])
+        end
+      rescue StandardError => ex
+        errors << validate_error(:assert_failed, rule, path, value, [rule.assert])
+      end
+    end
+
   end
 
 end

data/lib/kwalify/version.rb

@@ -1,5 +1,5 @@
 ### copyright(c) 2006 kuwata-lab.com all rights reserved.
 
 module Kwalify
-  RELEASE = '1.4.0-beta' # Same as in the gemspec file.
+  RELEASE = '1.4.0' # Same as in the gemspec file.
 end

data/lib/kwalify/yaml-parser.rb

@@ -1,9 +1,8 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 require 'kwalify/messages'
 require 'kwalify/errors'
@@ -391,7 +390,7 @@ module Kwalify
       case ch = current_char()
       when ?", ?'         #"
         endch = ch
-        s = ''
+        s = String.new
         while (ch = _getchar()) != nil && ch != endch
           if ch == ?\\
             ch = _getchar()
@@ -479,7 +478,7 @@ module Kwalify
     def parse_alias(column, value)
       assert value =~ /^\*([-\w]+)(( *)(.*))?$/
       label  = $1
-      space  = $3
+      _space  = $3
       value2 = $4
       if value2 && !value2.empty? && value2[0] != ?\#
         #* key=:alias_extradata  msg="alias cannot take any data."
@@ -545,20 +544,22 @@ module Kwalify
 
 
     def parse_block_text(column, value)
-      assert value =~ /^[>|\|]/
-      value =~ /^([>|\|])([-+]?)(\d+)?\s*(.*)$/
+      assert value =~ /^[>|]/
+      value =~ /^([>|])([-+]?)(\d+)?\s*(.*)$/
       char = $1
       indicator = $2
-      sep = char == "|" ? "\n" : " "
+      _sep = char == "|" ? "\n" : " "
       margin = $3 && !$3.empty? ? $3.to_i : nil
       #text = $4.empty? ? '' :  $4 + sep
       text = $4
-      s = ''
-      empty = ''
+      s = String.new
+      empty = String.new
       min_indent = -1
-      while line = _getline()
+
+      while (line = _getline())
         line =~ /^( *)(.*)/
         indent = $1.length
+
         if $2.empty?
           empty << "\n"
         elsif indent < column
@@ -566,7 +567,7 @@ module Kwalify
         else
           min_indent = indent if min_indent < 0 || min_indent > indent
           s << empty << line
-          empty = ''
+          empty = String.new
         end
       end
       s << empty if indicator == '+' && char != '>'
@@ -697,7 +698,7 @@ module Kwalify
         year, month, day = $1.to_i, $2.to_i, $3.to_i
         return Date.new(year, month, day)
       when /^(\d\d\d\d)-(\d\d)-(\d\d)(?:[Tt]|[ \t]+)(\d\d?):(\d\d):(\d\d)(\.\d*)?(?:Z|[ \t]*([-+]\d\d?)(?::(\d\d))?)?$/
-        year, mon, mday, hour, min, sec, usec, tzone_h, tzone_m = $1, $2, $3, $4, $5, $6, $7, $8, $9
+        year, mon, _mday, hour, min, sec, usec, tzone_h, tzone_m = $1, $2, $3, $4, $5, $6, $7, $8, $9
         #Time.utc(sec, min, hour, mday, mon, year, wday, yday, isdst, zone)
         #t = Time.utc(sec, min, hour, mday, mon, year, nil, nil, nil, nil)
         #Time.utc(year[, mon[, day[, hour[, min[, sec[, usec]]]]]])
@@ -705,8 +706,10 @@ module Kwalify
         if tzone_h
           diff_sec = tzone_h.to_i * 60 * 60
           if tzone_m
-            if diff_sec > 0 ; diff_sec += tzone_m.to_i * 60
-            else            ; diff_sec -= tzone_m.to_i * 60
+            if diff_sec > 0
+               diff_sec += tzone_m.to_i * 60
+            else
+               diff_sec -= tzone_m.to_i * 60
             end
           end
           p diff_sec

data/lib/kwalify.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2006 kuwata-lab.com all rights reserved.
 ###
 
@@ -15,9 +15,34 @@ require 'kwalify/yaml-parser'
 #require 'kwalify/parser/base'
 #require 'kwalify/parser/yaml'
 
+# Ruby 4.0 Compatibility Patch: StringScanner#peep was renamed to #peek in Ruby 4.0.
+require 'strscan'
+class StringScanner
+  alias_method :peep, :peek unless method_defined?(:peep)
+end
 
 module Kwalify
 
+  require 'logger'
+
+  # Logger singleton - can be configured per application
+  @@logger = Logger.new($stderr, level: Logger::WARN)
+  @@logger.formatter = proc do |severity, datetime, progname, msg|
+    "#{severity}: #{msg}\n"
+  end
+
+  def self.logger
+    @@logger
+  end
+
+  def self.logger=(logger)
+    @@logger = logger
+  end
+
+  def self.log(level, message)
+    @@logger.send(level, message)
+  end
+
   module Util
 
     autoload :HashLike, 'kwalify/util/hashlike'

data/test/Rookbook.yaml

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 

data/test/test-action.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
 

data/test/test-action.yaml

@@ -1,6 +1,6 @@
 ##
 ## $Rev$
-## $Release 1.4.0-beta $
+## $Release 1.4.0 $
 ## copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ##
 ---

data/test/test-databinding.rb

@@ -1,9 +1,8 @@
 ###
 ### $Rev$
-### $Release 1.4.0-beta $
+### $Release 1.4.0 $
 ### copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ###
-# frozen_string_literal: false
 
 require File.dirname(__FILE__) + '/test.rb'
 
@@ -25,7 +24,7 @@ class DataBindingTest < Test::Unit::TestCase
       TESTDATA1.key?(name) and raise "name '#{name}' is dupilcated."
       TESTDATA1[name] = hash
       #
-      s = ''
+      s = String.new
       s <<   "def test_#{name}\n"
       s <<   "  @name = '#{name}'\n"
       for key, val in hash
@@ -36,7 +35,6 @@ class DataBindingTest < Test::Unit::TestCase
       eval s
     end
   end
-  load_yaml_testdata(filename, :lang=>'ruby')
 
 
   def _test
@@ -57,7 +55,7 @@ class DataBindingTest < Test::Unit::TestCase
     ydoc = parser.parse(@data)
     assert_equal(parser.errors, [])
     ## pp
-    result = ''
+    result = String.new
     def result.write(arg); self << arg.to_s; end
     PP.pp(ydoc, result)
     ## convert object-id to portable number

data/test/test-databinding.yaml

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 63 $
-## $Release 1.4.0-beta $
+## $Release 1.4.0 $
 ## copyright(c) 2005-2010 kuwata-lab all rights reserved.
 ##
 ---