music_metadata_score 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmI2MWM0YTY1ZGViNzc4ZmNhYTk0ZDYyYzNiM2JlYWVjNTlhOWE5ZA==
+    Nzc0OTQ4ZTE1MzA2YzQ0NDY0NGU2M2E0ODY1MzQwNTNjMDk4Nzk4Mw==
   data.tar.gz: !binary |-
-    ZWZjMTM2OGFhMGRkMGNlMWQyMGQ4YjMyNjIzZDdjNTEyYjE5ZTFiNg==
+    MTU4ZjUwZGYxNmI2MTg3ZjVjYjExNTM4MzE3MGZlYzdiZTIwMTZjOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmQ2Y2IzYWY0NjgyMjdiOTVkMjc5MGU1NTBkNGI5MGE0ZTc5NmM0YTg3MWI0
-    NDhlMWQwZmVhYTAxNjNlMTI1MGNiYzNhOTljZjM2YzE3MjBkNWI3MTRiNzk4
-    ZDAzOWNiYWU5MTllNmRiOGVhMGRkMDM5MWUzMDg3NDEzYWIxYWI=
+    MDE1N2U0NDE0YmU0NWE0NzQ5MWU4ZDQ4ZTgyODg2MzZiZDMxNzUyZTRjOTgz
+    NDIxMjliZjQ5NGRkZWEwNTEwZGZkNWU4N2VjNTgxYWEwODBlMmNiM2RhYTU3
+    YmRlMjQ4M2ZjZDhkNzY2NTkzNWQwOTE3OThlZThkNTAxMGZlMmY=
   data.tar.gz: !binary |-
-    NzhiZGMyOWIwNDA1MTk5MWRjNGVhNGVmYWQxZjQyNTUxMmM0ZWI3MzkyYmY3
-    MGU3NjUzMDViOWRmNTBiY2NkMjFhZTAwZGE5NTAxOWRlOTViOTRmMzliOWZi
-    NjJmMzcwYmM0NGQ1YmMyZGVhMzEzZTA4ZDNiM2IxMGY1OTk2ZWI=
+    NWE5NGEwOGNiZmExZmZlMWYyNWI4NDg0OTk5MWQ2NzRkYWQ0MWVhZGRiOGM2
+    YTg4OGE5OTMzMzk2MWM1YTcyM2E4NmJkNTVkZDc5NmQxMzg5ZTQ1ZDYyMjk5
+    MWNkMjAwMTU4YWIyYTQ2Nzk4OTE1MDJhMTg1N2RjMWM4MDgzNzg=

data/lib/music_metadata_score/artist.rb

@@ -1,123 +1,125 @@
-class Artist
-	
-	def self.are_proper_artist_format?(artists, override, level)
-		if artists && artists != []
-			Artist.loop_artists(artists, override, level)
-		else
-			false
+module MusicMetadataScore
+	class Artist
+		
+		def self.are_proper_artist_format?(artists, override, level)
+			if artists && artists != []
+				MusicMetadataScore::Artist.loop_artists(artists, override, level)
+			else
+				false
+			end
 		end
-	end
-	
-	def self.loop_artists(artists, override, level)
-		value = true
-		artists.each do |a|
-			if !Artist.is_proper_artist_format?(a, override, level)
-				value = false
-				break
+		
+		def self.loop_artists(artists, override, level)
+			value = true
+			artists.each do |a|
+				if !MusicMetadataScore::Artist.is_proper_artist_format?(a, override, level)
+					value = false
+					break
+				end
 			end
+			value
 		end
-		value
-	end
-	
-	def self.is_proper_artist_format?(artist, override, level)
-		if Artist.is_title_case?(artist, override) && !Artist.is_compound_artist?(artist, override) && !Artist.is_bad_various_artists?(artist) && Artist.artist_fits_level?(artist, override, level)
-			true
-		else
-			false
+		
+		def self.is_proper_artist_format?(artist, override, level)
+			if MusicMetadataScore::Artist.is_title_case?(artist, override) && !MusicMetadataScore::Artist.is_compound_artist?(artist, override) && !MusicMetadataScore::Artist.is_bad_various_artists?(artist) && MusicMetadataScore::Artist.artist_fits_level?(artist, override, level)
+				true
+			else
+				false
+			end
 		end
-	end
-	
-	def self.is_title_case?(artist, override)
-		if MusicMetadataScore.is_title_case?(artist) || override == true
-			true
-		else
-			false
+		
+		def self.is_title_case?(artist, override)
+			if MusicMetadataScore.is_title_case?(artist) || override == true
+				true
+			else
+				false
+			end
 		end
-	end
-	
-	def self.is_compound_artist?(artist, override)
-		if override != true && (artist.downcase.include?('and') || artist.include?('&') || artist.downcase.include?('vs') || artist.downcase.include?('with') || artist.downcase.include?('feat') || artist.downcase.include?('present')) || artist.include?('/')
-			true
-		else
-			false
+		
+		def self.is_compound_artist?(artist, override)
+			if override != true && (artist.downcase.include?('and') || artist.include?('&') || artist.downcase.include?('vs') || artist.downcase.include?('with') || artist.downcase.include?('feat') || artist.downcase.include?('present')) || artist.include?('/')
+				true
+			else
+				false
+			end
 		end
-	end
-	
-	def self.is_bad_various_artists?(artist)
-		# various, va, v/a
-		if artist.downcase == 'various' || artist.downcase == 'va' || artist.downcase == 'v/a' || artist.downcase == 'various artist'
-			true
-		else
-			false
+		
+		def self.is_bad_various_artists?(artist)
+			# various, va, v/a
+			if artist.downcase == 'various' || artist.downcase == 'va' || artist.downcase == 'v/a' || artist.downcase == 'various artist'
+				true
+			else
+				false
+			end
 		end
-	end
-	
-	def self.artist_fits_level?(artist, override, level)
-		if override == false && level == :track && (artist.downcase == 'various artists' || artist.downcase == 'various artist' || artist.downcase == 'v/a' || artist.downcase == 'various')
-			false
-		else
-			true
+		
+		def self.artist_fits_level?(artist, override, level)
+			if override == false && level == :track && (artist.downcase == 'various artists' || artist.downcase == 'various artist' || artist.downcase == 'v/a' || artist.downcase == 'various')
+				false
+			else
+				true
+			end
 		end
-	end
-	
-	def self.format_artists(artists, override, level)
-		array = []
-		artists.each do |a|
-			new_artist = Artist.title_case(a)
-			separated_artists = Artist.separate_compound_artists(new_artist)
-			separated_artists.each do |sa|
-				array << sa
+		
+		def self.format_artists(artists, override, level)
+			array = []
+			artists.each do |a|
+				new_artist = MusicMetadataScore::Artist.title_case(a)
+				separated_artists = MusicMetadataScore::Artist.separate_compound_artists(new_artist)
+				separated_artists.each do |sa|
+					array << sa
+				end
 			end
+			return array
 		end
-		return array
-	end
-	
-	def self.title_case(artist)
-		new_artist = MusicMetadataScore.title_case(artist)
-		Artist.capitalize_the(new_artist)
-	end
-	
-	def self.capitalize_the(string)
-		split = string.split(' ')
-		split.each_with_index do |s, i|
-			if s == 'the'
-				split[i] = 'The'
+		
+		def self.title_case(artist)
+			new_artist = MusicMetadataScore.title_case(artist)
+			MusicMetadataScore::Artist.capitalize_the(new_artist)
+		end
+		
+		def self.capitalize_the(string)
+			split = string.split(' ')
+			split.each_with_index do |s, i|
+				if s == 'the'
+					split[i] = 'The'
+				end
 			end
+			return split.join(' ')
 		end
-		return split.join(' ')
-	end
-	
-	def self.separate_compound_artists(artist)
-		if artist.downcase.include?('and')
-			Artist.split_artists(artist, 'and')
-		elsif artist.downcase.include?('&')
-			Artist.split_artists(artist, '&')
-		elsif artist.downcase.include?('vs.')
-			Artist.split_artists(artist, 'vs.')
-		elsif artist.downcase.include?('vs')
-			Artist.split_artists(artist, 'vs')
-		elsif artist.downcase.include?('with')
-			Artist.split_artists(artist, 'with')
-		elsif artist.downcase.include?('feat.')
-			Artist.split_artists(artist, 'feat.')
-		elsif artist.downcase.include?('featuring')
-			Artist.split_artists(artist, 'featuring')
-		elsif artist.downcase.include?('feat')
-			Artist.split_artists(artist, 'feat')
-		elsif artist.downcase.include?('presents')
-			Artist.split_artists(artist, 'presents')
-		else
-			[artist]
+		
+		def self.separate_compound_artists(artist)
+			if artist.downcase.include?('and')
+				MusicMetadataScore::Artist.split_artists(artist, 'and')
+			elsif artist.downcase.include?('&')
+				MusicMetadataScore::Artist.split_artists(artist, '&')
+			elsif artist.downcase.include?('vs.')
+				MusicMetadataScore::Artist.split_artists(artist, 'vs.')
+			elsif artist.downcase.include?('vs')
+				MusicMetadataScore::Artist.split_artists(artist, 'vs')
+			elsif artist.downcase.include?('with')
+				MusicMetadataScore::Artist.split_artists(artist, 'with')
+			elsif artist.downcase.include?('feat.')
+				MusicMetadataScore::Artist.split_artists(artist, 'feat.')
+			elsif artist.downcase.include?('featuring')
+				MusicMetadataScore::Artist.split_artists(artist, 'featuring')
+			elsif artist.downcase.include?('feat')
+				MusicMetadataScore::Artist.split_artists(artist, 'feat')
+			elsif artist.downcase.include?('presents')
+				MusicMetadataScore::Artist.split_artists(artist 'presents')
+			else
+				[artist]
+			end
 		end
-	end
-	
-	def self.split_artists(string, separator)
-		array = string.split(separator)
-		new_array = []
-		array.each_with_index do |a, i|
-			new_array << a.strip
+		
+		def self.split_artists(string, separator)
+			array = string.split(separator)
+			new_array = []
+			array.each_with_index do |a, i|
+				new_array << a.strip
+			end
+			return new_array
 		end
-		return new_array
+		
 	end
-	
 end

data/lib/music_metadata_score/barcode.rb

@@ -1,80 +1,82 @@
-class Barcode
-	# Check length
-	# Check checksum
-	
-	def self.is_valid?(barcode)
-		if Barcode.valid_length?(barcode) && Barcode.valid_characters?(barcode) && Barcode.valid_checksum?(barcode)
-			true
-		else
-			false
+module MusicMetadataScore
+	class Barcode
+		# Check length
+		# Check checksum
+		
+		def self.is_valid?(barcode)
+			if MusicMetadataScore::Barcode.valid_length?(barcode) && MusicMetadataScore::Barcode.valid_characters?(barcode) && MusicMetadataScore::Barcode.valid_checksum?(barcode)
+				true
+			else
+				false
+			end
 		end
-	end
-	
-	def self.valid_length?(barcode)
-		if barcode.to_s.length == 12 || barcode.to_s.length == 13
-			true
-		else
-			false
+		
+		def self.valid_length?(barcode)
+			if barcode.to_s.length == 12 || barcode.to_s.length == 13
+				true
+			else
+				false
+			end
 		end
-	end
-	
-	def self.valid_characters?(barcode)
-		number = Integer(barcode) rescue false
-		if number != false
-			true
-		else
-			false
+		
+		def self.valid_characters?(barcode)
+			number = Integer(barcode) rescue false
+			if number != false
+				true
+			else
+				false
+			end
 		end
-	end
-	
-	def self.valid_checksum?(barcode)
-		if barcode.to_s[barcode.to_s.length - 1].to_i == Barcode.get_checksum(barcode)
-			true
-		else
-			false
+		
+		def self.valid_checksum?(barcode)
+			if barcode.to_s[barcode.to_s.length - 1].to_i == MusicMetadataScore::Barcode.get_checksum(barcode)
+				true
+			else
+				false
+			end
 		end
-	end
-	
-	def self.get_checksum(barcode)
-		barcode_sum = Barcode.calculate_barcode(Barcode.remove_checksum(barcode))
-		if barcode_sum != nil
-			Barcode.calculate_checksum(barcode_sum)
-		else
-			nil
+		
+		def self.get_checksum(barcode)
+			barcode_sum = MusicMetadataScore::Barcode.calculate_barcode(MusicMetadataScore::Barcode.remove_checksum(barcode))
+			if barcode_sum != nil
+				MusicMetadataScore::Barcode.calculate_checksum(barcode_sum)
+			else
+				nil
+			end
 		end
-	end
-	
-	def self.remove_checksum(barcode)
-		barcode = barcode.to_s
-		return barcode[0..barcode.length - 2]
-	end
-	
-	def self.calculate_barcode(barcode)
-		barcode = barcode.to_s
-  	if barcode.length == 11
-  		(barcode[0].to_i * 3) + barcode[1].to_i + (barcode[2].to_i * 3) + barcode[3].to_i + (barcode[4].to_i * 3) + barcode[5].to_i + (barcode[6].to_i * 3) + barcode[7].to_i + (barcode[8].to_i * 3) + barcode[9].to_i + (barcode[10].to_i * 3)
-  	elsif barcode.length == 12
-  		barcode[0].to_i + (barcode[1].to_i * 3) + barcode[2].to_i + (barcode[3].to_i * 3) + barcode[4].to_i + (barcode[5].to_i * 3) + barcode[6].to_i + (barcode[7].to_i * 3) + barcode[8].to_i + (barcode[9].to_i * 3) + barcode[10].to_i + (barcode[11].to_i * 3)
-  	else
-  		nil
-  	end
-	end
-	
-	def self.calculate_checksum(number)
-		over = number % 10
-		if over != 0
-			10 - over
-		else
-			0
+		
+		def self.remove_checksum(barcode)
+			barcode = barcode.to_s
+			return barcode[0..barcode.length - 2]
 		end
-	end
-	
-	def self.valid_barcode_or_nil(barcode)
-		if Barcode.is_valid?(barcode)
-			barcode
-		else
-			nil
+		
+		def self.calculate_barcode(barcode)
+			barcode = barcode.to_s
+			if barcode.length == 11
+				(barcode[0].to_i * 3) + barcode[1].to_i + (barcode[2].to_i * 3) + barcode[3].to_i + (barcode[4].to_i * 3) + barcode[5].to_i + (barcode[6].to_i * 3) + barcode[7].to_i + (barcode[8].to_i * 3) + barcode[9].to_i + (barcode[10].to_i * 3)
+			elsif barcode.length == 12
+				barcode[0].to_i + (barcode[1].to_i * 3) + barcode[2].to_i + (barcode[3].to_i * 3) + barcode[4].to_i + (barcode[5].to_i * 3) + barcode[6].to_i + (barcode[7].to_i * 3) + barcode[8].to_i + (barcode[9].to_i * 3) + barcode[10].to_i + (barcode[11].to_i * 3)
+			else
+				nil
+			end
+		end
+		
+		def self.calculate_checksum(number)
+			over = number % 10
+			if over != 0
+				10 - over
+			else
+				0
+			end
+		end
+		
+		def self.valid_barcode_or_nil(barcode)
+			if MusicMetadataScore::Barcode.is_valid?(barcode)
+				barcode
+			else
+				nil
+			end
 		end
+		
 	end
-	
 end

data/lib/music_metadata_score/composer.rb

@@ -1,30 +1,32 @@
-class Composer
-
-	def self.are_proper_format?(composers)
-		if composers && composers != []
-			Composer.loop_composers(composers)
-		else
-			false
-		end
-	end
+module MusicMetadataScore
+	class Composer
 	
-	def self.loop_composers(composers)
-		value = true
-		composers.each do |c|
-			if !Composer.is_proper_format?(c)
-				value = false
-				break
+		def self.are_proper_format?(composers)
+			if composers && composers != []
+				MusicMetadataScore::Composer.loop_composers(composers)
+			else
+				false
 			end
 		end
-		value
-	end
-	
-	def self.is_proper_format?(composer)
-		if Contributor.is_human_name?(composer) && MusicMetadataScore.is_title_case?(composer) && !Artist.is_compound_artist?(composer, false)
-			true
-		else
-			false
+		
+		def self.loop_composers(composers)
+			value = true
+			composers.each do |c|
+				if !MusicMetadataScore::Composer.is_proper_format?(c)
+					value = false
+					break
+				end
+			end
+			value
+		end
+		
+		def self.is_proper_format?(composer)
+			if MusicMetadataScore::Contributor.is_human_name?(composer) && MusicMetadataScore.is_title_case?(composer) && !MusicMetadataScore::Artist.is_compound_artist?(composer, false)
+				true
+			else
+				false
+			end
 		end
+	
 	end
-
 end

data/lib/music_metadata_score/contributor.rb

@@ -1,46 +1,48 @@
-class Contributor
-	
-	def self.are_proper_format?(contributors)
-		if contributors && contributors != []
-			Contributor.loop_contributors(contributors)
-		else
-			false
+module MusicMetadataScore
+	class Contributor
+		
+		def self.are_proper_format?(contributors)
+			if contributors && contributors != []
+				MusicMetadataScore::Contributor.loop_contributors(contributors)
+			else
+				false
+			end
 		end
-	end
-	
-	def self.loop_contributors(contributors)
-		value = true
-		contributors.each do |c|
-			if !Contributor.is_proper_format?(c)
-				value = false
-				break
+		
+		def self.loop_contributors(contributors)
+			value = true
+			contributors.each do |c|
+				if !MusicMetadataScore::Contributor.is_proper_format?(c)
+					value = false
+					break
+				end
 			end
+			value
 		end
-		value
-	end
-	
-	def self.is_proper_format?(contributor)
-		if Contributor.is_human_name?(contributor[:name]) && Contributor.has_role?(contributor[:role]) && !Artist.is_compound_artist?(contributor[:name], false) && MusicMetadataScore.is_title_case?(contributor[:name])
-			true
-		else
-			false
+		
+		def self.is_proper_format?(contributor)
+			if MusicMetadataScore::Contributor.is_human_name?(contributor[:name]) && MusicMetadataScore::Contributor.has_role?(contributor[:role]) && !MusicMetadataScore::Artist.is_compound_artist?(contributor[:name], false) && MusicMetadataScore.is_title_case?(contributor[:name])
+				true
+			else
+				false
+			end
 		end
-	end
-	
-	def self.is_human_name?(contributor)
-		if contributor.downcase.include?('the ') || contributor.split(' ').count < 2
-			false
-		else
-			true
+		
+		def self.is_human_name?(contributor)
+			if contributor.downcase.include?('the ') || contributor.split(' ').count < 2
+				false
+			else
+				true
+			end
 		end
-	end
-	
-	def self.has_role?(role)
-		if role && role != ""
-			true
-		else
-			false
+		
+		def self.has_role?(role)
+			if role && role != ""
+				true
+			else
+				false
+			end
 		end
+		
 	end
-	
 end

data/lib/music_metadata_score/isrc.rb

@@ -1,55 +1,57 @@
-class Isrc
-	
-	def self.is_valid?(isrc)
-		isrc = Isrc.strip_isrc(isrc)
-		if Isrc.valid_length?(isrc) && Isrc.valid_country_code?(isrc[0..1]) && Isrc.valid_numbers?(isrc[5..11])
-			true
-		else
-			false
+module MusicMetadataScore
+	class Isrc
+		
+		def self.is_valid?(isrc)
+			isrc = MusicMetadataScore::Isrc.strip_isrc(isrc)
+			if MusicMetadataScore::Isrc.valid_length?(isrc) && MusicMetadataScore::Isrc.valid_country_code?(isrc[0..1]) && MusicMetadataScore::Isrc.valid_numbers?(isrc[5..11])
+				true
+			else
+				false
+			end
 		end
-	end
-	
-	def self.valid_length?(isrc)
-		length = Isrc.strip_isrc(isrc).length rescue 0
-		if length != 12
-			false
-		else
-			true
+		
+		def self.valid_length?(isrc)
+			length = MusicMetadataScore::Isrc.strip_isrc(isrc).length rescue 0
+			if length != 12
+				false
+			else
+				true
+			end
 		end
-	end
-	
-	def self.strip_isrc(isrc)
-  	if isrc
-			isrc.strip!
-			isrc.tr!('^A-Za-z0-9', '')
-			isrc.upcase!
-  	end
-  	return isrc
-  end
-  
-  def self.valid_country_code?(code)
-  	if code.length == 2 && code[/[a-zA-Z]+/] == code
-  		true
-  	else
-  		false
-  	end
-  end
-  
-  def self.valid_numbers?(numbers)
-  	number = Integer(numbers) rescue false
-  	if numbers.to_s.length == 7 && number
-  		true
-  	else
-  		false
-  	end
-  end
-  
-  def self.valid_isrc_or_nil(isrc)
-		if Isrc.is_valid?(isrc)
-			Isrc.strip_isrc(isrc)
-		else
-			nil
+		
+		def self.strip_isrc(isrc)
+			if isrc
+				isrc.strip!
+				isrc.tr!('^A-Za-z0-9', '')
+				isrc.upcase!
+			end
+			return isrc
+		end
+		
+		def self.valid_country_code?(code)
+			if code.length == 2 && code[/[a-zA-Z]+/] == code
+				true
+			else
+				false
+			end
+		end
+		
+		def self.valid_numbers?(numbers)
+			number = Integer(numbers) rescue false
+			if numbers.to_s.length == 7 && number
+				true
+			else
+				false
+			end
+		end
+		
+		def self.valid_isrc_or_nil(isrc)
+			if MusicMetadataScore::Isrc.is_valid?(isrc)
+				MusicMetadataScore::Isrc.strip_isrc(isrc)
+			else
+				nil
+			end
 		end
+		
 	end
-	
 end