beatport 0.1.3 → 0.1.5

data/Gemfile

@@ -9,10 +9,12 @@ gem 'money'    # https://github.com/aflatter/money
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.3"
-  gem "rcov", ">= 0"
-  gem 'yard', '>=0'
+  gem 'bundler'
+  gem 'fakeweb'
+  gem 'jeweler', '~> 1.6.3'
+  #gem "rcov", ">= 0"
   gem 'log_buddy'
+  gem 'rspec', '>= 0'
+  gem 'yard', '>=0'
+  gem 'vcr'  
 end

data/Gemfile.lock

@@ -2,43 +2,45 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    fakeweb (1.3.0)
     git (1.2.5)
-    httparty (0.8.1)
-      multi_json
+    httparty (0.9.0)
+      multi_json (~> 1.0)
       multi_xml
-    i18n (0.6.0)
+    i18n (0.6.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.3)
-    log_buddy (0.6.0)
-    money (4.0.1)
+    json (1.7.5)
+    log_buddy (0.7.0)
+    money (5.0.0)
       i18n (~> 0.4)
       json
-    multi_json (1.0.4)
-    multi_xml (0.4.1)
+    multi_json (1.3.6)
+    multi_xml (0.5.1)
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    yard (0.7.3)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    vcr (2.2.5)
+    yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler
+  fakeweb
   httparty
   jeweler (~> 1.6.3)
   log_buddy
   money
-  rcov
   rspec
+  vcr
   yard

data/Rakefile

@@ -27,13 +27,13 @@ Jeweler::RubygemsDotOrgTasks.new
 
 #task :default => :test
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
+#require 'rcov/rcovtask'
+#Rcov::RcovTask.new do |test|
+#  test.libs << 'test'
+#  test.pattern = 'test/**/test_*.rb'
+#  test.verbose = true
+#  test.rcov_opts << '--exclude "gems/*"'
+#end
 
 
 

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

data/beatport.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{beatport}
-  s.version = "0.1.3"
+  s.name = "beatport"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = %q{2011-12-25}
-  s.description = %q{A ruby gem for accessing the beatport api}
-  s.email = %q{mateo.murphy@gmail.com}
+  s.date = "2012-10-10"
+  s.description = "A ruby gem for accessing the beatport api"
+  s.email = "mateo.murphy@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/beatport/catalog/chart_overview.rb",
     "lib/beatport/catalog/country.rb",
     "lib/beatport/catalog/currency.rb",
+    "lib/beatport/catalog/djprofile.rb",
     "lib/beatport/catalog/feature.rb",
     "lib/beatport/catalog/genre.rb",
     "lib/beatport/catalog/home.rb",
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
     "lib/beatport/catalog/label.rb",
     "lib/beatport/catalog/list.rb",
     "lib/beatport/catalog/mixed.rb",
+    "lib/beatport/catalog/part.rb",
     "lib/beatport/catalog/recommendations.rb",
     "lib/beatport/catalog/release.rb",
     "lib/beatport/catalog/search.rb",
@@ -84,16 +86,47 @@ Gem::Specification.new do |s|
     "spec/catalog/source_type_spec.rb",
     "spec/catalog/track_spec.rb",
     "spec/collection_spec.rb",
+    "spec/fixtures/account_type_all.yml",
+    "spec/fixtures/account_type_visa.yml",
+    "spec/fixtures/artist_7181.yml",
+    "spec/fixtures/artist_7181_7182.yml",
+    "spec/fixtures/artist_7181_top_downloads.yml",
+    "spec/fixtures/artist_all.yml",
+    "spec/fixtures/artist_all_5_per_page.yml",
+    "spec/fixtures/artist_all_for_facets.yml",
+    "spec/fixtures/artist_all_return_facets.yml",
+    "spec/fixtures/artist_all_sorted.yml",
+    "spec/fixtures/audio_format_2.yml",
+    "spec/fixtures/audio_format_all.yml",
+    "spec/fixtures/audio_format_wav.yml",
+    "spec/fixtures/autocomplete_lutzen.yml",
+    "spec/fixtures/autocomplete_lutzen_page_3.yml",
+    "spec/fixtures/chart_15722.yml",
+    "spec/fixtures/country_au.yml",
+    "spec/fixtures/currency_all.yml",
+    "spec/fixtures/genre_7.yml",
+    "spec/fixtures/genre_all.yml",
+    "spec/fixtures/genre_all_with_subgenres.yml",
+    "spec/fixtures/genre_invalid.yml",
+    "spec/fixtures/label_1390.yml",
+    "spec/fixtures/label_all.yml",
+    "spec/fixtures/release_164808.yml",
+    "spec/fixtures/search_ANJCDCO011D.yml",
+    "spec/fixtures/search_anjunadeep_genre_trance.yml",
+    "spec/fixtures/search_archipel.yml",
+    "spec/fixtures/search_believe_2004.yml",
+    "spec/fixtures/source_type_all.yml",
+    "spec/fixtures/track_1217790.yml",
     "spec/item_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/inflector_spec.rb",
     "spec/support/query_builder_spec.rb"
   ]
-  s.homepage = %q{http://github.com/mateomurphy/beatport}
+  s.homepage = "http://github.com/mateomurphy/beatport"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{ruby gem for accessing the beatport api}
+  s.rubygems_version = "1.8.24"
+  s.summary = "ruby gem for accessing the beatport api"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -101,31 +134,34 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
       s.add_runtime_dependency(%q<money>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<fakeweb>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
       s.add_development_dependency(%q<log_buddy>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<vcr>, [">= 0"])
     else
       s.add_dependency(%q<httparty>, [">= 0"])
       s.add_dependency(%q<money>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<fakeweb>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<log_buddy>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<vcr>, [">= 0"])
     end
   else
     s.add_dependency(%q<httparty>, [">= 0"])
     s.add_dependency(%q<money>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<fakeweb>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<log_buddy>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<vcr>, [">= 0"])
   end
 end
 

data/lib/beatport/catalog.rb

@@ -9,6 +9,7 @@ module Beatport
     autoload :ChartOverview,    'beatport/catalog/chart_overview'
     autoload :Country,          'beatport/catalog/country'
     autoload :Currency,         'beatport/catalog/currency'
+    autoload :Djprofile,        'beatport/catalog/djprofile'
     autoload :Feature,          'beatport/catalog/feature'    
     autoload :Genre,            'beatport/catalog/genre'
     autoload :Home,             'beatport/catalog/home'
@@ -20,6 +21,7 @@ module Beatport
     autoload :Label,            'beatport/catalog/label'
     autoload :List,             'beatport/catalog/list'
     autoload :Mixed,            'beatport/catalog/mixed'
+    autoload :Part,             'beatport/catalog/part'
     autoload :Recommendations,  'beatport/catalog/recommendations'
     autoload :Release,          'beatport/catalog/release'
     autoload :Search,           'beatport/catalog/search'

data/lib/beatport/catalog/djprofile.rb

@@ -0,0 +1,7 @@
+module Beatport
+  module Catalog
+    class Djprofile < Item
+
+    end
+  end
+end

data/lib/beatport/catalog/part.rb

@@ -0,0 +1,7 @@
+module Beatport
+  module Catalog
+    class Part < Item
+
+    end
+  end
+end

data/lib/beatport/support/query_builder.rb

@@ -60,7 +60,7 @@ module Beatport
       def process_facets(values)
         map_values(values) do |value|
           k, v = split_value(value, ':')
-          v.to_a.map {|v| "#{k}:#{v}"}.join(',')
+          Array(v).map {|v| "#{k}:#{v}"}.join(',')
         end       
       end
     

data/spec/catalog/account_type_spec.rb

@@ -3,20 +3,28 @@ require 'spec_helper'
 module Beatport::Catalog
   describe AccountType do
     describe 'structure' do
-      subject { AccountType.all.first }
+      subject do
+        VCR.use_cassette "account_type_all" do
+          AccountType.all.first
+        end
+      end
       
       it { should be_an(AccountType) }
       its (:code) { should == "AMEX" }
-      its (:bpid) { should == "1" }
+      its (:bpid) { should == 1 }
       its (:name) { should == "American Express"}
       its (:cybersource_card_type) { should == "003" }
       its (:issue_number_or_start_date_required) { should == false }
       its (:validation_regex) { should == /^3[47][0-9]{13}$/ }
-      its (:'images.small.url') { should == "https://ak-secure-beatport.bpddn.com/images/creditcard/logo_cc_amex_37x23.gif"}
+      its (:'images.small.url') { should == "https://secure-beatport.bpddn.com/images/creditcard/logo_cc_amex_37x23.gif"}
     end
     
     describe '.all' do
-      subject { AccountType.all }
+      subject do
+        VCR.use_cassette "account_type_all" do
+          AccountType.all
+        end
+      end
       
       its (:length) { should be > 1 }
     end
@@ -29,7 +37,12 @@ module Beatport::Catalog
       end
       
       context "by name" do
-        subject { AccountType.find('Visa') }
+        subject do
+          VCR.use_cassette "account_type_visa" do
+            AccountType.find('Visa')
+          end
+        end
+
         its (:name) { should == "Visa" }
       end
     end

data/spec/catalog/artist_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 module Beatport::Catalog
   describe Artist do
     describe 'structure' do
-      subject { Artist.find(7181) }
+      subject do
+        VCR.use_cassette('artist_7181') { Artist.find(7181) }
+      end
       
       it { should be_an(Artist) }
       its (:id) { should == 7181 }
@@ -13,24 +15,28 @@ module Beatport::Catalog
       its (:last_publish_date) { should >= Date.new(2011, 12, 15)}
       its (:biography) { should == "" }
       its (:'genres.length') { should be > 1 }
-      its (:'sub_genres.length') { should be > 1 }            
-      its (:'top_downloads.length') { should be > 1 }
-      its (:'images.small.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/400000/90000/1000/500/20/491527.jpg" }
-      its (:'images.medium.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/400000/90000/1000/500/30/491530.jpg" }
-      its (:'images.large.url') { should == "http://geo-media.beatport.com/items/imageCatalog/4000000/600000/80000/6000/400/20/4686424.jpg" }
+      its (:'sub_genres.length') { should be > 1 }
+      its (:'top_downloads.length') { VCR.use_cassette('artist_7181_top_downloads') { should be > 1 } }
+      its (:'images.small.url') { should == "http://geo-media.beatport.com/image/491527.jpg" }
+      its (:'images.medium.url') { should == "http://geo-media.beatport.com/image/491530.jpg" }
+      its (:'images.large.url') { should == "http://geo-media.beatport.com/image/4686424.jpg" }
 #      its (:'featured_releases.length') { should be > 1 }
     end
     
     describe '.find' do
       context 'with a single id' do
-        subject { Artist.find(7181) }
+        subject do
+          VCR.use_cassette('artist_7181') { Artist.find(7181) }
+        end
         
         it { should be_an(Artist) }
         its (:id) { should == 7181 }
       end
 
       context 'with multiple ids' do
-        subject { Artist.find(7181, 7182) }
+        subject do
+          VCR.use_cassette('artist_7181_7182') { Artist.find(7181, 7182) }
+        end
         
 #        it { should be_a(Collection) }
         its (:length) { should == 2 }
@@ -40,7 +46,9 @@ module Beatport::Catalog
       end
 
       context 'with an array of ids' do
-        subject { Artist.find([7181, 7182]) }
+        subject do
+          VCR.use_cassette('artist_7181_7182') { Artist.find(7181, 7182) }
+        end
         
 #        it { should be_a(Collection) }
         its (:length) { should == 2 }
@@ -52,53 +60,65 @@ module Beatport::Catalog
   
     describe '.all' do
       it "should get arbitrary artists" do
-        artists = Artist.all
-        artists.length.should == 10
+        VCR.use_cassette('artist_all') do
+          artists = Artist.all
+          artists.length.should == 10
+        end
       end
     
       it "should get the first page with 5 artists per page" do
-        artists = Artist.all :per_page => 5, :page => 1
-        artists.length.should == 5
-        artists.page.should == 1
-        artists.per_page.should == 5
+        VCR.use_cassette('artist_all_5_per_page') do
+          artists = Artist.all :per_page => 5, :page => 1
+          artists.length.should == 5
+          artists.page.should == 1
+          artists.per_page.should == 5
+        end
       end
     
       it "should get the first page with 5 artists per page, sorted by publish date and artist id, for the House genre" do
-        artists = Artist.all(:sort_by=> {:publish_date  => 'asc', :artist_id => 'asc'}, :genre_id=> 5, :per_page=>5, :page=>1)
-        artists.length.should == 5
-      
-        old_id = nil
-        old_date = artists.first.last_publish_date
-      
-        artists.each do |artist|
-          old_id = nil if old_date.to_s != artist.last_publish_date.to_s
+        VCR.use_cassette('artist_all_sorted') do
+          artists = Artist.all(:sort_by=> { :publish_date  => 'asc', :artist_id => 'asc' }, :genre_id=> 5, :per_page=>5, :page=>1)
+          artists.length.should == 5
         
-          # beatport has some bad genre data?
-          # artist.genres.map(&:id).should include(5)
-          artist.id.should be >= old_id if old_id
-          artist.last_publish_date.should be >= old_date if old_date
+          old_id = nil
+          old_date = artists.first.last_publish_date
         
-          old_id = artist.id
-          old_date = artist.publish_date
+          artists.each do |artist|
+            old_id = nil if old_date.to_s != artist.last_publish_date.to_s
+          
+            # beatport has some bad genre data?
+            # artist.genres.map(&:id).should include(5)
+            artist.id.should be >= old_id if old_id
+            artist.last_publish_date.should be >= old_date if old_date
+          
+            old_id = artist.id
+            old_date = artist.publish_date
+          end
         end
       end
     
       it "should get arbitrary artists with filter metadata for all genre names and artist names" do
-        artists = Artist.all :return_facets => ['genre_name', 'performer_name']
-    
-        artists.facets['fields']['performer_name'].count.should be > 1
-        artists.facets['fields']['genre_name'].count.should be > 1      
+        VCR.use_cassette('artist_all_return_facets') do
+          artists = Artist.all :return_facets => ['genre_name', 'performer_name']
+      
+          artists.facets['fields']['performer_name'].count.should be > 1
+          artists.facets['fields']['genre_name'].count.should be > 1      
+        end
       end
 
       it "should get all trance artists for above & beyond" do
-        artists = Artist.all :facets => {:genre_name => ['Trance', 'Progessive House']}
-    
-        artists.each do |artist|
-          artists = artist['artists'].map { |a| a['name'] }
-          artists.should include("Above & Beyond")
-        
-          genres = artist['genres'].map { |a| a['name'] }
-          genres.should include('Trance')
+        pending "Request doesn't return any results"
+
+        VCR.use_cassette('artist_all_for_facets') do
+          artists = Artist.all :facets => {:genre_name => ['Trance', 'Progessive House']}
+      
+          artists.each do |artist|
+            artists = artist['artists'].map { |a| a['name'] }
+            artists.should include("Above & Beyond")
+          
+            genres = artist['genres'].map { |a| a['name'] }
+            genres.should include('Trance')
+          end
         end
       end
     end