marc_alephsequential 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8df9c89123e3491792191102ca213b18deb648b3
-  data.tar.gz: 03cfc3c63a3912d03069ac095e195ac972dc2843
+  metadata.gz: c21cb8f33a3b2a1275e1c1fe4cbab9124105532e
+  data.tar.gz: 1679f8be5ceb7c577c9323a542237c533627ccd5
 SHA512:
-  metadata.gz: ba633b8560bb40c40983f7b1ca6b43631d2a342371837b4bcf0b4306c390a81de2abf3ae0b86414c15c9bbd4085833144be659e7eb860538ae47231d6cee6562
-  data.tar.gz: ac88f0374ec7e4270f345fc7134f32c0adaf9034971a50038233f16ebf26d570b5d861660f78be3ea2d5cb5bc019dcb972cb2ff49baefdb664fb24699d3d0604
+  metadata.gz: 9507f291bea0e23e0edf170c8aa1d9a7656da0bc8e74206d7182d52854b6420ab6058d45e7622b56f53723f097e988c1572eef5369c15612d77f143bb7cbf194
+  data.tar.gz: eca9f90589c7f5caef2fd23837d2f2af390a56fdc3d26b57c030477a10f6047e9f97034197ca75744ea0b603c0c820bf2ba183c988b65976a737ee5ab1bc25d3

data/ChangeLog.md

@@ -1,3 +1,18 @@
+### 2.0.0 /
+
+Change the way MARC::AlephSequential::Reader deals with errors when
+producing a record for `#each`. Instead of throwing an error (and aborting
+the loop whether you wanted to or not, since there's no way to catch
+the error in a provided block), it will now return a
+MARC::AlephSequential::ErrorRecord `er` with a method `er.error` holding
+the error.
+
+This should affect almost no one.
+
+### 1.0.0
+
+First 1.0 release. No major changes.
+
 ### 0.1.1  / 2013-10-23
 
 * Fixed bad call to respond_to in intializer

data/README.md

@@ -20,16 +20,14 @@ A [ruby-marc](https://github.com/ruby-marc/ruby-marc) reader for MARC files in t
   reader = MARC::AlephSequential::Reader.new('myfile.seq.gz') # automatically notice the .gz and behave!
   
   reader.log = log # optional. Set up a logger; otherwise, a default logger will be used
-  
-  begin
-    reader.each do |r|
-      # do stuff with the record
-    end  
-  rescue MARC::AlephSequential::Error => e
-    log.error "Error while parsing record #{e.record_id} at/near #{e.line_number}: #{e.message}"
-    retry # may or may not work the way you'd hope/expect
-  rescue => e
-    log.error "Other error of some sort. quitting. #{e.message}"
+
+  reader.each do |r|
+    if MARC::AlephSequential::ErrorRecord === r
+      e = r.error
+      log.error "Error while parsing record #{e.record_id} at/near #{e.line_number}: #{e.message}"
+      next
+    end
+    doStuffWithTheRecord(r)
   end
 
 ```

data/lib/marc_alephsequential/reader.rb

@@ -7,6 +7,22 @@ require 'marc_alephsequential/log'
 module MARC
   module AlephSequential
 
+    # We need an empty record to signal an error condition that might
+    # occur within #each (e.g, the record has no leader). Raising the
+    # error will abort any #each loop without giving the user a chance
+    # to catch is (because by the time the block is run, the error has
+    # already been thrown). See a simplified example of this problem at
+    # https://gist.github.com/billdueber/6d501f730c79f6a74498
+
+
+    class ErrorRecord < MARC::Record
+      attr_accessor :error
+      def initialize(error)
+        super()
+        self.error = error
+      end
+    end
+
     class Reader
 
       include Enumerable
@@ -30,7 +46,11 @@ module MARC
         while @areader.has_next?
           nextid = @areader.peek.id
           if nextid != @current_id && @areader.peek.valid_id?
-            yield agroup.to_record unless agroup.empty?
+            begin
+              yield agroup.to_record unless agroup.empty?
+            rescue RuntimeError => e
+              yield ErrorRecord.new(e)
+            end
             agroup      = ASLineGroup.new
             @current_id = nextid
           else
@@ -38,7 +58,12 @@ module MARC
           end
         end
         # yield whatever is left, unless there's nothing left
-        yield agroup.to_record unless agroup.empty?
+        begin
+          yield agroup.to_record unless agroup.empty?
+        rescue RuntimeError => e
+          yield ErrorRecord.new(e)
+        end
+
       end
     end
   end

data/lib/marc_alephsequential/version.rb

@@ -1,5 +1,5 @@
 module MarcAlephsequential
   # marc_alephsequential version
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end
 

data/spec/reader_spec.rb

@@ -33,13 +33,11 @@ describe 'Reader' do
 
   it "yells when there's no leader" do
     error = nil
-    begin
-      r = MARC::AlephSequential::Reader.new(@noleader).first
-    rescue MARC::AlephSequential::Error => e
-      error = e
-    end
-    error.wont_be_nil
-    error.message.must_match /leader/
+    r = MARC::AlephSequential::Reader.new(@noleader).first
+    r.must_be_kind_of MARC::AlephSequential::ErrorRecord
+    r.must_respond_to :error
+    r.error.wont_be_nil
+    r.error.message.must_match /leader/
   end
 
   it "deals ok with embedded newline" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marc_alephsequential
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Bill Dueber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marc