format_engine 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9763561c83301a57758ba138e2a5e1baceaa9bd2
-  data.tar.gz: a358fc3401bc95e897b7eb3470e3a0583d1699d7
+  metadata.gz: 9c631ec0b15ff1952a3a5b86419b573da0abbff2
+  data.tar.gz: 0186ba016892c41dad4f6e6e9d36f7a7cb2f2b04
 SHA512:
-  metadata.gz: 87ae5fcb562aa0a10b91dd6f7d599f8b50154e445e4fe56b62833e0d8d0e673cd49cca5295e24d86f0dbdfce542aabad41111e8688b7bc7462b2333c1043c995
-  data.tar.gz: 4894677c3a40eacf60946cf13b4d10e8d71a441283b81f5a2b7529a1d6a9cbe8fd08cd7992e614f67c58dc982a2158a4f53572313a612d5b4db5639b7e670abe
+  metadata.gz: d499b1394e144d1f454f7050b2c9efd1fc6d303384c544a53491f485e1e894b62ab1cc994921c82948185a7151481156e9e4a579fae45ee2a3c2222fb3dfbee3
+  data.tar.gz: 9e8ff69ca8bac9cf3c33ab3cfea213594c3a72a34acc3e154978d594fe6239c773fcaa3f0c8d8d4fc9461505a9124f3357e2badb6f8ae1abe3b17ca3a680c94b

data/README.md

@@ -102,7 +102,7 @@ creates the following format specification array:
 ```ruby
 [Literal("Elapsed = "),
  Variable("%*H", ["02"]),
- Literal("H"),
+ Literal(":"),
  Variable("%M", nil).
  Literal(":"),
  Variable("%S", ["5", "2"]),
@@ -149,8 +149,13 @@ Methods
 
 ###Format Specifier Attributes
 The format specifier (accessed as fmt above) has 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.
 
 ## Philosophy
 

data/lib/format_engine/format_spec/variable.rb

@@ -1,60 +1,85 @@
 module FormatEngine
 
-  # A format engine variable specification.
+  #A format engine variable specification.
   class FormatVariable
 
-    # The fixed part of this variable specification.
+    #The fixed part of this variable specification.
     attr_reader :format
 
-    # The (optional) numeric format parameters.
+    #The (optional) numeric format parameters or nil.
     attr_reader :parms
 
-    # Setup a variable format specification.
+    #The (optional) parameter data as a string or an empty string.
+    attr_reader :parm_str
+
+    #Setup a variable format specification.
     def initialize(format)
       if format =~ /(\d+(\.\d+)?)/
-        @format = $PREMATCH + $POSTMATCH
+        @format   = $PREMATCH + $POSTMATCH
+        @parm_str = $MATCH
 
-        if (digits = $MATCH) =~ /\./
+        if (@parm_str) =~ /\./
           @parms = [$PREMATCH, $POSTMATCH]
         else
-          @parms = [digits]
+          @parms = [@parm_str]
         end
 
       else
-        @parms  = nil
-        @format = format
+        @format   = format
+        @parm_str = ""
+        @parms    = nil
       end
     end
 
-    # Is this variable supported by the engine?
+    #Is this variable supported by the engine?
     def validate(engine)
       fail "Unsupported tag = #{format.inspect}" unless engine[format]
       self
     end
 
+    #Has a width been specified?
+    def has_width?
+      parms
+    end
+
     # Get the width parameter.
     def width
-      parms ? parms[0].to_i : 0
+      has_width? ? parms[0].to_i : 0
+    end
+
+    #Get the width as a string
+    def width_str
+      has_width? ? parms[0] : ""
     end
 
-    # Get the precision parameter.
+    #Has a precision been specified?
+    def has_prec?
+      has_width? && parms.length > 1
+    end
+
+    #Get the precision parameter.
     def prec
-      (parms && parms.length > 1) ? parms[1].to_i : 0
+      has_prec? ? parms[1].to_i : 0
+    end
+
+    #Get the precision as a string
+    def prec_str
+      has_prec? ? parms[1] : ""
     end
 
-    # Format onto the output string
+    #Format onto the output string
     def do_format(spec_info)
       spec_info.fmt = self
       spec_info.instance_exec(&spec_info.engine[self.format])
     end
 
-    # Parse from the input string
+    #Parse from the input string
     def do_parse(spec_info)
       spec_info.fmt = self
       spec_info.instance_exec(&spec_info.engine[self.format])
     end
 
-    # Inspect for debugging.
+    #Inspect for debugging.
     def inspect
       "Variable(#{format.inspect}, #{parms.inspect})"
     end

data/lib/format_engine/version.rb

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

data/tests/format_spec_tests.rb

@@ -32,6 +32,11 @@ class FormatSpecTester < Minitest::Test
       assert_equal(1, test.specs.length)
       assert_equal(FormatEngine::FormatVariable, test.specs[0].class)
       assert_equal("%#{char}A", test.specs[0].format)
+      refute(test.specs[0].has_width?)
+      refute(test.specs[0].has_prec?)
+      assert_equal("", test.specs[0].width_str)
+      assert_equal("", test.specs[0].prec_str)
+      assert_equal("", test.specs[0].parm_str)
     end
   end
 
@@ -45,6 +50,11 @@ class FormatSpecTester < Minitest::Test
     assert_equal(Array, test.specs[0].parms.class)
     assert_equal(1, test.specs[0].parms.length)
     assert_equal("123", test.specs[0].parms[0])
+    assert(test.specs[0].has_width?)
+    refute(test.specs[0].has_prec?)
+    assert_equal("123", test.specs[0].width_str)
+    assert_equal("", test.specs[0].prec_str)
+    assert_equal("123", test.specs[0].parm_str)
   end
 
   def test_that_it_scans_double_variable_formats
@@ -58,6 +68,11 @@ class FormatSpecTester < Minitest::Test
     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

data/tests/variable_spec_tests.rb

@@ -20,15 +20,31 @@ class VariableSpecTester < Minitest::Test
 
   def test_the_parms
     test = FormatEngine::FormatVariable.new("%B")
+    refute(test.has_width?)
     assert_equal(0, test.width)
+    assert_equal("", test.width_str)
+    refute(test.has_prec?)
     assert_equal(0, test.prec)
+    assert_equal("", test.prec_str)
+    assert_equal("", test.parm_str)
 
     test = FormatEngine::FormatVariable.new("%10B")
+    assert(test.has_width?)
     assert_equal(10, test.width)
+    assert_equal("10", test.width_str)
+    refute(test.has_prec?)
     assert_equal(0, test.prec)
+    assert_equal("", test.prec_str)
+    assert_equal("10", 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.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler