decibel_wrapper 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjFhNmFkOTQ3YzQ2ODU4MTA1MjgyM2FmZmFjYTBkYmVkNDdiYzllZA==
+    ZmM5MDRjZmVjMGU1MzcxNjg4Njg2ZmM4ZDM5NDIwNTc4YWFmZTVjMQ==
   data.tar.gz: !binary |-
-    OWY4OWM5ODUyYzRiNDUwNTFjODBkNzVkMDgxOTkwYmJhYzllMTRiZg==
+    ZDE2N2FlZGY4YmEwMDc5OTU0MDg4YjAxZGU1ZWEyMmI4ODE1MjIzNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGU3OWU0OGExNzU4ZDE2NDYxNjZhZmQ1Y2Q4OTM1MDMxOGU0OGQ3ZjRjZjg0
-    ZTc0MjYxOTg3MzBhNGYzNDI1MjRiMmU5MGRiOWRmMTk1MDExNjVhYzdhNjli
-    ZTY1MjZmNmNkZWFlZjdmOGMzYWViYmNlZjA5ODg2NmFiMzMyZDE=
+    MzQzMGMxNGU1Yjg0YjUxNjljNjU1ZTYxOWU3MjhiOGQxNGFiODlmMThhMDlk
+    YWI2NDc1M2FkZmNhYWI5Y2I4YjNmZTI3MDUxZDIyYmQ1M2ZlNDllOTEyMGJl
+    NjJmODYyNzc0YzQ2YmM5MmIzNTcxMDJiNDRlNTM3YjA2NmU3ZjY=
   data.tar.gz: !binary |-
-    NDQ4YWE3ZjU2YjY2ZDYxYzcxYmUzNWYyN2UwMDhmNjUxZjNiODlhNDhhMGM1
-    YjlkMmZlNGU1NGRlMjI4YTVjN2EwNzNlNDAwZDExNmVlNGNkMWM4YWI2M2I2
-    ZDRlMGU5Y2YxYzNlOTdmYTE5OWY3NDRkN2ZiODJkNWU3ZDM1OTc=
+    NTA1YTYzN2I1NzZkMzNmMTgzOWE4ZjdlNWU2ZjYxZDRiOTY5NjljNDU5YzEy
+    MmM5MDcwNzQ0NmMzZTA1ZGNlYTJkM2RmZGU1NWZmNmU4NzNhMjg3MzMyNzVk
+    NTE1ODkwMzM3NzM4NDc5NzBmOTJkMDcyNjA5NWZhMDZjOTBiMjk=

data/lib/decibel_wrapper/version.rb

@@ -1,3 +1,3 @@
 module DecibelWrapper
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/lib/wrapper/resources/album.rb

@@ -1,6 +1,6 @@
 class Decibel::Album
 	
-	attr_accessor :Id, :Title, :FeaturedArtistString, :LiteralMainArtists, :FeaturedArtists, :IsUnofficial, :Identifiers, :Genres, :Tracks, :MainArtists, :OriginalReleaseDate, :ImageId, :ImageUrl, :ThumbnailUrl
+	attr_accessor :Id, :Title, :FeaturedArtistString, :ArtistsLiteral, :FeaturedArtists, :IsUnofficial, :Identifiers, :Genres, :Recordings, :Artists, :Participations, :OriginalReleaseDate, :ImageId, :ImageUrl, :ThumbnailUrl
 	
 	def initialize args
 		args.each do |k, v|
@@ -13,8 +13,8 @@ class Decibel::Album
 		self.identifiers_initialize if self.Identifiers
 		self.featured_artists_initialize if self.FeaturedArtists
 		self.genres_initialize if self.Genres
-		self.tracks_initialize if self.Tracks
-		self.artists_initialize if self.MainArtists
+		self.recordings_initialize if self.Recordings
+		self.artists_initialize if self.Artists
 	end
 	
 	def identifiers_initialize
@@ -41,20 +41,28 @@ class Decibel::Album
 		self.Genres = array
 	end
 	
-	def tracks_initialize
+	def recordings_initialize
 		array = []
-		self.Tracks.each do |i|
+		self.Recordings.each do |i|
 			array << Decibel::Recording.new(i)
 		end
-		self.Tracks = array
+		self.Recordings = array
 	end
 	
 	def artists_initialize
 		array = []
-		self.MainArtists.each do |i|
+		self.Artists.each do |i|
 			array << Decibel::Artist.new(i)
 		end
-		self.MainArtists = array
+		self.Artists = array
+	end
+	
+	def participations_initialize
+		array = []
+		self.Participations.each do |i|
+			array << Decibel::Participation.new(i)
+		end
+		self.Participations = array
 	end
 
 end

data/lib/wrapper/resources/artist.rb

@@ -1,11 +1,33 @@
 class Decibel::Artist
 	
-	attr_accessor :LiteralName, :Id, :Name, :Probability
+	attr_accessor :Id, :Name, :StageName, :ArtistType, :Identifiers, :Annotations, :Members, :BirthDate, :DeathDate, :BirthPlace, :DeathPlace
 	
 	def initialize args
 		args.each do |k, v|
   		instance_variable_set("@#{k}", v) unless v.nil?
   	end
+  	self.child_initializers
+	end
+	
+	def child_initializers
+		self.members_initialize if self.Members
+  	self.annotations_initialize if self.Annotations
+	end
+	
+	def members_initialize
+		array = []
+		self.Members.each do |m|
+			array << Decibel::Participant.new(m)
+		end
+		self.Members = array
+	end
+	
+	def annotations_initialize
+		array = []
+		self.Annotations.each do |m|
+			array << m[:Text]
+		end
+		self.Annotations = array
 	end
 	
 end

data/lib/wrapper/resources/participant.rb

@@ -1,6 +1,6 @@
 class Decibel::Participant
 	
-	attr_accessor :Id, :Name, :StageName, :Identifiers, :Annotations, :Members, :DateOfBirth, :DateOfDeath
+	attr_accessor :Id, :Name, :StageName, :ArtistType, :Identifiers, :Annotations, :Members, :BirthDate, :DeathDate, :BirthPlace, :DeathPlace
 	
 	def initialize args
 		args.each do |k, v|

data/lib/wrapper/resources/participation.rb

@@ -1,6 +1,7 @@
 class Decibel::Participation
 	
-	attr_accessor :LiteralMainIdentities, :MainIdentities, :LiteralActivity, :Activities, :LiteralArtists, :Artists
+	attr_accessor :ActivityLiteral, :Activities, :ArtistsLiteral, :Artists, :IsFeatured
+	# Removed :LiteralMainIdentities, :MainIdentities,
 	
 	def initialize args
 		args.each do |k, v|
@@ -10,19 +11,11 @@ class Decibel::Participation
 	end
 	
 	def child_initializers
-		self.main_identities_initialize if self.MainIdentities
+		#self.main_identities_initialize if self.MainIdentities
 		self.artists_initialize if self.Artists
 		self.activities_initialize if self.Activities
 	end
 	
-	def main_identities_initialize
-		array = []
-		self.MainIdentities.each do |i|
-			array << Decibel::MainIdentity.new(i)
-		end
-		self.MainIdentities = array
-	end
-	
 	def activities_initialize
 		array = []
 		self.Activities.each do |a|
@@ -39,4 +32,13 @@ class Decibel::Participation
 		self.Artists = array
 	end
 	
+	# To Be Removed?
+	def main_identities_initialize
+		array = []
+		self.MainIdentities.each do |i|
+			array << Decibel::MainIdentity.new(i)
+		end
+		self.MainIdentities = array
+	end
+	
 end

data/lib/wrapper/resources/recording.rb

@@ -1,6 +1,6 @@
 class Decibel::Recording
 	
-	attr_accessor :Id, :AlbumSequence, :Title, :Artists, :FeaturedArtistString, :Duration, :FeaturedArtists, :Genres, :Participations, :Authors
+	attr_accessor :Id, :AlbumSequence, :Title, :Duration, :MainArtistsLiteral, :Artists, :FeaturedArtistsLiteral, :FeaturedArtists, :Genres, :Identifiers, :Participations, :Works, :Identifiers
 	
 	def initialize args
 		args.each do |k, v|
@@ -13,14 +13,15 @@ class Decibel::Recording
 		self.featured_artists_initialize if self.FeaturedArtists
 		self.genres_initialize if self.Genres
 		self.participations_initialize if self.Participations
-		self.authors_initialize if self.Authors
 		self.artists_initialize if self.Artists
+		self.identifiers_initialize if self.Identifiers
+		self.works_initialize if self.Works
 	end
 	
 	def featured_artists_initialize
 		array = []
 		self.FeaturedArtists.each do |a|
-			array << Decibel::FeaturedArtist.new(a)
+			array << Decibel::Artist.new(a)
 		end
 		self.FeaturedArtists = array
 	end
@@ -41,14 +42,6 @@ class Decibel::Recording
 		self.Participations = array
 	end
 	
-	def authors_initialize
-		array = []
-		self.Authors.each do |a|
-			array << Decibel::Participation.new(a)
-		end
-		self.Authors = array
-	end
-	
 	def artists_initialize
 		array = []
 		self.Artists.each do |a|
@@ -57,6 +50,22 @@ class Decibel::Recording
 		self.Artists = array
 	end
 	
+	def identifiers_initialize
+		array = []
+		self.Identifiers.each do |i|
+			array << Decibel::Identifier.new(i)
+		end
+		self.Identifiers = array
+	end
+	
+	def works_initialize
+		array = []
+		self.Works.each do |a|
+			array << Decibel::Work.new(a)
+		end
+		self.Works = array
+	end
+	
 	# Needs looking at for refactoring
 	def child_initializer(object, child_object)
 		array = []

data/lib/wrapper/resources/work.rb

@@ -1,6 +1,6 @@
 class Decibel::Work
 	
-	attr_accessor :Id, :Title, :Participations, :Tracks
+	attr_accessor :Id, :Name, :Title, :WorkType, :Participations, :Tracks
 	
 	def initialize args
 		args.each do |k, v|

data/lib/wrapper/wrapper.rb

@@ -32,6 +32,22 @@ class Decibel::Wrapper
 		end
   end
   
+  def artist(params)
+  	response = self.query(Decibel::Wrapper.create_query_string('artist/?', params))
+		Decibel::Artist.new(response) if !response.nil?
+  end
+  
+  def artists(params)
+  	response = self.query(Decibel::Wrapper.create_query_string('artists/?', params))
+		if !response.nil?
+			array = []
+			response.each do |a|
+				array << Decibel::Artist.new(a)
+			end
+			array
+		end
+  end
+  
   def disctags(params)
   
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decibel_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - tomallen400
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler