decibel_wrapper 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWE5MzAzZWQzOGExN2I1MmU0Yzg4YWQ4MzA4MzhkNTZjNDg3ZjkwZA==
+    MWNkMDBlYWZmMzc3Y2U2OWZhZWM2Nzc2Yzc3MTczYjFhMzQ1YWIyYQ==
   data.tar.gz: !binary |-
-    YmNmNTdjZTdkMWUwNTU4MjBlMmFjZTY4ZTE2MGRiNzZkNDJmZDY3OA==
+    NmU4MGJlOWJlMzQ2YzkwMGQzNGUzYjJhZDNjNzc5ZWZhYmJmZTRlMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2YzNTA4YTQ1YzE3OGI4MzI0MDNiNDBmOWE1OTBiZDYxYTcwYzk3NzYwNDgy
-    MzUwZDIzZWQ5YmEyNjMyODVmMmFmMDBkMmViNDliOWMyMzEwMzNhZmExM2Rk
-    NTM5YzA4ZmE3MzYxNzM3M2Q0OTFhMjBjZjUxOGJkZDQxMjA0ZTc=
+    NjFiNWEyMmE4ZmRhMWQ0Y2IwYzYyOTI4MjQ2NjI5M2E0NWIxOWE1ZjNmMGQz
+    ODg3MjI2ZjQ0YjdkZTgzZWVmYzdhYjc2M2RjMmUzNTg4NWVkZTdhY2U1MWFm
+    NTIwYzZhNmY4NTg1ZmMxODIwMDM0ZTA1MTQ1NjViMTI3MzFkNDQ=
   data.tar.gz: !binary |-
-    MDgyMWRlNTUyZTg4Yjc5NDYxNGFiZTM1YTNiMDNkM2Q1NDYzOWQxMGNjYWY1
-    Y2Y5NjY2MTM3ZWEzYzYwZjBkMDZkYmIwYzQ3ODExYjBjZWFhMTlmMzhlMDdh
-    Y2RhZWUwZjA2YWQzN2ZmNWFhODBmODZhZjdmY2Q4NTFiZTRkZTk=
+    MjdhNDc1MjAxMjBjYmQwOTg4YjMxODg4ZDI0ODUyMGYzMzIwZjVjNDcwM2Vm
+    NGJhMjBmNjBiYjE4NDEyNTg5MTljODk5M2I3ZDk3ZjhlYzE2OTUyNzhmMGZm
+    OWNjNWY0Njg1NjhlNDg3MWEyMjQ5M2JkMTg1NWE0MjYwNDQyMjc=

data/lib/decibel_wrapper/version.rb

@@ -1,3 +1,3 @@
 module DecibelWrapper
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/wrapper/resources/album.rb

@@ -1,6 +1,6 @@
 class Decibel::Album
 	
-	attr_accessor :Title, :FeaturedArtistString, :IsUnofficial, :Identifiers, :Genres, :Tracks
+	attr_accessor :Id, :Title, :FeaturedArtistString, :FeaturedArtists, :IsUnofficial, :Identifiers, :Genres, :Tracks
 	
 	def initialize args
 		args.each do |k, v|
@@ -11,6 +11,7 @@ class Decibel::Album
 	
 	def child_initializers
 		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
 	end
@@ -23,6 +24,14 @@ class Decibel::Album
 		self.Identifiers = array
 	end
 	
+	def featured_artists_initialize
+		array = []
+		self.FeaturedArtists.each do |a|
+			array << Decibel::FeaturedArtist.new(a)
+		end
+		self.FeaturedArtists = array
+	end
+	
 	def genres_initialize
 		array = []
 		self.Genres.each do |i|

data/lib/wrapper/resources/participant.rb

@@ -1,12 +1,17 @@
 class Decibel::Participant
 	
-	attr_accessor :Id, :Name, :StageName, :Identifiers, :Biography, :BiographySnippet, :Members
+	attr_accessor :Id, :Name, :StageName, :Identifiers, :Annotations, :Members
 	
 	def initialize args
 		args.each do |k, v|
   		instance_variable_set("@#{k}", v) unless v.nil?
   	end
-  	self.members_initialize if self.Members
+  	self.child_initializers
+	end
+	
+	def child_initializers
+		self.members_initialize if self.Members
+  	self.annotations_initialize if self.Annotations
 	end
 	
 	def members_initialize
@@ -17,4 +22,12 @@ class Decibel::Participant
 		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/recording.rb

@@ -1,6 +1,6 @@
 class Decibel::Recording
 	
-	attr_accessor :Id, :Title, :FeaturedArtistString, :Duration, :FeaturedArtists, :Genres, :Participations, :Authors
+	attr_accessor :Id, :AlbumSequence, :Title, :FeaturedArtistString, :Duration, :FeaturedArtists, :Genres, :Participations, :Authors
 	
 	def initialize args
 		args.each do |k, v|

data/spec/spec_helper.rb

@@ -16,4 +16,8 @@ RSpec.configure do |config|
   config.order = 'random'
 end
 
-require 'decibel_wrapper'
+require 'decibel_wrapper'
+
+YOUR_DECIBEL_APP_ID = ""
+YOUR_DECIBEL_APP_KEY = ""
+$wrapper = Decibel::Wrapper.new(:decibel_app_id => YOUR_DECIBEL_APP_ID, :decibel_app_key => YOUR_DECIBEL_APP_KEY)

data/spec/wrapper/album_spec.rb

@@ -2,40 +2,45 @@ require 'spec_helper'
 
 describe Decibel::Album do
 
-	let(:wrapper) { Decibel::Wrapper.new(:decibel_app_id => 'YOUR_DECIBEL_APP_ID', :decibel_app_key => 'YOUR_DECIBEL_APP_KEY')  }
+	let(:wrapper) { $wrapper }
 	let(:decibal_album) { wrapper.album(:id => 'cd94ce57-533a-e311-be6d-ac220b82800d') }
-	let(:album) { Decibel::Album.new(:Id => 'cd94ce57-533a-e311-be6d-ac220b82800d', :Identifiers => [{:IdentifierType => "A type", :Value => "1234"}], :Genres => [{:Name => "House"}, {:Name => "Electro"}]) }
+	let(:album) { Decibel::Album.new(:Id => 'cd94ce57-533a-e311-be6d-ac220b82800d', :Identifiers => [{:IdentifierType => "A type", :Value => "1234"}], :Genres => [{:Name => "House"}, {:Name => "Electro"}], :FeaturedArtists => [{:Id => "6e862d4e-8476-11e3-be7e-ac220b82800d", :LiteralName => "The Rolling Stones" }, {:Id => "6e862d4e-8476-11e3-be7e-ac220b82800d", :LiteralName => "The Rolling Stones" }], :Tracks => [{:Id => "6e862d28-8476-11e3-be7e-ac220b82800d", :Title => "Brown Sugar"}, {:Id => "6e862d50-8476-11e3-be7e-ac220b82800d", :Title => "Sway"}]) }
 	subject { album }
 	
+	it { should respond_to(:Id) }
 	it { should respond_to(:Title) }
 	it { should respond_to(:FeaturedArtistString) }
+	it { should respond_to(:FeaturedArtists) }
 	it { should respond_to(:IsUnofficial) }
 	it { should respond_to(:Identifiers) }
 	it { should respond_to(:Genres) }
 	it { should respond_to(:Tracks) }
 	
-	describe "identifiers_initialize" do
-		before { album.identifiers_initialize }
-		it "should set initializers to an array" do
-			album.Identifiers.should be_an_instance_of Array
-		end
-		it "should set initializers to an array of Decibel::Identifier s" do
-			album.Identifiers[0].should be_an_instance_of Decibel::Identifier
-		end
-	end
 	
-	describe "genres_intialize" do
-		before { album.genres_initialize }
-		it "should set genres to an array" do
-			album.Genres.should be_an_instance_of Array
-		end
-		it "should set genres to an array of Decibel::Genre s" do
-			album.Genres[0].should be_an_instance_of Decibel::Genre
-		end
+	it "should set initializers to an array" do
+		album.Identifiers.should be_an_instance_of Array
 	end
