jazz_model 0.1.0 → 0.2.0

data/lib/jazz_model/chord_symbol.rb

@@ -1,27 +1,29 @@
 module JazzModel
   # A standard chord symbol (if there is such a thing...).
   # Several chord symbols can be associated with a given chord,
-  # and each chord can be designated +case_sensitive+ or not, to handle 
-  # cases such as M representing Major and m representing minor. 
-  # Act as a list to facilitate preference ordering.  May abandong this 
+  # and each chord can be designated +case_sensitive+ or not, to handle
+  # cases such as M representing Major and m representing minor.
+  # Act as a list to facilitate preference ordering.  May abandong this
   # in the future to prefer a simple +primary+ designation.
-  # 
+  #
   # == Associations
-  # 
+  #
   # * +chord+ - Chord associated with the chord symbol.
-  # 
+  #
   class ChordSymbol < JazzModel::Base
     belongs_to :chord
-  
+
     class << self
       # Finds a chord symbol
       def resolve(symbol)
-        self.all.detect do |cs|
-          cs.case_sensitive? ? (cs.name == symbol) : (cs.name.downcase == symbol.downcase)
-        end
+        all.detect { |cs| cs.matches?(symbol) }
       end
       alias_method :[], :resolve
     end
-  
+
+    # Tests whether +symbol+ matches this chord symbol, respecting case sensitivity.
+    def matches?(symbol)
+      case_sensitive? ? name == symbol : name.casecmp?(symbol)
+    end
   end
-end
+end

data/lib/jazz_model/chord_symbol_collection.rb

@@ -1,17 +1,10 @@
 module JazzModel
   # Module mixin for Chord symbols
   module ChordSymbolCollection
-  
-    # WARNING: This is basically duplicated from ChordSymbol
-    # Find way to make this DRY!
-    # 
-    # Finds a chord symbol
+    # Finds a chord symbol within the collection
     def resolve(symbol)
-      self.detect do |cs|
-        cs.case_sensitive? ? (cs.name == symbol) : (cs.name.downcase == symbol.downcase)
-      end
+      detect { |cs| cs.matches?(symbol) }
     end
     alias_method :[], :resolve
-  
   end
-end
+end

data/lib/jazz_model/chord_tone.rb

@@ -1,32 +1,31 @@
 module JazzModel
-  # Represents one non-octval tone in a chord.  Chord tones are not ordered 
-  # and arrays of chord tones should be compared using +to_set+. 
-  # 
+  # Represents one non-octval tone in a chord.  Chord tones are not ordered
+  # and arrays of chord tones should be compared using +to_set+.
+  #
   # == Attributes
-  # 
-  # * +tone+ - A tone index from 0-11 representing the relative position of the 
+  #
+  # * +tone+ - A tone index from 0-11 representing the relative position of the
   #   tone within the chromatic scale.
-  # 
-  # * +letter_index+ - A 0-6 value representing the relative letter position, which 
+  #
+  # * +letter_index+ - A 0-6 value representing the relative letter position, which
   #   helps to disambiguate theoretic values such as Eb and D#.  See +Key+.
-  # 
-  # * +strength+ - A strength metric representing the tonal strength of the tone 
-  #   within the context of the chord.  Lower numbers are stronger.  Zero always 
+  #
+  # * +strength+ - A strength metric representing the tonal strength of the tone
+  #   within the context of the chord.  Lower numbers are stronger.  Zero always
   #   represents the root of the chord and any guide tones should be defined as one.
-  # 
-  # * +omitable+ - Specifies whether the tone can commonly be ommitted in jazz voicings 
+  #
+  # * +omitable+ - Specifies whether the tone can commonly be ommitted in jazz voicings
   #   for this chord.  For example, the root and the fifth are often not necessary.
-  # 
+  #
   # == Key Context
-  # 
+  #
   #  +key+ is delgated to chord to access the chord's key context.
-  # 
+  #
   class ChordTone < Tone
     belongs_to :chord
-  
-    acts_as_list :scope => :chord
-  
-    delegate :key, :to => :chord
-  
+
+    acts_as_list scope: :chord
+
+    delegate :key, to: :chord
   end
-end
+end

data/lib/jazz_model/definition.rb

@@ -2,11 +2,11 @@ module JazzModel
   class Definition
     cattr_accessor :definitions
     @@definitions = []
-    
+
     attr_reader :name
     attr_reader :definition
     attr_reader :included_definitions
-    
+
     def initialize(name = nil, &block)
       if name.is_a?(Hash)
         raise ArgumentError, "Only one hash key expected" if name.keys.size > 1
@@ -16,51 +16,51 @@ module JazzModel
         @name = name
         @included_definitions = []
       end
-      
+
       @definition = block
       @loaded = false
-      
+
       @@definitions << self
     end
-    
+
     def loaded?
       !!@loaded
     end
-    
+
     def self.[](name)
-      definitions.find {|d| d.name.to_s == name.to_s }
+      definitions.find { |d| d.name.to_s == name.to_s }
     end
-    
+
     def self.define(name, &block)
-      definition = self.new(name, &block)
+      new(name, &block)
     end
-    
+
     def self.load(name)
-      if definition = self[name]
+      if (definition = self[name])
         definition.load
       else
         raise ArgumentError, "No definition known '#{name}'."
       end
     end
-    
+
     def ensure_loaded
       load unless loaded?
     end
-    
+
     def load
       (all_included_definitions.uniq - [self]).each do |d|
         self.class[d].ensure_loaded
       end
-      
+
       instance_eval(&@definition)
-      
+
       @loaded = true
     end
-    
+
     def all_included_definitions
-      (@included_definitions.map {|d| self.class[d].try(:all_included_definitions) } + @included_definitions).flatten.compact.uniq
+      (@included_definitions.map { |d| self.class[d].try(:all_included_definitions) } + @included_definitions).flatten.compact.uniq
     end
   end
 end
 
-Dir[File.join(File.dirname(__FILE__), "definitions", "*.rb")].each {|f| require f}
+Dir[File.join(File.dirname(__FILE__), "definitions", "*.rb")].each { |f| require f }