pikelet 2.0.0.beta.5 → 2.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1dcc5a3b20d8e3277715f1841f88ea4dc22839c
-  data.tar.gz: a7526777b26bc21e7966fc7e1386083fe3630aac
+  metadata.gz: 3087089478a24e533544d4338a8960fe279cf967
+  data.tar.gz: 359ba4f4e47ceb3e5398384aadd8cceea288f005
 SHA512:
-  metadata.gz: 8f7957af9756008020b857e9ad2eb7e5e6c3474315900c55536babe8c685f6c596d2d798c1af2c597f5c30d34172b267aa4f68649dfed21c2b928f73805fc281
-  data.tar.gz: 275f4b314132e74d5cd74a73c32f78264d34f13cad6f286dc7a929d299f55fac5affeb040103d796ae98dde138e7d56672889203787fd88e52db8fb592f31d4d
+  metadata.gz: 4f77a62b628790a4a39bc4a5a35d33530fef9095d39490b4fb0d4991fae9764e8b298c68d2e78924f572004a809f3d4e6beaa11e35cd567d60dadb9ec8b89687
+  data.tar.gz: 9c14bfce0aea5c1fab0bd6259cf6d434fd816399c917a7d98b08b47ff8a3a325951d9ffcb3434df5ae7f15a60391c3b9d95c43ea984b4d2424c42d88d11bd031

data/lib/pikelet/field_definition.rb

@@ -10,6 +10,11 @@ module Pikelet
       @formatter = format || :to_s
       @padding = pad && pad.to_s || " "
       @alignment = align || :left
+      if alignment == :right
+        @align_method = :rjust
+      else
+        @align_method = :ljust
+      end
     end
 
     def parse(record)
@@ -19,7 +24,7 @@ module Pikelet
     end
 
     def format(value)
-      pad(truncate(formatter.to_proc.call(value)))
+      align(formatter.to_proc.call(value))[0...width]
     end
 
     def insert(value, record)
@@ -29,20 +34,10 @@ module Pikelet
 
     private
 
-    def blank
-      @blank ||= padding * width
-    end
+    attr_reader :align_method
 
-    def truncate(value)
-      value[0...width]
-    end
-
-    def pad(value)
-      if alignment == :left
-        value + blank[value.size...width]
-      else
-        blank[-width..-(1+value.size)] + value
-      end
+    def align(value)
+      value.send(align_method, width, padding)
     end
   end
 end

data/lib/pikelet/file_definition.rb

@@ -4,13 +4,13 @@ module Pikelet
 
     def initialize(signature_field: nil, record_class: nil, &block)
       @signature_field = signature_field
-      definer = RecordDefiner.new(self, record_class: record_class)
-      @base = definer.define(&block)
+      if block_given?
+        @base = define_record(nil, record_class: record_class, base: nil, &block)
+      end
     end
 
-    def record(signature, record_class: nil, base: nil, &block)
-      definer = RecordDefiner.new(self, record_class: record_class, base: base || self.base)
-      record_definitions[signature] = definer.define(&block)
+    def define_record(signature, record_class:, base:, &block)
+      record_definitions[signature] = RecordDefiner.define(self, record_class: record_class, base: base, &block)
     end
 
     def record_definitions
@@ -31,29 +31,13 @@ module Pikelet
 
     private
 
-    def all_record_definitions
-      [ base, *record_definitions.values ]
-    end
-
-    def records_with_type_signatures
-      all_record_definitions.select(&:type_signature)
-    end
-
-    def type_signatures
-      records_with_type_signatures.map(&:type_signature).uniq
-    end
-
-    def best_definition(signatures)
-      signatures.map { |sig| record_definitions[sig] }.detect { |d| d } || base
-    end
-
     def record_signature(record)
-      field = signature_field || (all_record_definitions.detect(&:signature_field) && :type_signature)
-      record.send(field) if record.respond_to?(field)
+      field = signature_field || (record_definitions.values.detect(&:signature_field) && :type_signature)
+      record.send(field) if field && record.respond_to?(field)
     end
 
     def format_record(record, width:)
-      definition = record_definitions[record_signature(record)] || base
+      definition = record_definitions[record_signature(record)]
       definition.format(record, width: width)
     end
 
@@ -66,12 +50,12 @@ module Pikelet
     end
 
     def signature_fields
-      all_record_definitions.map(&:signature_field).compact.uniq
+      record_definitions.values.map(&:signature_field).compact.uniq
     end
 
     def parse_record(data)
-      signatures = signature_fields.lazy.map { |field| field.parse(data) }
-      definition = signatures.map { |sig| record_definitions[sig] }.detect { |defn| defn } || base
+      signatures = signature_fields.lazy.map { |field| field.parse(data) }.reject(&:nil?)
+      definition = signatures.map { |sig| record_definitions[sig] }.reject(&:nil?).first || base
       definition.parse(data)
     end
   end

data/lib/pikelet/record_definer.rb

@@ -2,19 +2,9 @@ module Pikelet
   class RecordDefiner
     attr_reader :file_definition, :definition
 
-    def initialize(file_definition, record_class: nil, base: nil)
+    def initialize(file_definition, record_class:, base:)
       @file_definition = file_definition
-      @definition = RecordDefinition.new(file_definition,
-        record_class: record_class,
-        base:         base
-      )
-    end
-
-    def define(&block)
-      if block_given?
-        instance_eval(&block)
-      end
-      definition
+      @definition = RecordDefinition.new(file_definition, record_class: record_class, base: base)
     end
 
     def field(name, index, **options, &block)
@@ -22,11 +12,17 @@ module Pikelet
     end
 
     def record(signature, record_class: nil, &block)
-      file_definition.record(signature, record_class: record_class, base: definition, &block)
+      file_definition.define_record(signature, record_class: record_class, base: definition, &block)
     end
 
     def method_missing(method, *args, **options, &block)
       field(method, *args, **options, &block)
     end
+
+    def self.define(file_definition, record_class: nil, base: nil, &block)
+      definer = self.new(file_definition, record_class: record_class, base: base)
+      definer.instance_eval(&block) if block_given?
+      definer.definition
+    end
   end
 end

data/lib/pikelet/version.rb

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

data/spec/pikelet/field_definition_spec.rb

@@ -174,7 +174,7 @@ describe Pikelet::FieldDefinition do
       let(:index) { 3...7 }
 
       context "given a value that fits the field exactly" do
-        let(:value)         { "1234" }
+        let(:value) { "1234" }
 
         it "does not pad the field" do
           expect(formatted).to eq value
@@ -199,7 +199,7 @@ describe Pikelet::FieldDefinition do
             let(:padding) { { pad: '<->' } }
 
             it "pads the field on the right" do
-              expect(formatted).to eq "12><"
+              expect(formatted).to eq "12<-"
             end
           end
         end
@@ -219,7 +219,7 @@ describe Pikelet::FieldDefinition do
             let(:padding) { { pad: '<->' } }
 
             it "pads the field on the left" do
-              expect(formatted).to eq "><12"
+              expect(formatted).to eq "<-12"
             end
           end
         end

data/spec/pikelet/record_definer_spec.rb

@@ -1,8 +1,89 @@
 require "spec_helper"
 require "pikelet"
 
-describe Pikelet::RecordDefiner do
-  let(:definer)    { described_class.new(nil) }
-  let(:definition) { definer.definition }
+RSpec::Matchers.define :have_field_definition do |name|
+  match do |record_definition|
+    definition = record_definition.field_definitions[name]
+    definition && (!@index || definition.index == @index) && (!@alignment || definition.alignment == @alignment)
+  end
+
+  chain :with_index do |index|
+    @index = index
+  end
+
+  chain :with_alignment do |alignment|
+    @alignment = alignment
+  end
+
+  description do
+    message = "have field definition #{name.inspect}"
+    message += " with index #{@index.inspect}" if @index
+    message += " with #{@alignment.inspect} alignment" if @alignment
+    message
+  end
 end
 
+describe Pikelet::RecordDefiner do
+  let(:file_definition)   { Pikelet::FileDefinition.new }
+  let(:definer)           { described_class.new(file_definition, record_class: nil, base: nil) }
+  let(:record_definition) { definer.definition }
+
+  describe "#field" do
+    let(:parser) { ->(v) { v.to_i } }
+
+    subject(:field) { definer.field(:thing, 0...4, pad: "0", &parser) }
+
+    its(:index)   { is_expected.to eq 0...4 }
+    its(:padding) { is_expected.to eq "0" }
+    its(:parser)  { is_expected.to eq parser }
+
+    it "adds the field to the record definition" do
+      field
+      expect(record_definition.field_definitions[:thing]).to be field
+    end
+  end
+
+  describe "#record" do
+    let(:definition_block) { proc { field(:thing, 1..4) } }
+
+    subject(:record) { definer.record("NAME", record_class: OpenStruct, &definition_block) }
+
+    its(:record_class) { is_expected.to be OpenStruct }
+
+    it "adds the record to the file definition" do
+      record
+      expect(file_definition.record_definitions["NAME"]).to be record
+    end
+
+    it "evaluates the definition block" do
+      expect(record.field_definitions[:thing]).to_not be_nil
+    end
+  end
+
+  describe "shorthand field definition" do
+    let(:parser) { ->(v) { v.upcase } }
+
+    subject(:field) { definer.thing(10...20, pad: "-", &parser) }
+
+    its(:index)   { is_expected.to eq 10...20 }
+    its(:padding) { is_expected.to eq "-" }
+    its(:parser)  { is_expected.to eq parser }
+
+    it "adds the field to the record definition" do
+      field
+      expect(record_definition.field_definitions[:thing]).to be field
+    end
+  end
+
+  describe ".define" do
+    subject(:definition) do
+      described_class.define(file_definition, record_class: OpenStruct, base: nil) do
+        field :thing, 20...30, align: :right
+      end
+    end
+
+    its(:record_class) { is_expected.to be OpenStruct }
+
+    it { is_expected.to have_field_definition(:thing).with_index(20...30).with_alignment(:right) }
+  end
+end

data/spec/pikelet/record_definition_spec.rb

@@ -2,12 +2,14 @@ require "spec_helper"
 require "pikelet"
 
 describe Pikelet::RecordDefinition do
-  let(:definer) { Pikelet::RecordDefiner.new(nil, base: nil) }
+  def define_record(&block)
+    Pikelet::RecordDefiner.define(nil, base: nil, &block)
+  end
 
-  let(:data)    { "Hello world" }
+  let(:data) { "Hello world" }
 
   let(:definition) do
-    definer.define do
+    define_record do
       hello 0... 5
       world 6...11
     end
@@ -26,7 +28,7 @@ describe Pikelet::RecordDefinition do
 
     context "with contiguous fields" do
       let(:definition) do
-        definer.define do
+        define_record do
           hello 0... 5
           world 6...11
         end
@@ -39,7 +41,7 @@ describe Pikelet::RecordDefinition do
 
     context "with overlapping fields" do
       let(:definition) do
-        definer.define do
+        define_record do
           hello 0..6
           world 4..9
         end
@@ -52,7 +54,7 @@ describe Pikelet::RecordDefinition do
 
     context "with discontinuous fields" do
       let(:definition) do
-        definer.define do
+        define_record do
           hello 4... 7
           world 9...16
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pikelet
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.5
+  version: 2.0.0.beta.6
 platform: ruby
 authors:
 - John Carney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler