ruby_sscanf 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bc480e9779f68f86b3e1fc6c3037c82f9faf0b8
-  data.tar.gz: fb6dd5f80869cdcbadaeb9ab8c277f3983b60cef
+  metadata.gz: ebdb3c9a6ba312ee15d515c456ec29608c615a04
+  data.tar.gz: 2d20f9a4f4f278deb583a7d764629c346e31f629
 SHA512:
-  metadata.gz: 8ddc5dc86fbfb694334448efc479a5084294094204be68cc8bbf7dc7c08f363606213d53668f9ab1b9ab62ade320d7f8e4ac10ef28df6d6cc18764b3c566ecea
-  data.tar.gz: 5d6af7a4a181a41e6ba9251b500553beed42e251e9686b9117475ee6fd597338998e648f242bd98cc6ef48e19f63538b7d01e23deb31d10a7da64eaa5557f9f0
+  metadata.gz: c17787e331f21a747c6cf5a3542d141399bf236d555dee02c50afaf809db8c0ae04b8101879517b2142bd9f71d93d73e37e8f4917b5d823e0fe4188ff73fdf14
+  data.tar.gz: 9088a19271832f38f28a5ad6c31b98b1316f9d640f3dec292d9288ce376b339dd609c350a3e59cbfeeb05cc722cac35c1521696c79ad04a586361f564e1d588b

data/README.md

@@ -49,15 +49,19 @@ 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.
 
-The layout of a format specifier is:
+The layouts of a format specifier are:
 
     %[skip_flag][width]format
+    %[skip_flag][[min_width,]max_width]set
 
 * The % sign is the lead-in character.
 * The optional skip flag, the *, causes any data extracted to be ignored.
 * The width field is an integer that determines the amount of text to be
-parsed.
+parsed. Note that a .precision field may be specified, but it is ignored.
 * The format field determines the type of data being parsed.
+* 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 supported format field values are:
 <br>
@@ -152,22 +156,22 @@ pleased to see that in fact ruby_sscanf was faster. Here are the results:
 
     Warming up --------------------------------------
     Scan strings with ruby_sscanf
-                             1.594k i/100ms
+                             1.768k i/100ms
     Scan strings with scanf
-                           305.000  i/100ms
+                           310.000  i/100ms
     Calculating -------------------------------------
     Scan strings with ruby_sscanf
-                             16.419k (± 4.9%) i/s -     82.888k
+                             18.355k (± 5.8%) i/s -     91.936k
     Scan strings with scanf
-                              3.077k (± 6.2%) i/s -     15.555k
+                              3.145k (± 7.2%) i/s -     15.810k
 
     Comparison:
-    Scan strings with ruby_sscanf:    16418.6 i/s
-    Scan strings with scanf:     3077.1 i/s - 5.34x slower
+    Scan strings with ruby_sscanf:    18354.7 i/s
+    Scan strings with scanf:     3145.0 i/s - 5.84x slower
 
 This benchmark test was run under:
 * ruby 2.1.6p336 (2015-04-13 revision 50298) [i386-mingw32]
-* format_engine version = 0.5.2
+* format_engine version = 0.6.0
 
 ## Contributing
 

data/lib/ruby_sscanf.rb

@@ -43,9 +43,15 @@ class String
   #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_engine
+  def self.get_parser_engine
+
     Thread.current[:ruby_sscanf_engine] ||= FormatEngine::Engine.new(
       "%a"  => RSF_FLOAT_PARSE,
       "%*a" => RSF_FLOAT_SKIP,
@@ -114,13 +120,16 @@ class String
       "%X"  => RSF_HEX_PARSE,
       "%*X" => RSF_HEX_SKIP,
 
-      "%["  => lambda {parse(fmt.regex) ? dst << found : :break},
-      "%*[" => lambda {parse(fmt.regex) || :break})
+      "%["  => RSF_RGX,
+      "%*[" => RSF_RGX_SKIP,
+
+      "%/"  => RSF_RGX,
+      "%*/" => RSF_RGX_SKIP)
   end
 
   #Scan the formatted input.
   def sscanf(format)
-    String.get_engine.do_parse(self, [], format)
+    String.get_parser_engine.do_parse(self, [], format)
   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.1.3"
+  VERSION = "0.2.0"
 end

data/ruby_sscanf.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_runtime_dependency "format_engine", ">= 0.5"
+  spec.add_runtime_dependency "format_engine", ">= 0.7"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/tests/scan_tests.rb

@@ -85,6 +85,9 @@ class ScanTester < Minitest::Test
 
     result = "a b c".sscanf "%[a] %[b] %[c]"
     assert_equal(["a", "b", "c"] , result)
+
+    result = "a abbccc acbcad".sscanf "%/A/i %/a+b+c+/ %/([ab][cd])+/"
+    assert_equal(["a", "abbccc", "acbcad"] , result)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_sscanf
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-22 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.5'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement