pikelet 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49ef5854cd526cdc7bd4491974e5ae7dcb013582
-  data.tar.gz: 52b908b3bee6e565b53b5e0b17b9c2723af24a42
+  metadata.gz: 0f85a72791e86e65cc0074bbb3912015240b280f
+  data.tar.gz: 76b4aab6edad8e711a2df279b07d616e33de878d
 SHA512:
-  metadata.gz: c5e64237c90b7eeea7e8c934df11f195948d1142c307951345f4454c7a9a6cee7e35a18962e518a860ef02eae128066a8f9c159f0960917f081fe5c383ccb8fc
-  data.tar.gz: 2c92d249c1e3fb2e12de71d91fdabf809af6e2510ac95a90a024fd0e54d96a5e25fa23752754ec97fe00e1a7feeab8dd4e06b3acced5c2f419dbaa5bf8ac9e5f
+  metadata.gz: acc91a2a79c79bfb32f361ee41a0085cbf80c1196202e250335f7666625d153675de3ea163884c8ff3b5634f3b9a78c4498f243a19fd54f554da894cbbb13805
+  data.tar.gz: ce8f7386d344c99f65548b124dc6f0d3909296c04773ed744a33c8fdd77daf89b7595d7df66950f483c7783739b96e8d3280e6baa8e9107f68fe75a9d278d6a1

data/lib/pikelet/file_definition.rb

@@ -3,12 +3,12 @@ module Pikelet
     attr_reader :base_record_definition
 
     def initialize(&block)
-      @base_record_definition = RecordDefinition.new(self, &block)
+      @base_record_definition = RecordDefiner.new(self).define(&block)
     end
 
     def record(type_signature, base_definition: nil, &block)
       base_definition ||= base_record_definition
-      record_definitions[type_signature] = RecordDefinition.new(self, base_definition: base_definition, &block)
+      record_definitions[type_signature] = RecordDefiner.new(self, base_definition: base_definition).define(&block)
     end
 
     def record_definitions

data/lib/pikelet/record_definer.rb

@@ -0,0 +1,29 @@
+module Pikelet
+  class RecordDefiner
+    attr_reader :file_definition, :definition
+
+    def initialize(file_definition, base_definition: nil)
+      @file_definition = file_definition
+      @definition = RecordDefinition.new(file_definition, base_definition: base_definition)
+    end
+
+    def define(&block)
+      if block_given?
+        instance_eval(&block)
+      end
+      definition
+    end
+
+    def field(name, index, &block)
+      definition.field(name, index, &block)
+    end
+
+    def record(type_signature, &block)
+      file_definition.record(type_signature, base_definition: definition, &block)
+    end
+
+    def method_missing(method, *args, &block)
+      field(method, *args, &block)
+    end
+  end
+end

data/lib/pikelet/record_definition.rb

@@ -1,13 +1,12 @@
+require "pikelet/record_definer"
+
 module Pikelet
   class RecordDefinition
     attr_reader :file_definition, :field_definitions
 
-    def initialize(file_definition, base_definition: nil, &block)
+    def initialize(file_definition, base_definition:)
       @file_definition = file_definition
       @field_definitions = base_definition && base_definition.field_definitions.dup || {}
-      if block_given?
-        instance_eval(&block)
-      end
     end
 
     def field(name, index, &block)
@@ -15,10 +14,6 @@ module Pikelet
       field_definitions[name] = Pikelet::FieldDefinition.new(index, &block)
     end
 
-    def record(type_signature, &block)
-      file_definition.record(type_signature, base_definition: self, &block)
-    end
-
     def parse(data)
       record_class.new(*field_definitions.values.map { |field| field.parse(data) })
     end
@@ -27,10 +22,6 @@ module Pikelet
       record_class.new(*hash.values_at(*field_definitions.keys))
     end
 
-    def method_missing(method, *args, &block)
-      field(method, *args, &block)
-    end
-
     def record_class
       @record_class ||= Struct.new(*field_definitions.keys.map(&:to_sym))
     end

data/lib/pikelet/version.rb

@@ -1,3 +1,3 @@
 module Pikelet
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/pikelet/record_definition_spec.rb

@@ -4,7 +4,7 @@ require "pikelet"
 describe Pikelet::RecordDefinition do
   let(:data)  { "Hello world" }
   let(:definition) do
-    Pikelet::RecordDefinition.new(nil) do
+    Pikelet::RecordDefiner.new(nil, base_definition: nil).define do
       hello 0...5
       world 6..-1
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pikelet
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - John Carney
@@ -128,6 +128,7 @@ files:
 - lib/pikelet.rb
 - lib/pikelet/field_definition.rb
 - lib/pikelet/file_definition.rb
+- lib/pikelet/record_definer.rb
 - lib/pikelet/record_definition.rb
 - lib/pikelet/version.rb
 - pikelet.gemspec