nu_wav 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/nu_wav.rb

@@ -8,6 +8,7 @@ require 'rubygems'
 require 'mp3info'
 require 'date'
 require 'tempfile'
+require 'fileutils'
 
 module NuWav
 
@@ -43,9 +44,7 @@ module NuWav
     attr_accessor :header, :chunks
 
     def self.parse(wave_file)
-      wf = NuWav::WaveFile.new
-      wf.parse(wave_file)
-      wf
+      NuWav::WaveFile.new.parse(wave_file)
     end
 
     def initialize
@@ -54,6 +53,8 @@ module NuWav
     
     def parse(wave_file)
       NuWav::WaveFile.log "Processing wave file #{wave_file.inspect}...."
+      wave_file_size = File.size(wave_file)
+
       File.open(wave_file, File::RDWR) do |f|
 
         #only for windows, make sure we are operating in binary mode 
@@ -64,8 +65,10 @@ module NuWav
         riff, riff_length = read_chunk_header(f)
         NuWav::WaveFile.log "riff: #{riff}"
         NuWav::WaveFile.log "riff_length: #{riff_length}"
+        NuWav::WaveFile.log "wave_file_size: #{wave_file_size}"
+
         raise NotRIFFFormat unless riff == 'RIFF'
-        riff_end = f.tell + riff_length
+        riff_end = [f.tell + riff_length, wave_file_size].min
 
         riff_type = f.read(4)
         raise NotWAVEFormat unless riff_type == 'WAVE'
@@ -95,6 +98,7 @@ module NuWav
       end
       @chunks.each{|k,v| NuWav::WaveFile.log "#{k}: #{v}\n\n" unless k.to_s == 'data'}
       NuWav::WaveFile.log "parse done"
+      self
     end
 
     def duration
@@ -272,7 +276,10 @@ module NuWav
     
     def read_chunk_header(file)
       hdr = file.read(8)
-      chunkName, chunkLen = hdr.unpack("A4V")
+      # puts "hdr: #{hdr}"
+      chunkName, chunkLen = hdr.unpack("A4V") rescue [nil, nil]
+      # puts "chunkName: '#{chunkName}', chunkLen: '#{chunkLen}'"
+      [chunkName, chunkLen]
     end
 
     def chunk_class(name)
@@ -335,7 +342,7 @@ module NuWav
     end
     
     def read_char(start, length=(@raw.length-start))
-      @raw[start..(start+length-1)]
+      (@raw[start..(start+length-1)] || '').strip
     end
 
     def write_dword(val)
@@ -350,6 +357,7 @@ module NuWav
     
     def write_char(val, length=nil)
       val ||= ''
+      val = val.to_s
       length ||= val.length
       # NuWav::WaveFile.log "length:#{length} val.length:#{val.length} val:#{val}"
       padding = "\0" * [(length - val.length), 0].max
@@ -602,9 +610,9 @@ module NuWav
     def self.new_from_file(file)
       tmp_data = Tempfile.open('data_chunk')
       tmp_data.binmode
-      File.copy(file.path, tmp_data.path)
+      FileUtils.cp(file.path, tmp_data.path)
       tmp_data.rewind
-      self.new('data', File.size(file.path), tmp_data)
+      self.new('data', File.size(tmp_data.path).to_s, tmp_data)
     end
 
     def initialize(id=nil, size=nil, tmp_data_file=nil)

data/nu_wav.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nu_wav}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kookster"]
-  s.date = %q{2011-08-15}
+  s.date = %q{2012-07-19}
   s.description = %q{NuWav is a pure ruby audio WAV file parser and writer.  It supports Broadcast Wave Format (BWF), inclluding MPEG audio data, and the public radio standard cart chunk.}
   s.email = %q{andrew@beginsinwonder.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nu_wav
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - kookster
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 -04:00
+date: 2012-07-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency