format_engine 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c631ec0b15ff1952a3a5b86419b573da0abbff2
-  data.tar.gz: 0186ba016892c41dad4f6e6e9d36f7a7cb2f2b04
+  metadata.gz: 6a255811c1f0df1bc9b92fc02eaaee55b58b2f73
+  data.tar.gz: 10705de5b1a6bf5722cbf4d8350cce41f10a08c1
 SHA512:
-  metadata.gz: d499b1394e144d1f454f7050b2c9efd1fc6d303384c544a53491f485e1e894b62ab1cc994921c82948185a7151481156e9e4a579fae45ee2a3c2222fb3dfbee3
-  data.tar.gz: 9e8ff69ca8bac9cf3c33ab3cfea213594c3a72a34acc3e154978d594fe6239c773fcaa3f0c8d8d4fc9461505a9124f3357e2badb6f8ae1abe3b17ca3a680c94b
+  metadata.gz: b61ac28dd23cd0cb2c3a58f6ba6cf80b79d883933a0906f24de50c173019d718e49c89a807a0f476d444970dd407e9a2626e8b115bf47363adf9d77ba4db025d
+  data.tar.gz: e76b17e94d5e83e26e0c99c2d4e43b82e1c00ec5bd49de5c490c6c06f149bbee446fffecee2d9564d806176e9e269b7400269873c626b7c0a350af4f6829e147

data/README.md

@@ -49,8 +49,8 @@ class Customer
 
   #Demo defn of the strfmt method for formatted string output!
   attr_formatter :strfmt,
-  {"%f"  => lambda {cat src.first_name.ljust(fmt.width) },
-   "%l"  => lambda {cat src.last_name.ljust(fmt.width)  } }
+  {"%f"  => lambda {cat "%#{fmt.width_str}s" % src.first_name },
+   "%l"  => lambda {cat "%#{fmt.width_str}s" % src.last_name  } }
 
   #Demo defn of the strprs method for formatted string input!
   attr_parser :strprs,
@@ -82,11 +82,8 @@ agent = Customer.strprs(in_str, "%f, %l")
 Format String Specification Syntax (BNF):
 
 * spec = ( text | item )+
-* item = "%" flag* (parm ("." parm)?)? command
-* flag = ( "~" | "@" | "#" | "&" | "^"  |
-  "&" | "*" | "-" | "+" | "="  |
-  "?" | "_" | "<" | ">" | "\\" |
-  "/" | "." | "," | "|" | "!"  )
+* item = "%" flag* ("+" | "-")?(parm ("." parm)?)? command
+* flag = "~"|"@"|"#"|"&"|"^"|"&"|"*"|"="|"?"|"_"|"<"|">"|"\\"|"/"|"."|","|"|"|"!"
 * parm = ("0" .. "9")+
 * command = ("a" .. "z" | "A" .. "Z")
 
@@ -95,7 +92,7 @@ Format String Specification Syntax (BNF):
 
 The format specification:
 ```ruby
-"Elapsed = %*02H:%M:%5.2S!"
+"Elapsed = %*02H:%M:%-5.2S!"
 ```
 creates the following format specification array:
 
@@ -105,7 +102,7 @@ creates the following format specification array:
  Literal(":"),
  Variable("%M", nil).
  Literal(":"),
- Variable("%S", ["5", "2"]),
+ Variable("%S", ["-5", "2"]),
  Literal("!")]
 ```
 Where literals are processed as themselves and variables are executed by looking

data/lib/format_engine/format_spec/variable.rb

@@ -14,7 +14,7 @@ module FormatEngine
 
     #Setup a variable format specification.
     def initialize(format)
-      if format =~ /(\d+(\.\d+)?)/
+      if format =~ /[+-]?(\d+(\.\d+)?)/
         @format   = $PREMATCH + $POSTMATCH
         @parm_str = $MATCH
 

data/lib/format_engine/format_spec.rb

@@ -41,7 +41,7 @@ module FormatEngine
     #Scan the format string extracting literals and variables.
     def scan_spec(fmt_string)
       until fmt_string.empty?
-        if fmt_string =~ /%[~@#$^&*\-+=?_<>\\\/\.,\|!]*(\d+(\.\d+)?)?[a-zA-Z]/
+        if fmt_string =~ /%[~@#$^&*\=?_<>\\\/\.,\|!]*[-+]?(\d+(\.\d+)?)?[a-zA-Z]/
           @specs << FormatLiteral.new($PREMATCH) unless $PREMATCH.empty?
           @specs << FormatVariable.new($MATCH)
           fmt_string  =  $POSTMATCH

data/lib/format_engine/version.rb

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

data/mocks/demo/demo_format.rb

@@ -7,7 +7,7 @@ class Customer
   #The specification of the formatter method of the demo \Customer class.
 
   attr_formatter :strfmt,
-  {"%f"  => lambda {cat src.first_name.ljust(fmt.width) },
-   "%l"  => lambda {cat src.last_name.ljust(fmt.width)  } }
+  {"%f"  => lambda {cat "%#{fmt.width_str}s" % src.first_name },
+   "%l"  => lambda {cat "%#{fmt.width_str}s" % src.last_name  } }
 
 end

data/tests/format_spec_tests.rb

@@ -75,6 +75,24 @@ class FormatSpecTester < Minitest::Test
     assert_equal("123.456", test.specs[0].parm_str)
   end
 
+  def test_negative_variable_formats
+    test = FormatEngine::FormatSpec.get_spec "%-123.456A"
+    assert_equal(Array, test.specs.class)
+    assert_equal(1, test.specs.length)
+    assert_equal(FormatEngine::FormatVariable, test.specs[0].class)
+    assert_equal("%A", test.specs[0].format)
+
+    assert_equal(Array, test.specs[0].parms.class)
+    assert_equal(2, test.specs[0].parms.length)
+    assert_equal("-123", test.specs[0].parms[0])
+    assert_equal("456", test.specs[0].parms[1])
+    assert(test.specs[0].has_width?)
+    assert(test.specs[0].has_prec?)
+    assert_equal("-123", test.specs[0].width_str)
+    assert_equal("456", test.specs[0].prec_str)
+    assert_equal("-123.456", test.specs[0].parm_str)
+  end
+
   def test_multipart_formats
     test = FormatEngine::FormatSpec.get_spec "T(%+02A:%3B:%4.1C)"
 
@@ -85,9 +103,9 @@ class FormatSpecTester < Minitest::Test
     assert_equal("T(", test.specs[0].literal)
 
     assert_equal(FormatEngine::FormatVariable, test.specs[1].class)
-    assert_equal("%+A", test.specs[1].format)
+    assert_equal("%A", test.specs[1].format)
     assert_equal(1, test.specs[1].parms.length)
-    assert_equal("02", test.specs[1].parms[0])
+    assert_equal("+02", test.specs[1].parms[0])
 
     assert_equal(FormatEngine::FormatLiteral, test.specs[2].class)
     assert_equal(":", test.specs[2].literal)

data/tests/formatter_engine_tests.rb

@@ -13,14 +13,10 @@ class FormatterTester < Minitest::Test
 
   def make_formatter
     FormatEngine::Engine.new(
-      "%f"  => lambda {cat src.first_name.ljust(fmt.width) },
-      "%-f" => lambda {cat src.first_name.rjust(fmt.width) },
-      "%F"  => lambda {cat src.first_name.upcase.ljust(fmt.width) },
-      "%-F" => lambda {cat src.first_name.upcase.rjust(fmt.width) },
-      "%l"  => lambda {cat src.last_name.ljust(fmt.width)},
-      "%-l" => lambda {cat src.last_name.rjust(fmt.width)},
-      "%L"  => lambda {cat src.last_name.upcase.ljust(fmt.width) },
-      "%-L" => lambda {cat src.last_name.upcase.rjust(fmt.width) })
+      "%f"  => lambda {cat "%#{fmt.width_str}s" % src.first_name},
+      "%F"  => lambda {cat "%#{fmt.width_str}s" % src.first_name.upcase},
+      "%l"  => lambda {cat "%#{fmt.width_str}s" % src.last_name},
+      "%L"  => lambda {cat "%#{fmt.width_str}s" % src.last_name.upcase})
   end
 
   def make_person
@@ -46,12 +42,12 @@ class FormatterTester < Minitest::Test
   end
 
   def test_that_it_can_format_wider
-    engine, obj, spec = make_all("Name = %10f %10l")
+    engine, obj, spec = make_all("Name = %-10f %-10l")
     assert_equal("Name = Squidly    Jones     ", engine.do_format(obj, spec))
   end
 
   def test_that_it_can_format_right
-    engine, obj, spec = make_all("Name = %-10f %-10l")
+    engine, obj, spec = make_all("Name = %10f %10l")
     assert_equal("Name =    Squidly      Jones", engine.do_format(obj, spec))
   end
 

data/tests/variable_spec_tests.rb

@@ -46,5 +46,14 @@ class VariableSpecTester < Minitest::Test
     assert_equal("5", test.prec_str)
     assert_equal("10.5", test.parm_str)
 
+    test = FormatEngine::FormatVariable.new("%-10.5B")
+    assert(test.has_width?)
+    assert_equal(-10, test.width)
+    assert_equal("-10", test.width_str)
+    assert(test.has_prec?)
+    assert_equal(5, test.prec)
+    assert_equal("5", test.prec_str)
+    assert_equal("-10.5", test.parm_str)
+
   end
 end

metadata

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