ruby_sscanf 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bc62e85d57a5d9c3b5c8dcd4b5710be669d33e4
-  data.tar.gz: e263651715d3557d7ff6933e933e406dc0deb8d2
+  metadata.gz: a3637116ff8d600da08dc6dbdda7176f920e2b7c
+  data.tar.gz: 2f1d07cacd079a28c3d57e572e6f5d8392d5664f
 SHA512:
-  metadata.gz: 1695d80b48075693c685e2f8c0f2e31c54337cd11854ea73f97656b7f8ab9f875fff2a693ac3f113eb9e6854a5bc9c58531856c7f6c90a91542a33934b4dddba
-  data.tar.gz: b98fecc6662d6d2a763e10616581bf9e8c0ccb83e4f20be90a580e0c638fdcc6cd5cc5a423552a278c4a3da755bab63f01fde3289ab2c41783a188b80b3df07b
+  metadata.gz: 8e761ffadd60be04a4bfd62c96476a3bd2c7d06cd0f94aadf30b76ade72205617b3efa340c4dac26615fc82f290c200b70d13b4bb2d60a0a96a293511e7bc39e
+  data.tar.gz: 9473f807205c1539e1960a9c8b6bbeeaa367ec816c2edf358fa0bd10e02174677520fecc7d26764c3444d33f8250c774fe92c6c901b3324c35ff84a1b8eda4c2

data/README.md

@@ -46,8 +46,10 @@ cannot be matched to input data, processing stops at that point. Otherwise
 processing continues until all the format elements are done.
 
 Literal string components match themselves in the input string. If the literal
-has a trailing space, then this matches zero or more spaces.
-The special sequence '%%' matches one '%' in the input string.
+has a trailing space, then this matches zero or more spaces. The backslash
+character is used as a quoting character. Thus \\\\ is processed as a single \\.
+The special sequence '%%' matches one '%' in the input string. This is
+equivalent to the sequence \\%.
 
 The layouts of a format specifier are:
 
@@ -64,6 +66,7 @@ parsed. Note that a .precision field may be specified, but it is ignored.
 * The min_width is the minimum allowed run of characters in the set.
 * The max_width is the maximum allowed run of characters in the set.
 * The set field is a regular expression style [...] set.
+* The regex field is a full blown regular expression followed by options.
 
 The supported format field values are:
 <br>

data/lib/ruby_sscanf.rb

@@ -1,132 +1,10 @@
 require 'format_engine'
+require_relative 'ruby_sscanf/engine'
 require_relative 'ruby_sscanf/version'
 
 #The String class is monkey patched to support sscanf.
 class String
 
-  #A regular expression for decimal integers.
-  RSF_DECIMAL  = /[+-]?\d+/
-
-  #A regular expression for unsigned decimal integers.
-  RSF_UNSIGNED = /[+]?\d+/
-
-  #A regular expression for hexadecimal integers.
-  rsf_hex      = /[+-]?(0[xX])?\h+/
-  RSF_HEX_PARSE = lambda {parse(rsf_hex) ? dst << found.to_i(16) : :break}
-  RSF_HEX_SKIP  = lambda {parse(rsf_hex) || :break}
-
-  #A regular expression for octal integers.
-  RSF_OCTAL    = /[+-]?(0[oO])?[0-7]+/
-
-  #A regular expression for binary integers.
-  RSF_BINARY   = /[+-]?(0[bB])?[01]+/
-
-  #A regular expression for flexible base integers.
-  RSF_INTEGER  = /[+-]?((0[xX]\h+)|(0[bB][01]+)|(0[oO]?[0-7]*)|([1-9]\d*))/
-
-  #A regular expression for floating point and scientific notation numbers.
-  rsf_float    = /[+-]?\d+(\.\d+)?([eE][+-]?\d+)?/
-  RSF_FLOAT_PARSE = lambda {parse(rsf_float) ? dst << found.to_f : :break}
-  RSF_FLOAT_SKIP  = lambda {parse(rsf_float) || :break}
-
-  #A regular expression for rational numbers.
-  RSF_RATIONAL = /[+-]?\d+\/\d+(r)?/
-
-  #A regular expression for complex numbers.
-  RSF_COMPLEX  = %r{(?<num> \d+(\.\d+)?([eE][+-]?\d+)?){0}
-                    [+-]?\g<num>[+-]\g<num>[ij]
-                   }x
-
-  #A regular expression for a string.
-  RSF_STRING   = /\S+/
-
-  #A regular expression for quoted strings.
-  RSF_QUOTED   = /("([^\\"]|\\.)*")|('([^\\']|\\.)*')/
-
-  #The standard handlers for formats with embedded regular expressions.
-  RSF_RGX      = lambda {parse(fmt.regex) ? dst << found : :break}
-  RSF_RGX_SKIP = lambda {parse(fmt.regex) || :break}
-
-
-  #Get the parsing engine. This is cached on a per-thread basis. That is to
-  #say, each thread gets its own \FormatEngine::Engine instance.
-  def self.get_parser_engine
-
-    Thread.current[:ruby_sscanf_engine] ||= FormatEngine::Engine.new(
-      "%a"  => RSF_FLOAT_PARSE,
-      "%*a" => RSF_FLOAT_SKIP,
-
-      "%A"  => RSF_FLOAT_PARSE,
-      "%*A" => RSF_FLOAT_SKIP,
-
-      "%b"  => lambda {parse(RSF_BINARY) ? dst << found.to_i(2) : :break},
-      "%*b" => lambda {parse(RSF_BINARY) || :break},
-
-      "%c"  => lambda {dst << grab},
-      "%*c" => lambda {grab},
-
-      "%d"  => lambda {parse(RSF_DECIMAL) ? dst << found.to_i : :break},
-      "%*d" => lambda {parse(RSF_DECIMAL) || :break},
-
-      "%e"  => RSF_FLOAT_PARSE,
-      "%*e" => RSF_FLOAT_SKIP,
-
-      "%E"  => RSF_FLOAT_PARSE,
-      "%*E" => RSF_FLOAT_SKIP,
-
-      "%f"  => RSF_FLOAT_PARSE,
-      "%*f" => RSF_FLOAT_SKIP,
-
-      "%F"  => RSF_FLOAT_PARSE,
-      "%*F" => RSF_FLOAT_SKIP,
-
-      "%g"  => RSF_FLOAT_PARSE,
-      "%*g" => RSF_FLOAT_SKIP,
-
-      "%G"  => RSF_FLOAT_PARSE,
-      "%*G" => RSF_FLOAT_SKIP,
-
-      "%i"  => lambda {parse(RSF_INTEGER) ? dst << found.to_i(0) : :break},
-      "%*i" => lambda {parse(RSF_INTEGER) || :break},
-
-      "%j"  => lambda {parse(RSF_COMPLEX) ? dst << Complex(found) : :break},
-      "%*j" => lambda {parse(RSF_COMPLEX) || :break},
-
-      "%o"  => lambda {parse(RSF_OCTAL) ? dst << found.to_i(8) : :break},
-      "%*o" => lambda {parse(RSF_OCTAL) || :break},
-
-      "%q"  => lambda do
-        if parse(RSF_QUOTED)
-          dst << found[1..-2].gsub(/\\./) {|seq| seq[-1]}
-        else
-          :break
-        end
-      end,
-
-      "%*q" => lambda {parse(RSF_QUOTED) || :break},
-
-      "%r"  => lambda {parse(RSF_RATIONAL) ? dst << found.to_r : :break},
-      "%*r" => lambda {parse(RSF_RATIONAL) || :break},
-
-      "%s"  => lambda {parse(RSF_STRING) ? dst << found : :break},
-      "%*s" => lambda {parse(RSF_STRING) || :break},
-
-      "%u"  => lambda {parse(RSF_UNSIGNED) ? dst << found.to_i : :break},
-      "%*u" => lambda {parse(RSF_UNSIGNED) || :break},
-
-      "%x"  => RSF_HEX_PARSE,
-      "%*x" => RSF_HEX_SKIP,
-
-      "%X"  => RSF_HEX_PARSE,
-      "%*X" => RSF_HEX_SKIP,
-
-      "%["  => RSF_RGX,
-      "%*[" => RSF_RGX_SKIP,
-
-      "%/"  => RSF_RGX,
-      "%*/" => RSF_RGX_SKIP)
-  end
-
   #Scan the formatted input.
   def sscanf(format)
     String.get_parser_engine.do_parse(self, [], format)
