key_change 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9bfc6b47c91ccf65c17feba58b638104b3f190a
-  data.tar.gz: 321c735ca9c0cd2c8fb453abc6e42010448fb9e1
+  metadata.gz: 1a54f17413b6a34e150c7004034f67f7bbf00703
+  data.tar.gz: a8651b1b3c5c44f355630d661c0dd66e442a17f3
 SHA512:
-  metadata.gz: 4c8fdaf73f7e931cc8c187e6b4593f7333b21a503050ae760f1d760c8e2d87ac1acf82e61aaf89f0ce9d7f44a469e49d5cc01a72a2f741ebdc5b7af4bac3a021
-  data.tar.gz: e6f10d45200e330f2246499b5ba92d38c5efa95c76bf9947acd37016add6b0a4b1fde207d5bb74aeefeeb4eecd44cfc8653485ceb3af1e216aa4c87040eaa539
+  metadata.gz: 3ec0e319e3247508228a12416b1dc9a1c795e764e4a71f6a123e1f24b5b1ead7b9229fae355c12f15b33a5db0e49ccaefb778b5fa488c529752280b8fe36e12e
+  data.tar.gz: 88ccc06a6c2b087474c44f81406fa982057c4267ea57e76b030c3be6d5c86aabb6c01b8e846768c829a77cab475c7d29901983d1b66fa88600d83959da6aad71

data/lib/key_change.rb

@@ -1,56 +1,48 @@
+# 必要な変数の定義
+NOTES_SHARP = ["C", "C♯", "D", "D♯", "E", "F", "F♯", "G", "G♯", "A", "A♯", "B"]
+NOTES_FLAT = ["C", "D♭", "D", "E♭", "E", "F", "G♭", "G", "A♭", "A", "B♭", "B"]
+
 # 便利なファンクションの定義
