gotime-slither 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d2ee3717c7e3ed3187c30b6f5913f15ca2d382
-  data.tar.gz: c941cd80a505c801172bf0377343b27064df2eb0
+  metadata.gz: 99ab6bb56013c690a945d6621bfba1a39beb78a3
+  data.tar.gz: 8195f0c7272a6b8988d8ecf502a47aaa67ce7d6e
 SHA512:
-  metadata.gz: 2ab17161a128a546574ea4f1cd2b5be6f39363005c7578a0eb758a381e0d2afa1a8eba1c0bf421d233e456dd9396cf43429fd7434bb52a4d8accffde40e4894e
-  data.tar.gz: 3b9c5d9746c2cb86b943efdcbeb0871f93de2b7509cbb5e86d04f1ca253acd3299dc277618e8d84c57d1f312dfc4657e1a5788aee0d79337200bb0238e87a292
+  metadata.gz: fc74901e7d3c703c87c0a37716f906a4f33ca6bec64407c424e2d233d4c04296237cfc3de4ca87d8eb1f5f17ec80017e2ea4118c7ced1927676c21d515823753
+  data.tar.gz: b9159e5c9d546abcb62a22469e765781558770fad136bbc76f1e9daea891e79bae14f7ab4cd193658e95f3a244c085cf06b0514ef297da34c6f7c5260403a734

data/README.rdoc

@@ -76,7 +76,7 @@ Then either feed it a nested struct with data values to create the file in the d
 or parse files already in that format into a nested hash:
 
    parsed_data = Slither.parse(input_filename, :simple)
-   parsed_data = Slither.parseIo(io_object, :simple)
+   parsed_data = Slither.parse_io(io_object, :simple)
 
 
 == INSTALL:

data/lib/slither/parser.rb

@@ -8,29 +8,20 @@ class Slither
       @mode = :linear
     end
     
-    def parse(error_handler=nil)
-      parsed = {}
-
+    def parse
       @file.each_line do |line|
         line.chomp! if line
         next if line.empty?
         @definition.sections.each do |section|
           if section.match(line)
-            validate_length(line, section, error_handler) if @definition.options[:validate_length]
-            parsed = fill_content(line, section, parsed)
+            validate_length(line, section) if @definition.options[:validate_length]
+            yield section.parse(line)
           end
         end
       end
-
-      @definition.sections.each do |section|
-        raise(Slither::RequiredSectionNotFoundError, "Required section '#{section.name}' was not found.") unless parsed[section.name] || section.optional
-      end
-      parsed
     end
     
     def parse_by_bytes
-      parsed = {}
-      
       all_section_lengths = @definition.sections.map{|sec| sec.length }
       byte_length = all_section_lengths.max
       all_section_lengths.each { |bytes| raise(Slither::SectionsNotSameLengthError,
@@ -47,33 +38,18 @@ class Slither
         
         @definition.sections.each do |section|
           if section.match(record)
-            parsed = fill_content(record, section, parsed)
+            yield section.parse(record)
           end
         end
       end
-      
-      @definition.sections.each do |section|
-        raise(Slither::RequiredSectionNotFoundError, "Required section '#{section.name}' was not found.") unless parsed[section.name] || section.optional
-      end
-      parsed
     end
     
     private
-    
-      def fill_content(line, section, parsed)
-        parsed[section.name] ||= []
-        parsed[section.name] << section.parse(line)
-        parsed
-      end
       
-      def validate_length(line, section, error_handler)
+      def validate_length(line, section)
         if line.length != section.length
-          if error_handler
-            error_handler.call(line)
-          else
-            parsed_line = parse_for_error_message(line)
-            raise Slither::LineWrongSizeError, "Line wrong size: (#{line.length} when it should be #{section.length}. #{parsed_line})" 
-          end
+          parsed_line = parse_for_error_message(line)
+          raise Slither::LineWrongSizeError, "Line wrong size: (#{line.length} when it should be #{section.length}. #{parsed_line})" 
         end
       end
       

data/lib/slither/slither.rb

@@ -31,18 +31,18 @@ class Slither
     end
   end
   
-  def self.parse(filename, definition_name)
+  def self.parse(filename, definition_name, &block)
     raise ArgumentError, "File #{filename} does not exist." unless File.exists?(filename)
 
     file_io = File.open(filename, 'r')
-    parseIo(file_io, definition_name)
+    parse_io(file_io, definition_name, &block)
   end
 
-  def self.parseIo(io, definition_name)
+  def self.parse_io(io, definition_name, &block)
     definition = definition(definition_name)
     raise ArgumentError, "Definition name '#{definition_name}' was not found." unless definition
     parser = Parser.new(definition, io)
-    definition.options[:by_bytes] ? parser.parse_by_bytes : parser.parse(definition.options[:error_handler])
+    definition.options[:by_bytes] ? parser.parse_by_bytes(&block) : parser.parse(&block)
   end
   
   private

data/spec/parser_spec.rb

@@ -107,7 +107,7 @@ describe Slither::Parser do
         :body => [ {:first => utf_str1, :last => utf_str2} ]
       }
       
-      Slither.parseIo(@io, :test).should eq(expected)
+      Slither.parse_io(@io, :test).should eq(expected)
     end
     
   end
@@ -153,7 +153,7 @@ describe Slither::Parser do
         :body => [ {:first => utf_str1, :last => utf_str2} ]
       }
       
-      Slither.parseIo(@io, :test).should eq(expected)
+      Slither.parse_io(@io, :test).should eq(expected)
     end
     
     it 'should handle mid-line newline chars' do
@@ -165,7 +165,7 @@ describe Slither::Parser do
         :body => [ {:first => str1, :last => str2}, {:first => str1, :last => str2} ]
       }
       
-      Slither.parseIo(@io, :test).should eq(expected)
+      Slither.parse_io(@io, :test).should eq(expected)
     end
     
     it 'should throw exception if section lengths are different' do
@@ -206,7 +206,7 @@ describe Slither::Parser do
           :body => [ {:first => 'abc', :dat => [0x00, 0x18], :last => 'end'} ]
       }
 
-      Slither.parseIo(@io, :test).should eq(expected)
+      Slither.parse_io(@io, :test).should eq(expected)
     end
 
     it 'should handle spaces' do
@@ -216,7 +216,7 @@ describe Slither::Parser do
           :body => [ {:first => 'abc', :dat => [0x20, 0x18], :last => 'end'} ]
       }
 
-      Slither.parseIo(@io, :test).should eq(expected)
+      Slither.parse_io(@io, :test).should eq(expected)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-slither
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ryan Wood