-	
-	describe "tracks_initialize" do
-		
+	it "should set initializers to an array of Decibel::Identifier s" do
+		album.Identifiers[0].should be_an_instance_of Decibel::Identifier
+	end
+	it "should set featured artists to an array" do
+		album.FeaturedArtists.should be_an_instance_of Array
+	end
+	it "should set featured artists to an array of Decibel::FeaturedArtists" do
+		album.FeaturedArtists[0].should be_an_instance_of Decibel::FeaturedArtist
 	end
+	it "should set genres to an array" do
+		album.Genres.should be_an_instance_of Array
+	end
+	it "should set genres to an array of Decibel::Genres" do
+		album.Genres[0].should be_an_instance_of Decibel::Genre
+	end
+	it "should set tracks to an array" do
+		album.Tracks.should be_an_instance_of Array
+	end
+	it "should set tracks to an array of Decibel::Recordings" do
+		album.Tracks[0].should be_an_instance_of Decibel::Recording
+	end
+		
 
 end

data/spec/wrapper/participant_spec.rb

@@ -2,17 +2,16 @@ require 'spec_helper'
 
 describe Decibel::Participant do
 
-	let(:wrapper) { Decibel::Wrapper.new(:decibel_app_id => 'YOUR_DECIBEL_APP_ID', :decibel_app_key => 'YOUR_DECIBEL_APP_KEY')  }
+	let(:wrapper) { $wrapper }
 	let(:decibal_participant) { wrapper.participant(:id => '5e9c115a-7e00-11e3-be7b-ac220b82800d') }
-	let(:participant) { Decibel::Participant.new(:Id => "1fe03321-463a-e311-be6d-ac220b82800d", :Name => "The Rolling Stones", :StageName => "The Rolling Stones", :Members => [:Id => "1fe03321-463a-e311-be6d-ac220b82800d", :Name => "The Rolling Stones", :StageName => "The Rolling Stones", :Identifiers => [{:IdentifierType => "DiscogsName", :Value => "Rolling Stones, The"}, {:IdentifierType => "DiscogsID", :Value => "a20991"}]], :Identifiers => [{:IdentifierType => "DiscogsName", :Value => "Rolling Stones, The"}, {:IdentifierType => "DiscogsID", :Value => "a20991"}], :ParticipantType => 1) }
+	let(:participant) { Decibel::Participant.new(:Id => "1fe03321-463a-e311-be6d-ac220b82800d", :Name => "The Rolling Stones", :StageName => "The Rolling Stones", :Members => [:Id => "1fe03321-463a-e311-be6d-ac220b82800d", :Name => "The Rolling Stones", :StageName => "The Rolling Stones", :Identifiers => [{:IdentifierType => "DiscogsName", :Value => "Rolling Stones, The"}, {:IdentifierType => "DiscogsID", :Value => "a20991"}]], :Identifiers => [{:IdentifierType => "DiscogsName", :Value => "Rolling Stones, The"}, {:IdentifierType => "DiscogsID", :Value => "a20991"}], :Annotations => [{:Text => "Annotation 1"}, {:Text => "Annotation 2"}], :ParticipantType => 1) }
 	subject { participant }
 	
 	it { should respond_to(:Id) }
 	it { should respond_to(:Name) }
 	it { should respond_to(:StageName) }
 	it { should respond_to(:Identifiers) }
-	it { should respond_to(:Biography) }
-	it { should respond_to(:BiographySnippet) }
+	it { should respond_to(:Annotations) }
 	it { should respond_to(:Members) }
 
 	it "should set Members to an array" do
@@ -21,5 +20,11 @@ describe Decibel::Participant do
 	it "should set Members to an array of Decibel::Participants" do
 		participant.Members[0].should be_an_instance_of Decibel::Participant
 	end
+	it "should set Members to an array" do
+		participant.Annotations.should be_an_instance_of Array
+	end
+	it "should set Members to an array of String" do
+		participant.Annotations[0].should be_an_instance_of String
+	end
 	
 end

data/spec/wrapper/recording_participation_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 
 describe Decibel::Participation do
 
-	let(:wrapper) { Decibel::Wrapper.new(:decibel_app_id => 'YOUR_DECIBEL_APP_ID', :decibel_app_key => 'YOUR_DECIBEL_APP_KEY')  }
-	#let(:decibal_participant) { wrapper.recording(:id => '5e9c115a-7e00-11e3-be7b-ac220b82800d') }
+	let(:wrapper) { $wrapper }
 	let(:participation) { Decibel::Participation.new(:LiteralMainIdentities => "Chad Smith", :MainIdentities => [{:Id => "f8d2a321-463a-e311-be6d-ac220b82800d", :LiteralName => "Chad Smith"}], :LiteralActivity => "Drums", :Activities => [{:Name => "Drums"}]) }
 	subject { participation }
 	

data/spec/wrapper/recording_spec.rb

@@ -2,17 +2,21 @@ require 'spec_helper'
 
 describe Decibel::Recording do
 
-	let(:wrapper) { Decibel::Wrapper.new(:decibel_app_id => 'YOUR_DECIBEL_APP_ID', :decibel_app_key => 'YOUR_DECIBEL_APP_KEY')  }
+	let(:wrapper) { $wrapper }
 	let(:decibal_recording) { wrapper.recording(:id => '5e9c115a-7e00-11e3-be7b-ac220b82800d') }
 	let(:recording) { Decibel::Recording.new(:Id => '5e9c115a-7e00-11e3-be7b-ac220b82800d', :Title => "Zephyr Song", :Genres => [{:Name => "House"}, {:Name => "Electro"}], :Duration => 232.0, :FeaturedArtists => [{:Id => "efcd42f6-7dff-11e3-be7b-ac220b82800d", :LiteralName => "Red Hot Chili Peppers"}], :Participations => [{:LiteralMainIdentities => "Chad Smith", :MainIdentities => [{:Id  => "f8d2a321-463a-e311-be6d-ac220b82800d", :LiteralName => "Chad Smith"}], :LiteralActivity => "Drums", :Activities => [{:Name => "Drums"}]}], :Authors => [{:LiteralMainIdentities => "John Frusciante", :MainIdentities => [{:Id => "03d85421-463a-e311-be6d-ac220b82800d", :LiteralName => "John Frusciante"}], :LiteralActivity => "Written-By", :Activities => [{:Name => "Written By"}]}]) }
 	let(:blank_recording) { Decibel::Recording.new(:Id => "") }
 	subject { recording }
 	
 	it { should respond_to(:Id) }
+	it { should respond_to(:AlbumSequence) }
 	it { should respond_to(:Title) }
 	it { should respond_to(:FeaturedArtistString) }
 	it { should respond_to(:Duration) }
 	it { should respond_to(:FeaturedArtists) }
+	it { should respond_to(:Genres) }
+	it { should respond_to(:Participations) }
+	it { should respond_to(:Authors) }
 	
 	it "should set FeaturedArtists to an array" do
 		recording.FeaturedArtists.should be_an_instance_of Array

data/spec/wrapper/wrapper_spec.rb

@@ -2,9 +2,13 @@ require 'spec_helper'
 
 describe Decibel::Wrapper do
 	
-	let(:wrapper) { Decibel::Wrapper.new(:decibel_app_id => 'YOUR_DECIBEL_APP_ID', :decibel_app_key => 'YOUR_DECIBEL_APP_KEY')  }
+	let(:wrapper) { $wrapper }
 	let(:test_query) { "albums/?title=the%20fame%20monster&depth=Tracks;TrackAuthors" }
 	let(:album_query) { "album/?id=cd94ce57-533a-e311-be6d-ac220b82800d" }
+	subject { wrapper }
+	
+	it { should respond_to(:decibel_app_id) }
+	it { should respond_to(:decibel_app_key) }
 	
 	# Album
 	describe "album" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decibel_wrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - tomallen400