ruby_sscanf 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebdb3c9a6ba312ee15d515c456ec29608c615a04
-  data.tar.gz: 2d20f9a4f4f278deb583a7d764629c346e31f629
+  metadata.gz: 0bc62e85d57a5d9c3b5c8dcd4b5710be669d33e4
+  data.tar.gz: e263651715d3557d7ff6933e933e406dc0deb8d2
 SHA512:
-  metadata.gz: c17787e331f21a747c6cf5a3542d141399bf236d555dee02c50afaf809db8c0ae04b8101879517b2142bd9f71d93d73e37e8f4917b5d823e0fe4188ff73fdf14
-  data.tar.gz: 9088a19271832f38f28a5ad6c31b98b1316f9d640f3dec292d9288ce376b339dd609c350a3e59cbfeeb05cc722cac35c1521696c79ad04a586361f564e1d588b
+  metadata.gz: 1695d80b48075693c685e2f8c0f2e31c54337cd11854ea73f97656b7f8ab9f875fff2a693ac3f113eb9e6854a5bc9c58531856c7f6c90a91542a33934b4dddba
+  data.tar.gz: b98fecc6662d6d2a763e10616581bf9e8c0ccb83e4f20be90a580e0c638fdcc6cd5cc5a423552a278c4a3da755bab63f01fde3289ab2c41783a188b80b3df07b

data/README.md

@@ -53,6 +53,8 @@ The layouts of a format specifier are:
 
     %[skip_flag][width]format
     %[skip_flag][[min_width,]max_width]set
+    %[skip_flag]regex[options]
+
 
 * The % sign is the lead-in character.
 * The optional skip flag, the *, causes any data extracted to be ignored.
@@ -91,6 +93,8 @@ or "...".
 leading '0x' or '0X'.
 * [chars] - Scan for a contiguous string of characters in the set [chars].
 * [^chars] - Scan for a contiguous string of characters not in the set [^chars]
+* /regex/ - Scan for a string matching the regular expression. This may be
+followed by one or more optional flags. Supported flags are i, m, and x.
 
 ## Examples
 Here are a few exmaples of the sscanf method in action.
@@ -146,6 +150,17 @@ returns   ["quote", "un quote", "a '"]
 
 "a b c".sscanf "%[a] %[b] %[c]"
 returns   ["a", "b", "c"]
+
+"a abbccc acbcad".sscanf "%/A/i %/a+b+c+/ %/([ab][cd])+/"
+returns   ["a", "abbccc", "acbcad"]
+```
+
+## Getting unparsed text
+When a string is parsed, there may be some text at the end of the string that
+is not parsed. It is possible to retrieve this text using the following:
+
+```ruby
+String.sscanf_unparsed
 ```
 
 ## Benchmarks

data/lib/ruby_sscanf.rb

@@ -11,9 +11,9 @@ class String
   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}
+  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]+/
@@ -25,9 +25,9 @@ class String
   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}
+  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)?/
@@ -132,4 +132,9 @@ class String
     String.get_parser_engine.do_parse(self, [], format)
   end
 
+  #Get any unparsed text.
+  def self.sscanf_unparsed
+    String.get_parser_engine.unparsed
+  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.0"
+  VERSION = "0.2.1"
 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.7"
+  spec.add_runtime_dependency "format_engine", ">= 0.7.1"
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/tests/scan_tests.rb

@@ -90,4 +90,14 @@ class ScanTester < Minitest::Test
     assert_equal(["a", "abbccc", "acbcad"] , result)
   end
 
+  def test_unparsed_text
+    result = "12 34 and much more".sscanf "%u %u"
+    assert_equal([12, 34] , result)
+    assert_equal(" and much more" , String.sscanf_unparsed)
+
+    result = "12 34 and much more".sscanf "%u %u "
+    assert_equal([12, 34] , result)
+    assert_equal("and much more" , String.sscanf_unparsed)
+  end
+
 end

metadata

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