pikelet 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22fadd28f1e37b036e1f2cf7c5b2afee9a0bee74
-  data.tar.gz: 51c14989ef2bbd19eb3c04107d45b87a1e5396fb
+  metadata.gz: 92134160fa79ab2d8985325efe9593aab5380451
+  data.tar.gz: 48510ce920f6fd195814d84688584b0d5c079da2
 SHA512:
-  metadata.gz: 5ecea7731c540fd6626f96cbf9ce6058adad82f616f06066255858f0ba53906c04b844e06747774636990114bc350bc6df5ead169d80b99fc328d3de46672fc7
-  data.tar.gz: a8c75d1f053b7f732a61d50da20b538735c67b97777103d8f43101e82c17512cb2233eac37e4e6fa5c7d84e59c72373581b8f3fa65bfdaf87d65e77be4cb161b
+  metadata.gz: ebfab61d3e579d5316e86c2495eba1ad7d57795c3fbed235c4f969ae9dc5892ee26f24622809a34c3e75f1a292dd5affb53365cf4e5e118f9fa756640c081e6d
+  data.tar.gz: fa71ad390ba4ece29732b2917b7f0de1ae4b4e6121755b7390241aa9859753a17a696397296c83a28ab007a32064a43fda10c2b14b17b8b9e32d38f012e40f26

data/lib/pikelet/field_definition.rb

@@ -2,9 +2,10 @@ module Pikelet
   class FieldDefinition
     attr_reader :index, :parser
 
-    def initialize(index, &parser)
+    def initialize(index, parse: nil, &parser)
       @index = index
-      @parser = parser || :strip.to_proc
+      @parser = parser || parse || :strip
+      @parser = @parser.to_proc unless @parser.respond_to? :call
     end
 
     def parse(text)

data/lib/pikelet/record_definer.rb

@@ -14,16 +14,16 @@ module Pikelet
       definition
     end
 
-    def field(name, index, &block)
-      definition.field(name, index, &block)
+    def field(name, index, **options, &block)
+      definition.field(name, index, **options, &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)
+    def method_missing(method, *args, **options, &block)
+      field(method, *args, **options, &block)
     end
   end
 end

data/lib/pikelet/record_definition.rb

@@ -9,9 +9,9 @@ module Pikelet
       @field_definitions = base_definition && base_definition.field_definitions.dup || {}
     end
 
-    def field(name, index, &block)
+    def field(name, index, **options, &block)
       @record_class = nil
-      field_definitions[name] = Pikelet::FieldDefinition.new(index, &block)
+      field_definitions[name] = Pikelet::FieldDefinition.new(index, **options, &block)
     end
 
     def parse(data)

data/lib/pikelet/version.rb

@@ -1,3 +1,3 @@
 module Pikelet
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/pikelet/field_definition_spec.rb

@@ -3,63 +3,90 @@ require "pikelet"
 require "csv"
 
 describe Pikelet::FieldDefinition do
-  let(:data)        { "The quick brown fox" }
-  let(:definition)  { Pikelet::FieldDefinition.new(index) }
+  let(:data)       { "The quick brown fox" }
+  let(:definition) { Pikelet::FieldDefinition.new(index) }
 
-  subject(:value) { definition.parse(data) }
+  subject(:result) { definition.parse(data) }
 
-  describe "for a fixed-width field" do
+  context "for a fixed-width field" do
     let(:index) { 4...9 }
 
     it "extracts the field content from the data" do
-      expect(value).to eq "quick"
+      expect(result).to eq "quick"
     end
   end
 
-  describe "given whitespace" do
+  context "given whitespace" do
     let(:index) { 3...16 }
 
     it "strips leading and trailing whitespace" do
-      expect(value).to eq "quick brown"
+      expect(result).to eq "quick brown"
     end
   end
 
-  describe "given a CSV row" do
+  context "given a CSV row" do
     let(:data)  { CSV.parse("The,quick,brown,fox").first }
     let(:index) { 2 }
 
     it "extracts the field" do
-      expect(value).to eq "brown"
+      expect(result).to eq "brown"
     end
   end
 
-  describe "given a parser block" do
-    let(:index) { 4...9 }
-    let(:definition) do
-      Pikelet::FieldDefinition.new(index) { |value| value.reverse }
+  context "given a custom parser" do
+    let(:parser) { ->(value) { value } }
+
+    before do
+      allow(parser).to receive(:call)
+      result
+    end
+
+    context "as a block" do
+      let(:index)      { 4...9 }
+      let(:definition) { Pikelet::FieldDefinition.new(index, &parser) }
+
+      it "yields the value to the parser" do
+        expect(parser).to have_received(:call).with("quick")
+      end
     end
 
-    it "yields the value to the parser" do
-      expect(value).to eq "kciuq"
+    context "as a parse option" do
+      let(:index)      { 10...15 }
+      let(:definition) { Pikelet::FieldDefinition.new(index, parse: parser) }
+
+      it "yields the value to the parser" do
+        expect(parser).to have_received(:call).with("brown")
+      end
     end
   end
 
-  describe "given a symbol for the parser block" do
-    let(:index) { 4...9 }
-    let(:definition) do
-      Pikelet::FieldDefinition.new(index, &:upcase)
+  context "given a shorthand parser" do
+    let(:parser) { :upcase }
+
+    context "as a block" do
+      let(:index)      { 10...15 }
+      let(:definition) { Pikelet::FieldDefinition.new(index, &parser) }
+
+      it "invokes the named method on the value" do
+        expect(result).to eq "BROWN"
+      end
     end
 
-    it "invokes the named method on the value" do
-      expect(value).to eq "QUICK"
+    context "as a parse option" do
+      let(:index)      { 4...9 }
+      let(:definition) { Pikelet::FieldDefinition.new(index, parse: parser) }
+
+      it "invokes the named method on the value" do
+        expect(result).to eq "QUICK"
+      end
     end
   end
 
-  describe "given an index not covered in the data" do
+  context "given an index not covered in the data" do
     let(:index) { 999..999 }
 
     it "parses as nil" do
-      expect(value).to be_nil
+      expect(result).to be_nil
     end
   end
 end

data/spec/pikelet_spec.rb

@@ -132,6 +132,42 @@ describe Pikelet do
     its(:value) { is_expected.to eq 5637 }
   end
 
+  describe "given a parse option" do
+    let(:definition) do
+      Pikelet.define do
+        value 0...4, parse: ->(value) { value.to_i }
+      end
+    end
+
+    let(:data) do
+      <<-FILE.gsub(/^\s*/, "").split(/[\r\n]+/)
+        5637
+      FILE
+    end
+
+    subject { records.first }
+
+    its(:value) { is_expected.to eq 5637 }
+  end
+
+  describe "given a shorthand parse option" do
+    let(:definition) do
+      Pikelet.define do
+        value 0...4, parse: :to_i
+      end
+    end
+
+    let(:data) do
+      <<-FILE.gsub(/^\s*/, "").split(/[\r\n]+/)
+        5637
+      FILE
+    end
+
+    subject { records.first }
+
+    its(:value) { is_expected.to eq 5637 }
+  end
+
   describe "given a block when parsing" do
     let(:collected_records) { [] }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pikelet
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - John Carney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A simple flat-file database parser.