musi 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b748d083bddb0e6ab09f09407fd66bbec7bd68e824c2a65d842319c214fd81bf
-  data.tar.gz: 55ef187bca090ec7f9fd38114997bb68add5c26055e316f707a4ee89c5df48b3
+  metadata.gz: 05013b57172445c7de43bc022ec4e27f3ae29e87209caaa2ec40160dab088066
+  data.tar.gz: 6ab87d588e9f75324caa8c1095849f8ec2c0ba4266923b15ed3005d1c1e49c78
 SHA512:
-  metadata.gz: d7d84fc85d947c139da366224cc130b81744e8f9a920e731046de29722b4f2b59d877b3bf0da553411639fe94423850839ca68d28914d43104a6d8a8838897cb
-  data.tar.gz: 5b76a83afb58dda3dc185172afbb009d1f16f56eff368e433c0d3ac27da4b78600b2bfded775f534106cbd3128304d992bda54d276c6c969ffb479e44a243db5
+  metadata.gz: 9fe508c1357e966768d8960be1ea6161a59327ce446dd25fd9c612055c48d2f48e02c1d0a239fa79bfaff656a5eabca2368aa390b34e241c6d8600dbfbf5cc14
+  data.tar.gz: 5cc5b487d261f13ceaf6fab5cbdafd5b5730a6a120ec4126f0731b7b576b34b6b1131d616a673d6d63829780f8a61fb7b1597cf8df3f7f531aac5124e8a541fd

data/Gemfile.lock

@@ -1,12 +1,17 @@
 PATH
   remote: .
   specs:
-    musi (0.1.2)
+    musi (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
     diff-lcs (1.3)
+    method_source (0.9.2)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -28,6 +33,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   musi!
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
 

data/README.md

@@ -1,8 +1,10 @@
 # Musi
 
-Welcome to Musi! A very basic gem for calculating intervals in music theory. Pass a note as a string such as "C" or "Ab" to a method and receive a new note in the form of a string.
+Welcome to Musi 1.0.0! A very basic gem for calculating intervals in music theory. Pass a note as a string such as "C" or "Ab" to a method and receive a new note in the form of a string.
 
-You may sharp or flat a note or raise by perfect 4th and 5th intervals. Minor/Major intervals not yet supported.
+Musi 1.0.0 now allows a user to raise or lower a note by all major/minor and perfect intervals as well as tritones.
+
+Musi 1.0.0 updates Musi 0.1.2 which only had support for basic sharping, flatting, and raising and lowering by perfect fourths and fifths.
 
 
 ## Installation
@@ -23,21 +25,40 @@ Or install it yourself as:
 
 ## Usage
 
-.sharp is a method which will raise the input of a note given as a string by one half step
-.flat is a a method which will lower the input of a note given as a string by one half step
-.raise_whole_step raises a note by a whole step
-.lower_whole_step lowers a note by a whole step
-.raiseP4 raises a note by a perfect fourth
-.lowerP4 lowers a note by a perfect fourth
-.raiseP5 raises a note by a perfect fifth
-.lowerP5 lowers a note by a perfect fifth
+.sharp and .raisem2 are methods which both raise the input of a note given as a string by a minor 2nd interval
+.flat is a a method which will lower the input of a note given as a string by a minor 2nd
+.raise_whole_step and .raiseM2 raise a note by a major 2nd
+.lower_whole_step and .lowerM2 lower a note by a major 2nd
+
+Other methods included:
+.raisem3
+.lowerm3
+.raiseM3
+.lowerM3
+.raiseP4
+.lowerP4
+.raiseA4
+.lowerA4
+.raised5
+.lowerd5
+.raiseP5
+.lowerP5
+.raisem6
+.lowerm6
+.raiseM6
+.lowerM6
+.raisem7
+.lowerm7
+.raiseM7
+.lowerM7
+
+To use:
 
 Musi::Note.sharp("D") => D#
 
-Enharmonic spellings such as B# and Gx are currently not supported.
-.raise_whole_step("A#") will raise to "C"
+Enharmonic spellings such as B#, E# and Gx are currently not supported as input values, although spellings such as Cb and B# are valid output values.
 
-Currently only these 8 actions available.
+No support for augmented and diminished intervals yet aside from triones.
 
 ## Development
 

data/lib/musi/note.rb

@@ -31,90 +31,235 @@ module Musi
       "B" => 11
     }
 
-    #Helper Method for lowering intervals that go below C
-    def self.above_zero(next_note)
-      if next_note < 0
-        next_note += 12
-      else
-        next_note
-      end
-    end
+    @@letter_names = [
+      "A", "B", "C", "D", "E", "F", "G", "A", "B", "C", "D", "E", "F", "G"
+    ]
 
-    #Helper method for raising(m2, M2, P4, P5)
-    def self.raise_helper(note, modifier)
-      if note.include?("b")
-        next_note = (@@flat_notes[note] + modifier) % 12
-        @@flat_notes.keys.each do |k|
-          if @@flat_notes[k] == next_note
-            return k
-          end
+    def self.raise_helper(note, diatonic_step, semitones)
+      letter = note[0]
+      i = 0
+      while i < 7
+        if letter == @@letter_names[i]
+          new_letter = @@letter_names[i + diatonic_step]
+          break
+        end
+        i += 1
+      end
+      if !note.match /b/
+        if @@sharp_notes[new_letter] - @@sharp_notes[note] == semitones || @@sharp_notes[new_letter] - @@sharp_notes[note] == (semitones - 12)
+          return new_letter
+        elsif @@sharp_notes[new_letter] - @@sharp_notes[note] == semitones - 1 || @@sharp_notes[new_letter] - @@sharp_notes[note] == (semitones - 13)
+          new_letter += "#"
+        else
+          new_letter += "b"
         end
       else
-        next_note = (@@sharp_notes[note] + modifier) % 12
-        @@sharp_notes.keys.each do |k|
-          if @@sharp_notes[k] == next_note
-            return k
-          end
+        if @@flat_notes[new_letter] - @@flat_notes[note] == semitones || @@flat_notes[new_letter] - @@flat_notes[note] == (semitones - 12)
+          return new_letter
+        else
+          new_letter += "b"
         end
       end
     end
 
-
-    #Helper method for lowering(m2, M2, P4, P5)
-    def self.lower_helper(note, modifier)
-      if note.include?("#")
-        next_note = (@@sharp_notes[note] - modifier) % 12
-        @@sharp_notes.keys.each do |k|
-          if @@sharp_notes[k] == self.above_zero(next_note)
-            return k
-          end
+    def self.lower_helper(note, diatonic_step, semitones)
+      letter = note[0]
+      i = 13
+      while i >= 7
+        if letter == @@letter_names[i]
+          new_letter = @@letter_names[i - diatonic_step]
+          break
+        end
+        i -= 1
+      end
+      if !note.match /b/
+        if @@sharp_notes[note] - @@sharp_notes[new_letter] == semitones || @@sharp_notes[note] - @@sharp_notes[new_letter] == (semitones - 12)
+          return new_letter
+        elsif @@sharp_notes[note] - @@sharp_notes[new_letter] == semitones + 1 || @@sharp_notes[note] - @@sharp_notes[new_letter] == (semitones - 11)
+          new_letter += "#"
+        else
+          new_letter += "b"
         end
       else
-        next_note = (@@flat_notes[note] - modifier)
-        @@flat_notes.keys.each do |k|
-          if @@flat_notes[k] == self.above_zero(next_note)
-            return k
-          end
+        if @@flat_notes[note] - @@flat_notes[new_letter] == semitones || @@flat_notes[note] - @@flat_notes[new_letter] == (semitones - 12)
+          return new_letter
+        else
+          new_letter += "b"
         end
       end
     end
 
     #m2
     def self.sharp(note)
-      self.raise_helper(note, 1)
+      self.raise_helper(note, 1, 1)
+    end
+
+    def self.raisem2(note)
+      self.raise_helper(note, 1, 1)
     end
 
     def self.flat(note)
-      self.lower_helper(note, 1)
+      self.lower_helper(note, 1, 1)
+    end
+
+    def self.lowerm2(note)
+      self.lower_helper(note, 1, 1)
     end
 
     #M2
     def self.raise_whole_step(note)
-      self.raise_helper(note, 2)
+      self.raise_helper(note, 1, 2)
+    end
+
+    def self.raiseM2(note)
+      self.raise_helper(note, 1, 2)
     end
 
     def self.lower_whole_step(note)
-      self.lower_helper(note, 2)
+      self.lower_helper(note, 1, 2)
+    end
+
+    def self.lowerM2(note)
+      self.lower_helper(note, 1, 2)
+    end
+
+    #m3
+    def self.raisem3(note)
+      self.raise_helper(note, 2, 3)
+    end
+
+    def self.lowerm3(note)
+      self.lower_helper(note, 2, 3)
     end
 
-    #P4
+    #M3
+
+    def self.raiseM3(note)
+      self.raise_helper(note, 2, 4)
+    end
+
+    def self.lowerM3(note)
+      self.lower_helper(note, 2, 4)
+    end
+
+    # P4
     def self.raiseP4(note)
-      self.raise_helper(note, 5)
+      self.raise_helper(note, 3, 5)
     end
 
     def self.lowerP4(note)
-      self.lower_helper(note, 5)
+      self.lower_helper(note, 3, 5)
+    end
+
+    # tritone
+    def self.raiseA4(note)
+      self.raise_helper(note, 3, 6)
+    end
+
+    def self.raised5(note)
+      self.raise_helper(note, 4, 6)
+    end
+
+    def self.lowerA4(note)
+      self.lower_helper(note, 3, 6)
+    end
+
+    def self.lowerd5(note)
+      self.lower_helper(note, 4, 6)
     end
 
-    #P5
+    # P5
     def self.raiseP5(note)
-      self.raise_helper(note, 7)
+      self.raise_helper(note, 4, 7)
     end
 
     def self.lowerP5(note)
-      self.lower_helper(note, 7)
+      self.lower_helper(note, 4, 7)
+    end
+
+    #m6
+    def self.raisem6(note)
+      self.raise_helper(note, 5, 8)
+    end
+
+    def self.lowerm6(note)
+      self.lower_helper(note, 5, 8)
+    end
+
+    #M6
+    def self.raiseM6(note)
+      self.raise_helper(note, 5, 9)
+    end
+
+    def self.lowerM6(note)
+      self.lower_helper(note, 5, 9)
+    end
+
+    #m7
+    def self.raisem7(note)
+      self.raise_helper(note, 6, 10)
+    end
+
+    def self.lowerm7(note)
+      self.lower_helper(note, 6, 10)
+    end
+
+    #M7
+    def self.raiseM7(note)
+      self.raise_helper(note, 6, 11)
+    end
+
+    def self.lowerM7(note)
+      self.lower_helper(note, 6, 11)
     end
 
   end
 
 end
+
+#Original Helper method for raising(m2, M2, P4, P5)
+# def self.raise_helper(note, modifier)
+#   if note.include?("b")
+#     next_note = (@@flat_notes[note] + modifier) % 12
+#     @@flat_notes.keys.each do |k|
+#       if @@flat_notes[k] == next_note
+#         return k
+#       end
+#     end
+#   else
+#     next_note = (@@sharp_notes[note] + modifier) % 12
+#     @@sharp_notes.keys.each do |k|
+#       if @@sharp_notes[k] == next_note
+#         return k
+#       end
+#     end
+#   end
+# end
+
+#Original Helper Method for lowering intervals that go below C
+# def self.above_zero(next_note)
+#   if next_note < 0
+#     next_note += 12
+#   else
+#     next_note
+#   end
+# end
+
+#Original Helper method for lowering(m2, M2, P4, P5)
+# def self.lower_helper(note, modifier)
+#   if note.include?("#")
+#     next_note = (@@sharp_notes[note] - modifier) % 12
+#     @@sharp_notes.keys.each do |k|
+#       if @@sharp_notes[k] == self.above_zero(next_note)
+#         return k
+#       end
+#     end
+#   else
+#     next_note = (@@flat_notes[note] - modifier)
+#     @@flat_notes.keys.each do |k|
+#       if @@flat_notes[k] == self.above_zero(next_note)
+#         return k
+#       end
+#     end
+#   end
+# end

data/lib/musi/version.rb

@@ -1,3 +1,3 @@
 module Musi
-  VERSION = "0.1.2"
+  VERSION = "1.0.0"
 end

data/musi.gemspec

@@ -14,21 +14,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/Eselbeus/musi.git"
   spec.license       = "MIT"
 
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  # if spec.respond_to?(:metadata)
-  #   spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
-  #
-  #   spec.metadata["homepage_uri"] = spec.homepage
-  #   spec.metadata["source_code_uri"] = "https://github.com/Eselbeus/musi.git"
-  #   spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-  # else
-  #   raise "RubyGems 2.0 or newer is required to protect against " \
-  #     "public gem pushes."
-  # end
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Eselbeus
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-11 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ files:
 - lib/musi/version.rb
 - musi-0.1.0.gem
 - musi-0.1.1.gem
+- musi-0.1.2.gem
 - musi.gemspec
 homepage: https://github.com/Eselbeus/musi.git
 licenses: