format_engine 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0baee6898a0254f3c7e17992bdb405855786cde
-  data.tar.gz: e4ed97834beefe97848e7c45e9a8bbda13918b4d
+  metadata.gz: 31f6ac5a6816b11346d2bfe10a94108395ac2feb
+  data.tar.gz: 9f0aabe82aa6fcaeac3a9300bb17b2588e48ff52
 SHA512:
-  metadata.gz: 81baf16535d34920bfc19c3be71fe479fc728db0e0f07c9926b32e97c088a2072c241ea131e144d14ab19e2b8699875b0b50afedb82c1964e42f59ec73ea40f2
-  data.tar.gz: 2721ee739f1a909e8307612f55ff84a916b103b804b6108e2e89d612d191600ecd6f48a9766b806c83814b4b32e69baa5e7d3b4fe32d6610ae71d98feb789a0c
+  metadata.gz: 3a4c4b22b157eeccaaaa6225e6a22db1b6c2fef0c1ee38ff5e05b3088f840990c55832f26995c5d5de0175e70e2d6cccae6b822ad1c1e8e0c9b20170d4025073
+  data.tar.gz: 54370ba86beaeaae3faaf6b354e8fc6a63781b5b73695ccf1ccc5e20afd08f1d2a3a1808127df5887172e309e940ba026d319f88a6de811f358f19f27aebad00

data/README.md

@@ -37,6 +37,8 @@ require 'format_engine'
 
 #A demo class for the format_engine gem.
 
+require 'format_engine'
+
 class Customer
   extend FormatEngine::AttrFormatter
   extend FormatEngine::AttrParser
@@ -47,32 +49,39 @@ class Customer
   #Demo customer last name
   attr_reader :last_name
 
+  #Demo customer age
+  attr_reader :age
+
   #Demo defn of the strfmt method for formatted string output!
   attr_formatter :strfmt,
-  {"%f"  => lambda {cat "%#{fmt.width_str}s" % src.first_name },
-   "%l"  => lambda {cat "%#{fmt.width_str}s" % src.last_name  } }
+  {"%a"  => lambda {cat "%#{fmt.width_str}d" % src.age },
+   "%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,
-  {"%f"    => lambda { tmp[:fn] = 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]) } }
+   :after  => lambda { set dst.new(tmp[:fn], tmp[:ln], tmp[:age]) }
+  }
 
   #Create an instance of the demo customer.
-  def initialize(first_name, last_name)
-    @first_name, @last_name = first_name, last_name
+  def initialize(first_name, last_name, age)
+    @first_name, @last_name, @age = first_name, last_name, age
   end
 end
 
 #Then later in the code...
 
-cust = Customer.new("Jane", "Doe")
-puts cust.strfmt("%f, %l"))  #"Jane, Doe"
+cust = Customer.strprs('Jane, Smith 22', "%f, %l %a")
+
+# snd still in another part of Gotham City...
 
-#And elsewhere in Gotham City...
+puts cust.strfmt('%f %l is %a years old.')
 
-in_str = "Jane, Doe"
-agent = Customer.strprs(in_str, "%f, %l")
+# Prints out: Jane Smith is 22 years old.
 
 #Etc, etc, etc ...
 

data/lib/format_engine/format_spec/literal.rb

@@ -10,7 +10,7 @@ module FormatEngine
     def initialize(literal)
       @literal = literal
       @head = literal.rstrip
-      @tail = literal.end_with?(' ')
+      @tail = @head != @literal
     end
 
     # Is this literal supported by the engine? YES!

data/lib/format_engine/version.rb

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

data/mocks/demo/demo_format.rb

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

data/mocks/demo/demo_parse.rb

@@ -7,8 +7,10 @@ class Customer
   #The specification of the parser method of the demo \Customer class.
 
   attr_parser :strprs,
-  {"%f"    => lambda { tmp[:fn] = 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]) } }
+   :after  => lambda { set dst.new(tmp[:fn], tmp[:ln], tmp[:age]) }
+  }
 
 end

data/mocks/demo.rb

@@ -1,5 +1,7 @@
 # A simple class of customer info.
 
+require_relative '../lib/format_engine'
+
 require_relative 'demo/demo_format'
 require_relative 'demo/demo_parse'
 
@@ -11,8 +13,15 @@ class Customer
   #Demo customer last name
   attr_reader :last_name
 
+  #Demo customer age
+  attr_reader :age
+
   #Create an instance of the demo customer.
-  def initialize(first_name, last_name)
-    @first_name, @last_name = first_name, last_name
+  def initialize(first_name, last_name, age)
+    @first_name, @last_name, @age = first_name, last_name, age
   end
 end
+
+cust = Customer.strprs('Jane, Smith 22', "%f, %l %a")
+
+puts cust.strfmt('%f %l is %a years old.')

data/mocks/test_person_mock.rb

@@ -3,8 +3,9 @@
 class TestPerson
   attr_reader :first_name
   attr_reader :last_name
+  attr_reader :age
 
-  def initialize(first_name, last_name)
-    @first_name, @last_name = first_name, last_name
+  def initialize(first_name, last_name, age)
+    @first_name, @last_name, @age = first_name, last_name, age
   end
 end

data/tests/format_spec_tests.rb

@@ -25,6 +25,23 @@ class FormatSpecTester < Minitest::Test
     assert_equal(nil, test.specs[0].parms)
   end
 
+  def test_that_it_scans_tab_seperators
+    test = FormatEngine::FormatSpec.get_spec "%A\t%B"
+    assert_equal(Array, test.specs.class)
+    assert_equal(3, test.specs.length)
+
+    assert_equal(FormatEngine::FormatVariable, test.specs[0].class)
+    assert_equal("%A", test.specs[0].format)
+    assert_equal(nil, test.specs[0].parms)
+
+    assert_equal(FormatEngine::FormatLiteral, test.specs[1].class)
+    assert_equal("\t", test.specs[1].literal)
+
+    assert_equal(FormatEngine::FormatVariable, test.specs[2].class)
+    assert_equal("%B", test.specs[2].format)
+    assert_equal(nil, test.specs[2].parms)
+  end
+
   def test_that_it_scans_option_variable_formats
     "~@#&^&*-+=?_<>\\/.,|".each_char do |char|
       test = FormatEngine::FormatSpec.get_spec "%#{char}A"

data/tests/formatter_engine_tests.rb

@@ -13,6 +13,7 @@ class FormatterTester < Minitest::Test
 
   def make_formatter
     FormatEngine::Engine.new(
+      "%a"  => lambda {cat "%#{fmt.width_str}d" % src.age},
       "%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},
@@ -20,7 +21,7 @@ class FormatterTester < Minitest::Test
   end
 
   def make_person
-    TestPerson.new("Squidly", "Jones")
+    TestPerson.new("Squidly", "Jones", 21)
   end
 
   def make_spec(str)
@@ -32,23 +33,23 @@ class FormatterTester < Minitest::Test
   end
 
   def test_that_it_can_format_normally
-    engine, obj, spec = make_all("Name = %f %l")
-    assert_equal("Name = Squidly Jones", engine.do_format(obj, spec))
+    engine, obj, spec = make_all("Name = %f %l %a")
+    assert_equal("Name = Squidly Jones 21", engine.do_format(obj, spec))
   end
 
   def test_that_it_can_format_shouting
-    engine, obj, spec = make_all("Name = %F %L")
-    assert_equal("Name = SQUIDLY JONES", engine.do_format(obj, spec))
+    engine, obj, spec = make_all("Name = %F %L %a")
+    assert_equal("Name = SQUIDLY JONES 21", engine.do_format(obj, spec))
   end
 
   def test_that_it_can_format_wider
-    engine, obj, spec = make_all("Name = %-10f %-10l")
-    assert_equal("Name = Squidly    Jones     ", engine.do_format(obj, spec))
+    engine, obj, spec = make_all("Name = %-10f %-10l %-5a")
+    assert_equal("Name = Squidly    Jones      21   ", engine.do_format(obj, spec))
   end
 
   def test_that_it_can_format_right
-    engine, obj, spec = make_all("Name = %10f %10l")
-    assert_equal("Name =    Squidly      Jones", engine.do_format(obj, spec))
+    engine, obj, spec = make_all("Name = %10f %10l %5a")
+    assert_equal("Name =    Squidly      Jones    21", engine.do_format(obj, spec))
   end
 
   def test_that_it_calls_before_and_after

data/tests/parser_engine_tests.rb

@@ -13,7 +13,8 @@ class ParserTester < Minitest::Test
 
   def make_parser
     FormatEngine::Engine.new(
-      "%f"    => lambda { tmp[:fn] = found if parse(/(\w)+/ ) },
+      "%a"    => lambda { tmp[:age] = found.to_i if parse(/\d+/) },
+      "%f"    => lambda { tmp[:fn] = found if parse(/(\w)+/) },
       "%F"    => lambda { tmp[:fn] = found.upcase if parse(/(\w)+/) },
       "%-F"   => lambda { tmp[:fn] = found.capitalize if parse(/(\w)+/) },
       "%l"    => lambda { tmp[:ln] = found if parse(/(\w)+/ ) },
@@ -22,13 +23,15 @@ class ParserTester < Minitest::Test
       "%t"    => lambda { parse("\t") },
       "%!t"   => lambda { parse!("\t") },
 
-      :after  => lambda { set TestPerson.new(tmp[:fn], tmp[:ln]) })
+      :after  => lambda do
+        set TestPerson.new(*[tmp[:fn], tmp[:ln], tmp[:age]].delete_if(&:nil?))
+      end)
   end
 
   def test_that_it_can_parse
     engine = make_parser
