pikelet 2.0.0.beta.3 → 2.0.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68d81342d91b044e20a05a3b6f1529c4ecf92341
-  data.tar.gz: f15c6928d585b0d1a8e65674d5193c69a0a47efc
+  metadata.gz: 70a0fcf61a81ceefc60f5553225d9e9c8aef3038
+  data.tar.gz: fb8276527757550144e73f69b939bdeb6038a430
 SHA512:
-  metadata.gz: e1bc4ca7eda495fa16b92a000e41e62c017e4d1b043729e3e544f0b679dbc084b7b4ffebe7d03c1b1fdcb354f9a0d3d8aee37583730e2af552baf3aa53de90ea
-  data.tar.gz: 21aad39051235f6bb604f7151c3912bec8ac37c93ca084a07c83aa8863360522cfd4a1f796ad1c7f0ebadbd48209fd37e11fa75c5ab5ee0d4a630f82aacdca3a
+  metadata.gz: 3532873fe18e685b72fe211270f08d55b343e4e5cf87d094d0ec191b21c255e57c1e5eec609f2d5d789791ecfea7b9d00652ef23c6cdf034a256866ed4631c48
+  data.tar.gz: e274f942d76718d17a135affafff8152299edb84a06a66aaa70d9be561fd4e2d6f7087503fe11f9c3395990c3cf5b7ebf2ea8f2084e10656117bfe136dff8a26

data/lib/pikelet/file_definition.rb

@@ -2,13 +2,14 @@ module Pikelet
   class FileDefinition
     attr_reader :base_record_definition
 
-    def initialize(&block)
-      @base_record_definition = RecordDefiner.new(self).define(&block)
+    def initialize(record_class: nil, &block)
+      @base_record_definition = RecordDefiner.new(self, record_class: record_class).define(&block)
     end
 
-    def record(type_signature, base_definition: nil, &block)
+    def record(type_signature, record_class: nil, base_definition: nil, &block)
       base_definition ||= base_record_definition
-      record_definitions[type_signature] = RecordDefiner.new(self, base_definition: base_definition).define(&block)
+      definer = RecordDefiner.new(self, record_class: record_class, base_definition: base_definition)
+      record_definitions[type_signature] = definer.define(&block)
     end
 
     def record_definitions

data/lib/pikelet/record_definer.rb

@@ -2,9 +2,9 @@ module Pikelet
   class RecordDefiner
     attr_reader :file_definition, :definition
 
-    def initialize(file_definition, base_definition: nil)
+    def initialize(file_definition, record_class: nil, base_definition: nil)
       @file_definition = file_definition
-      @definition = RecordDefinition.new(file_definition, base_definition: base_definition)
+      @definition = RecordDefinition.new(file_definition, record_class: record_class, base_definition: base_definition)
     end
 
     def define(&block)
@@ -27,8 +27,8 @@ module Pikelet
       end
     end
 
-    def record(type_signature, &block)
-      file_definition.record(type_signature, base_definition: definition, &block)
+    def record(type_signature, record_class: nil, &block)
+      file_definition.record(type_signature, record_class: record_class, base_definition: definition, &block)
     end
 
     def method_missing(method, *args, **options, &block)

data/lib/pikelet/record_definition.rb

@@ -5,13 +5,13 @@ module Pikelet
     attr_reader :file_definition, :field_definitions
     attr_writer :type_signature
 
-    def initialize(file_definition, base_definition:)
+    def initialize(file_definition, record_class: nil, base_definition:)
       @file_definition = file_definition
       @field_definitions = base_definition && base_definition.field_definitions.dup || {}
+      @record_class = record_class
     end
 
     def field(name, index, **options, &block)
-      @record_class = nil
       field_definitions[name] = Pikelet::FieldDefinition.new(index, **options, &block)
     end
 
@@ -27,7 +27,7 @@ module Pikelet
     end
 
     def parse(data)
-      record_class.new(*field_definitions.values.map { |field| field.parse(data) })
+      record_class.new(parse_fields(data))
     end
 
     def format(record, width: nil)
@@ -38,11 +38,32 @@ module Pikelet
     end
 
     def record_class
-      @record_class ||= Struct.new(*field_definitions.keys.map(&:to_sym))
+      @record_class ||= default_record_class
+    end
+
+    def default_record_class
+      Struct.new(*field_names) do
+        def initialize(**attributes)
+          # FIXME: Do we need to worry about missing attributes?
+          super(*attributes.values_at(*self.class.members))
+        end
+      end
     end
 
     def width
-      field_definitions.values.map(&:width).inject(&:+)
+      field_definitions.values.map { |d| d.index.max }.max + 1
+    end
+
+    private
+
+    def field_names
+      field_definitions.keys.map(&:to_sym)
+    end
+
+    def parse_fields(data)
+      field_definitions.each_with_object({}) do |(field, definition), result|
+        result[field.to_sym] = definition.parse(data)
+      end
     end
   end
 end

data/lib/pikelet/version.rb

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

data/lib/pikelet.rb

@@ -4,7 +4,7 @@ require "pikelet/record_definition"
 require "pikelet/field_definition"
 
 module Pikelet
-  def self.define(&block)
-    Pikelet::FileDefinition.new(&block)
+  def self.define(record_class: nil, &block)
+    Pikelet::FileDefinition.new(record_class: record_class, &block)
   end
 end

data/spec/pikelet/record_definition_spec.rb

@@ -2,9 +2,12 @@ require "spec_helper"
 require "pikelet"
 
 describe Pikelet::RecordDefinition do
-  let(:data)  { "Hello world" }
+  let(:definer) { Pikelet::RecordDefiner.new(nil, base_definition: nil) }
+
+  let(:data)    { "Hello world" }
+
   let(:definition) do
-    Pikelet::RecordDefiner.new(nil, base_definition: nil).define do
+    definer.define do
       hello 0... 5
       world 6...11
     end
@@ -43,4 +46,47 @@ describe Pikelet::RecordDefinition do
       its(:type_signature) { is_expected.to eq :type_signature }
     end
   end
+
+  describe "#width" do
+    subject(:width) { definition.width }
+
+    context "with contiguous fields" do
+      let(:definition) do
+        definer.define do
+          hello 0... 5
+          world 6...11
+        end
+      end
+
+      it "returns the width of the record" do
+        expect(width).to eq 11
+      end
+    end
+
+    context "with overlapping fields" do
+      let(:definition) do
+        definer.define do
+          hello 0..6
+          world 4..9
+        end
+      end
+
+      it "returns the width of the record" do
+        expect(width).to eq 10
+      end
+    end
+
+    context "with discontinuous fields" do
+      let(:definition) do
+        definer.define do
+          hello 4... 7
+          world 9...16
+        end
+      end
+
+      it "returns the width of the record" do
+        expect(width).to eq 16
+      end
+    end
+  end
 end

data/spec/pikelet_spec.rb

@@ -9,6 +9,36 @@ describe Pikelet do
     end
   end
 
+  describe "custom record classes" do
+    let(:custom_class) do
+      Class.new do
+        attr_reader :first_name, :last_name
+
+        def initialize(**attrs)
+          @first_name = attrs[:first_name]
+          @last_name = attrs[:last_name]
+        end
+      end
+    end
+
+    let(:definition) do
+      Pikelet.define record_class: custom_class do
+        first_name  0...10
+        last_name  10...20
+      end
+    end
+
+    let(:data)       { [ "Nicolaus  Copernicus" ] }
+    subject(:record) { definition.parse(data).to_a.first }
+
+    it "uses the supplied record class" do
+      expect(record).to be_a custom_class
+    end
+
+    its(:first_name) { is_expected.to eq "Nicolaus" }
+    its(:last_name)  { is_expected.to eq "Copernicus" }
+  end
+
   describe "#format" do
     let(:definition) do
       Pikelet.define do

metadata

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