pikelet 2.0.0.beta.4 → 2.0.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70a0fcf61a81ceefc60f5553225d9e9c8aef3038
-  data.tar.gz: fb8276527757550144e73f69b939bdeb6038a430
+  metadata.gz: f1dcc5a3b20d8e3277715f1841f88ea4dc22839c
+  data.tar.gz: a7526777b26bc21e7966fc7e1386083fe3630aac
 SHA512:
-  metadata.gz: 3532873fe18e685b72fe211270f08d55b343e4e5cf87d094d0ec191b21c255e57c1e5eec609f2d5d789791ecfea7b9d00652ef23c6cdf034a256866ed4631c48
-  data.tar.gz: e274f942d76718d17a135affafff8152299edb84a06a66aaa70d9be561fd4e2d6f7087503fe11f9c3395990c3cf5b7ebf2ea8f2084e10656117bfe136dff8a26
+  metadata.gz: 8f7957af9756008020b857e9ad2eb7e5e6c3474315900c55536babe8c685f6c596d2d798c1af2c597f5c30d34172b267aa4f68649dfed21c2b928f73805fc281
+  data.tar.gz: 275f4b314132e74d5cd74a73c32f78264d34f13cad6f286dc7a929d299f55fac5affeb040103d796ae98dde138e7d56672889203787fd88e52db8fb592f31d4d

data/lib/pikelet/file_definition.rb

@@ -1,15 +1,16 @@
 module Pikelet
   class FileDefinition
-    attr_reader :base_record_definition
+    attr_reader :base, :signature_field
 
-    def initialize(record_class: nil, &block)
-      @base_record_definition = RecordDefiner.new(self, record_class: record_class).define(&block)
+    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)
     end
 
-    def record(type_signature, record_class: nil, base_definition: nil, &block)
-      base_definition ||= base_record_definition
-      definer = RecordDefiner.new(self, record_class: record_class, base_definition: base_definition)
-      record_definitions[type_signature] = definer.define(&block)
+    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)
     end
 
     def record_definitions
@@ -30,8 +31,12 @@ module Pikelet
 
     private
 
+    def all_record_definitions
+      [ base, *record_definitions.values ]
+    end
+
     def records_with_type_signatures
-      [ base_record_definition, *record_definitions.values ].select(&:type_signature)
+      all_record_definitions.select(&:type_signature)
     end
 
     def type_signatures
@@ -39,12 +44,17 @@ module Pikelet
     end
 
     def best_definition(signatures)
-      signatures.map { |sig| record_definitions[sig] }.detect { |d| d } || base_record_definition
+      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)
     end
 
     def format_record(record, width:)
-      signatures = type_signatures.lazy.select(&record.method(:respond_to?)).map(&record.method(:send))
-      best_definition(signatures).format(record, width: width)
+      definition = record_definitions[record_signature(record)] || base
+      definition.format(record, width: width)
     end
 
     def parse_records(data, &block)
@@ -56,12 +66,13 @@ module Pikelet
     end
 
     def signature_fields
-      records_with_type_signatures.map(&:signature_field).uniq
+      all_record_definitions.map(&:signature_field).compact.uniq
     end
 
     def parse_record(data)
       signatures = signature_fields.lazy.map { |field| field.parse(data) }
-      best_definition(signatures).parse(data)
+      definition = signatures.map { |sig| record_definitions[sig] }.detect { |defn| defn } || base
+      definition.parse(data)
     end
   end
 end

data/lib/pikelet/record_definer.rb

@@ -2,9 +2,12 @@ module Pikelet
   class RecordDefiner
     attr_reader :file_definition, :definition
 
-    def initialize(file_definition, record_class: nil, base_definition: nil)
+    def initialize(file_definition, record_class: nil, base: nil)
       @file_definition = file_definition
-      @definition = RecordDefinition.new(file_definition, record_class: record_class, base_definition: base_definition)
+      @definition = RecordDefinition.new(file_definition,
+        record_class: record_class,
+        base:         base
+      )
     end
 
     def define(&block)
@@ -18,17 +21,8 @@ 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, record_class: nil, &block)
-      file_definition.record(type_signature, record_class: record_class, base_definition: definition, &block)
+    def record(signature, record_class: nil, &block)
+      file_definition.record(signature, record_class: record_class, base: definition, &block)
     end
 
     def method_missing(method, *args, **options, &block)

data/lib/pikelet/record_definition.rb

@@ -3,11 +3,10 @@ require "pikelet/record_definer"
 module Pikelet
   class RecordDefinition
     attr_reader :file_definition, :field_definitions
-    attr_writer :type_signature
 
-    def initialize(file_definition, record_class: nil, base_definition:)
+    def initialize(file_definition, record_class: nil, base:)
       @file_definition = file_definition
-      @field_definitions = base_definition && base_definition.field_definitions.dup || {}
+      @field_definitions = base && base.field_definitions.dup || {}
       @record_class = record_class
     end
 
@@ -15,17 +14,6 @@ module Pikelet
       field_definitions[name] = Pikelet::FieldDefinition.new(index, **options, &block)
     end
 
-    def type_signature
-      unless defined? @type_signature
-        @type_signature = :type_signature if field_definitions.key? :type_signature
-      end
-      @type_signature
-    end
-
-    def signature_field
-      type_signature && field_definitions[type_signature]
-    end
-
     def parse(data)
       record_class.new(parse_fields(data))
     end
@@ -44,7 +32,6 @@ module Pikelet
     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
@@ -54,6 +41,10 @@ module Pikelet
       field_definitions.values.map { |d| d.index.max }.max + 1
     end
 
+    def signature_field
+      field_definitions[file_definition.signature_field || :type_signature]
+    end
+
     private
 
     def field_names

data/lib/pikelet/version.rb

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

data/lib/pikelet.rb

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

data/spec/pikelet/record_definer_spec.rb

@@ -4,34 +4,5 @@ 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

@@ -2,7 +2,7 @@ require "spec_helper"
 require "pikelet"
 
 describe Pikelet::RecordDefinition do
-  let(:definer) { Pikelet::RecordDefiner.new(nil, base_definition: nil) }
+  let(:definer) { Pikelet::RecordDefiner.new(nil, base: nil) }
 
   let(:data)    { "Hello world" }
 
@@ -21,32 +21,6 @@ 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
-
   describe "#width" do
     subject(:width) { definition.width }
 

metadata

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