Fix bug in lib/apple_music

kumabook · Jan 26, 2019 · deb16a4 · deb16a4
1 parent 53b2502
commit deb16a4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/lib/apple_music/album.rb b/lib/apple_music/album.rb
@@ -26,6 +26,8 @@ class Album
       genres
     ]
     attr_accessor :id, :type, :href
+    attr_accessor *@attributes
+    attr_accessor *@relationships
 
     class << self
       attr_accessor :attributes
@@ -36,10 +38,10 @@ def initialize(id, type, href, attributes = {}, relationships = {})
       @id   = id
       @type = type
       @href = href
-      @@attributes.each do |attr|
+      self.class.attributes.each do |attr|
         send("#{attr}=".to_sym, attributes[attr.to_s.camelize(:lower)])
       end
-      @@relationships.each do |rel|
+      self.class.relationships.each do |rel|
         relationship = relationships[rel.to_s.camelize(:lower)]
         next if relationship.nil?
         partial_resources = relationship["data"].map do |h|

diff --git a/lib/apple_music/artist.rb b/lib/apple_music/artist.rb
@@ -15,6 +15,8 @@ class Artist
       genres
     ]
     attr_accessor :id, :type, :href
+    attr_accessor *@attributes
+    attr_accessor *@relationships
 
     class << self
       attr_accessor :attributes
@@ -25,10 +27,10 @@ def initialize(id, type, href, attributes = nil, relationships = nil)
       @id   = id
       @type = type
       @href = href
-      @@attributes.each do |attr|
+      self.class.attributes.each do |attr|
         send("#{attr}=".to_sym, attributes[attr.to_s.camelize(:lower)])
       end
-      @@relationships.each do |rel|
+      self.class.relationships.each do |rel|
         relationship = relationships[rel.to_s.camelize(:lower)]
         next if relationship.nil?
         partial_resources = relationship["data"].map do |h|

diff --git a/lib/apple_music/music_video.rb b/lib/apple_music/music_video.rb
@@ -29,6 +29,8 @@ class MusicVideo
       genres
     ]
     attr_accessor :id, :type, :href
+    attr_accessor *@attributes
+    attr_accessor *@relationships
 
     class << self
       attr_accessor :attributes
@@ -39,10 +41,10 @@ def initialize(id, type, href, attributes = {}, relationships = {})
       @id   = id
       @type = type
       @href = href
-      @@attributes.each do |attr|
+      self.class.attributes.each do |attr|
         send("#{attr}=".to_sym, attributes[attr.to_s.camelize(:lower)])
       end
-      @@relationships.each do |rel|
+      self.class.relationships.each do |rel|
         relationship = relationships[rel.to_s.camelize(:lower)]
         next if relationship.nil?
         partial_resources = relationship["data"].map do |h|

diff --git a/lib/apple_music/song.rb b/lib/apple_music/song.rb
@@ -31,6 +31,8 @@ class Song
       genres
     ]
     attr_accessor :id, :type, :href
+    attr_accessor *@attributes
+    attr_accessor *@relationships
 
     class << self
       attr_accessor :attributes
@@ -41,10 +43,10 @@ def initialize(id, type, href, attributes = {}, relationships = {})
       @id   = id
       @type = type
       @href = href
-      @@attributes.each do |attr|
+      self.class.attributes.each do |attr|
         send("#{attr}=".to_sym, attributes[attr.to_s.camelize(:lower)])
       end
-      @@relationships.each do |rel|
+      self.class.relationships.each do |rel|
         relationship = relationships[rel.to_s.camelize(:lower)]
         next if relationship.nil?
         partial_resources = relationship["data"].map do |h|