pikelet 2.0.0.beta.2 → 2.0.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ba6a85d7364f3d8a5b93bb24cc8d64bac5de91
-  data.tar.gz: e6e9e5e60b8ac35c8669fa992327ee422d3871f6
+  metadata.gz: 68d81342d91b044e20a05a3b6f1529c4ecf92341
+  data.tar.gz: f15c6928d585b0d1a8e65674d5193c69a0a47efc
 SHA512:
-  metadata.gz: b0a0c5500a5f72c17735608a678f78fbdd9c433c086be1875e1077d11da3e2463c3704cf75621f4a4c6ff569e8ea8873d82bd26d06f4042ee47b8b9a68a83c08
-  data.tar.gz: e65c43af74592ffe8462c91dab56abc0d67bbb82880ba227b0342f3ea542827686653dadbf46873dc244a2e0d55313c5d23e5daf821ce78f200ea62e2ead15ab
+  metadata.gz: e1bc4ca7eda495fa16b92a000e41e62c017e4d1b043729e3e544f0b679dbc084b7b4ffebe7d03c1b1fdcb354f9a0d3d8aee37583730e2af552baf3aa53de90ea
+  data.tar.gz: 21aad39051235f6bb604f7151c3912bec8ac37c93ca084a07c83aa8863360522cfd4a1f796ad1c7f0ebadbd48209fd37e11fa75c5ab5ee0d4a630f82aacdca3a

data/lib/pikelet/file_definition.rb

@@ -16,11 +16,7 @@ module Pikelet
     end
 
     def parse(data, &block)
-      parse_records(data, method: :parse, &block)
-    end
-
-    def parse_hashes(hashes, &block)
-      parse_records(hashes, method: :parse_hash, &block)
+      parse_records(data, &block)
     end
 
     def format(records)
@@ -33,33 +29,38 @@ module Pikelet
 
     private
 
+    def records_with_type_signatures
+      [ base_record_definition, *record_definitions.values ].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_record_definition
+    end
+
     def format_record(record, width:)
-      record_definition = record.respond_to?(:type_signature) && record_definitions[record.type_signature]
-      record_definition ||= base_record_definition
-      record_definition.format(record, width: width)
+      signatures = type_signatures.lazy.select(&record.method(:respond_to?)).map(&record.method(:send))
+      best_definition(signatures).format(record, width: width)
     end
 
-    def parse_records(data, method:, &block)
-      records = Enumerator.new do |y|
-        data.each do |data|
-          y.yield(parse_record(data, method: method))
+    def parse_records(data, &block)
+      data.map(&method(:parse_record)).tap do |records|
+        if block_given?
+          records.each(&block)
         end
       end
-      if block_given?
-        records.each(&block)
-      else
-        records
-      end
     end
 
-    def parse_record(data, method:)
-      record = base_record_definition.send(method, data)
-      if record.respond_to?(:type_signature)
-        if definition = record_definitions[record.type_signature]
-          record = definition.send(method, data)
-        end
-      end
-      record
+    def signature_fields
+      records_with_type_signatures.map(&:signature_field).uniq
+    end
+
+    def parse_record(data)
+      signatures = signature_fields.lazy.map { |field| field.parse(data) }
+      best_definition(signatures).parse(data)
     end
   end
 end

data/lib/pikelet/record_definer.rb

@@ -18,6 +18,15 @@ module Pikelet
       definition.field(name, index, **options, &block)
     end
 
+    def type_signature(field_or_index, **options, &block)
+      if field_or_index.is_a? Range
+        field(:type_signature, field_or_index, **options, &block)
+        definition.type_signature = :type_signature
+      else
+        definition.type_signature = field_or_index
+      end
+    end
+
     def record(type_signature, &block)
       file_definition.record(type_signature, base_definition: definition, &block)
     end

data/lib/pikelet/record_definition.rb

@@ -3,6 +3,7 @@ require "pikelet/record_definer"
 module Pikelet
   class RecordDefinition
     attr_reader :file_definition, :field_definitions
+    attr_writer :type_signature
 
     def initialize(file_definition, base_definition:)
       @file_definition = file_definition
@@ -14,12 +15,19 @@ module Pikelet
       field_definitions[name] = Pikelet::FieldDefinition.new(index, **options, &block)
     end
 
-    def parse(data)
-      record_class.new(*field_definitions.values.map { |field| field.parse(data) })
+    def type_signature
+      unless defined? @type_signature
+        @type_signature = :type_signature if field_definitions.key? :type_signature
+      end
+      @type_signature
     end
 
