music-transcription 0.3.0 → 0.4.0

data/spec/spec_helper.rb

@@ -5,19 +5,7 @@ include Music::Transcription
 
 class Samples
   SAMPLE_PART = Part.new(
-    :notes => [
-      Note.new(
-        :duration => 0.25,
-        :intervals => [
-          Interval.new( :pitch => C1 ),
-          Interval.new( :pitch => D1 ),
-        ]
-      )
-    ],
-    :loudness_profile => profile(
-      0.5, {
-        1.0 => linear_change(1.0, 2.0)
-      }
-    )
+    :notes => [ Note.new(0.25, [ C1, D1 ]) ],
+    :loudness_profile => Profile.new(0.5, 1.0 => linear_change(1.0, 2.0))
   )
 end

data/spec/transition_spec.rb

@@ -1,13 +1,31 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Transition do
+  describe Transition::Immediate do
+    describe '.new' do
+      it "should assign duration of 0" do
+        t = Transition::Immediate.new()
+        t.duration.should eq(0)
+      end
+    end
+  end
   
-  context '.new' do
-    it "should assign duration and type given during construction" do
-      t = Transition.new(:duration => 1.5, :type => Transition::LINEAR)
-      t.duration.should eq(1.5)
-      t.type.should eq(Transition::LINEAR)
+  describe Transition::Linear do
+    describe '.new' do
+      it "should assign duration given" do
+        t = Transition::Linear.new(1.5)
+        t.duration.should eq(1.5)
+      end
     end
   end
-
-end
+  
+  describe Transition::Immediate do
+    describe '.new' do
+      it "should assign duration and abruptness given" do
+        t = Transition::Sigmoid.new(1.2, 0.4)
+        t.duration.should eq(1.2)
+        t.abruptness.should eq(0.4)
+      end
+    end
+  end
+end

data/spec/value_change_spec.rb

@@ -4,14 +4,14 @@ describe ValueChange do
   
   context '.new' do
     it "should assign offset, value, and duration given during construction" do
-      event = ValueChange.new(:value => 0)
+      event = ValueChange.new(0)
       event.value.should eq(0)
-      event.transition.type.should eq(Transition::IMMEDIATE)
+      event.transition.class.should eq(Transition::Immediate)
       event.transition.duration.should eq(0)
       
-      event = ValueChange.new(:value => 2, :transition => linear(3))
+      event = ValueChange.new(2, Transition::Linear.new(3))
       event.value.should eq(2)
-      event.transition.type.should eq(Transition::LINEAR)
+      event.transition.class.should eq(Transition::Linear)
       event.transition.duration.should eq(3)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: music-transcription
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,32 +9,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: hashmake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '1.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rubygems-bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ dependencies:
 description: ! "The goal of music-transcription is the abstract representation of
   standard \nmusical features such as pitch, note, loudness, tempo, etc. Establishing\na
   common representation enables composition and performance.\n"
-email: jamestunnell@lavabit.com
+email: jamestunnell@gmail.com
 executables:
 - transcribe
 extensions: []
@@ -135,6 +135,7 @@ files:
 - .document
 - .gitignore
 - .rspec
+- .ruby-version
 - .yardopts
 - ChangeLog.rdoc
 - Gemfile
@@ -143,9 +144,8 @@ files:
 - Rakefile
 - bin/transcribe
 - lib/music-transcription.rb
-- lib/music-transcription/arrangement.rb
-- lib/music-transcription/instrument_config.rb
-- lib/music-transcription/interval.rb
+- lib/music-transcription/accent.rb
+- lib/music-transcription/errors.rb
 - lib/music-transcription/link.rb
 - lib/music-transcription/note.rb
 - lib/music-transcription/part.rb
@@ -177,8 +177,6 @@ files:
 - samples/arrangements/slur_test.yml
 - samples/arrangements/song1.yml
 - samples/arrangements/song2.yml
