beatport 0.1.1 → 0.1.2

data/lib/beatport/support/parser.rb

@@ -0,0 +1,10 @@
+module Beatport
+  module Support
+    # A custom HTTParter parse that underscores the keys of the result
+    class Parser < HTTParty::Parser
+      def parse
+        Inflector.process_keys(super) { |k| Inflector.underscore(k) }
+      end
+    end
+  end
+end

data/lib/beatport/support/query_builder.rb

@@ -0,0 +1,88 @@
+module Beatport
+  module Support
+    # Converts a set of arguments into a format that beatport will understand
+    class QueryBuilder
+      SPECIAL_OPTIONS = ['sortBy', 'facets', 'returnFacets']
+      
+      def single_result?
+        @single_result
+      end
+
+      def self.process(*args)
+        new.process(*args)
+      end
+
+      def special_option?(key)
+        SPECIAL_OPTIONS.include?(key)
+      end
+   
+      def process(*args)
+        @single_result = false
+        
+        options = args.last.is_a?(Hash) ? args.pop : {}      
+        string_key_type = options.delete(:string_key_type) || :name
+        collection = options.delete(:collection)
+        key = options.delete(:key) || (args.length > 1 ? args.compact : args.first)
+    
+        case key
+        when Integer
+          options[:id] = key
+          @single_result = true unless collection
+        when String, Symbol
+          options[string_key_type] = key.to_s
+          @single_result = true unless collection
+        when Array
+          options[:ids] = key.flatten
+        end
+      
+        options = camelize_keys(options)
+      
+        options.map do |key, value|
+          options[key] = send(Inflector.underscore("process_#{key}"), value) if special_option?(key)
+        end
+      
+        options
+      end
+
+      # Camelizes all the keys in the options hash
+      def camelize_keys(options)
+        Inflector.process_keys(options) { |k| Inflector.camelize(k.to_s, false) }
+      end
+
+      # Special processing for sort_by keys
+      def process_sort_by(values)
+        map_values(values) do |value|
+          split_value(value, " ").join(" ")
+        end       
+      end
+    
+      # Special processing for facets
+      def process_facets(values)
+        map_values(values) do |value|
+          k, v = split_value(value, ':')
+          v.to_a.map {|v| "#{k}:#{v}"}.join(',')
+        end       
+      end
+    
+      # Special processing for return_facets
+      def process_return_facets(values)
+        map_values(values) do |value|
+          Inflector.camelize(value, false)
+        end
+      end    
+    
+      def map_values(values)
+        values = values.split(/,\s*/) if values.is_a?(String)
+        values.map do |value|
+          yield value
+        end.join(",") 
+      end
+    
+      def split_value(value, seperator)
+        value = value.split(seperator) if value.is_a?(String)
+        
+        [Inflector.camelize(value.first, false), value.last]
+      end
+    end
+  end
+end

data/spec/catalog/account_type_spec.rb

@@ -3,14 +3,35 @@ require 'spec_helper'
 module Beatport::Catalog
   describe AccountType do
     describe 'structure' do
-     before(:all) { @account_type = AccountType.all.first }
-     
-     it { @account_type.code.should == "AMEX" }
-     it { @account_type.bpid.should == "1" }
-     it { @account_type.cybersource_card_type.should == "003" }
-     it { @account_type.issue_number_or_start_date_required.should == false }
-     it { @account_type.validation_regex.should == /^3[47][0-9]{13}$/ }
-     it { @account_type.images.small.url.should == "https://ak-secure-beatport.bpddn.com/images/creditcard/logo_cc_amex_37x23.gif"}
+      subject { AccountType.all.first }
+      
+      it { should be_an(AccountType) }
+      its (:code) { should == "AMEX" }
+      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"}
+    end
+    
+    describe '.all' do
+      subject { AccountType.all }
+      
+      its (:length) { should be > 1 }
+    end
+
+    describe '.find' do
+      context "by id" do
+        pending "Isn't currently supported by beatport"
+#        subject { AccountType.find(2) }
+#        its (:name) { should == "Visa" }
+      end
+      
+      context "by name" do
+        subject { AccountType.find('Visa') }
+        its (:name) { should == "Visa" }
+      end
     end
   end
 end

data/spec/catalog/artist_spec.rb

@@ -3,29 +3,52 @@ require 'spec_helper'
 module Beatport::Catalog
   describe Artist do
     describe 'structure' do
-      before(:all) { @artist = Artist.find(7181) }
+      subject { Artist.find(7181) }
       
-      it { @artist.id.should == 7181 }
-      it { @artist.type.should == "artist" }
-      it { @artist.name.should == "Above & Beyond" }
-      it { @artist.slug.should == "above-and-beyond" }
-      it { @artist.last_publish_date.should == Date.new(2011, 12, 15)}
-      it { @artist.biography.should == "" }
-      it { @artist.genres.length.should be > 1 }
-      it { @artist.sub_genres.length.should be > 1 }            
-      it { @artist.top_downloads.length.should be > 1 }
-      it { @artist.images.small.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/400000/90000/1000/500/20/491527.jpg" }
-      it { @artist.images.medium.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/400000/90000/1000/500/30/491530.jpg" }
-      it { @artist.images.large.url.should == "http://geo-media.beatport.com/items/imageCatalog/4000000/600000/80000/6000/400/20/4686424.jpg" }
-      it { @artist.featured_releases.length.should be > 1 }
+      it { should be_an(Artist) }
+      its (:id) { should == 7181 }
+      its (:type) { should == "artist" }
+      its (:name) { should == "Above & Beyond" }
+      its (:slug) { should == "above-and-beyond" }
+      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 (:'featured_releases.length') { should be > 1 }
     end
     
     describe '.find' do
-      it "should find Above & Beyond when given id 7181" do
-        artist = Artist.find(7181)
-        artist.id.should == 7181
+      context 'with a single id' do
+        subject { Artist.find(7181) }
+        
+        it { should be_an(Artist) }
+        its (:id) { should == 7181 }
       end
-    end
+
+      context 'with multiple ids' do
+        subject { Artist.find(7181, 7182) }
+        
+#        it { should be_a(Collection) }
+        its (:length) { should == 2 }
+        it "returns the requested artists" do
+          subject.map(&:id).should == [7181, 7182]
+        end
+      end
+
+      context 'with an array of ids' do
+        subject { Artist.find([7181, 7182]) }
+        
+#        it { should be_a(Collection) }
+        its (:length) { should == 2 }
+        it "returns the requested artists" do
+          subject.map(&:id).should == [7181, 7182]
+        end
+      end
+    end    
   
     describe '.all' do
       it "should get arbitrary artists" do

data/spec/catalog/audio_format_spec.rb

@@ -3,12 +3,30 @@ require 'spec_helper'
 module Beatport::Catalog
   describe "AudioFormat" do
     describe 'structure' do
-     before(:all) { @audio_format = AudioFormat.all.first }
+      subject { AudioFormat.all.first }
      
-     it { @audio_format.id.should == 1 }
-     it { @audio_format.name.should == "mp3" }
-     it { @audio_format.person_preference_visibility.should == true }
+      it { should be_an(AudioFormat) }
+      its (:id) { should == 1 }
+      its (:name) { should == "mp3" }
+      its (:person_preference_visibility) { should == true }
     end    
-    
+  
+    describe '.all' do
+      subject { AudioFormat.all }
+      
+      its (:length) { should be > 1 }
+    end
+
+    describe '.find' do
+      context "by id" do
+        subject { AudioFormat.find(2) }
+        its (:name) { should == "m4a" }
+      end
+      
+      context "by name" do
+        subject { AudioFormat.find('wav') }
+        its (:name) { should == "wav" }
+      end
+    end
   end
 end

data/spec/catalog/autocomplete_spec.rb

@@ -3,23 +3,32 @@ require 'spec_helper'
 module Beatport::Catalog
   describe Autocomplete do
     describe 'stucture' do
-      before(:all) { @result = Autocomplete.query('lutzen').first }
-      it { @result.name.downcase.should match(/lutzen/) }
+      subject { Autocomplete.query('lutzen').first }
+      
+      its (:'name.downcase') { should match(/lutzen/) }
     end
     
     describe 'collection' do
-      before(:all) { @collection = Autocomplete.query('lutzen') }
-      it { @collection.host.should == "api.beatport.com" }
-      it { @collection.path.should == "/catalog/autocomplete" }
-      it { @collection.query.should == "query=lutzen" }
-      it { @collection.page.should == 1 }
-      it { @collection.per_page.should == 10 }
-      it { @collection.count.should be > 1 }
-      it { @collection.total_pages.should be > 1 }
-      it { @collection.next_query.should == "query=lutzen&page=2"}
-      it { @collection.per_page_options.should_not be_nil }
-      it { @collection.facets.should_not be_nil }
-      it { @collection.spellcheck.should_not be_nil }
+      subject { Autocomplete.query('lutzen') }
+      
+      its (:host) { should == "api.beatport.com" }
+      its (:path) { should == "/catalog/autocomplete" }
+      its (:query) { should == "query=lutzen" }
+      its (:page) { should == 1 }
+      its (:per_page) { should == 10 }
+      its (:count) { should be > 1 }
+      its (:total_pages) { should be > 1 }
+      its (:next_query) { should == "query=lutzen&page=2"}
+      its (:per_page_options) { should_not be_nil }
+      its (:facets) { should_not be_nil }
+      its (:spellcheck) { should_not be_nil }
+    end
+    
+    describe '.query' do
+      subject { Autocomplete.query('lutzen', :page => 3, :per_page => 2)}
+      
+      its (:page) { should == 3 }
+      its (:per_page) { should == 2 }
     end
   end
 end

data/spec/catalog/chart_overview_spec.rb

@@ -3,12 +3,11 @@ require 'spec_helper'
 module Beatport::Catalog
   describe ChartOverview do
     describe '.get' do
-      it "should have 16 newest charts and 4 featured charts" do
-        overview = ChartOverview.get
+      subject { ChartOverview.get }
       
-        overview.newest.length.should == 16
-        overview.featured.length.should == 4
-      end
+      it { should be_a(ChartOverview) }
+      its (:'newest.length') { should == 16 }
+      its (:'featured.length') { should == 4 }
     end
   end
 end

data/spec/catalog/chart_spec.rb

@@ -4,27 +4,46 @@ module Beatport::Catalog
   describe Chart do
   
     describe 'structure' do
-      before(:all) { @chart = Chart.find(15722) }
-      it { @chart.id.should == 15722 }
-      it { @chart.type.should == "chart" }
-      it { @chart.name.should == "Nitrous Oxide – April Top 10" }    
-      it { @chart.slug.should == "nitrous-oxide-april-top-10" }
-      it { @chart.description.should == "" }
-      it { @chart.publish_date.should == Date.new(2009, 05, 12) }
-      it { @chart.price.to_s.should == '13.91' }
-      it { @chart.audio_format_fee.wav.to_s.should == "9.00" }
-      it { @chart.audio_format_fee.aiff.to_s.should == "9.00" }      
-      it { @chart.genres.map(&:name).should == ["Trance"] }
-      it { @chart.images.small.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/400000/90000/1000/500/30/491534.jpg"}
-      it { @chart.images.medium.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/400000/10000/2000/900/20/412921.jpg"}
-      it { @chart.images.large.url.should == "http://geo-media.beatport.com/items/imageCatalog/0/400000/10000/2000/900/20/412922.jpg"}            
-
-      it { @chart.tracks.length.should == 9 }
+      subject { Chart.find(15722) }
+      
+      it { should be_a(Chart) }
+      its (:id) { should == 15722 }
+      its (:type) { should == "chart" }
+      its (:name) { should == "Nitrous Oxide – April Top 10" }    
+      its (:slug) { should == "nitrous-oxide-april-top-10" }
+      its (:description) { should == "" }
+      its (:publish_date) { should == Date.new(2009, 05, 12) }
+      its (:'price.to_s') { should == '13.91' }
+      its (:'audio_format_fee.wav.to_s') { should == "9.00" }
+      its (:'audio_format_fee.aiff.to_s') { should == "9.00" }      
+      specify { subject.genres.map(&:name).should == ["Trance"] }
+      its (:'images.small.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/400000/90000/1000/500/30/491534.jpg"}
+      its (:'images.medium.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/400000/10000/2000/900/20/412921.jpg"}
+      its (:'images.large.url') { should == "http://geo-media.beatport.com/items/imageCatalog/0/400000/10000/2000/900/20/412922.jpg"}            
+      its (:'tracks.length') { should == 9 }
     end
   
     describe '.find' do
-      chart = Chart.find(15722)
-      chart.id.should == 15722
+      context 'with a single id' do
+        subject { Chart.find(15722) }
+        its (:id) { should == 15722 }
+      end
+
+      context 'with multiple ids' do
+        subject { Chart.find(15722, 15723) }
+        its (:length) { should == 2 }
+        it "returns the requested charts" do
+          subject.map(&:id).should == [15722, 15723]
+        end
+      end
+
+      context 'with an array of ids' do
+        subject { Chart.find([15722, 15723]) }
+        its (:length) { should == 2 }
+        it "returns the requested charts" do
+          subject.map(&:id).should == [15722, 15723]
+        end
+      end
     end
   
     describe '.all' do

data/spec/catalog/country_spec.rb

@@ -3,20 +3,22 @@ require 'spec_helper'
 module Beatport::Catalog
   describe Country do
     describe 'structure' do
-      before(:all) { @country = Country.find('au') }
-      it { @country.id.should ==  5 }
-      it { @country.code.should == "AUS" }
-      it { @country.code_short.should == "AU" }
-      it { @country.name.should == "Australia" }
-      it { @country.vat_enabled.should == false }
-      it { @country.vat_rate.should == 0 }
-      it { @country.iso3166_3.should == "AUS" }
-      it { @country.iso3166_2.should == "AU" }
-      it { @country.currency.code.should == "USD" }
-      it { @country.currency.name.should == "Dollar" }
-      it { @country.states.first.code.should == 'ACT' }
-      it { @country.states.first.type.should == 'territory' } 
-      it { @country.states.first.name.should == "Australian Capital Territory" }
+      subject { Country.find('au') }
+      
+      it { should be_a(Country) }
+      its (:id) { should ==  5 }
+      its (:code) { should == "AUS" }
+      its (:code_short) { should == "AU" }
+      its (:name) { should == "Australia" }
+      its (:vat_enabled) { should == false }
+      its (:vat_rate) { should == 0 }
+      its (:iso3166_3) { should == "AUS" }
+      its (:iso3166_2) { should == "AU" }
+      its (:'currency.code') { should == "USD" }
+      its (:'currency.name') { should == "Dollar" }
+      its (:'states.first.code') { should == 'ACT' }
+      its (:'states.first.type') { should == 'territory' } 
+      its (:'states.first.name') { should == "Australian Capital Territory" }
     end
   end
 end

data/spec/catalog/currency_spec.rb

@@ -3,10 +3,12 @@ require 'spec_helper'
 module Beatport::Catalog
   describe Currency do
     describe "structure" do
-      before(:all) { @currency = Currency.all.first }
-      it { @currency.id.should == 1 }
-      it { @currency.code.should == "USD" }
-      it { @currency.name.should == "Dollar" }      
+      subject { Currency.all.first }
+      
+      it { should be_a(Currency) }
+      its (:id) { should == 1 }
+      its (:code) { should == "USD" }
+      its (:name) { should == "Dollar" }      
       
     end
   end

data/spec/catalog/genre_spec.rb

@@ -5,21 +5,18 @@ module Beatport::Catalog
   describe Genre do
     
     describe "structure" do
-      before(:all) { @genre = Genre.find(7) }
-
-      it { @genre.name.should == "Trance" }
-      it { @genre.slug.should == "trance" }
-      it { @genre.subgenres.length.should be > 1}
-      it { @genre.slideshow.header.length.should be > 1 }
-      it { @genre.slideshow.small.length.should be > 1 }
-      it { @genre.top_downloads.length.should be > 1 }
+      subject { Genre.find(7) }
+      
+      it { should be_a(Genre) }
+      its (:name) { should == "Trance" }
+      its (:slug) { should == "trance" }
+      its (:'subgenres.length') { should be > 1}
+      its (:'slideshow.header.length') { should be > 1 }
+      its (:'slideshow.small.length') { should be > 1 }
+      its (:'top_downloads.length') { should be > 1 }
 #      it { @genre.features.length.should be > 1}
-    end
-    
-    describe '.find' do
-      it "should retrieve information about the trance genre via its id" do
-        genre = Genre.find(7)
-        genre.name.should == "Trance"
+
+
 =begin
         genre.features.each do |feature|
           if feature.autoload
@@ -28,6 +25,19 @@ module Beatport::Catalog
           end
         end
 =end
+    end
+    
+    describe '.find' do
+      it "should retrieve information about the trance genre via its id" do
+        Genre.find(7).name.should == "Trance"
+      end
+
+      it "should retrieve information about the trance genre via the slug" do
+        Genre.find('trance').name.should == "Trance"
+      end
+
+      it "should retrieve information about the trance genre via the slug passed as a symbol" do
+        Genre.find(:trance).name.should == "Trance"
       end
 
       it "should return nil with an invalid id" do
@@ -48,18 +58,6 @@ module Beatport::Catalog
         genres = Genre.all(:subgenres => true)
         genres.first.subgenres.length.should be > 1
       end
-  
-      it "should retrieve information about the trance genre via the slug" do
-        Genre.all('trance').first.name.should == "Trance"
-      end
-
-      it "should retrieve information about the trance genre via the slug passed as a symbol" do
-        Genre.all(:trance).first.name.should == "Trance"
-      end
-    
-      it "should retrieve information about the trance genre via its id" do
-        Genre.all(7).first.name.should == "Trance"
-      end
     end
     
     describe '.overview' do
@@ -81,18 +79,6 @@ module Beatport::Catalog
         genre = Genre.find(7)
         genre.top_downloads.length.should == 10
       end
-      
-      it "should return the top downloads of a genre loaded via all" do
-        genre = Genre.all(7).first
-        genre.top_downloads.length.should == 10
-      end
-      
-      it "should return the same downloads no matter how the genre was loaded" do
-        by_find = Genre.find(7)
-        by_all = Genre.all(7).first
-        
-        by_find.top_downloads.map(&:id).should == by_all.top_downloads.map(&:id)
-      end
     end
     
     describe '#slideshow' do
@@ -100,18 +86,6 @@ module Beatport::Catalog
         genre = Genre.find(7)
         genre.slideshow.header.length.should be > 1
       end
-      
-      it "should return the slideshow of a genre loaded via all" do
-        genre = Genre.all(7).first
-        genre.slideshow.header.length.should be > 1
-      end
-    
-      it "should return the same slideshow no matter how the genre was loaded" do
-        by_find = Genre.find(7)
-        by_all = Genre.all(7).first
-        
-        by_find.slideshow.header.map(&:link).should == by_all.slideshow.header.map(&:link)
-      end    
     end    
   end
 end