-    spec = "%f, %l"
-    result = engine.do_parse("Squidly, Jones", TestPerson, spec)
+    spec = "%f, %l %a"
+    result = engine.do_parse("Squidly, Jones 55", TestPerson, spec)
 
     assert_equal(TestPerson, result.class)
     assert_equal("Squidly", result.first_name)
@@ -37,8 +40,8 @@ class ParserTester < Minitest::Test
 
   def test_that_it_can_parse_loudly
     engine = make_parser
-    spec =  "%F, %L"
-    result = engine.do_parse("Squidly, Jones", TestPerson, spec)
+    spec =  "%F, %L %a"
+    result = engine.do_parse("Squidly, Jones 55", TestPerson, spec)
 
     assert_equal(TestPerson, result.class)
     assert_equal("SQUIDLY", result.first_name)
@@ -47,8 +50,8 @@ class ParserTester < Minitest::Test
 
   def test_that_it_can_fix_shouting
     engine = make_parser
-    spec =  "%-F, %-L"
-    result = engine.do_parse("SQUIDLY, JONES", TestPerson, spec)
+    spec =  "%-F, %-L %a"
+    result = engine.do_parse("SQUIDLY, JONES 55", TestPerson, spec)
 
     assert_equal(TestPerson, result.class)
     assert_equal("Squidly", result.first_name)
@@ -57,24 +60,24 @@ class ParserTester < Minitest::Test
 
   def test_that_it_can_flex_parse
     engine = make_parser
-    spec =  "%f, %l"
+    spec =  "%f, %l, %a"
 
     #No spaces.
-    result = engine.do_parse("Squidly,Jones", TestPerson, spec)
+    result = engine.do_parse("Squidly,Jones,55", 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)
+    result = engine.do_parse("Squidly, Jones, 55", 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)
+    result = engine.do_parse("Squidly,  Jones,  55", TestPerson, spec)
 
     assert_equal(TestPerson, result.class)
     assert_equal("Squidly", result.first_name)
@@ -83,8 +86,8 @@ class ParserTester < Minitest::Test
 
   def test_that_it_can_tab_parse
     engine = make_parser
-    spec =  "%f%t%l"
-    result = engine.do_parse("Squidly\tJones", TestPerson, spec)
+    spec =  "%f %l %a"
+    result = engine.do_parse("Squidly\tJones\t55", TestPerson, spec)
 
     assert_equal(TestPerson, result.class)
     assert_equal("Squidly", result.first_name)
@@ -93,17 +96,30 @@ class ParserTester < Minitest::Test
 
   def test_that_it_can_detect_errors
     engine = make_parser
-    spec =  "%f, %l"
+    spec =  "%f, %l %a"
 
     assert_raises(RuntimeError) do
-      engine.do_parse("Squidly Jones", TestPerson, spec)
+      engine.do_parse("Squidly Jones 55", TestPerson, spec)
     end
 
-    spec =  "%f%!t%l"
+    spec =  "%f%!t%l %a"
 
     assert_raises(RuntimeError) do
+      engine.do_parse("Squidly Jones 55", TestPerson, spec)
+    end
+
+    spec =  "%f %l"
+
+    assert_raises(ArgumentError) do
+      engine.do_parse("Squidly Jones 55", TestPerson, spec)
+    end
+
+    spec =  "%f %l %a"
+
+    assert_raises(ArgumentError) do
       engine.do_parse("Squidly Jones", TestPerson, spec)
     end
+
   end
 
 end

metadata

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