sndfile 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c232895c9482256a13565c57f1b26856ac2ccd9c
-  data.tar.gz: bb4388474d9bfbab60c29f1eb8e42881bd96d44a
+  metadata.gz: 7bd96cbf94b2f2f9e759f54814c6061deae1ed50
+  data.tar.gz: 20db0e672753f0d6193835988fb9f5422ba6d6c1
 SHA512:
-  metadata.gz: ea60311ff4bbe116e07ffb3f4ea6f29e8d72e9429090223594a0ce8773b9222645815433bd25b1c1a897b9bcbef49f70a1e16d736de9516d70b5a729524a79b0
-  data.tar.gz: 7c173364cdf387773e3896c8a1cc6b526af6751e67f90510561cd0d251c7867b93587b1017dda8c1e6cbdccc579997c78651075217a1e2c7382488c9e0645ef8
+  metadata.gz: b5f73cb61634147e7a84183df61626223379ec1a1803d3736ad4191bef87d1d973f68ce053ca337a44080e3c731e67cf48f868c00165d2a892002c914b37a884
+  data.tar.gz: 7b725f1b747d1f5919f679d14855def31b4339c6116c18eac555ffd86c13e83442f0a6744511872de43de1d144c6c926fb747d2cf9c1c039731672be2f9cdafd

data/README.md

@@ -64,6 +64,7 @@ History
 
 Release notes:
 
+* 1.1.0 - Add detail fields to Sndfile::Error
 * 1.0.0 - Add Sndfile::Info. Deprecate individual accessors.  No longer support ruby 1.8.7 
 * 0.2.0 - Support ruby 1.8.7.  Thanks to [youpy](https://github.com/youpy)
 * 0.1.3 - Back to ruby-gsl-ng: memory leaks fixed

data/lib/sndfile/error.rb

@@ -4,5 +4,23 @@ module Sndfile
   # contains the libsndfile error message.
   #
   class Error < RuntimeError
+    attr_reader :description
+    attr_reader :code
+    attr_reader :file
+    def initialize(args)
+      args = args.keyword_args(:description, :code, :file)
+      @description = args.description
+      @code = args.code
+      @file = args.file
+    end
+
+    def to_s
+      s = ""
+      s << @description if @description
+      s << " (#{@code})" if @code
+      s << " [#{@file}]" if @file
+      s
+    end
+
   end
 end

data/lib/sndfile/file.rb

@@ -125,10 +125,9 @@ module Sndfile
     def check_error(code = nil)
       code ||= sf_error(@sfpointer.null? ? nil : @sfpointer)
       if code != 0
-        msg = sf_strerror(@sfpointer.null? ? nil : @sfpointer)
-        msg += " (#{ErrorCode[code]})" if ErrorCode[code]
-        msg += " [#{@path}]"
-        raise Sndfile::Error, msg
+        raise Sndfile::Error.new(:description => sf_strerror(@sfpointer.null? ? nil : @sfpointer),
+                                 :code => ErrorCode[code],
+                                 :file => @path) 
       end
     end
 

data/lib/sndfile/version.rb

@@ -1,3 +1,3 @@
 module Sndfile
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/error_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Sndfile::Error do
+
+  it "inludes all info in to_s" do
+    error = Sndfile::Error.new(:description => 'ABCDEF', :code => 'GHIJKL', :file => 'MNOPQR')
+    error.to_s.should =~ /\bABCDEF\b/
+    error.to_s.should =~ /\bGHIJKL\b/
+    error.to_s.should =~ /\bMNOPQR\b/
+  end
+
+end

data/spec/file_spec.rb

@@ -33,7 +33,11 @@ describe Sndfile::File do
   end
 
   it "raises an error when it can't open the file" do
-    expect { Sndfile::File.open("/no/such/file") }.to raise_error Sndfile::Error
+    expect { Sndfile::File.open("/no/such/file") }.to raise_error(Sndfile::Error) { |error|
+      error.description.should =~ /No such file/
+      error.code.should == :SF_ERR_SYSTEM
+      error.file.should == "/no/such/file"
+    }
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sndfile
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - ronen barzel
@@ -159,6 +159,7 @@ files:
 - lib/sndfile/sndfile_api.rb
 - lib/sndfile/version.rb
 - sndfile.gemspec
+- spec/error_spec.rb
 - spec/file_spec.rb
 - spec/inputs/ComputerMagic.wav
 - spec/inputs/Flute3.wav
@@ -192,6 +193,7 @@ specification_version: 4
 summary: Ruby wrapper for libsndfile.  Reads/writes data as GSL matrices, to allow
   fast processing.
 test_files:
+- spec/error_spec.rb
 - spec/file_spec.rb
 - spec/inputs/ComputerMagic.wav
 - spec/inputs/Flute3.wav