-def Sharp? (note)
-  if note.match(/♯/) || note.match(/\#/)
-    return true
-  else
-    return false
+def sharp? (note)
+  note.match(/♯/) || note.match(/#/)
+end
+
+def flat? (note)
+  note.match(/♭/) || note.match(/b/)
+end
+
+# 「b」か「#」であったら変換されます
+def replace(note)
+  if sharp?(note)
+    note.gsub!(/#/, "♯")
+  elsif flat?(note)
+    note.gsub!(/b/, "♭")
   end
 end
 
-def Flat? (note)
-  if note.match(/♭/) || note.match(/b/)
-    return true
+# noteの位置を調べて返します
+# C と C♯ の差で (position = 1 - 0) にならないように「1」を足します
+def note_position(note)
+  if flat?(note)
+    NOTES_FLAT.index(note) + 1
   else
-    return false
+    NOTES_SHARP.index(note) + 1
   end
 end
 
+# 主要のメソッド
+def change (original_chords, old_key, new_key, option)
 
-# 主本のメソッド
-def Change (chords, old_key, new_key, option)
-
-  # 必要な変数の定義
-  notes_sharp = ["C", "C♯", "D", "D♯", "E", "F", "F♯", "G", "G♯", "A", "A♯", "B"]
-  notes_flat = ["C", "D♭", "D", "E♭", "E", "F", "G♭", "G", "A♭", "A", "B♭", "B"]
-  new_chords = []
+  chords = Marshal.load(Marshal.dump(original_chords))
 
-  # b か # であったら変換してくれる
-  if Sharp?(old_key)
-    old_key.gsub!(/\#/, "♯")
-  elsif Flat?(old_key)
-    old_key.gsub!(/\b/, "♭")
-  end
-
-  if Sharp?(new_key)
-    new_key.gsub!(/\#/, "♯")
-  elsif Flat?(new_key)
-    new_key.gsub!(/b/, "♭")
+  replace(old_key)
+  replace(new_key)
+  chords.each do |chord|
+    replace(chord)
   end
 
-
-   # 古いキーの位置を調べて取得する
-   if Flat? (old_key)
-     old_key_position = notes_flat.index(old_key) + 1
-   else
-     old_key_position = notes_sharp.index(old_key) + 1
-   end
-
-   # 新しい方も
-   if Flat? (new_key)
-     new_key_position = notes_flat.index(new_key) + 1
-   else
-     new_key_position = notes_sharp.index(new_key) + 1
-   end
+  old_key_position = note_position(old_key)
+  new_key_position = note_position(new_key)
 
    # キーの差を計算する
    if new_key_position == old_key_position
@@ -63,14 +55,7 @@ def Change (chords, old_key, new_key, option)
      key_up = true
    end
 
-  chords.each do |chord|
-
-    # メソッドが終わってもオリジナルのコードが影響を受けてgsub!されるので注意してください
-    if Sharp?(chord)
-      chord.gsub!(/\#/, "♯")
-    elsif Flat?(chord)
-      chord.gsub!(/b/, "♭")
-    end
+  chords.map do |chord|
 
     addition = ""
     case chord
@@ -102,48 +87,26 @@ def Change (chords, old_key, new_key, option)
       addition = "aug"
     when /11/ then
       addition = "11"
-
     end
+
     # chord を上手く計算するために、addition を chord から取り除く
     if addition != ""
       chord.gsub!(addition, "")
     end
 
-
-
+    original_position = note_position(chord)
     if key_up == true
-      if Flat?(chord)
-        original_position = notes_flat.index(chord) + 1
-        new_position = original_position + difference
-        if new_position > 12
-          new_position -= 12
-        end
-        new_position -= 1
-      else
-        original_position = notes_sharp.index(chord) + 1
-        new_position = original_position + difference
-        if new_position > 12
-          new_position -= 12
-        end
-        new_position -= 1
+      new_position = original_position + difference
+      if new_position > 12
+        new_position -= 12
       end
     else # key_up == false
-      if Flat?(chord)
-        original_position = notes_flat.index(chord) + 1
-        new_position = original_position - difference
-        if new_position < 1
-          new_position += 12
-        end
-        new_position -= 1
-      else
-        original_position = notes_sharp.index(chord) + 1
-        new_position = original_position - difference
-        if new_position < 1
-          new_position += 12
-        end
-        new_position -= 1
+      new_position = original_position - difference
+      if new_position < 1
+        new_position += 12
       end
     end
+    new_position -= 1
 
     if option == :default
       option = :sharp
@@ -151,25 +114,23 @@ def Change (chords, old_key, new_key, option)
 
     case option
     when :sharp then
-      if Flat?(chord)
-        new_chords << notes_flat[new_position] + addition
+      if flat?(chord)
+        NOTES_FLAT[new_position] + addition
       else
-        new_chords << notes_sharp[new_position] + addition
+        NOTES_SHARP[new_position] + addition
       end
     when :flat then
-      if Sharp?(chord)
-        new_chords << notes_sharp[new_position] + addition
+      if sharp?(chord)
+        NOTES_SHARP[new_position] + addition
       else
-        new_chords << notes_flat[new_position] + addition
+        NOTES_FLAT[new_position] + addition
       end
     when :all_sharp then
-        new_chords << notes_sharp[new_position] + addition
+        NOTES_SHARP[new_position] + addition
     when :all_flat then
-        new_chords << notes_flat[new_position] + addition
+        NOTES_FLAT[new_position] + addition
     end
 
-  end #chords.eachの終わり
-
-  return new_chords
+  end #chords.mapの終わり
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: key_change
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Gabriel Arcangel Zayas
@@ -11,9 +11,8 @@ cert_chain: []
 date: 2016-07-17 00:00:00.000000000 Z
 dependencies: []
 description: |-
-  Change the chords of an array of any length by providing the array, the original key and the new key in the arguments of the function
-  Please visit the following link for documentation: https://github.com/gazayas/key_change
-  音楽のchordの配列を楽に転調する。詳細はこちら：https://github.com/gazayas/key_change
+  Music key change. Please visit the following link for documentation: https://github.com/gazayas/key_change
+  Rubyで転調を行う。詳細はこちら：https://github.com/gazayas/key_change
 email: g-zayas@hotmail.com
 executables: []
 extensions: []