gingerhendrix-echonest 0.2.0 → 0.3.0

data/spec/echonest/{hotttness_result_spec.rb → xml/hotttness_result_spec.rb}

@@ -1,27 +1,27 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "HotttnessResult" do
 
   describe "#parse" do
     
     before(:each) do
-      @xml =  File.read(File.dirname(__FILE__) + "/../fixtures/hotttnesss/radiohead.xml")
+      @xml =  File.read(File.dirname(__FILE__) + "/../../fixtures/hotttnesss/radiohead.xml")
     end
     
     it "should parse xml" do
-      EchoNest::HotttnesssResult.parse(@xml)
+      HotttnesssResult.parse(@xml)
     end
     
     it "should have artist" do
-      hottnesss = EchoNest::HotttnesssResult.parse(@xml)
-      hottnesss.artist.should be_kind_of(EchoNest::Artist)
+      hottnesss = HotttnesssResult.parse(@xml)
+      hottnesss.artist.should be_kind_of(ArtistDoc)
       hottnesss.artist.name.should == "Radiohead"
       hottnesss.artist.id.should == "music://id.echonest.com/~/AR/ARH6W4X1187B99274F"      
     end
     
     it "artist should have hottnesss" do
-      hottnesss = EchoNest::HotttnesssResult.parse(@xml)
-      hottnesss.artist.should be_kind_of(EchoNest::Artist)
+      hottnesss = HotttnesssResult.parse(@xml)
+      hottnesss.artist.should be_kind_of(ArtistDoc)
       hottnesss.artist.hotttnesss.should_not be_nil
       hottnesss.artist.hotttnesss.should == 0.96974159665
     end

data/spec/echonest/{news_result_spec.rb → xml/news_result_spec.rb}

@@ -1,27 +1,27 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "NewsResult" do
 
   describe "#parse" do
     
     before(:each) do
-      @xml =  File.read(File.dirname(__FILE__) + "/../fixtures/news/radiohead.xml")
+      @xml =  File.read(File.dirname(__FILE__) + "/../../fixtures/news/radiohead.xml")
     end
     
     it "should parse xml" do
-      EchoNest::NewsResult.parse(@xml)
+      NewsResult.parse(@xml)
     end
     
     it "should have artist" do
-      news = EchoNest::NewsResult.parse(@xml)
-      news.artist.should be_kind_of(EchoNest::Artist)
+      news = NewsResult.parse(@xml)
+      news.artist.should be_kind_of(ArtistDoc)
       news.artist.name.should == "Radiohead"
       news.artist.id.should == "music://id.echonest.com/~/AR/ARH6W4X1187B99274F"      
     end
     
     it "should have results" do
-      news = EchoNest::NewsResult.parse(@xml)
-      news.results.should be_kind_of(EchoNest::NewsResults)
+      news = NewsResult.parse(@xml)
+      news.results.should be_kind_of(NewsResults)
 
       news.results.found.should == "67"
       news.results.shown.should == "2"
@@ -32,9 +32,9 @@ describe "NewsResult" do
     
     describe "result" do
       it "should be an NewsDoc" do
-        news = EchoNest::NewsResult.parse(@xml)
+        news = NewsResult.parse(@xml)
         doc = news.results.docs[0]  
-        doc.should be_kind_of(EchoNest::NewsDoc)
+        doc.should be_kind_of(NewsDoc)
 
         doc.name.should == "Modeselektor supports Radiohead in Japan"
         doc.url.should == "http://www.residentadvisor.net/news.aspx?id=9632"

data/spec/echonest/{profile_result_spec.rb → xml/profile_result_spec.rb}

@@ -1,20 +1,20 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "ProfileResult" do
 
   describe "#parse" do
     
     before(:each) do
-      @xml =  File.read(File.dirname(__FILE__) + "/../fixtures/profile/radiohead.xml")
+      @xml =  File.read(File.dirname(__FILE__) + "/../../fixtures/profile/radiohead.xml")
     end
     
     it "should parse xml" do
-      EchoNest::ProfileResult.parse(@xml)
+      ProfileResult.parse(@xml)
     end
     
     it "should have artist" do
-      profile = EchoNest::ProfileResult.parse(@xml)
-      profile.artist.should be_kind_of(EchoNest::Artist)
+      profile = ProfileResult.parse(@xml)
+      profile.artist.should be_kind_of(ArtistDoc)
       profile.artist.name.should == "Radiohead"
       profile.artist.id.should == "music://id.echonest.com/~/AR/ARH6W4X1187B99274F"      
       profile.artist.foreign_id.should == "music://id.echonest.com/5ZAOMB3BUR8QUN4PE/AR/1"   

