audio_monster 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8ff1806c90f459f01c8c8c804be6a9924f37e91
-  data.tar.gz: 93fab5211b9c7c2663353071ac67916d0f5fc700
+  metadata.gz: 4381409b28c95625a20cf1c8268cfd848c702a51
+  data.tar.gz: 01e78e0d037c96af6437526888ec645b33484a73
 SHA512:
-  metadata.gz: e4485524174726a344b16386d0fdfb3aca441948bd8cb5de59b3449395206329206a0b2e72b509d01b56e166cf40944fb73fdf283bf242e7f75c9208fbf1ac5e
-  data.tar.gz: 4c5441ac587e4bd2d76e074cf5cfc1b7ef2514e9ec3323bd986930c033d535f37acc3c0c1e30901e97903b226cc920689ce8f94274766bfe82f39952ada3a891
+  metadata.gz: 74d9fee35c7054c62b1392c8930ef0657d3b0848baf91b83e4859d8548816b0beccaaf853e01527c5a4229780873d5a3aeea1271c30ec91a043cc6dab770437f
+  data.tar.gz: 9bfb0af609185bc6ed874715f2c5c79882851143f98d7b6281e66a769a9b07ee13cc2d13c1c9f561b55c7deadac5c27f4fb501070a7cfbfbd8b95f098c72d2f0

data/lib/audio_monster/monster.rb

@@ -19,6 +19,17 @@ module AudioMonster
     include Configuration
     include ::NuWav
 
+    # when we want to be sure a format string is chosen
+    # esp. when mimemagic has multiple options
+    COMMON_EXTENSIONS = {
+      'application/xml' => 'xml',
+      'audio/mpeg' => 'mp3',
+      'audio/mp4'  => 'm4a',
+      'audio/ogg'  => 'ogg',
+      'image/jpeg' => 'jpg',
+      'text/plain' => 'txt'
+    }
+
     def initialize(options={})
       apply_configuration(options)
       check_binaries if ENV['AUDIO_MONSTER_DEBUG']
@@ -215,54 +226,67 @@ module AudioMonster
       return [out, err]
     end
 
-    def info_for_mpeg(mpeg_path, info = nil)
-      logger.debug "info_for_mpeg: start"
-      length = audio_file_duration(mpeg_path)
-      info ||= Mp3Info.new(mpeg_path)
-      result = {
-        :size         => File.size(mpeg_path),
-        :content_type => 'audio/mpeg',
-        :channel_mode => info.channel_mode,
-        :bit_rate     => info.bitrate,
-        :length       => [info.length.to_i, length.to_i].max,
-        :sample_rate  => info.samplerate,
-        :version      => info.mpeg_version, # mpeg specific
-        :layer        => info.layer # mpeg specific
-      }
-
-      # indicate this can be GC'd
-      info = nil
-
-      result
+    def info_for(path)
+      ct = content_type(path)
+      mm = MimeMagic.new(ct)
+      if respond_to?("info_for_#{mm.mediatype}")
+        send("info_for_#{mm.mediatype}", path)
+      else
+        basic_info_for_file(path)
+      end
     end
 
-    alias info_for_mp2 info_for_mpeg
-    alias info_for_mp3 info_for_mpeg
-
-    def info_for_wav(wav_file_path)
-      wf = WaveFile.parse(wav_file_path)
-      fmt = wf.chunks[:fmt]
+    def basic_info_for_file(path)
+      ct = content_type(path)
+      mm = MimeMagic.new(ct)
       {
-        :size         => File.size(wav_file_path),
-        :content_type => 'audio/vnd.wave',
-        :channel_mode => fmt.number_of_channels <= 1 ? 'Mono' : 'Stereo',
-        :bit_rate     => (fmt.byte_rate * 8) / 1000, #kilo bytes per sec
-        :length       => wf.duration,
-        :sample_rate  => fmt.sample_rate
+        size: File.size(path),
+        content_type: ct,
+        format: common_extensions(ct) || mm.extensions.first
       }
     end
 
+    def common_extensions(content_type)
+      COMMON_EXTENSIONS[content_type]
+    end
+
     def info_for_audio(path)
       info = audio_file_info_ffprobe(path)
-      {
-        size:         info['format']['size'].to_i,
-        content_type: (MimeMagic.by_path(path) || MimeMagic.by_magic(path)).to_s,
+      audio_info = {
         format:       audio_file_format(path, info),
         channel_mode: audio_file_channels(path, info) <= 1 ? 'Mono' : 'Stereo',
+        channels:     audio_file_channels(path, info),
         bit_rate:     audio_file_bit_rate(path, info),
         length:       audio_file_duration(path, info),
         sample_rate:  audio_file_sample_rate(path, info)
       }
+      basic_info_for_file(path).merge(audio_info)
+    end
+
+    def info_for_mpeg(path, info = nil)
+      info = info_for_audio(path)
+      mp3_info ||= Mp3Info.new(path)
+      info[:version] = mp3_info.mpeg_version
+      info[:layer] = mp3_info.layer
+      info[:padding] = mp3_info.header[:padding]
+      info
+    end
+
+    alias info_for_mp2 info_for_mpeg
+    alias info_for_mp3 info_for_mpeg
+
+    def content_type(path)
+      mime_magic_content_type(path) || file_content_type(path)
+    end
+
+    def mime_magic_content_type(path)
+      (MimeMagic.by_path(path) || MimeMagic.by_magic(path)).to_s
+    end
+
+    def file_content_type(path)
+      check_local_file(path)
+      out, err = run_command("#{bin(:file)} --brief --mime-type '#{path}'", nice: 'n', echo_return: false)
+      out.chomp
     end
 
     def audio_file_format(path, info = nil)
@@ -1006,7 +1030,7 @@ module AudioMonster
       if name.to_s.starts_with?('encode_wav_pcm_from_')
         decode_audio(*args)
       elsif name.to_s.starts_with?('info_for_')
-        info_for_audio(*args)
+        info_for(*args)
       else
         super
       end

data/lib/audio_monster/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module AudioMonster
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/test/files/test.txt

@@ -0,0 +1,44 @@
+Authorities arrested a suspect Wednesday in the fatal bombings at the Boston Marathon, a federal law enforcement source told CNN's Fran Townsend.
+Details about the suspect's identity and motive were not immediately available. News of the arrest was first reported by CNN.
+Investigators identified the suspect based on two videos taken before Monday's attack, the federal law enforcement source told Townsend.
+One of the videos was surveillance footage taken at the nearby Lord & Taylor department store, the other was shot by a Boston television station, a source who has has been briefed on the investigation exclusively told CNN's John King.
+The development came after a chaotic day in which investigators revealed more details about the makeup of the bombs and apparently unrelated scares over letters containing ricin gripped the nation's capital.
+The bombs exploded 12 seconds apart near the finish line of the Boston Marathon, killing three people and wounding about 180 others.
+One of the bombs was housed in a pressure cooker hidden inside a backpack, the FBI said in a joint intelligence bulletin. The device also had fragments that may have included nails, BBs and ball bearings, the agency said.
+The second bomb was also housed in a metal container, but it was not clear whether it too was in a pressure cooker, the FBI said.
+The U.S. government has warned federal agencies in the past that terrorists could turn pressure cookers into bombs by packing them with explosives and shrapnel and detonating them with blasting caps.
+The bombs
+Photos obtained by CNN show the remains of a pressure cooker found at the scene, along with a shredded black backpack and what appear to be metal pellets or ball bearings.
+Scraps of at least one pressure cooker, nails and nylon bags found at the scene were sent to the FBI's national laboratory in Virginia, where technicians will try to reconstruct the devices, the agent leading the investigation said Tuesday.
+The pieces suggest each of the devices was 6 liters (about 1.6 gallons) in volume, a Boston law enforcement source said. The recovered parts include part of a circuit board, which might have been used to detonate a device.
+A law enforcement official said Monday's bombs were probably detonated by timers. But the FBI said details of the detonating system were unknown.
+While the clues moved the investigation forward, they did not make it immediately apparent whether the attack was an act of domestic or foreign terrorism.
+ Tracking suspects in the Boston bombings New clues in Boston Marathon attack
+Photos: Nation mourns Boston bomb victims
+ Photos: Deadly attack at Boston Marathon
+"If your experience and your expertise is Middle East terrorism, it has the hallmarks of al Qaeda or a Middle East group," former FBI Assistant Director Tom Fuentes said. "If your experience is domestic groups and bombings that have occurred here, it has the hallmarks of a domestic terrorist like Eric Rudolph in the 1996 Atlanta Summer Olympics bombings."
+Things we know
+Fuentes said he has investigated both types of terrorism -- from Iraq to the United States -- and finds the Boston attack has elements of both. "It has the hallmarks of both domestic and international (attacks), and you can see either side of that."
+Opinion: Why is this so rare?
+Third victim identified
+Boston University identified graduate student Lingzu Lu as the third person who died in Monday's bombings.
+Previously identified were Krystle Campbell, 29, of Arlington, Massachusetts, and Martin Richard, 8, of Dorchester, Massachusetts.
+"She was the best," Campbell's distraught mother, Patty, told reporters Tuesday. "You couldn't ask for a better daughter."
+Martin "was a bright, energetic young boy who had big dreams and high hopes for his future," his school said in a statement. "We are heartbroken by this loss."
+ Source: Bomb was in pressure cooker Boston doctor: 'Everyone was my patient' Remembering 8-year-old Martin Richard
+The hunt for the attacker
+The attack left Boston police with "the most complex crime scene that we've dealt with in the history of our department," Commissioner Ed Davis said Tuesday.
+Authorities sifted through thousands of pieces of evidence and a mass of digital photos and video clips leading up to Wednesday's arrest. They had pleaded for the public's help in providing additional leads and images.
+"Someone knows who did this," said Rick DesLauriers, the special agent in charge of the FBI's Boston office said prior to the arrest. "Cooperation from the community will play a crucial role in this investigation."
+Medical personnel treating the wounded found evidence suggesting the bombmaker or bombmakers sought to maximize the suffering.
+Dr. George Velmahos, head of trauma care at Massachusetts General Hospital, said his team found metal pellets and nails inside patients' bodies.
+"They are numerous. There are people who have 10, 20, 30, 40 of them in their body, or more," Velmahos said.
+While most of the patients treated at Brigham and Women's Hospital were wounded by "ordinary debris," three were struck by "perfectly round objects" that were uniform, consistent and metallic, the hospital's chairman of emergency medicine said.
+'Human spirit' still alive
+Dr. Ron Walls also said one patient had more than 12 carpenter-type nails.
+"There is no question some of these objects were implanted in the device for the purpose of being exploded forward," he said.
+Victims continue recovery
+As investigators closed in on the suspect, those wounded in the incident continued to recover.
+Boston Medical Center has two patients in critical condition, down from 11 just after the bombings, Dr. Peter Burke, chief of trauma care, told reporters Wednesday. Ten patients are in serious condition and seven are in fair condition, he said.
+The incident deeply affected thousands, including Candace Rispoli, who was cheering on a friend when the festive atmosphere turned into a "terrifying hell." She suffered minor injuries.
+"I personally will never participate in an event of this nature in a city in fear that something like this could happen again," she said. "I keep replaying the moments of terror over and over in my head and am just still in utter shock. Always seeing terrible things of this nature happen all over the world on TV, my heart would always go out to those directly affected. But I never imagined in a million years I would be a spectator at the Boston Marathon running for my life."

data/test/monster_test.rb

@@ -28,13 +28,13 @@ describe AudioMonster::Monster do
 
   it 'can validate an mpeg audio file\'s attributes' do
     validations = {
-      :version=>2,
-      :layer=>3,
-      :channel_mode=>['Joint Stereo', 'Stereo'],
-      :channels=>2,
-      :sample_rate=>'<= 44000',
-      :bit_rate=>'< 100',
-      :per_channel_bit_rate=>'>= 256'
+      version: 2,
+      layer: 3,
+      channel_mode: ['Joint Stereo', 'Stereo'],
+      channels: 2,
+      sample_rate: '<= 44000',
+      bit_rate: '< 100',
+      per_channel_bit_rate: '>= 256'
     }
 
     errors, info = monster.validate_mpeg(in_file('test_long.mp2'), validations)
@@ -75,7 +75,7 @@ describe AudioMonster::Monster do
 
   it 'should get the length using soxi' do
     info = monster.info_for_mpeg(in_file('test_long.mp2'))
-    info[:length].must_equal 48
+    info[:length].to_i.must_equal 48
   end
 
   it 'should get info for ogg file' do
@@ -129,14 +129,14 @@ describe AudioMonster::Monster do
     File.extname(file.path).must_equal '.exten'
   end
 
-  describe 'test info' do
+  describe 'test audio file info' do
     let(:audio_files) do
       {
-        'test_short.mp2' => ['mp2', 5, 2, 48000, 256],
-        'test_long.mp3' => ['mp3', 48, 1, 44100, 128],
-        'test.ogg' => ['ogg', 12, 2, 44100, 128],
-        'test.flac' => ['flac', 15, 2, 44100, 246],
-        'test_short.wav' => ['wav', 5, 2, 48000, 1536]
+        'test_short.mp2' => ['mp2', 5, 2, 48000, 256, 'audio/mp2'],
+        'test_long.mp3' => ['mp3', 48, 1, 44100, 128, 'audio/mpeg'],
+        'test.ogg' => ['ogg', 12, 2, 44100, 128, 'audio/ogg'],
+        'test.flac' => ['flac', 15, 2, 44100, 246, 'audio/flac'],
+        'test_short.wav' => ['wav', 5, 2, 48000, 1536, 'audio/x-wav']
       }
     end
 
@@ -151,31 +151,36 @@ describe AudioMonster::Monster do
 
     it 'can get the format of a file' do
       audio_files.keys.each do |file|
-        monster.audio_file_format(in_file(file)).must_equal audio_files[file][0]
+        info = monster.info_for_audio(in_file(file))
+
+        info[:format].must_equal audio_files[file][0]
+        info[:length].to_i.must_equal audio_files[file][1]
+        info[:channels].must_equal audio_files[file][2]
+        info[:sample_rate].must_equal audio_files[file][3]
+        info[:bit_rate].must_equal audio_files[file][4]
+        info[:content_type].must_equal audio_files[file][5]
       end
     end
+  end
 
-    it 'can get the duration of a file' do
-      audio_files.keys.each do |file|
-        monster.audio_file_duration(in_file(file)).to_i.must_equal audio_files[file][1]
-      end
-    end
+  describe 'test audio file info' do
 
-    it 'can get the number of channels for a file' do
-      audio_files.keys.each do |file|
-        monster.audio_file_channels(in_file(file)).must_equal audio_files[file][2]
-      end
+    let(:other_files) do
+      {
+        'test.txt' => ['txt', 'text/plain', 6463],
+        'test.gif' => ['gif', 'image/gif', 708713],
+        'test.jpg' => ['jpg', 'image/jpeg', 823925],
+        'test.png' => ['png', 'image/png', 2035485]
+      }
     end
 
-    it 'can get the sample rate of a file' do
-      audio_files.keys.each do |file|
-        monster.audio_file_sample_rate(in_file(file)).must_equal audio_files[file][3]
-      end
-    end
+    it 'gets the format, content type, and size' do
+      other_files.keys.each do |file|
+        info = monster.info_for(in_file(file))
 
-    it 'can get the bit rate of a file' do
-      audio_files.keys.each do |file|
-        monster.audio_file_bit_rate(in_file(file)).must_equal audio_files[file][4]
+        info[:format].must_equal other_files[file][0]
+        info[:content_type].must_equal other_files[file][1]
+        info[:size].must_equal other_files[file][2]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audio_monster
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nu_wav
@@ -142,7 +142,11 @@ files:
 - lib/audio_monster/version.rb
 - test/audio_monster_test.rb
 - test/files/test.flac
+- test/files/test.gif
+- test/files/test.jpg
 - test/files/test.ogg
+- test/files/test.png
+- test/files/test.txt
 - test/files/test_long.mp2
 - test/files/test_long.mp3
 - test/files/test_long.wav
@@ -179,7 +183,11 @@ summary: audio_monster manipulates and transcodes audio
 test_files:
 - test/audio_monster_test.rb
 - test/files/test.flac
+- test/files/test.gif
+- test/files/test.jpg
 - test/files/test.ogg
+- test/files/test.png
+- test/files/test.txt
 - test/files/test_long.mp2
 - test/files/test_long.mp3
 - test/files/test_long.wav