nu_wav 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 711f1ff9cf1e866c3a00c0be81d4f67aad7c02dc
-  data.tar.gz: e906d964674f1f2f1811cfe481ceeacbb33f4b90
+  metadata.gz: 8c30891ab0c891a3979c1941e18e9c12a1bbd440
+  data.tar.gz: 96f2fc0f82f3fcd1bb82b8fa4a88292e2bbb1da4
 SHA512:
-  metadata.gz: d618ffb303ad737921f15bd2251621b438a4f3d5b513fbb3d2d6094f87233d35d30b9864423013955d0d4a73a6cf9f4099eb3855767122a65532ad414be6efa9
-  data.tar.gz: c270464f572ac25f788d774e59a889bdd437cc84e7dcd1611ccdffaa0b608bb2a35269f689267377b6e07180da9c32a6a93c1d076129e4224ccab1e2d049328e
+  metadata.gz: 877cb25d33a3679a51a2f7c229628536b7696efeb1385639af751b82b05c11a2fca5e443cddd5217d12c6f287261c6e81212cf8d112b70cb4e7849439ab472e2
+  data.tar.gz: ebc5112bf96fee32b4851cd0e1c09a1ea3fe65dda6c5b87aed483bdd7579fc8d8366920136e9b0162e2919ed0fb78611479a3e2d9d6dd9c442e95f35ef358063

data/lib/nu_wav/chunk.rb

@@ -49,7 +49,7 @@ module NuWav
       out
     end
     
-    def to_binary
+    def to_binary(options={})
     end
   end
 
@@ -94,7 +94,7 @@ module NuWav
       end
     end
 
-    def to_binary
+    def to_binary(options={})
       out = ''
       out += write_word(@compression_code)
       out += write_word(@number_of_channels)
@@ -138,7 +138,7 @@ module NuWav
       "<chunk type:fact samples_number:#{@samples_number} />"
     end
     
-    def to_binary
+    def to_binary(options={})
       "fact" + write_dword(4) + write_dword(@samples_number)
     end
     
@@ -159,7 +159,7 @@ module NuWav
       "<chunk type:mext sound_information:(#{sound_information}) #{(0..15).inject(''){|s,x| "#{s}#{sound_information[x]}"}}, frame_size:#{frame_size}, ancillary_data_length:#{ancillary_data_length}, ancillary_data_def:#{(0..15).inject(''){|s,x| "#{s}#{ancillary_data_def[x]}"}}, reserved:'#{reserved}' />"
     end
     
-    def to_binary
+    def to_binary(options={})
       out = "mext" + write_dword(12)
       out += write_word(@sound_information)
       out += write_word(@frame_size)
@@ -192,7 +192,7 @@ module NuWav
       "<chunk type:bext description:'#{description}', originator:'#{originator}', originator_reference:'#{originator_reference}', origination_date:'#{origination_date}', origination_time:'#{origination_time}', time_reference_low:#{time_reference_low}, time_reference_high:#{time_reference_high}, version:#{version}, umid:#{umid}, reserved:'#{reserved}', coding_history:#{coding_history} />"
     end
 
-    def to_binary
+    def to_binary(options={})
       out = "bext" + write_dword(602 + @coding_history.length )
       out += write_char(@description, 256)
       out += write_char(@originator, 32)
@@ -242,7 +242,7 @@ module NuWav
       "<chunk type:cart version:#{version}, title:#{title}, artist:#{artist}, cut_id:#{cut_id}, client_id:#{client_id}, category:#{category}, classification:#{classification}, out_cue:#{out_cue}, start_date:#{start_date}, start_time:#{start_time}, end_date:#{end_date}, end_time:#{end_time}, producer_app_id:#{producer_app_id}, producer_app_version:#{producer_app_version}, user_def:#{user_def}, level_reference:#{level_reference}, post_timer:#{post_timer}, reserved:#{reserved}, url:#{url}, tag_text:#{tag_text} />"
     end
     
-    def to_binary
+    def to_binary(options={})
       out = "cart" + write_dword(2048 + @tag_text.length )
       out += write_char(@version,4)
       out += write_char(@title,64)
@@ -319,12 +319,12 @@ module NuWav
       "<chunk type:data (size:#{data.size})/>"
     end
     
-    def to_binary
+    def to_binary(options={})
       NuWav::WaveFile.log "data chunk to_binary"
       d = self.data
       NuWav::WaveFile.log "got data size = #{d.size} #{d[0,10]}"
       out = "data" + write_dword(d.size) + d
-      if d.size.odd?
+      if d.size.odd? && !options[:no_pad_byte]
         NuWav::WaveFile.log "odd, adding a pad byte"
         out += "\0"
       end

data/lib/nu_wav/version.rb

@@ -1,3 +1,3 @@
 module NuWav
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/lib/nu_wav/wave_file.rb

@@ -104,8 +104,8 @@ module NuWav
       end
     end
 
-    def to_file(file_name, add_extension=false)
-      if add_extension && !(file_name =~ /\.wav/)
+    def to_file(file_name, options={})
+      if options[:add_extension] && !(file_name =~ /\.wav/)
         file_name += ".wav"
       end
       NuWav::WaveFile.log "NuWav::WaveFile.to_file: file_name = #{file_name}"
@@ -113,7 +113,7 @@ module NuWav
       #get all the chunks together to get final length
       chunks_out = [:fmt, :fact, :mext, :bext, :cart, :data].inject([]) do |list, chunk|
         if self.chunks[chunk]
-          out = self.chunks[chunk].to_binary
+          out = self.chunks[chunk].to_binary(options)
           NuWav::WaveFile.log out.length
           list << out
         end

data/test/test_nu_wav.rb

@@ -98,15 +98,34 @@ class TestNuWav < Test::Unit::TestCase
     assert File.exists?('test_from_mpeg.wav')
     assert_equal File.size('test_from_mpeg.wav'), 182522
     File.delete('test_from_mpeg.wav')
+  end
+
+  def test_from_mpeg_no_pad
+    w = WaveFile.from_mpeg(File.expand_path(File.dirname(__FILE__) + '/files/test_odd.mp2'))
 
+    File.delete('test_no_pad.wav') rescue nil
+    w.to_file('test_no_pad.wav')
+    assert File.exists?('test_no_pad.wav')
+    assert_equal File.size('test_no_pad.wav'), 962226
+    File.delete('test_no_pad.wav')
 
-    File.delete('test_from_mpeg.mp2') rescue nil
-    w.write_data_file('test_from_mpeg.mp2')
-    assert File.exists?('test_from_mpeg.mp2')
-    assert_equal File.size('test_from_mpeg.mp2'), 179712
-    File.delete('test_from_mpeg.mp2')
+    File.delete('test_no_pad.wav') rescue nil
+    w.to_file('test_no_pad.wav', {:no_pad_byte=>true})
+    assert File.exists?('test_no_pad.wav')
+    assert_equal File.size('test_no_pad.wav'), 962225
+    File.delete('test_no_pad.wav')
   end
-  
+
+  def test_write_data_file
+    w = WaveFile.from_mpeg(File.expand_path(File.dirname(__FILE__) + '/files/test.mp2'))
+
+    File.delete('test_write_data_file.mp2') rescue nil
+    w.write_data_file('test_write_data_file.mp2')
+    assert File.exists?('test_write_data_file.mp2')
+    assert_equal File.size('test_write_data_file.mp2'), 179712
+    File.delete('test_write_data_file.mp2')
+  end
+
   def unpad(str)
     str.gsub(/\0*$/, '')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nu_wav
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-mp3info
@@ -74,6 +74,7 @@ files:
 - test/files/test.mp2
 - test/files/test_basic.wav
 - test/files/test_bwf.wav
+- test/files/test_odd.mp2
 - test/helper.rb
 - test/test_nu_wav.rb
 homepage: http://github.com/kookster/nu_wav
@@ -104,5 +105,6 @@ test_files:
 - test/files/test.mp2
 - test/files/test_basic.wav
 - test/files/test_bwf.wav
+- test/files/test_odd.mp2
 - test/helper.rb
 - test/test_nu_wav.rb