@@ -134,7 +12,7 @@ class String
 
   #Get any unparsed text.
   def self.sscanf_unparsed
-    String.get_parser_engine.unparsed
+    get_parser_engine.unparsed
   end
 
 end

data/lib/ruby_sscanf/engine.rb

@@ -0,0 +1,128 @@
+#The String class is monkey patched to support sscanf.
+class String
+
+  protected
+
+  #A regular expression for decimal integers.
+  RSF_DECIMAL  = /[+-]?\d+/
+
+  #A regular expression for unsigned decimal integers.
+  RSF_UNSIGNED = /[+]?\d+/
+
+  #A regular expression for hexadecimal integers.
+  rsf_hex      = /[+-]?(0[xX])?\h+/
+  RSF_HEX_PARSE = lambda {parse(rsf_hex) ? dst << found.to_i(16) : :break}
+  RSF_HEX_SKIP  = lambda {parse(rsf_hex) || :break}
+
+  #A regular expression for octal integers.
+  RSF_OCTAL    = /[+-]?(0[oO])?[0-7]+/
+
+  #A regular expression for binary integers.
+  RSF_BINARY   = /[+-]?(0[bB])?[01]+/
+
+  #A regular expression for flexible base integers.
+  RSF_INTEGER  = /[+-]?((0[xX]\h+)|(0[bB][01]+)|(0[oO]?[0-7]*)|([1-9]\d*))/
+
+  #A regular expression for floating point and scientific notation numbers.
+  rsf_float    = /[+-]?\d+(\.\d+)?([eE][+-]?\d+)?/
+  RSF_FLOAT_PARSE = lambda {parse(rsf_float) ? dst << found.to_f : :break}
+  RSF_FLOAT_SKIP  = lambda {parse(rsf_float) || :break}
+
+  #A regular expression for rational numbers.
+  RSF_RATIONAL = /[+-]?\d+\/\d+(r)?/
+
+  #A regular expression for complex numbers.
+  RSF_COMPLEX  = %r{(?<num> \d+(\.\d+)?([eE][+-]?\d+)?){0}
+                    [+-]?\g<num>[+-]\g<num>[ij]
+                   }x
+
+  #A regular expression for a string.
+  RSF_STRING   = /\S+/
+
+  #A regular expression for quoted strings.
+  RSF_QUOTED   = /("([^\\"]|\\.)*")|('([^\\']|\\.)*')/
+
+  #The standard handlers for formats with embedded regular expressions.
+  RSF_RGX      = lambda {parse(fmt.regex) ? dst << found : :break}
+  RSF_RGX_SKIP = lambda {parse(fmt.regex) || :break}
+
+
+  #Get the parsing engine. This is cached on a per-thread basis. That is to
+  #say, each thread gets its own \FormatEngine::Engine instance.
+  def self.get_parser_engine
+
+    Thread.current[:ruby_sscanf_engine] ||= FormatEngine::Engine.new(
+      "%a"  => RSF_FLOAT_PARSE,
+      "%*a" => RSF_FLOAT_SKIP,
+
+      "%A"  => RSF_FLOAT_PARSE,
+      "%*A" => RSF_FLOAT_SKIP,
+
+      "%b"  => lambda {parse(RSF_BINARY) ? dst << found.to_i(2) : :break},
+      "%*b" => lambda {parse(RSF_BINARY) || :break},
+
+      "%c"  => lambda {dst << grab},
+      "%*c" => lambda {grab},
+
+      "%d"  => lambda {parse(RSF_DECIMAL) ? dst << found.to_i : :break},
+      "%*d" => lambda {parse(RSF_DECIMAL) || :break},
+
+      "%e"  => RSF_FLOAT_PARSE,
+      "%*e" => RSF_FLOAT_SKIP,
+
+      "%E"  => RSF_FLOAT_PARSE,
+      "%*E" => RSF_FLOAT_SKIP,
+
+      "%f"  => RSF_FLOAT_PARSE,
+      "%*f" => RSF_FLOAT_SKIP,
+
+      "%F"  => RSF_FLOAT_PARSE,
+      "%*F" => RSF_FLOAT_SKIP,
+
+      "%g"  => RSF_FLOAT_PARSE,
+      "%*g" => RSF_FLOAT_SKIP,
+
+      "%G"  => RSF_FLOAT_PARSE,
+      "%*G" => RSF_FLOAT_SKIP,
+
+      "%i"  => lambda {parse(RSF_INTEGER) ? dst << found.to_i(0) : :break},
+      "%*i" => lambda {parse(RSF_INTEGER) || :break},
+
+      "%j"  => lambda {parse(RSF_COMPLEX) ? dst << Complex(found) : :break},
+      "%*j" => lambda {parse(RSF_COMPLEX) || :break},
+
+      "%o"  => lambda {parse(RSF_OCTAL) ? dst << found.to_i(8) : :break},
+      "%*o" => lambda {parse(RSF_OCTAL) || :break},
+
+      "%q"  => lambda do
+        if parse(RSF_QUOTED)
+          dst << found[1..-2].gsub(/\\./) {|seq| seq[-1]}
+        else
+          :break
+        end
+      end,
+
+      "%*q" => lambda {parse(RSF_QUOTED) || :break},
+
+      "%r"  => lambda {parse(RSF_RATIONAL) ? dst << found.to_r : :break},
+      "%*r" => lambda {parse(RSF_RATIONAL) || :break},
+
+      "%s"  => lambda {parse(RSF_STRING) ? dst << found : :break},
+      "%*s" => lambda {parse(RSF_STRING) || :break},
+
+      "%u"  => lambda {parse(RSF_UNSIGNED) ? dst << found.to_i : :break},
+      "%*u" => lambda {parse(RSF_UNSIGNED) || :break},
+
+      "%x"  => RSF_HEX_PARSE,
+      "%*x" => RSF_HEX_SKIP,
+
+      "%X"  => RSF_HEX_PARSE,
+      "%*X" => RSF_HEX_SKIP,
+
+      "%["  => RSF_RGX,
+      "%*[" => RSF_RGX_SKIP,
+
+      "%/"  => RSF_RGX,
+      "%*/" => RSF_RGX_SKIP)
+  end
+end

data/lib/ruby_sscanf/version.rb

@@ -1,5 +1,5 @@
 #The ruby_sscanf doesn't really live here.
 module RubySscanf
   #The gem's version.
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/ruby_sscanf.gemspec

@@ -22,12 +22,12 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_runtime_dependency "format_engine", ">= 0.7.1"
+  spec.add_runtime_dependency "format_engine", ">= 0.7.2"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'minitest', "~> 5.5.1"
-  spec.add_development_dependency 'minitest_visible', ">= 0.1.0"
+  spec.add_development_dependency 'minitest_visible', ">= 0.1.1"
   spec.add_development_dependency 'rdoc', "~> 4.0.1"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_sscanf
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: format_engine
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - Rakefile
 - bench/bench.rb
 - lib/ruby_sscanf.rb
+- lib/ruby_sscanf/engine.rb
 - lib/ruby_sscanf/version.rb
 - ruby_sscanf.gemspec
 - tests/scan_tests.rb