-    def parse_hash(hash)
-      record_class.new(*hash.values_at(*field_definitions.keys))
+    def signature_field
+      type_signature && field_definitions[type_signature]
+    end
+
+    def parse(data)
+      record_class.new(*field_definitions.values.map { |field| field.parse(data) })
     end
 
     def format(record, width: nil)

data/lib/pikelet/version.rb

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

data/spec/pikelet/record_definer_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+require "pikelet"
+
+describe Pikelet::RecordDefiner do
+  let(:definer)    { described_class.new(nil) }
+  let(:definition) { definer.definition }
+
+  describe "#type_signature" do
+    context "given a field name" do
+      before do
+        allow(definition).to receive(:type_signature=).and_call_original
+        definer.type_signature :type
+      end
+
+      it "sets the type signature field on the record definition" do
+        expect(definition).to have_received(:type_signature=).with(:type)
+      end
+    end
+
+    context "legacy usage" do
+      before do
+        allow(definition).to receive(:type_signature=).and_call_original
+        allow(definer).to receive(:field).and_call_original
+        definer.type_signature 0...4, align: :right, pad: "0", &:to_i
+      end
+
+      it "creates the field" do
+        expect(definer).to have_received(:field).with(:type_signature, 0...4, align: :right, pad: "0", &:to_i)
+      end
+
+      it "sets the type signature field on the record definition" do
+        expect(definition).to have_received(:type_signature=).with(:type_signature)
+      end
+    end
+  end
+end
+

data/spec/pikelet/record_definition_spec.rb

@@ -10,15 +10,6 @@ describe Pikelet::RecordDefinition do
     end
   end
 
-  describe "#parse_hash" do
-    let(:record)      { definition.parse(data) }
-    let(:record_hash) { Hash[record.to_h.to_a.reverse] }
-
-    subject { definition.parse_hash(record_hash) }
-
-    it { is_expected.to eq record }
-  end
-
   describe "#format" do
     let(:record) { OpenStruct.new(hello: "Hello", world: "world") }
 
@@ -26,4 +17,30 @@ describe Pikelet::RecordDefinition do
 
     it { is_expected.to eq "Hello world" }
   end
+
+  describe "#type_signature" do
+    let(:definition) { described_class.new(nil, base_definition: nil) }
+
+    subject { definition }
+
+    context "with no fields and no signature defined" do
+      its(:type_signature) { is_expected.to be_nil }
+    end
+
+    context "with signature defined" do
+      before do
+        definition.type_signature = :type
+      end
+
+      its(:type_signature) { is_expected.to eq :type }
+    end
+
+    context "with a field named :type_signature" do
+      before do
+        definition.field(:type_signature, 0...3)
+      end
+
+      its(:type_signature) { is_expected.to eq :type_signature }
+    end
+  end
 end

data/spec/pikelet_spec.rb

@@ -210,27 +210,4 @@ describe Pikelet do
       end
     end
   end
-
-  describe "#parse_hashes" do
-    let(:definition) do
-      Pikelet.define do
-        name   0... 4
-        number 4...13
-      end
-    end
-
-    let(:data) do
-      <<-FILE.split(/[\r\n]+/).map(&:lstrip)
-        John012345678
-        Sue 087654321
-      FILE
-    end
-
-    let(:records) { definition.parse(data) }
-    let(:hashes)  { records.map(&:to_h) }
-
-    subject { definition.parse_hashes(hashes).to_a }
-
-    it { is_expected.to eq records.to_a }
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pikelet
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.2
+  version: 2.0.0.beta.3
 platform: ruby
 authors:
 - John Carney
@@ -133,6 +133,7 @@ files:
 - lib/pikelet/version.rb
 - pikelet.gemspec
 - spec/pikelet/field_definition_spec.rb
+- spec/pikelet/record_definer_spec.rb
 - spec/pikelet/record_definition_spec.rb
 - spec/pikelet_spec.rb
 - spec/spec_helper.rb
@@ -162,6 +163,7 @@ specification_version: 4
 summary: A simple flat-file database parser.
 test_files:
 - spec/pikelet/field_definition_spec.rb
+- spec/pikelet/record_definer_spec.rb
 - spec/pikelet/record_definition_spec.rb
 - spec/pikelet_spec.rb
 - spec/spec_helper.rb