format_engine 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a255811c1f0df1bc9b92fc02eaaee55b58b2f73
-  data.tar.gz: 10705de5b1a6bf5722cbf4d8350cce41f10a08c1
+  metadata.gz: b0baee6898a0254f3c7e17992bdb405855786cde
+  data.tar.gz: e4ed97834beefe97848e7c45e9a8bbda13918b4d
 SHA512:
-  metadata.gz: b61ac28dd23cd0cb2c3a58f6ba6cf80b79d883933a0906f24de50c173019d718e49c89a807a0f476d444970dd407e9a2626e8b115bf47363adf9d77ba4db025d
-  data.tar.gz: e76b17e94d5e83e26e0c99c2d4e43b82e1c00ec5bd49de5c490c6c06f149bbee446fffecee2d9564d806176e9e269b7400269873c626b7c0a350af4f6829e147
+  metadata.gz: 81baf16535d34920bfc19c3be71fe479fc728db0e0f07c9926b32e97c088a2072c241ea131e144d14ab19e2b8699875b0b50afedb82c1964e42f59ec73ea40f2
+  data.tar.gz: 2721ee739f1a909e8307612f55ff84a916b103b804b6108e2e89d612d191600ecd6f48a9766b806c83814b4b32e69baa5e7d3b4fe32d6610ae71d98feb789a0c

data/README.md

@@ -105,7 +105,8 @@ creates the following format specification array:
  Variable("%S", ["-5", "2"]),
  Literal("!")]
 ```
-Where literals are processed as themselves and variables are executed by looking
+Where literals are processed as themselves. If that literal ends with a space,
+that space will match zero or more spaces. Variables are executed by looking
 up the format string in the library and executing the corresponding block.
 
 **Note:** If a format string does not correspond to an entry in the library,
@@ -145,14 +146,15 @@ Methods
 * found - The text found by the last parse (or parse!) operation.
 
 ###Format Specifier Attributes
-The format specifier (accessed as fmt above) has the following attributes:
+The format specifier, used in both formatting and parsing and accessed as the
+fmt attribute, has itself, the following attributes:
 * has_width? - Was a width specified?
 * width - The width parameter or 0 if not specified.
 * width_str - The actual width text or an empty string.
 * has_prec? - Was a precision specified?
 * prec - The precision parameter or 0 if not specified.
 * prec_str - The actual precision text or an empty string.
-* parm_str - The actual parameter text or an empty string.
+* parm_str - The actual parameter (width and precision) text or an empty string.
 
 ## Philosophy
 

data/lib/format_engine/attr_formatter.rb

@@ -19,6 +19,7 @@ module FormatEngine
     def attr_formatter(method, library)
       engine = Engine.new(library)
 
+      #Create an instance method to do the formatting.
       define_method(method) do |spec_str|
         engine.do_format(self, spec_str)
       end

data/lib/format_engine/attr_parser.rb

@@ -20,6 +20,7 @@ module FormatEngine
     def attr_parser(method, library)
       engine = Engine.new(library)
 
+      #Create a class method to do the parsing.
       define_singleton_method(method) do |src, spec_str|
         engine.do_parse(src, self, spec_str)
       end

data/lib/format_engine/format_spec/literal.rb

@@ -9,6 +9,8 @@ module FormatEngine
     # Set up a literal format specification.
     def initialize(literal)
       @literal = literal
+      @head = literal.rstrip
+      @tail = literal.end_with?(' ')
     end
 
     # Is this literal supported by the engine? YES!
@@ -23,7 +25,8 @@ module FormatEngine
 
     # Parse from the input string
     def do_parse(spec_info)
-      spec_info.parse!(literal)
+      spec_info.parse!(@head) unless @head.empty?
+      spec_info.parse(/\s*/)  if @tail
     end
 
     # Inspect for debugging.

data/lib/format_engine/version.rb

@@ -1,5 +1,5 @@
 
 module FormatEngine
   # The version of the format_engine gem.
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/tests/parser_engine_tests.rb

@@ -19,8 +19,6 @@ class ParserTester < Minitest::Test
       "%l"    => lambda { tmp[:ln] = found if parse(/(\w)+/ ) },
       "%L"    => lambda { tmp[:ln] = found.upcase if parse(/(\w)+/) },
       "%-L"   => lambda { tmp[:ln] = found.capitalize if parse(/(\w)+/) },
-      "%s"    => lambda { parse(/\s+/) },
-      "%,s"   => lambda { parse(/[,\s]\s*/) },
       "%t"    => lambda { parse("\t") },
       "%!t"   => lambda { parse!("\t") },
 
@@ -59,12 +57,28 @@ class ParserTester < Minitest::Test
 
   def test_that_it_can_flex_parse
     engine = make_parser
-    spec =  "%f%,s%l"
+    spec =  "%f, %l"
+
+    #No spaces.
+    result = engine.do_parse("Squidly,Jones", TestPerson, spec)
+
+    assert_equal(TestPerson, result.class)
+    assert_equal("Squidly", result.first_name)
+    assert_equal("Jones", result.last_name)
+
+    #One space.
     result = engine.do_parse("Squidly, Jones", TestPerson, spec)
 
     assert_equal(TestPerson, result.class)
     assert_equal("Squidly", result.first_name)
     assert_equal("Jones", result.last_name)
+
+    #Two spaces.
+    result = engine.do_parse("Squidly,  Jones", TestPerson, spec)
+
+    assert_equal(TestPerson, result.class)
+    assert_equal("Squidly", result.first_name)
+    assert_equal("Jones", result.last_name)
   end
 
   def test_that_it_can_tab_parse

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: format_engine
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler