pikelet 2.0.0.beta.6 → 2.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3087089478a24e533544d4338a8960fe279cf967
-  data.tar.gz: 359ba4f4e47ceb3e5398384aadd8cceea288f005
+  metadata.gz: 4e3adcc8650568a13523518174d2723b61ddf4ba
+  data.tar.gz: d79cc1a300a4d0356ada007222b6759f98e86c6d
 SHA512:
-  metadata.gz: 4f77a62b628790a4a39bc4a5a35d33530fef9095d39490b4fb0d4991fae9764e8b298c68d2e78924f572004a809f3d4e6beaa11e35cd567d60dadb9ec8b89687
-  data.tar.gz: 9c14bfce0aea5c1fab0bd6259cf6d434fd816399c917a7d98b08b47ff8a3a325951d9ffcb3434df5ae7f15a60391c3b9d95c43ea984b4d2424c42d88d11bd031
+  metadata.gz: 6fb05cf2c716cd1cee499cbe4abe9fe4fd6d4bf99b55c0d9bf471a5749dc17d122514f2aebd8d52e671c3dadf5633e69e1183a10ee16275fdbe46897dd0f5546
+  data.tar.gz: d4b1012c93182ce8d00364ed9d47ccd9ba5003e224c122ccf78d4f33111f08fdf3b3208501a2054fa9aba06b5e75172a7803d57ea6c51a33be97ac7df167d3e3

data/lib/pikelet/field_definition.rb

@@ -2,18 +2,33 @@ module Pikelet
   class FieldDefinition
     attr_reader :index, :parser, :formatter, :padding, :alignment, :width
 
-    def initialize(index, parse: nil, format: nil, pad: nil, align: nil, &block)
+    def initialize(index, parse: nil, type: :alpha, format: nil, pad: nil, align: nil, &block)
       raise ArgumentError, "index must be a range" unless index.is_a? Range
+      raise ArgumentError, "type must be :alpha or :numeric" unless %i{ alpha numeric }.include? type
+      if align
+        raise ArgumentError, "align must be :left, :right, or :center" unless %i{ left right centre center }.include?(align)
+      end
+
       @index = index
       @width = index.size
       @parser = parse || block || :strip
       @formatter = format || :to_s
-      @padding = pad && pad.to_s || " "
-      @alignment = align || :left
-      if alignment == :right
-        @align_method = :rjust
+
+      if type == :numeric
+        @padding = pad && pad.to_s || "0"
+        @alignment = align || :right
       else
+        @padding = pad && pad.to_s || " "
+        @alignment = align || :left
+      end
+
+      case alignment
+      when :right
+        @align_method = :rjust
+      when :left
         @align_method = :ljust
+      when :centre, :center
+        @align_method = :center
       end
     end
 

data/lib/pikelet/record_definer.rb

@@ -7,7 +7,7 @@ module Pikelet
       @definition = RecordDefinition.new(file_definition, record_class: record_class, base: base)
     end
 
-    def field(name, index, **options, &block)
+    def field(name, index, *flags, **options, &block)
       definition.field(name, index, **options, &block)
     end
 

data/lib/pikelet/version.rb

@@ -1,3 +1,3 @@
 module Pikelet
-  VERSION = "2.0.0.beta.6"
+  VERSION = "2.0.0.beta.7"
 end

data/spec/pikelet/field_definition_spec.rb

@@ -7,8 +7,9 @@ describe Pikelet::FieldDefinition do
   let(:formatter)  { { } }
   let(:padding)    { { } }
   let(:alignment)  { { } }
+  let(:type)       { { } }
   let(:block)      { nil }
-  let(:definition) { Pikelet::FieldDefinition.new(index, **parser, **formatter, **padding, **alignment, &block) }
+  let(:definition) { Pikelet::FieldDefinition.new(index, **type, **parser, **formatter, **padding, **alignment, &block) }
 
   describe "defaults" do
     let(:index) { 0...1 }
@@ -19,6 +20,13 @@ describe Pikelet::FieldDefinition do
     its(:formatter) { is_expected.to eq :to_s }
     its(:padding)   { is_expected.to eq " " }
     its(:alignment) { is_expected.to eq :left }
+
+    context "for numeric type" do
+      let(:type) { { type: :numeric } }
+
+      its(:padding)   { is_expected.to eq "0" }
+      its(:alignment) { is_expected.to eq :right }
+    end
   end
 
   describe "#parse" do
@@ -184,6 +192,26 @@ describe Pikelet::FieldDefinition do
       context "given a value that underflows the field" do
         let(:value) { "12" }
 
+        context "with center alignment" do
+          let(:alignment) { { align: :center } }
+
+          context "with single-character padding" do
+            let(:padding) { { pad: '-' } }
+
+            it "pads the field on the left and right" do
+              expect(formatted).to eq "-12-"
+            end
+          end
+
+          context "with multi-character padding" do
+            let(:padding) { { pad: '<->' } }
+
+            it "pads the field on the left and right" do
+              expect(formatted).to eq "<12<"
+            end
+          end
+        end
+
         context "with left alignment" do
           let(:alignment) { { align: :left } }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pikelet
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.6
+  version: 2.0.0.beta.7
 platform: ruby
 authors:
 - John Carney