data/spec/echonest/xml/refactor.rb

@@ -0,0 +1,12 @@
+
+
+Dir.glob(File.dirname(__FILE__) + "/*_spec.rb").each do |file|
+  if File.exists? "#{file}.old"
+  `rm #{file}`
+  `mv #{file}.old #{file}`
+  end
+  `sed s:'/../spec_helper':'/../../spec_helper': #{file} | sed s:"/../fixtures/:"/../../fixtures/: | sed s/EchoNest:://  | sed "s/\(Artist\)/\(ArtistDoc\)/" > #{file}.new`
+  `mv #{file} #{file}.old`
+  `mv #{file}.new #{file}`
+
+end

data/spec/echonest/{reviews_result_spec.rb → xml/reviews_result_spec.rb}

@@ -1,27 +1,27 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "ReviewsResult" do
 
   describe "#parse" do
     
     before(:each) do
-      @xml =  File.read(File.dirname(__FILE__) + "/../fixtures/reviews/radiohead.xml")
+      @xml =  File.read(File.dirname(__FILE__) + "/../../fixtures/reviews/radiohead.xml")
     end
     
     it "should parse xml" do
-      EchoNest::ReviewsResult.parse(@xml)
+      ReviewsResult.parse(@xml)
     end
     
     it "should have artist" do
-      reviews = EchoNest::ReviewsResult.parse(@xml)
-      reviews.artist.should be_kind_of(EchoNest::Artist)
+      reviews = ReviewsResult.parse(@xml)
+      reviews.artist.should be_kind_of(ArtistDoc)
       reviews.artist.name.should == "Radiohead"
       reviews.artist.id.should == "music://id.echonest.com/~/AR/ARH6W4X1187B99274F"      
     end
     
     it "should have results" do
-      reviews = EchoNest::ReviewsResult.parse(@xml)
-      reviews.results.should be_kind_of(EchoNest::ReviewsResults)
+      reviews = ReviewsResult.parse(@xml)
+      reviews.results.should be_kind_of(ReviewsResults)
       #TODO: Fill in these values as found in fixture
       reviews.results.found.should == "188"
       reviews.results.shown.should == "2"
@@ -32,9 +32,9 @@ describe "ReviewsResult" do
     
     describe "result" do
       it "should be an ReviewsDoc" do
-        reviews = EchoNest::ReviewsResult.parse(@xml)
+        reviews = ReviewsResult.parse(@xml)
         doc = reviews.results.docs[0]  
-        doc.should be_kind_of(EchoNest::ReviewsDoc)
+        doc.should be_kind_of(ReviewsDoc)
         #TODO: Create tests based on attributes in resource
         doc.name.should == "Radiohead - Hail to the Thief (from Robert Christgau)"
         doc.review_text.should == "See: No Hope Radio."

data/spec/echonest/{similar_result_spec.rb → xml/similar_result_spec.rb}

@@ -1,29 +1,29 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "SimilarResult" do
 
   describe "#parse" do
     
     before(:each) do
-      @xml =  File.read(File.dirname(__FILE__) + "/../fixtures/similar/radiohead.xml")
+      @xml =  File.read(File.dirname(__FILE__) + "/../../fixtures/similar/radiohead.xml")
     end
     
     it "should parse xml" do
-      EchoNest::SimilarResult.parse(@xml)
+      SimilarResult.parse(@xml)
     end
     
     it "should have results" do
-      similar = EchoNest::SimilarResult.parse(@xml)
-      similar.results.should be_kind_of(EchoNest::SimilarResults)
+      similar = SimilarResult.parse(@xml)
+      similar.results.should be_kind_of(SimilarResults)
       similar.results.docs.should be_kind_of(Array)
       similar.results.docs.length.should == 3
     end
     
     describe "result" do
       it "should be an SimilarDoc" do
-        similar = EchoNest::SimilarResult.parse(@xml)
+        similar = SimilarResult.parse(@xml)
         doc = similar.results.docs[0]  
-        doc.should be_kind_of(EchoNest::SimilarDoc)
+        doc.should be_kind_of(SimilarDoc)
         doc.id.should == "music://id.echonest.com/~/AR/ARKG7TE1187B9A45D8"
         doc.name.should == "Dinah Washington"
         doc.rank.should == 1

data/spec/echonest/{urls_result_spec.rb → xml/urls_result_spec.rb}

@@ -1,26 +1,26 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "UrlsResult" do
 
   describe "#parse" do
     
     before(:each) do
-      @xml =  File.read(File.dirname(__FILE__) + "/../fixtures/urls/radiohead.xml")
+      @xml =  File.read(File.dirname(__FILE__) + "/../../fixtures/urls/radiohead.xml")
     end
     
     it "should parse xml" do
-      EchoNest::UrlsResult.parse(@xml)
+      UrlsResult.parse(@xml)
     end
     
     it "should have artist" do
-      urls = EchoNest::UrlsResult.parse(@xml)
-      urls.artist.should be_kind_of(EchoNest::Artist)
+      urls = UrlsResult.parse(@xml)
+      urls.artist.should be_kind_of(ArtistDoc)
       urls.artist.name.should == "Radiohead"
       urls.artist.id.should == "music://id.echonest.com/~/AR/ARH6W4X1187B99274F"      
     end
     
     it "#artist should have urls" do
-      urls = EchoNest::UrlsResult.parse(@xml)
+      urls = UrlsResult.parse(@xml)
       artist = urls.artist
 
       artist.mb_url.should == "http://musicbrainz.org/artist/a74b1b7f-71a5-4011-9441-d0b5e4122711"

data/spec/echonest/{video_result_spec.rb → xml/video_result_spec.rb}

@@ -1,27 +1,27 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "VideosResult" do
 
   describe "#parse" do
     
     before(:each) do
-      @xml =  File.read(File.dirname(__FILE__) + "/../fixtures/video/radiohead.xml")
+      @xml =  File.read(File.dirname(__FILE__) + "/../../fixtures/video/radiohead.xml")
     end
     
     it "should parse xml" do
-      EchoNest::VideoResult.parse(@xml)
+      VideoResult.parse(@xml)
     end
     
     it "should have artist" do
-      videos = EchoNest::VideoResult.parse(@xml)
-      videos.artist.should be_kind_of(EchoNest::Artist)
+      videos = VideoResult.parse(@xml)
+      videos.artist.should be_kind_of(ArtistDoc)
       videos.artist.name.should == "Radiohead"
       videos.artist.id.should == "music://id.echonest.com/~/AR/ARH6W4X1187B99274F"      
     end
     
     it "should have results" do
-      videos = EchoNest::VideoResult.parse(@xml)
-      videos.results.should be_kind_of(EchoNest::VideoResults)
+      videos = VideoResult.parse(@xml)
+      videos.results.should be_kind_of(VideoResults)
 
       videos.results.found.should == "88"
       videos.results.shown.should == "2"
@@ -32,9 +32,9 @@ describe "VideosResult" do
     
     describe "result" do
       it "should be an VideoDoc" do
-        videos = EchoNest::VideoResult.parse(@xml)
+        videos = VideoResult.parse(@xml)
         doc = videos.results.docs[0]  
-        doc.should be_kind_of(EchoNest::VideoDoc)
+        doc.should be_kind_of(VideoDoc)
 
         doc.site.should == "youtube"
         doc.title.should == "Radiohead- Tell Me Why- Live Hollywood Bowl Neil Young 8-25"

data/spec/spec_helper.rb

@@ -11,3 +11,5 @@ require 'echonest'
 Spec::Runner.configure do |config|
   
 end
+
+include EchoNest::Xml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gingerhendrix-echonest
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Gareth Andrew
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-14 00:00:00 -07:00
+date: 2009-08-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- examples/artist_audio.rb
 - generators/echonest_acceptance_test/USAGE
 - generators/echonest_acceptance_test/echonest_acceptance_test_generator.rb
 - generators/echonest_acceptance_test/templates/feature.erb
@@ -43,41 +44,45 @@ files:
 - lib/echonest.rb
 - lib/echonest/api_request.rb
 - lib/echonest/artist.rb
-- lib/echonest/artist_search.rb
-- lib/echonest/audio_doc.rb
-- lib/echonest/audio_result.rb
-- lib/echonest/audio_results.rb
-- lib/echonest/blog_doc.rb
-- lib/echonest/blog_result.rb
-- lib/echonest/blog_results.rb
-- lib/echonest/familiarity_result.rb
-- lib/echonest/hotttnesss_result.rb
-- lib/echonest/news_doc.rb
-- lib/echonest/news_result.rb
-- lib/echonest/news_results.rb
-- lib/echonest/profile_result.rb
-- lib/echonest/reviews_doc.rb
-- lib/echonest/reviews_result.rb
-- lib/echonest/reviews_results.rb
-- lib/echonest/similar_doc.rb
-- lib/echonest/similar_result.rb
-- lib/echonest/similar_results.rb
-- lib/echonest/urls_result.rb
-- lib/echonest/video_doc.rb
-- lib/echonest/video_result.rb
-- lib/echonest/video_results.rb
+- lib/echonest/paged_result.rb
+- lib/echonest/xml/artist_doc.rb
+- lib/echonest/xml/artist_search_results.rb
+- lib/echonest/xml/audio_doc.rb
+- lib/echonest/xml/audio_result.rb
+- lib/echonest/xml/audio_results.rb
+- lib/echonest/xml/blogs_doc.rb
+- lib/echonest/xml/blogs_result.rb
+- lib/echonest/xml/blogs_results.rb
+- lib/echonest/xml/familiarity_result.rb
+- lib/echonest/xml/hotttnesss_result.rb
+- lib/echonest/xml/news_doc.rb
+- lib/echonest/xml/news_result.rb
+- lib/echonest/xml/news_results.rb
+- lib/echonest/xml/profile_result.rb
+- lib/echonest/xml/reviews_doc.rb
+- lib/echonest/xml/reviews_result.rb
+- lib/echonest/xml/reviews_results.rb
+- lib/echonest/xml/similar_doc.rb
+- lib/echonest/xml/similar_result.rb
+- lib/echonest/xml/similar_results.rb
+- lib/echonest/xml/urls_result.rb
+- lib/echonest/xml/video_doc.rb
+- lib/echonest/xml/video_result.rb
+- lib/echonest/xml/video_results.rb
 - spec/echonest/api_request_spec.rb
-- spec/echonest/audio_result_spec.rb
-- spec/echonest/blog_result_spec.rb
-- spec/echonest/familiarity_result_spec.rb
-- spec/echonest/hotttness_result_spec.rb
-- spec/echonest/news_result_spec.rb
-- spec/echonest/profile_result_spec.rb
-- spec/echonest/reviews_result_spec.rb
-- spec/echonest/search_spec.rb
-- spec/echonest/similar_result_spec.rb
-- spec/echonest/urls_result_spec.rb
-- spec/echonest/video_result_spec.rb
+- spec/echonest/paged_result_spec.rb
+- spec/echonest/xml/artist_search_results_spec.rb
+- spec/echonest/xml/audio_result_spec.rb
+- spec/echonest/xml/blogs_result_spec.rb
+- spec/echonest/xml/familiarity_result_spec.rb
+- spec/echonest/xml/hotttness_result_spec.rb
+- spec/echonest/xml/news_result_spec.rb
+- spec/echonest/xml/profile_result_spec.rb
+- spec/echonest/xml/refactor.rb
+- spec/echonest/xml/reviews_result_spec.rb
+- spec/echonest/xml/similar_result_spec.rb
+- spec/echonest/xml/urls_result_spec.rb
+- spec/echonest/xml/video_result_spec.rb
 - spec/fixtures/audio/wavves.xml
 - spec/fixtures/blog/radiohead.xml
 - spec/fixtures/familiarity/radiohead.xml
@@ -97,6 +102,7 @@ files:
 - test/test_generator_helper.rb
 has_rdoc: false
 homepage: http://github.com/gingerhendrix/echonest
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -117,26 +123,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A ruby ribrary for accessing the echonest api
 test_files: 
 - spec/spec_helper.rb
-- spec/echonest/audio_result_spec.rb
-- spec/echonest/search_spec.rb
+- spec/echonest/paged_result_spec.rb
+- spec/echonest/xml/artist_search_results_spec.rb
+- spec/echonest/xml/audio_result_spec.rb
+- spec/echonest/xml/blogs_result_spec.rb
+- spec/echonest/xml/familiarity_result_spec.rb
+- spec/echonest/xml/hotttness_result_spec.rb
+- spec/echonest/xml/news_result_spec.rb
+- spec/echonest/xml/profile_result_spec.rb
+- spec/echonest/xml/refactor.rb
+- spec/echonest/xml/reviews_result_spec.rb
+- spec/echonest/xml/similar_result_spec.rb
+- spec/echonest/xml/urls_result_spec.rb
+- spec/echonest/xml/video_result_spec.rb
 - spec/echonest/api_request_spec.rb
-- spec/echonest/blog_result_spec.rb
-- spec/echonest/news_result_spec.rb
-- spec/echonest/familiarity_result_spec.rb
-- spec/echonest/hotttness_result_spec.rb
-- spec/echonest/profile_result_spec.rb
-- spec/echonest/urls_result_spec.rb
-- spec/echonest/reviews_result_spec.rb
-- spec/echonest/similar_result_spec.rb
-- spec/echonest/video_result_spec.rb
 - test/test_echonest_acceptance_test_generator.rb
 - test/test_echonest_model_generator.rb
 - test/test_echonest_resource_generator.rb
 - test/test_generator_helper.rb
 - test/test_echonest_unit_test_generator.rb
+- examples/artist_audio.rb