beatport 0.1.5 → 0.1.6

data/Gemfile

@@ -11,7 +11,7 @@ gem 'money'    # https://github.com/aflatter/money
 group :development do
   gem 'bundler'
   gem 'fakeweb'
-  gem 'jeweler', '~> 1.6.3'
+  gem 'jeweler'
   #gem "rcov", ">= 0"
   gem 'log_buddy'
   gem 'rspec', '>= 0'

data/Gemfile.lock

@@ -8,10 +8,11 @@ GEM
       multi_json (~> 1.0)
       multi_xml
     i18n (0.6.1)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
     json (1.7.5)
     log_buddy (0.7.0)
     money (5.0.0)
@@ -20,6 +21,8 @@ GEM
     multi_json (1.3.6)
     multi_xml (0.5.1)
     rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -38,7 +41,7 @@ DEPENDENCIES
   bundler
   fakeweb
   httparty
-  jeweler (~> 1.6.3)
+  jeweler
   log_buddy
   money
   rspec

data/README.rdoc

@@ -4,7 +4,17 @@ A ruby gem for accessing the Beatport API
 
 http://api.beatport.com
 
-Currently incomplete, but under active development. 
+Currently incomplete, but under development. 
+
+{<img src="https://secure.travis-ci.org/mateomurphy/beatport.png" alt="Build Status" />}[http://travis-ci.org/mateomurphy/beatport]
+
+== Facets
+
+Many queries to beatport support facets, but they aren't properly documentated on their site. These are the ones I've found so far:
+
+* genreName
+* artistName (and not performerName)
+* labelName
 
 == Contributing to beatport
  

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/beatport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "beatport"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = "2012-10-10"
+  s.date = "2012-11-11"
   s.description = "A ruby gem for accessing the beatport api"
   s.email = "mateo.murphy@gmail.com"
   s.extra_rdoc_files = [
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
     "lib/beatport/catalog/keys.rb",
     "lib/beatport/catalog/label.rb",
     "lib/beatport/catalog/list.rb",
+    "lib/beatport/catalog/mix.rb",
     "lib/beatport/catalog/mixed.rb",
     "lib/beatport/catalog/part.rb",
     "lib/beatport/catalog/recommendations.rb",
@@ -86,37 +87,22 @@ 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/fixtures/account_type.yml",
+    "spec/fixtures/artist.yml",
+    "spec/fixtures/audio_format.yml",
+    "spec/fixtures/autocomplete.yml",
+    "spec/fixtures/chart.yml",
+    "spec/fixtures/chart_overview.yml",
+    "spec/fixtures/country.yml",
+    "spec/fixtures/currency.yml",
+    "spec/fixtures/genre.yml",
+    "spec/fixtures/item_type.yml",
+    "spec/fixtures/label.yml",
+    "spec/fixtures/mixed.yml",
+    "spec/fixtures/release.yml",
+    "spec/fixtures/search.yml",
+    "spec/fixtures/source_type.yml",
+    "spec/fixtures/track.yml",
     "spec/item_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/inflector_spec.rb",
@@ -136,7 +122,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<money>, [">= 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<jeweler>, [">= 0"])
       s.add_development_dependency(%q<log_buddy>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -146,7 +132,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<money>, [">= 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<jeweler>, [">= 0"])
       s.add_dependency(%q<log_buddy>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -157,7 +143,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<money>, [">= 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<jeweler>, [">= 0"])
     s.add_dependency(%q<log_buddy>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/lib/beatport/catalog.rb

@@ -20,6 +20,7 @@ module Beatport
     autoload :Keys,             'beatport/catalog/keys'
     autoload :Label,            'beatport/catalog/label'
     autoload :List,             'beatport/catalog/list'
+    autoload :Mix,              'beatport/catalog/mix'
     autoload :Mixed,            'beatport/catalog/mixed'
     autoload :Part,             'beatport/catalog/part'
     autoload :Recommendations,  'beatport/catalog/recommendations'

data/lib/beatport/catalog/artist.rb

@@ -6,13 +6,19 @@ module Beatport
       has_one :images, Images
       has_many :top_downloads, Track
 #      has_many :featured_releases, Release
-    
-      def self.find(*args)
-        Client.retrieve 'artists', Artist, *args
-      end
 
-      def self.all(options = {})
-        Client.retrieve 'artists', Artist, options
+      class << self
+        def all(options = {})
+          Client.retrieve 'artists', Artist, options
+        end
+
+        def find(*args)
+          Client.retrieve 'artists', Artist, *args
+        end
+
+        def name_facet
+          :artist_name
+        end
       end
     
       def top_downloads(options = {})

data/lib/beatport/catalog/label.rb

@@ -8,18 +8,24 @@ module Beatport
       has_many :most_popular_releases, Release
       has_one :images, Images
       
-      def self.find(*args)
-        Client.retrieve 'labels', Label, *args
-      end
+      class << self
+        def all(options = {})
+          Client.retrieve 'labels', Label, options
+        end
+
+        def featured(*args)
+          Client.retrieve 'featured/labels', Label, *args
+        end
 
-      def self.all(options = {})
-        Client.retrieve 'labels', Label, options
+        def find(*args)
+          Client.retrieve 'labels', Label, *args
+        end
+
+        def name_facet
+          :label_name
+        end
       end
-    
-      def self.featured(*args)
-        Client.retrieve 'featured/labels', Label, *args
-      end    
-    
+
       def releases(options)
         options[:label_id] = id
         Release.all(options)

data/lib/beatport/catalog/mix.rb

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

data/lib/beatport/item.rb

@@ -20,6 +20,24 @@ module Beatport
         return if respond_to?(var)
         class_eval "def #{var}; @#{var}; end"
       end
+
+      def find_by_name(name, *args)
+        raise "finding by name is not supported" unless respond_to?(:name_facet)
+
+        options = args.last || {}
+        options[:facets] ||= {}
+        options[:facets][name_facet] = name
+        results = find(options)
+
+        case results.length
+        when 0
+          nil
+        when 1
+          results.first
+        else
+          raise "find_by_name returned multiple results"
+        end
+      end
     end
   
     def initialize(data = {})

data/spec/catalog/account_type_spec.rb

@@ -2,11 +2,17 @@ require 'spec_helper'
 
 module Beatport::Catalog
   describe AccountType do
+    before :each do
+      VCR.insert_cassette 'account_type'
+    end
+
+    after :each do
+      VCR.eject_cassette
+    end
+
     describe 'structure' do
       subject do
-        VCR.use_cassette "account_type_all" do
-          AccountType.all.first
-        end
+        AccountType.all.first
       end
       
       it { should be_an(AccountType) }
@@ -21,9 +27,7 @@ module Beatport::Catalog
     
     describe '.all' do
       subject do
-        VCR.use_cassette "account_type_all" do
-          AccountType.all
-        end
+        AccountType.all
       end
       
       its (:length) { should be > 1 }
@@ -38,9 +42,7 @@ module Beatport::Catalog
       
       context "by name" do
         subject do
-          VCR.use_cassette "account_type_visa" do
-            AccountType.find('Visa')
-          end
+          AccountType.find('Visa')
         end
 
         its (:name) { should == "Visa" }

data/spec/catalog/artist_spec.rb

@@ -2,10 +2,16 @@ require 'spec_helper'
 
 module Beatport::Catalog
   describe Artist do
+    before :each do
+      VCR.insert_cassette 'artist'
+    end
+
+    after :each do
+      VCR.eject_cassette
+    end
+
     describe 'structure' do
-      subject do
-        VCR.use_cassette('artist_7181') { Artist.find(7181) }
-      end
+      subject { Artist.find(7181) }
       
       it { should be_an(Artist) }
       its (:id) { should == 7181 }
@@ -16,7 +22,7 @@ module Beatport::Catalog
       its (:biography) { should == "" }
       its (:'genres.length') { should be > 1 }
       its (:'sub_genres.length') { should be > 1 }
-      its (:'top_downloads.length') { VCR.use_cassette('artist_7181_top_downloads') { should be > 1 } }
+      its (:'top_downloads.length') { 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" }
@@ -25,20 +31,16 @@ module Beatport::Catalog
     
     describe '.find' do
       context 'with a single id' do
-        subject do
-          VCR.use_cassette('artist_7181') { Artist.find(7181) }
-        end
+        subject { Artist.find(7181) }
         
         it { should be_an(Artist) }
         its (:id) { should == 7181 }
       end
 
       context 'with multiple ids' do
-        subject do
-          VCR.use_cassette('artist_7181_7182') { Artist.find(7181, 7182) }
-        end
+        subject { Artist.find(7181, 7182) }
         
-#        it { should be_a(Collection) }
+        # it { should be_a(Collection) }
         its (:length) { should == 2 }
         it "returns the requested artists" do
           subject.map(&:id).should == [7181, 7182]
@@ -46,11 +48,9 @@ module Beatport::Catalog
       end
 
       context 'with an array of ids' do
-        subject do
-          VCR.use_cassette('artist_7181_7182') { Artist.find(7181, 7182) }
-        end
+        subject { Artist.find(7181, 7182) }
         
-#        it { should be_a(Collection) }
+        # it { should be_a(Collection) }
         its (:length) { should == 2 }
         it "returns the requested artists" do
           subject.map(&:id).should == [7181, 7182]
@@ -58,69 +58,68 @@ module Beatport::Catalog
       end
     end    
   
+    describe '.find_by_name' do
+      subject { Artist.find_by_name('Above & Beyond') }
+      
+      it { should be_an(Artist) }
+      its (:id) { should == 7181 }
+    end
+
     describe '.all' do
       it "should get arbitrary artists" do
-        VCR.use_cassette('artist_all') do
-          artists = Artist.all
-          artists.length.should == 10
-        end
+        artists = Artist.all
+        artists.length.should == 10
       end
     
       it "should get the first page with 5 artists per page" do
-        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
+        artists = Artist.all :per_page => 5, :page => 1
+        artists.length.should == 5
+        artists.page.should == 1
+        artists.per_page.should == 5
       end
     
       it "should get the first page with 5 artists per page, sorted by publish date and artist id, for the House genre" do
-        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
+        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
         
-          old_id = nil
-          old_date = artists.first.last_publish_date
+          # 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
         
-          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
+          old_id = artist.id
+          old_date = artist.publish_date
         end
       end
     
       it "should get arbitrary artists with filter metadata for all genre names and artist names" do
-        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
+        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
 
       it "should get all trance artists for above & beyond" do
         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
+        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
 end