-- spec/instrument_config_spec.rb
-- spec/interval_spec.rb
 - spec/link_spec.rb
 - spec/musicality_spec.rb
 - spec/note_spec.rb
@@ -205,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4504170498906695205
+      hash: 4349874836488789101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4504170498906695205
+      hash: 4349874836488789101
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -223,8 +221,6 @@ specification_version: 3
 summary: Classes for representing music notational features like pitch, note, loudness,
   tempo, etc.
 test_files:
-- spec/instrument_config_spec.rb
-- spec/interval_spec.rb
 - spec/link_spec.rb
 - spec/musicality_spec.rb
 - spec/note_spec.rb

data/lib/music-transcription/arrangement.rb

@@ -1,31 +0,0 @@
-module Music
-module Transcription
-
-# Contains a Score object, and also instrument configurations to be assigned to
-# score parts.
-class Arrangement
-  include Hashmake::HashMakeable
-  
-  # specifies which hashed args can be used for initialize.
-  ARG_SPECS = {
-    :score => arg_spec(:reqd => true, :type => Score),
-    :instrument_configs => arg_spec_hash(:reqd => false, :type => InstrumentConfig),
-  }
-
-  attr_reader :score, :instrument_configs
-  
-  def initialize args
-    hash_make args, Arrangement::ARG_SPECS
-  end
-  
-  # Assign a new score.
-  # @param [Score] score The new score.
-  # @raise [ArgumentError] if score is not a Score.
-  def score= score
-    Arrangement::ARG_SPECS[:score].validate_value score
-    @score = score
-  end
-end
-
-end
-end

data/lib/music-transcription/instrument_config.rb

@@ -1,38 +0,0 @@
-module Music
-module Transcription
-
-# Contains all the information needed to create the instrument plugin, configure
-# initial settings, and any settings changes.
-#
-# @author James Tunnell
-class InstrumentConfig
-  include Hashmake::HashMakeable
-
-  attr_reader :plugin_name, :initial_settings, :setting_changes
-
-  # hashed-arg specs (for hash-makeable idiom)
-  ARG_SPECS = {
-    :plugin_name => arg_spec(:reqd => true, :type => String),
-    :initial_settings => arg_spec(:reqd => false, :default => ->(){ {} }, :validator => ->(a){ a.is_a?(String) || a.is_a?(Array) || a.is_a?(Hash)} ),
-    :setting_changes => arg_spec_hash(:reqd => false, :type => Hash)
-  }
-  
-  # A new instance of InstrumentConfig.
-  # @param [Hash] args Hashed arguments. Required key is :plugin_name (String).
-  #                    Optional key is :initial_settings and setting_changes.
-  def initialize args={}
-    hash_make args, InstrumentConfig::ARG_SPECS
-    
-    @setting_changes.each do |offset, hash|
-      hash.each do |key, val|
-        # replace plain values with immediate value changes
-        unless val.is_a?(ValueChange)
-          hash[keys] = immediate_change(val)
-        end
-      end
-    end
-  end
-end
-
-end
-end

data/lib/music-transcription/interval.rb

@@ -1,66 +0,0 @@
-module Music
-module Transcription
-
-# Describes a pitch (for one note) that can be linked to a pitch in another note.
-#
-# @author James Tunnell
-#
-# @!attribute [rw] pitch
-#   @return [Pitch] The pitch of the note.
-#
-# @!attribute [rw] link
-#   @return [Link] Shows how the current note is related to a following note.
-#
-class Interval
-  include Hashmake::HashMakeable
-  attr_reader :pitch, :link
-  
-  # hashed-arg specs (for hash-makeable idiom)
-  ARG_SPECS = {
-    :pitch => arg_spec(:type => Pitch, :reqd => true),
-    :link => arg_spec(:type => Link, :reqd => false, :default => ->(){ Link.new } ),
-  }
-  
-  def initialize args
-    hash_make args
-  end
-  
-  # Return true if the @link relationship is not NONE.
-  def linked?
-    @link.relationship != Link::RELATIONSHIP_NONE
-  end
-
-  # Compare the equality of another Interval object.
-  def == other
-    return (@pitch == other.pitch) && (@link == other.link)
-  end
-  
-  # Set the note pitch.
-  # @param [Pitch] pitch The pitch to use.
-  # @raise [ArgumentError] if pitch is not a Pitch.
-  def pitch= pitch
-    ARG_SPECS[:pitch].validate_value pitch
-    @pitch = pitch
-  end
-
-  # Setup the relationship to a following note.
-  # @param [Link] link The Link object to assign.
-  def link= link
-    ARG_SPECS[:link].validate_value link
-    @link = link
-  end
-
-  # Produce an identical Note object.
-  def clone
-    Interval.new(:pitch => @pitch, :link => @link.clone)
-  end
-end
-
-module_function
-
-def interval pitch, link = Link.new
-  Interval.new(:pitch => pitch, :link => link)
-end
-
-end
-end

data/spec/instrument_config_spec.rb

@@ -1,47 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe InstrumentConfig do
-
-  it "should assign the given name" do
-    cfg = InstrumentConfig.new :plugin_name => "MyPluginName"
-    cfg.plugin_name.should eq("MyPluginName")
-  end
-  
-  it "should assign the given initial settings" do
-    settings = {
-      :volume => 0.5,
-      :gain => 0.75,
-    }
-    cfg = InstrumentConfig.new :plugin_name => "MyPluginName", :initial_settings => settings
-    cfg.initial_settings.should eq(settings)
-  end
-
-  it "should allow a String to be given as initial settings" do
-    settings = "preset A"
-    cfg = InstrumentConfig.new :plugin_name => "MyPluginName", :initial_settings => settings
-    cfg.initial_settings.should eq(settings)
-  end
-  
-  it "should allow an Array to be given as initial settings" do
-    settings = ["preset A","preset B"]
-    cfg = InstrumentConfig.new :plugin_name => "MyPluginName", :initial_settings => settings
-    cfg.initial_settings.should eq(settings)
-  end
-  
-  it "should assign each of the given setting changes" do
-    setting_changes = {
-      1.0 => {
-        :volume => ValueChange.new(:value => 0.5),
-        :gain => ValueChange.new(:value => 0.75),
-      },
-      4.0 => {
-        :volume => ValueChange.new(:value => 0.1),
-        :gain => ValueChange.new(:value => 0.1),
-      }
-    }
-    
-    cfg = InstrumentConfig.new :plugin_name => "MyPluginName", :setting_changes => setting_changes
-    cfg.setting_changes.should eq(setting_changes)
-  end
-
-end

data/spec/interval_spec.rb

@@ -1,38 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Interval do
-  before :all do
-    @pitch = C4
-  end
-  
-  context '.new' do
-    it "should assign :pitch parameter given during construction" do
-      interval = Interval.new :pitch => @pitch
-      interval.pitch.should eq(@pitch)
-    end
-    
-    it "should assign :link parameter if given during construction" do
-      link = Link.new(:relationship => Link::RELATIONSHIP_TIE, :target_pitch => @pitch)
-      interval = Interval.new :pitch => @pitch, :link => link
-      interval.link.should eq(link)
-    end
-  end
-  
-  context '#pitch=' do
-    it "should assign pitch" do
-      interval = Interval.new :pitch => @pitch
-      interval.pitch = Gb4
-      interval.pitch.should eq Gb4
-    end
-  end
-  
-  context '#link=' do
-    it "should assign link" do
-      link = Link.new(:relationship => Link::RELATIONSHIP_SLUR, :target_pitch => G2)
-      interval = Interval.new :pitch => @pitch
-      interval.link = link
-      interval.link.should eq(link)
-    end
-  end
-
-end