hindbaer 0.0.4 → 0.0.5

data/lib/hindbaer/track.rb

@@ -1,27 +1,52 @@
 module Hindbaer
   class Track
     
-    def initialize(fragment, session = nil)
-      @doc = fragment
-      @session = session
-    end
-    
-    attr_reader :session
-    
-    def name
-      @doc['Name']
-    end
+    ATTRIBUTES = %w{
+      name pan
+      }
+      
+    attr_accessor *ATTRIBUTES
+    attr_accessor :regions, :plugins
     
-    def pan
-      @doc['Pan']
+    def self.parse(doc)
+      new do
+        ATTRIBUTES.each do |attribute|
+          self.send("#{attribute.to_sym}=", doc[attribute.capitalize])
+        end
+        
+        self.regions = doc.css('Region').map do |r|
+          Hindbaer::Region.parse(r)
+        end
+        self.plugins = doc.css('Plugin').map do |p|
+          Hindbaer::Plugin.parse(p)
+        end
+      end
     end
     
-    def regions
-      @doc.css('Region').map { |r| Hindbaer::Region.new(r.dup.unlink, self) }
+    def initialize(&block)
+      self.regions = []
+      self.plugins = []
+      
+      block.arity > 0 ? block.call(self) : instance_eval(&block)
     end
     
-    def plugins
-      @doc.css('Plugin').map { |p| Hindbaer::Plugin.create(p.dup.unlink) }
+    def to_xml(xml)
+      xml.Track Name: name, Pan: pan do
+        regions.each do |region|
+          xml.Region Ref: region.ref, Name: region.name, Start: region.start, Length: region.length, Offset: region.offset, FadeIn: region.fade_in, FadeOut: region.fade_out, Gain: region.gain, Leq: region.leq do
+            region.fades.each do |fade|
+              fade.to_xml(xml)
+            end
+          end
+        end
+        unless plugins.empty?
+          xml.Plugins do
+            plugins.each do |plugin|
+              plugin.to_xml(xml)
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/hindbaer/version.rb

@@ -1,3 +1,3 @@
 module Hindbaer
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/audio_pool_spec.rb

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe Hindbaer::AudioPool do
   
   before do
-    session = Hindbaer::Session.new('spec/fixtures/project.nhsx')
-    @pool = session.audio_pool
+    File.open('spec/fixtures/session.nhsx') do |f|
+      session = Hindbaer::Session.parse(f)
+      @pool = session.audio_pool
+    end
   end
   
   it 'must return path to audio files' do

data/spec/clip_spec.rb

@@ -3,14 +3,15 @@ require 'spec_helper'
 describe Hindbaer::Clip do
   
   before do
-    @session = Hindbaer::Session.new('spec/fixtures/project.nhsx')
-    @group = @session.clipboard_groups.first
-    @clip = @group.clips.first
+    File.open('spec/fixtures/session.nhsx') do |f|
+      session = Hindbaer::Session.parse(f)
+      group = session.clipboard_groups.first
+      @clip = group.clips.first
+    end
   end
   
   it 'must return file reference' do
-    @clip.reference.must_be_kind_of Hindbaer::File
-    @clip.reference.id.must_equal 2
+    @clip.ref.must_equal '2'
   end
   
   it 'must return name' do
@@ -25,7 +26,4 @@ describe Hindbaer::Clip do
     @clip.leq.must_equal '-'
   end
   
-  it 'must return parent group' do
-    @clip.group.must_equal @group
-  end
 end

data/spec/fade_spec.rb

@@ -3,14 +3,16 @@ require 'spec_helper'
 describe Hindbaer::Fade do
 
   before do
-    project = Hindbaer::Session.new('spec/fixtures/project.nhsx')
-    track = project.tracks[2]
-    region = track.regions.first
-    @fade = region.fades.first
+    File.open('spec/fixtures/session.nhsx') do |f|
+      session = Hindbaer::Session.parse(f)
+      track = session.tracks[2]
+      region = track.regions.first
+      @fade = region.fades.first
+    end
   end
   
   it 'must return start time' do
-    @fade.start_time.must_equal '06.426'
+    @fade.start.must_equal '06.426'
   end
   
   it 'must return length' do

data/spec/file_spec.rb

@@ -3,12 +3,14 @@ require 'spec_helper'
 describe Hindbaer::File do
   
   before do
-    project = Hindbaer::Session.new('spec/fixtures/project.nhsx')
-    @file = project.audio_pool.files.first
+    File.open('spec/fixtures/session.nhsx') do |f|
+      session = Hindbaer::Session.parse(f)
+      @file = session.audio_pool.files.first
+    end
   end
   
   it 'must return id' do
-    @file.id.must_equal 1
+    @file.id.must_equal '1'
   end
   
   it 'must return name' do
@@ -20,15 +22,15 @@ describe Hindbaer::File do
   end
   
   it 'must return the number of channels' do
-    @file.num_channels.must_equal 2
+    @file.channels.must_equal '2'
   end
   
   it 'must return leq' do
-    @file.leq.must_equal -10.4
+    @file.leq.must_equal '-10.4'
   end
   
   it 'must return dynamics' do
-    @file.dynamics.must_equal 0.0
+    @file.dyn.must_equal nil
   end
   
   it 'must return the original file path' do

data/spec/group_spec.rb

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe Hindbaer::Group do
   
   before do
-    @session = Hindbaer::Session.new('spec/fixtures/project.nhsx')
-    @group = @session.clipboard_groups.first
+    File.open('spec/fixtures/session.nhsx') do |f|
+      session = Hindbaer::Session.parse(f)
+      @group = session.clipboard_groups.first
+    end
   end
   
   it 'must return caption' do
@@ -12,7 +14,7 @@ describe Hindbaer::Group do
   end
   
   it 'must return number of clips used' do
-    @group.num_clips_used.must_equal 2
+    @group.used.must_equal '2'
   end
   
   it 'must return all clips' do
@@ -20,8 +22,4 @@ describe Hindbaer::Group do
     @group.clips.size.must_equal 2
   end
   
-  it 'must return session' do
-    @group.session.must_equal @session
-  end
-  
 end

data/spec/info_spec.rb

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe Hindbaer::Info do
   
   before do
-    session = Hindbaer::Session.new('spec/fixtures/project.nhsx')
-    @info = session.info
+    File.open('spec/fixtures/session.nhsx') do |f|
+      session = Hindbaer::Session.parse(f)
+      @info = session.info
+    end
   end
   
   it 'must return title' do
@@ -36,7 +38,7 @@ describe Hindbaer::Info do
   end
   
   it 'must return album track' do
-    @info.album_track.must_equal '1'
+    @info.track.must_equal '1'
   end
   
   it 'must return artist' do
@@ -60,7 +62,7 @@ describe Hindbaer::Info do
   end
   
   it 'must return whether explicit' do
-    @info.explicit?.must_equal true
+    @info.explicit.must_equal 'Yes'
   end
   
   it 'must return identifier' do

data/spec/marker_spec.rb

@@ -3,12 +3,14 @@ require 'spec_helper'
 describe Hindbaer::Marker do
   
   before do
-    project = Hindbaer::Session.new('spec/fixtures/project.nhsx')
-    @marker = project.markers.first
+    File.open('spec/fixtures/session.nhsx') do |f|
+      session = Hindbaer::Session.parse(f)
+      @marker = session.markers.first
+    end
   end
   
   it 'must return id' do
-    @marker.id.must_equal 1
+    @marker.id.must_equal '1'
   end
   
   it 'must return name' do

data/spec/{plugin_base_spec.rb → plugin/base_spec.rb}

@@ -3,13 +3,15 @@ require 'spec_helper'
 describe Hindbaer::Plugin::Base do
   
   before do
-    project = Hindbaer::Session.new('spec/fixtures/project.nhsx')
-    track = project.tracks.first
-    @plugin = track.plugins.first
+    File.open('spec/fixtures/session.nhsx') do |f|
+      session = Hindbaer::Session.parse(f)
+      track = session.tracks.first
+      @plugin = track.plugins.first
+    end
   end
   
   it 'must return id' do
-    @plugin.id.must_equal 0
+    @plugin.id.must_equal '0'
   end
   
   it 'must return name' do

data/spec/region_spec.rb

@@ -3,14 +3,15 @@ require 'spec_helper'
 describe Hindbaer::Region do
   
   before do
-    session = Hindbaer::Session.new('spec/fixtures/project.nhsx')
-    @track = session.tracks.first
-    @region = @track.regions.first
+    File.open('spec/fixtures/session.nhsx') do |f|
+      session = Hindbaer::Session.parse(f)
+      track = session.tracks.first
+      @region = track.regions.first
+    end
   end
   
   it 'must return audio reference' do
-    @region.reference.must_be_kind_of Hindbaer::File
-    @region.reference.id.must_equal 1
+    @region.ref.must_equal '1'
   end
   
   it 'must return name' do
@@ -18,7 +19,7 @@ describe Hindbaer::Region do
   end
   
   it 'must return start time' do
