format_engine 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31f6ac5a6816b11346d2bfe10a94108395ac2feb
-  data.tar.gz: 9f0aabe82aa6fcaeac3a9300bb17b2588e48ff52
+  metadata.gz: 5d7dfb82f1660f588d8c962202bc052410d0103a
+  data.tar.gz: afc3a10a88f09024a9d37493bf77308be189473b
 SHA512:
-  metadata.gz: 3a4c4b22b157eeccaaaa6225e6a22db1b6c2fef0c1ee38ff5e05b3088f840990c55832f26995c5d5de0175e70e2d6cccae6b822ad1c1e8e0c9b20170d4025073
-  data.tar.gz: 54370ba86beaeaae3faaf6b354e8fc6a63781b5b73695ccf1ccc5e20afd08f1d2a3a1808127df5887172e309e940ba026d319f88a6de811f358f19f27aebad00
+  metadata.gz: 5f0d437c4b5d083b40287823fe705cb3a09871b68b8ed8805eb09e64f5d28dbb80779fb5f471f261d1ff9e84d0ba4fcd01c8f0ee78fd32b7bc0fcaa4201a585d
+  data.tar.gz: 110691ceb8a920df1b626febe8f803402e2b8ad48fe7934bf5cd06a6f0d84e8f04bcacd404c2c885a1fa9da7ccfc4fbf432585ce5089345bf5bac18e432f60a1

data/README.md

@@ -37,8 +37,6 @@ require 'format_engine'
 
 #A demo class for the format_engine gem.
 
-require 'format_engine'
-
 class Customer
   extend FormatEngine::AttrFormatter
   extend FormatEngine::AttrParser

data/lib/format_engine/format_spec/literal.rb

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

data/lib/format_engine/format_spec.rb

@@ -17,6 +17,12 @@ module FormatEngine
 
   #The format string parser.
   class FormatSpec
+    #The regex used to parse variable specifications.
+    VAR_REGEX = %r{(?<flags> [~@#$^&*\=?_<>\\\/\.,\|!]*){0}
+                   (?<parms> [-+]?(\d+(\.\d+)?)?){0}
+                   (%\g<flags>\g<parms>[a-zA-Z])
+                  }x
+
     #Don't use new, use get_spec instead.
     private_class_method :new
 
@@ -41,7 +47,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 =~ VAR_REGEX
           @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.3.1"
+  VERSION = "0.3.2"
 end

data/mocks/demo/demo_parse.rb

@@ -7,9 +7,9 @@ class Customer
   #The specification of the parser method of the demo \Customer class.
 
   attr_parser :strprs,
-  {"%a"    => lambda { tmp[:age] = found.to_i if parse(/(\d)+/ ) },
-   "%f"    => lambda { tmp[:fn] = found if parse(/(\w)+/ ) },
-   "%l"    => lambda { tmp[:ln] = found if parse(/(\w)+/ ) },
+  {"%a"    => lambda { tmp[:age] = found.to_i if parse(/(\d)+/) },
+   "%f"    => lambda { tmp[:fn] = found if parse(/(\w)+/) },
+   "%l"    => lambda { tmp[:ln] = found if parse(/(\w)+/) },
    :after  => lambda { set dst.new(tmp[:fn], tmp[:ln], tmp[:age]) }
   }
 

data/mocks/demo.rb

@@ -22,6 +22,7 @@ class Customer
   end
 end
 
-cust = Customer.strprs('Jane, Smith 22', "%f, %l %a")
-
-puts cust.strfmt('%f %l is %a years old.')
+if __FILE__ == $0
+  cust = Customer.strprs('Jane, Smith 22', "%f, %l %a")
+  puts cust.strfmt('%f %l is %a years old.')
+end

data/tests/format_engine_tests.rb

@@ -12,18 +12,19 @@ class FormatEngineTester < Minitest::Test
   MinitestVisible.track self, __FILE__
 
   def test_basic_formatting
-    cust = Customer.new("Jane", "Doe")
+    cust = Customer.new("Jane", "Doe", 21)
 
-    assert_equal("Jane, Doe", cust.strfmt("%f, %l"))
+    assert_equal("Jane, Doe 21", cust.strfmt("%f, %l %a"))
   end
 
 
   def test_basic_parsing
-    cust = Customer.strprs("Jane, Doe", "%f, %l")
+    cust = Customer.strprs("Jane, Doe 21", "%f, %l %a")
 
     assert_equal(Customer, cust.class)
     assert_equal("Jane", cust.first_name)
     assert_equal("Doe", cust.last_name)
+    assert_equal(21, cust.age)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: format_engine
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Peter Camilleri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler