musician 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f0c98a088bdcda6656d0cd23d8b04ca135914d
-  data.tar.gz: 82cb2aaa56e67a79f149b7f327ee28e49dafdb51
+  metadata.gz: d5a0602cfef96b5fb12983bfb55be1cd1e994276
+  data.tar.gz: 96507362f14c35912bb1d968dc3f5193463e022e
 SHA512:
-  metadata.gz: 99a256418060cd47e9ab83ceb97ab3fbf0f26f85c909fffe91fdc3061292a9f7794fcc73b0331ebdf21cc409f487b8851e722f0a3116bf5083cd4f5f32ead8f3
-  data.tar.gz: faa93b524d746c122d14998dab993e3de043d6a835a471d8156d414abdbe9b8065d2057a9b0d2c83d07640aa180693ee84bfd68d9d185e48884dd045e199cc8a
+  metadata.gz: 69bf88c781e38ce655df9d4fbd39a3b49848d661852e0c6a7cec168dff09430be6c87c90950ab23a3e9179430d409c1d9f75679b760a72b4c7927e289bc36ef9
+  data.tar.gz: 134b786f32e78043edbd4e1357b0a481b493fcaccbdd40682d5ad3dc7a0cbd13c33b8290302ad64663785f06480db7057b18a3989f3ead89adcdc1dba082eefd

data/lib/files/chord.rb

@@ -1,86 +1,60 @@
-class Chord
+class Chord < Note
 
-  Sharp = "♯"
-  Flat = "♭"
-
-  attr_accessor :name, :sanitized_name, :addition
-  attr_reader :Sharp_chords, :Flat_chords
+  attr_accessor :name, :raw_name, :addition
 
   def initialize(name)
-    name = name.tr("#b", "#{Sharp}#{Flat}") # gsub()の変わりに「tr」を使ってる（・ω・）
+    # ちょっとややこしいし良くないかもしれないけど、
+    # 一応 @name が chord の name になってて、@raw_name が addition (maj7, dim とか)なしの name
+    # こう： @name #=> "G♭m" @raw_name #=> "G♭"
+    # でも、Note.name は普通は maj7 や dim とかはないから、OOP においては Chord.name はおかしいかもしれない
+    # Note.name は Chord.name と違うので、OOPの考え方においては良くないかもしれない。
+    # でも、Note.name と Chord.name はバリ分かりやすいと思うのでそのようにしたい。
+    # とりあえす、Chord.name は Note.name とは違うという風に書いています。
     @name = name
-    sanitized_elements = sanitize_method
-    @sanitized_name = sanitized_elements[0]
-    @addition = sanitized_elements[1]
-    @Sharp_chords = ["C", "C♯", "D", "D♯", "E", "F", "F♯", "G", "G♯", "A", "A♯", "B"]
-    @Flat_chords = ["C", "D♭", "D", "E♭", "E", "F", "G♭", "G", "A♭", "A", "B♭", "B"]
-  end
-
-  # 真偽を返して欲しかったから次のように書きました
-  def sharp?
-    !!name.match(/#/) || !!name.match(/♯/)
-  end
-
-  def flat?
-    !!name.match(/b/) || !!name.match(/♭/)
+    raw_elements = sanitize_method
+    super(raw_elements[0]) # 一応 raw_name で Note のインスタンス変数を作る
+    @raw_name = change_symbol
+    @addition = raw_elements[1]
+    @name = name
+    @name = change_symbol
   end
 
+  # note.rbだけで置くようにしたいけど、raw_nameが。。。
   def position
-    # 1を足す理由は、key_changeの中で使うためです
-    # 1が足されないと計算がうまくできないから
-    # そして配列が正しく定義されるように、new_position -= 1 を def key_change ... end の中に行う
     if sharp?
-      @Sharp_chords.index(sanitized_name)
+      SHARP_CHORDS.index(raw_name)
     else
-      @Flat_chords.index(sanitized_name)
+      FLAT_CHORDS.index(raw_name)
     end
   end
 
   private
   def sanitize_method
 
-    addition = ""
-
-    case name
-    when /dim7/ then
-      addition = "dim7"
-    when /dim/ then
-      addition = "dim"
-    when /2/ then
-      addition = "2"
-    when /sus4/ then
-      addition = "sus4"
-    when /sus/ then
-      addition = "sus"
-    when /maj7/ then
-      addition = "maj7"
-    when /maj/ then
-      addition = "maj"
-    when /m7/ then
-      addition = "m7"
-    when /m/ then
-      addition = "m"
-    when /7/ then
-      addition = "7"
-    when /6/ then
-      addition = "6"
-    when /9/ then
-      addition = "9"
-    when /aug/ then
-      addition = "aug"
-    when /11/ then
-      addition = "11"
+    addition = String.new
+    raw = Array.new
+
+    # additionがあるか確認する
+    finished_search = false
+    until !addition.empty? || finished_search == true
+      ADDITIONS.each do |add|
+        regexp = Regexp.new(add)
+        raw = Array.new
+        if name.match(regexp)
+          addition = add
+          raw << name.gsub(add, "")
+          raw << add
+          break
+        end
+      end
+      # もしadditionがなければ、nameをそのまま返して、additionが空の配列のまま返す
+      if addition.empty?
+        raw << name
+        raw << addition
+      end
+      finished_search = true
     end
-
-    sanitized_chord_array = []
-    if addition != ""
-      sanitized_chord_array << name.gsub(addition, "")
-      sanitized_chord_array << addition
-    else
-      sanitized_chord_array << name
-      sanitized_chord_array << ""
-    end
-
+    raw
   end
 
 end

data/lib/files/music.rb

@@ -1,29 +1,9 @@
 class Music
 
+  # whole restとか、half noteとかは見つけられないのでこのクラスを消すかな
   def initialize
     @quarter_note = "♩"
-    @half_note = ""
-    @whole_note = ""
-    @eight_note = "♪"
-    @sixteenth_note = ""
+    @eighth_note = "♪"
   end
 
-  # この中にメソッドを作るかは分からないけど、
-  # とにかく普通のキーボードで書けないシンボルを使えるようにする
-
-  # Song.rbの方にはテンポがあるけど。。。
-
-  def add_notes(note1, note2)
-    # この中に、
-    note1 = "♪"
-    note2 = "♪"
-    new_note = note1 + note2
-    # をして、返すのは
-    "♩"
-    # みたいな感じのメソッドはどうかな
-    # 今の段階ではそんなにいらないけど、一応役に立つと思う
-
-  end
-
-
 end

data/lib/files/note.rb

@@ -0,0 +1,31 @@
+class Note
+
+  attr_accessor :name
+
+  def initialize(name)
+    @name = name
+    @name = change_symbol
+  end
+
+  def change_symbol
+    @name = @name.tr("#b", "#{Sharp}#{Flat}") # gsub()の変わりに「tr」を使ってる（・ω・）
+  end
+
+  # Noteを初期化する時に#は♯に変換されるから両方が要るかな。。。
+  def sharp?
+    !!name.match(/#/) || !!name.match(/♯/) # 真偽を返して欲しかったから次のように書きました
+  end
+
+  def flat?
+    !!name.match(/b/) || !!name.match(/♭/)
+  end
+
+  def position
+    if sharp?
+      SHARP_CHORDS.index(name)
+    else
+      FLAT_CHORDS.index(name)
+    end
+  end
+
+end

data/lib/files/song.rb

@@ -1,7 +1,6 @@
 class Song
 
   attr_accessor :key, :chords, :title, :tempo
-  attr_reader :Sharp_chords, :Flat_chords
 
   # keyは文字列で、chordsは文字列の配列
   def initialize(key, chords)
@@ -14,8 +13,9 @@ class Song
     @tempo = ""
   end
 
-  def key_change(new_key, option)
-    new_key = Chord.new(new_key)
+  def key_change(new_key, option=:sharp)
+    # unless new_key.instance_of? Chord then new_key = Chord.new(new_key)
+    new_key = Chord.new(new_key) # もうすでにChordクラスであればこれを飛ばすようにする
 
     if key.position < new_key.position
       key_up = true
@@ -45,22 +45,22 @@ class Song
       new_position -= 1
 
       case option
-      when :default || :sharp then
+      when :sharp then
         if chord.flat?
-          chord.Flat_chords[new_position] + chord.addition
+          FLAT_CHORDS[new_position] + chord.addition
         else
-          chord.Sharp_chords[new_position] + chord.addition
+          SHARP_CHORDS[new_position] + chord.addition
         end
       when :flat then
         if chord.sharp?
-          chord.Sharp_chords[new_position] + chord.addition
+          SHARP_CHORDS[new_position] + chord.addition
         else
-          chord.Flat_chords[new_position] + chord.addition
+          FLAT_CHORDS[new_position] + chord.addition
         end
       when :all_sharp
-        chord.Sharp_chords[new_position] + chord.addition
+        SHARP_CHORDS[new_position] + chord.addition
       when :all_flat
-        chord.Flat_chords[new_position] + chord.addition
+        FLAT_CHORDS[new_position] + chord.addition
       end
     end
 

data/lib/musician.rb

@@ -1,3 +1,10 @@
-require 'files/music'
+Sharp = "♯"
+Flat = "♭"
+SHARP_CHORDS = ["C", "C♯", "D", "D♯", "E", "F", "F♯", "G", "G♯", "A", "A♯", "B"]
+FLAT_CHORDS = ["C", "D♭", "D", "E♭", "E", "F", "G♭", "G", "A♭", "A", "B♭", "B"]
+ADDITIONS = ["dim7", "dim", "2", "sus4", "sus", "maj7", "maj", "m7", "m", "aug", "7", "6", "9", "11"]
+
+require 'files/note'
 require 'files/chord'
 require 'files/song'
+require 'files/music'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musician
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Gabriel Arcangel Zayas
@@ -18,6 +18,7 @@ extra_rdoc_files: []
 files:
 - lib/files/chord.rb
 - lib/files/music.rb
+- lib/files/note.rb
 - lib/files/song.rb
 - lib/musician.rb
 homepage: http://www.github.com/gazayas/musician