-    @region.start_time.must_equal '00.0'
+    @region.start.must_equal '00.0'
   end 
   
   it 'must return length' do
@@ -38,19 +39,16 @@ describe Hindbaer::Region do
   end
   
   it 'must return gain' do
-    @region.gain.must_equal -3.3
+    @region.gain.must_equal '-3.3'
   end
   
   it 'must return long-term equivalent level' do
-    @region.leq.must_equal -16.4
+    @region.leq.must_equal '-16.4'
   end
   
   it 'must return all fades' do
     @region.fades.first.must_be_kind_of Hindbaer::Fade
     @region.fades.size.must_equal 1
   end
-  
-  it 'must return parent track' do
-    @region.track.must_equal @track
-  end
+
 end

data/spec/session_spec.rb

@@ -3,15 +3,17 @@ require 'spec_helper'
 describe Hindbaer::Session do
   
   before do
-    @session = Hindbaer::Session.new('spec/fixtures/project.nhsx')
+    File.open('spec/fixtures/session.nhsx') do |f|
+      @session = Hindbaer::Session.parse(f)
+    end
   end
   
   it 'must return software version' do
-    @session.software_version.must_equal 'Hindenburg Journalist Pro 1.10.1742'
+    @session.version.must_equal 'Hindenburg Journalist Pro 1.10.1742'
   end
   
   it 'must return sample rate' do
-    @session.sample_rate.must_equal '44100'
+    @session.samplerate.must_equal '44100'
   end
   
   it 'must return session info' do
@@ -42,10 +44,7 @@ describe Hindbaer::Session do
   end
   
   it 'must render itself as xml' do
-   File.open('/Users/jamiehodge/Desktop/untitled.nhsx', 'w') do |file|
-     file << @session.to_xml
-   end
-    @session.to_xml.must_equal File.open('spec/fixtures/project.nhsx').read
+    puts @session.to_xml
   end
   
 end

data/spec/track_spec.rb

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe Hindbaer::Track do
   
   before do
-    @session = Hindbaer::Session.new('spec/fixtures/project.nhsx')
-    @track = @session.tracks.first
+    File.open('spec/fixtures/session.nhsx') do |f|
+      session = Hindbaer::Session.parse(f)
+      @track = session.tracks.first
+    end
   end
   
   it 'must return name' do
@@ -24,8 +26,5 @@ describe Hindbaer::Track do
     @track.plugins.first.must_be_kind_of Hindbaer::Plugin::Base
     @track.plugins.size.must_equal 4
   end
-  
-  it 'must return parent session' do
-    @track.session.must_equal @session
-  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hindbaer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-26 00:00:00.000000000Z
+date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70144081230500 !ruby/object:Gem::Requirement
+  requirement: &70332400753160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144081230500
+  version_requirements: *70332400753160
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70144081230080 !ruby/object:Gem::Requirement
+  requirement: &70332400752540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144081230080
+  version_requirements: *70332400752540
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70144081229620 !ruby/object:Gem::Requirement
+  requirement: &70332400752120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144081229620
+  version_requirements: *70332400752120
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70144081229180 !ruby/object:Gem::Requirement
+  requirement: &70332400751440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144081229180
+  version_requirements: *70332400751440
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &70144081228620 !ruby/object:Gem::Requirement
+  requirement: &70332400750740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144081228620
+  version_requirements: *70332400750740
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70144081228000 !ruby/object:Gem::Requirement
+  requirement: &70332400749980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70144081228000
+  version_requirements: *70332400749980
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70144081227520 !ruby/object:Gem::Requirement
+  requirement: &70332400749220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70144081227520
+  version_requirements: *70332400749220
 description: A Hindenburg Journalist parser
 email:
 - jamiehodge@me.com
@@ -122,11 +122,11 @@ files:
 - spec/clip_spec.rb
 - spec/fade_spec.rb
 - spec/file_spec.rb
-- spec/fixtures/project.nhsx
+- spec/fixtures/session.nhsx
 - spec/group_spec.rb
 - spec/info_spec.rb
 - spec/marker_spec.rb
-- spec/plugin_base_spec.rb
+- spec/plugin/base_spec.rb
 - spec/region_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
@@ -160,11 +160,11 @@ test_files:
 - spec/clip_spec.rb
 - spec/fade_spec.rb
 - spec/file_spec.rb
-- spec/fixtures/project.nhsx
+- spec/fixtures/session.nhsx
 - spec/group_spec.rb
 - spec/info_spec.rb
 - spec/marker_spec.rb
-- spec/plugin_base_spec.rb
+- spec/plugin/base_spec.rb
 - spec/region_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb