Moved happy mapper classes to xml namespace

justin368 · Aug 1, 2009 · 7212383 · 7212383
1 parent f378ee1
commit 7212383
Show file tree

Hide file tree

Showing 59 changed files with 476 additions and 407 deletions.
diff --git a/lib/echonest.rb b/lib/echonest.rb
@@ -16,31 +16,37 @@ def self.api_key
 require "echonest/api_request.rb"
 require "echonest/artist.rb"
 require "echonest/artist_search.rb"
-require "echonest/audio_doc.rb"
-require "echonest/audio_results.rb"
-require "echonest/audio_result.rb"
-require "echonest/blog_doc.rb"
-require "echonest/blog_results.rb"
-require "echonest/blog_result.rb"
-require "echonest/familiarity_result.rb"
-require "echonest/hotttnesss_result.rb"
-
-require "echonest/news_doc.rb"
-require "echonest/news_results.rb"
-require "echonest/news_result.rb"
-
-require "echonest/profile_result.rb"
-
-require "echonest/reviews_doc.rb"
-require "echonest/reviews_results.rb"
-require "echonest/reviews_result.rb"
-
-require "echonest/similar_doc.rb"
-require "echonest/similar_results.rb"
-require "echonest/similar_result.rb"
-
-require "echonest/urls_result.rb"
-
-require "echonest/video_doc.rb"
-require "echonest/video_results.rb"
-require "echonest/video_result.rb"
+
+require "echonest/xml/artist_doc.rb"
+
+require "echonest/xml/audio_doc.rb"
+require "echonest/xml/audio_results.rb"
+require "echonest/xml/audio_result.rb"
+
+require "echonest/xml/blog_doc.rb"
+require "echonest/xml/blog_results.rb"
+require "echonest/xml/blog_result.rb"
+
+require "echonest/xml/familiarity_result.rb"
+
+require "echonest/xml/hotttnesss_result.rb"
+
+require "echonest/xml/news_doc.rb"
+require "echonest/xml/news_results.rb"
+require "echonest/xml/news_result.rb"
+
+require "echonest/xml/profile_result.rb"
+
+require "echonest/xml/reviews_doc.rb"
+require "echonest/xml/reviews_results.rb"
+require "echonest/xml/reviews_result.rb"
+
+require "echonest/xml/similar_doc.rb"
+require "echonest/xml/similar_results.rb"
+require "echonest/xml/similar_result.rb"
+
+require "echonest/xml/urls_result.rb"
+
+require "echonest/xml/video_doc.rb"
+require "echonest/xml/video_results.rb"
+require "echonest/xml/video_result.rb"
diff --git a/lib/echonest/artist.rb b/lib/echonest/artist.rb
@@ -6,20 +6,6 @@ class Artist
     def initialize(id=nil)
       @id = id if id
     end
-
-    element :name, String
-    element :id, String
-    element :familiarity, Float
-    element :hotttnesss, Float
-    element :foreign_id, String
-
-    element :mb_url, String
-    element :official_url, String
-    element :myspace_url, String
-    element :wikipedia_url, String
-    element :amazon_url, String
-    element :itunes_url, String
-
 
     def get_audio
       request = ApiRequest.new("get_audio", {:id => id})

diff --git a/lib/echonest/audio_doc.rb b/lib/echonest/audio_doc.rb
diff --git a/lib/echonest/audio_result.rb b/lib/echonest/audio_result.rb
diff --git a/lib/echonest/audio_results.rb b/lib/echonest/audio_results.rb
diff --git a/lib/echonest/blog_doc.rb b/lib/echonest/blog_doc.rb
diff --git a/lib/echonest/blog_result.rb b/lib/echonest/blog_result.rb
diff --git a/lib/echonest/blog_results.rb b/lib/echonest/blog_results.rb
diff --git a/lib/echonest/familiarity_result.rb b/lib/echonest/familiarity_result.rb
diff --git a/lib/echonest/hotttnesss_result.rb b/lib/echonest/hotttnesss_result.rb
diff --git a/lib/echonest/news_doc.rb b/lib/echonest/news_doc.rb
diff --git a/lib/echonest/news_result.rb b/lib/echonest/news_result.rb
diff --git a/lib/echonest/news_results.rb b/lib/echonest/news_results.rb
diff --git a/lib/echonest/profile_result.rb b/lib/echonest/profile_result.rb
diff --git a/lib/echonest/reviews_doc.rb b/lib/echonest/reviews_doc.rb
diff --git a/lib/echonest/reviews_result.rb b/lib/echonest/reviews_result.rb
diff --git a/lib/echonest/reviews_results.rb b/lib/echonest/reviews_results.rb
diff --git a/lib/echonest/similar_doc.rb b/lib/echonest/similar_doc.rb
diff --git a/lib/echonest/similar_result.rb b/lib/echonest/similar_result.rb
diff --git a/lib/echonest/similar_results.rb b/lib/echonest/similar_results.rb
diff --git a/lib/echonest/urls_result.rb b/lib/echonest/urls_result.rb
diff --git a/lib/echonest/video_doc.rb b/lib/echonest/video_doc.rb
diff --git a/lib/echonest/video_result.rb b/lib/echonest/video_result.rb
diff --git a/lib/echonest/video_results.rb b/lib/echonest/video_results.rb