beatport 0.2.0 → 0.2.1

data/Gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 
 gem 'addressable'
 gem 'signet'
+gem 'faraday', '~> 0.8.8'
 gem 'money', '~> 5.1.1'    # https://github.com/RubyMoney/money
 
 # Add dependencies to develop your gem here.

data/README.md

@@ -1,23 +1,23 @@
 # Beatport
 
-A ruby gem for accessing the Beatport API
-
-http://api.beatport.com
+[![Dependency Status](https://gemnasium.com/mateomurphy/beatport.png)](https://gemnasium.com/mateomurphy/beatport)
 
-Currently incomplete, but under development. 
+A ruby gem for accessing the Beatport API; currently incomplete and only supports the Catalog API, but under development. 
 
-[![Dependency Status](https://gemnasium.com/mateomurphy/beatport.png)](https://gemnasium.com/mateomurphy/beatport)
+https://oauth-api.beatport.com/docs/
 
 ## Oauth
 
 Beatport's api now requires authentication via Oauth. This means you now need to provide the gem
-you oauth credentials to make requests, for example in a rails initializer:
+your oauth credentials to make requests, for example in a rails initializer:
 
     Beatport.consumer_key =        'consumer_key'
     Beatport.consumer_secret =     'consumer_secret'
     Beatport.access_token_key =    'access_token_key'
     Beatport.access_token_secret = 'access_token_secret'
 
+Your consumer key and secret are found in the API Keys section of your beatbort account, whereas the access token key and secret can be generated at the docs page.
+
 ## 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:
@@ -42,8 +42,7 @@ Many queries to beatport support facets, but they aren't properly documentated o
   query[1].class # => second result is a Beatport.Catalog::Chart object
   query[1].publish_date # => returns the published date of the Chart
 
-  # Note that search results change frequently, so first result may not
-    necessarily be a Beatport::Catalog::Artist object
+  # Note that search results change frequently, so first result may not necessarily be a Beatport::Catalog::Artist object
 
   # Find top downloads for a given genre
   genres = Beatport::Catalog::Genre.all # => list all genres
@@ -67,6 +66,11 @@ Many queries to beatport support facets, but they aren't properly documentated o
   trance_genre = Beatport::Catalog::Genre.find(7) # => returns a Trance Genre object
   ```
 
+## Running specs
+
+To run specs, you'll need to create a file with your oauth credentials in `spec/config.rb`, which
+will be loaded by `spec/spec_helper.rb`
+
 ## Contributing to beatport
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/beatport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "beatport"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = "2013-08-31"
+  s.date = "2013-11-20"
   s.description = "A ruby gem for accessing the beatport api"
   s.email = "mateo.murphy@gmail.com"
   s.extra_rdoc_files = [
@@ -37,6 +37,8 @@ Gem::Specification.new do |s|
     "lib/beatport/catalog/country.rb",
     "lib/beatport/catalog/currency.rb",
     "lib/beatport/catalog/djprofile.rb",
+    "lib/beatport/catalog/dynamic_image.rb",
+    "lib/beatport/catalog/dynamic_images.rb",
     "lib/beatport/catalog/feature.rb",
     "lib/beatport/catalog/genre.rb",
     "lib/beatport/catalog/home.rb",
@@ -66,8 +68,10 @@ Gem::Specification.new do |s|
     "lib/beatport/price.rb",
     "lib/beatport/support.rb",
     "lib/beatport/support/inflector.rb",
+    "lib/beatport/support/middleware.rb",
     "lib/beatport/support/parser.rb",
     "lib/beatport/support/query_builder.rb",
+    "lib/beatport/support/url.rb",
     "spec/beatport_spec.rb",
     "spec/catalog/account_type_spec.rb",
     "spec/catalog/artist_spec.rb",
@@ -106,6 +110,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<addressable>, [">= 0"])
       s.add_runtime_dependency(%q<signet>, [">= 0"])
+      s.add_runtime_dependency(%q<faraday>, ["~> 0.8.8"])
       s.add_runtime_dependency(%q<money>, ["~> 5.1.1"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
@@ -117,6 +122,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<addressable>, [">= 0"])
       s.add_dependency(%q<signet>, [">= 0"])
+      s.add_dependency(%q<faraday>, ["~> 0.8.8"])
       s.add_dependency(%q<money>, ["~> 5.1.1"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
@@ -129,6 +135,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<addressable>, [">= 0"])
     s.add_dependency(%q<signet>, [">= 0"])
+    s.add_dependency(%q<faraday>, ["~> 0.8.8"])
     s.add_dependency(%q<money>, ["~> 5.1.1"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])

data/lib/beatport/catalog.rb

@@ -10,12 +10,14 @@ module Beatport
     autoload :Country,          'beatport/catalog/country'
     autoload :Currency,         'beatport/catalog/currency'
     autoload :Djprofile,        'beatport/catalog/djprofile'
-    autoload :Feature,          'beatport/catalog/feature'    
+    autoload :DynamicImage,     'beatport/catalog/dynamic_image'
+    autoload :DynamicImages,    'beatport/catalog/dynamic_images'
+    autoload :Feature,          'beatport/catalog/feature'
     autoload :Genre,            'beatport/catalog/genre'
     autoload :Home,             'beatport/catalog/home'
     autoload :ItemType,         'beatport/catalog/item_type'
     autoload :Image,            'beatport/catalog/image'
-    autoload :Images,           'beatport/catalog/images'    
+    autoload :Images,           'beatport/catalog/images'
     autoload :Key,              'beatport/catalog/key'
     autoload :Keys,             'beatport/catalog/keys'
     autoload :Label,            'beatport/catalog/label'
@@ -30,36 +32,36 @@ module Beatport
     autoload :Slide,            'beatport/catalog/slide'
     autoload :Slideshow,        'beatport/catalog/slideshow'
     autoload :SourceType,       'beatport/catalog/source_type'
-    autoload :Track,            'beatport/catalog/track'  
-    
+    autoload :Track,            'beatport/catalog/track'
+
     def self.artist(id)
       Artist.find(id)
     end
-  
+
     def self.artists(*args)
       Artist.all(*args)
     end
-  
+
     def self.chart(id)
       Chart.find(id)
     end
-  
+
     def self.chart_overview(*args)
       ChartOverview.get
     end
-  
+
     def self.charts(*args)
       Chart.all
     end
-  
+
     def self.genre(key)
       Genre.find(key)
     end
-  
+
     def self.genre_overview
       Genre.overview
     end
-  
+
     def self.genres(*args)
       Genre.all(*args)
     end
@@ -83,14 +85,14 @@ module Beatport
     def self.releases(*args)
       Release.all(*args)
     end
-  
+
     def self.track(id)
       Track.find(id)
     end
-  
+
     def self.tracks(*args)
       Track.all(*args)
-    end    
-    
+    end
+
   end
-end
+end

data/lib/beatport/catalog/artist.rb

@@ -1,6 +1,8 @@
 module Beatport
   module Catalog
     class Artist < Item
+      include Support::Url
+
       has_many :genres, Genre
       has_many :subgenres, Genre
       has_one :images, Images
@@ -20,10 +22,10 @@ module Beatport
           :artist_name
         end
       end
-    
+
       def top_downloads(options = {})
         Track.most_popular_for_artist(id, options)
       end
     end
   end
-end
+end

data/lib/beatport/catalog/dynamic_image.rb

@@ -0,0 +1,11 @@
+module Beatport
+  module Catalog
+    class DynamicImage < Item
+      def dynamic_url(options = {})
+        url.gsub(/{(\w*)}/) do |m|
+          options[m[1...-1].to_sym]
+        end
+      end
+    end
+  end
+end

data/lib/beatport/catalog/dynamic_images.rb

@@ -0,0 +1,13 @@
+module Beatport
+  module Catalog
+    class DynamicImages
+      attr_reader :main, :banner, :waveform
+
+      def initialize(images)
+        images.each do |format, data|
+          instance_variable_set(:"@#{format}", DynamicImage.new(data))
+        end
+      end
+    end
+  end
+end

data/lib/beatport/catalog/images.rb

@@ -2,7 +2,7 @@ module Beatport
   module Catalog
     class Images
       attr_reader :small, :medium, :large, :waveform, :banner
-    
+
       def initialize(images)
         images.each do |format, data|
           instance_variable_set(:"@#{format}", Image.new(data))
@@ -10,4 +10,4 @@ module Beatport
       end
     end
   end
-end
+end

data/lib/beatport/catalog/label.rb

@@ -1,13 +1,15 @@
 module Beatport
   module Catalog
     class Label < Item
+      include Support::Url
+
       has_many :genres, Genre
       has_many :subgenres, Genre
       has_many :top_downloads, Track
       has_many :featured_releases, Release
       has_many :most_popular_releases, Release
       has_one :images, Images
-      
+
       class << self
         def all(options = {})
           Client.retrieve 'labels', Label, options
@@ -32,4 +34,4 @@ module Beatport
       end
     end
   end
-end
+end

data/lib/beatport/catalog/release.rb

@@ -1,6 +1,8 @@
 module Beatport
   module Catalog
     class Release < Item
+      include Support::Url
+
       has_many :artists, Artist
       has_one :audio_format_fee, AudioFormatFee
       has_many :genres, Genre
@@ -14,15 +16,15 @@ module Beatport
       def discount
         tracks_price - price
       end
-    
+
       def self.find(*args)
         Client.retrieve 'releases', Release, *args
       end
 
       def self.all(options={})
         Client.retrieve 'releases', Release, options
-      end    
-    
+      end
+
       def self.featured(*args)
         Client.retrieve 'featured/releases', Release, *args
       end
@@ -34,4 +36,3 @@ module Beatport
     end
   end
 end
-  

data/lib/beatport/catalog/track.rb

@@ -1,6 +1,8 @@
 module Beatport
-  module Catalog  
+  module Catalog
     class Track < Item
+      include Support::Url
+
       has_many :genres, Genre
       has_many :sub_genres, Genre
       has_many :artists, Artist
@@ -9,29 +11,30 @@ module Beatport
       has_one :label, Label
       has_one :price, Price
       has_one :images, Images
+      has_one :dynamic_images, DynamicImages
       has_one :audio_format_fee, AudioFormatFee
       has_one :key, Keys
-    
+
       # Returns the track with the given id
       def self.find(key)
         Client.retrieve 'tracks', Track, :key => key
       end
-  
+
       # Returns all the tracks matching the criterea
       def self.all(options = {})
         Client.retrieve 'tracks', Track, options
-      end    
-    
+      end
+
       def self.most_popular(options = {})
         Client.retrieve 'most-popular', Track, options
       end
-    
+
       def self.most_popular_for_genre(id, options = {})
         options[:id] = id
         options[:collection] = true
         Client.retrieve "most-popular/genre", Track, options
       end
-    
+
       def self.most_popular_for_artist(id, options = {})
         options[:id] = id
         options[:collection] = true
@@ -43,7 +46,7 @@ module Beatport
         options[:collection] = true
         Client.retrieve "most-popular/label", Track, options
       end
-    
+
     end
   end
-end
+end

data/lib/beatport/client.rb

@@ -1,5 +1,12 @@
 module Beatport
   module Client
+    def self.connection
+      @connection ||= Faraday.new do |conn|
+        conn.use Support::Middleware
+        conn.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+      end      
+    end
+    
     def self.client
       @client ||= Signet::OAuth1::Client.new(
         :client_credential_key =>     Beatport.consumer_key,
@@ -13,19 +20,20 @@ module Beatport
       @builder ||= Support::QueryBuilder.new
     end
     
-    def self.retrieve(path, klass, *args)
-      uri = Addressable::URI.new(
+    def self.uri(path, args)
+      Addressable::URI.new(
         :scheme => 'https',
         :host => 'api.beatport.com',
         :path => "/catalog/3/#{path}",
         :query_values => builder.process(*args)
-      )
-      
-      result = client.fetch_protected_resource(:uri => uri.to_s)
-      result = JSON.parse(result.body)
-
-      # underscore result keys
-      result = Support::Inflector.process_keys(result) { |k| Support::Inflector.underscore(k) }
+      )      
+    end
+    
+    def self.retrieve(path, klass, *args)
+      result = client.fetch_protected_resource(
+        :connection => connection, 
+        :uri => uri(path, args).to_s
+      ).body
 
       if result['metadata']['error']
         raise Error.new("#{result['metadata']['error']}: #{result['metadata']['message']}")

data/lib/beatport/item.rb

@@ -1,21 +1,21 @@
 module Beatport
-  
+
   class Item < OpenStruct
     class << self
       def associations
         @associations ||= {}
       end
-      
+
       def has_one(var, klass)
         lazy_accessor(var)
         self.associations[var] = {:list => false, :klass => klass}
       end
-    
+
       def has_many(var, klass)
         lazy_accessor(var)
         self.associations[var] = {:list => true, :klass => klass}
       end
-      
+
       def lazy_accessor(var)
         return if respond_to?(var)
         class_eval "def #{var}; @#{var}; end"
@@ -39,25 +39,25 @@ module Beatport
         end
       end
     end
-  
+
     def initialize(data = {})
       raise ArgumentError, "Invalid data passed to Item.new: #{data.inspect}" unless data.is_a?(Hash)
-            
+
       # OpenStruct doesn't like id or type, so we store them after the call to super
       id = data.delete('id')
       type = data.delete('type')
-      
+
       self.class.associations.each do |k, v|
         associate(data, k, v[:list], v[:klass])
       end
-      
+
       super(data)
 
       data.each do |k, v|
         @table[k.to_sym] = Date.parse(v) if k =~ /_date$/
         @table[k.to_sym] = Regexp.new(v.to_s) if k =~ /_regex$/
       end
-      
+
       @table['id'] = id if id
       @table['type'] = type if type
     end
@@ -65,21 +65,21 @@ module Beatport
     def id
       @table['id']
     end
-    
+
     def type
       @table['type']
     end
-    
+
     # Allow treating the item as a hash
     def [](key)
       send(key) if respond_to?(key)
     end
-    
+
     def associate(data, var, collection = false, klass = Item)
       a = data.delete(var.to_s)
-      
+
       return unless a
-      
+
       if collection && a.is_a?(Array)
         a = a.compact.map { |g| klass.new(g) }
       elsif !collection && a.is_a?(Hash)
@@ -90,10 +90,10 @@ module Beatport
       else
         raise ArgumentError, "Invalid data for association: '#{var}' = #{a.inspect}"
       end
-      
+
       instance_variable_set(:"@#{var}", a)
     end
-    
-    
+
+
   end
-end
+end

data/lib/beatport/support.rb

@@ -3,5 +3,7 @@ module Beatport
     autoload :Inflector,       'beatport/support/inflector'
     autoload :Parser,          'beatport/support/parser'
     autoload :QueryBuilder,    'beatport/support/query_builder'
+    autoload :Middleware,      'beatport/support/middleware'
+    autoload :Url,             'beatport/support/url'
   end
 end

data/lib/beatport/support/middleware.rb

@@ -0,0 +1,14 @@
+module Beatport
+  module Support
+    class Middleware < Faraday::Response::Middleware
+      def parse(body)
+        body = jsonify(body)
+      end
+      
+      def jsonify(body)
+        body = ::JSON.parse(body)
+        body = Support::Inflector.process_keys(body) { |k| Support::Inflector.underscore(k) }
+      end
+    end
+  end
+end

data/lib/beatport/support/url.rb

@@ -0,0 +1,9 @@
+module Beatport
+  module Support
+    module Url
+      def url
+        "http://www.beatport.com/#{type}/#{slug}/#{id}"
+      end
+    end
+  end
+end

data/spec/catalog/artist_spec.rb

@@ -12,12 +12,13 @@ module Beatport::Catalog
 
     describe 'structure' do
       subject { Artist.find(7181) }
-      
+
       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 (:url) { should == "http://www.beatport.com/artist/above-and-beyond/7181" }
       its (:last_publish_date) { should >= Date.new(2011, 12, 15)}
       its (:biography) { should == "" }
       its (:'genres.length') { should be > 1 }
@@ -28,18 +29,18 @@ module Beatport::Catalog
       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) }
-        
+
         it { should be_an(Artist) }
         its (:id) { should == 7181 }
       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
@@ -49,18 +50,18 @@ module Beatport::Catalog
 
       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    
-  
+    end
+
     describe '.find_by_name' do
       subject { Artist.find_by_name('Above & Beyond') }
-      
+
       it { should be_an(Artist) }
       its (:id) { should == 7181 }
     end
@@ -70,39 +71,39 @@ module Beatport::Catalog
         artists = Artist.all
         artists.length.should == 10
       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
       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
-        
+
           # 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
-    
+
       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      
+        artists.facets['fields']['genre_name'].count.should be > 1
 
       end
 
@@ -110,11 +111,11 @@ module Beatport::Catalog
         pending "Request doesn't return any results"
 
         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
@@ -122,4 +123,4 @@ module Beatport::Catalog
 
     end
   end
-end
+end

data/spec/catalog/country_spec.rb

@@ -12,7 +12,7 @@ module Beatport::Catalog
 
     describe 'structure' do
       subject { Country.find('au') }
-      
+
       it { should be_a(Country) }
       its (:id) { should ==  5 }
       its (:code) { should == "AUS" }
@@ -22,11 +22,11 @@ module Beatport::Catalog
       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 (:'currency.code') { should == "AUD" }
+      its (:'currency.name') { should == "Australian Dollar" }
       its (:'states.first.code') { should == 'ACT' }
-      its (:'states.first.type') { should == 'territory' } 
+      its (:'states.first.type') { should == 'territory' }
       its (:'states.first.name') { should == "Australian Capital Territory" }
     end
   end
-end
+end

data/spec/catalog/label_spec.rb

@@ -12,36 +12,37 @@ module Beatport::Catalog
 
     describe 'structure' do
       subject { Label.find(1390) }
-      
+
       it { should be_a(Label) }
       its (:id) { should == 1390 }
       its (:type) { should == "label" }
       its (:name) { should == "Anjunadeep" }
-      its (:slug) { should == "anjunadeep" }      
+      its (:slug) { should == "anjunadeep" }
+      its (:url) { should == "http://www.beatport.com/label/anjunadeep/1390" }
       pending "source type is no longer returned?"
       #its (:source_type) { should == ["store", "mobile", "sushi"] }
 
       its (:last_publish_date) { should > Date.new(2012, 9, 10) }
       its (:biography) { should == "" }
       its (:'genres.length') { should be > 1 }
-      its (:'sub_genres.length') { should be > 0 }      
+      its (:'sub_genres.length') { should be > 0 }
 #      its (:display_level) { should == 1 }
       its (:'images.small.url') { should == "http://geo-media.beatport.com/image/3406.jpg"}
       its (:'images.medium.url') { should == "http://geo-media.beatport.com/image/1191.jpg"}
-      its (:'images.banner.url') { should == "http://geo-media.beatport.com/image/345152.jpg"}            
+      its (:'images.banner.url') { should == "http://geo-media.beatport.com/image/345152.jpg"}
 #      its (:'top_downloads.length') { should be > 1 }
 #      its (:'featured_releases.length') { should be > 1 }
 #      its (:'most_popular_releases.length') { should be > 1 }
 
     end
-  
+
     describe '.find' do
       it "should get Anjunadeep give id 1390" do
         label = Label.find(1390)
         label.id.should == 1390
       end
     end
-  
+
     describe '.find_by_name' do
       it 'returns Anjunadeep' do
         label = Label.find_by_name('Anjunadeep')
@@ -54,55 +55,55 @@ module Beatport::Catalog
         labels = Label.all
         labels.length.should == 10
       end
-    
+
       it "should get the first page with 5 labels per page" do
         labels = Label.all :per_page => 5, :page => 1
         labels.length.should == 5
         labels.page.should == 1
         labels.per_page.should == 5
       end
-    
+
       it "should get the first page with 5 labels per page, sorted by publish date and label id, for the House genre" do
         labels = Label.all(:sort_by=> ['publishDate asc', 'labelId asc'], :genre_id=> 5, :per_page=>5, :page=>1)
         labels.length.should == 5
-      
+
         old_id = nil
         old_date = labels.first.last_publish_date
-      
+
         labels.each do |label|
           old_id = nil if old_date.to_s != label.last_publish_date.to_s
-        
+
           # beatport has some bad genre data?
           # label.genres.map(&:id)) { should include(5)
           label.id.should be >= old_id if old_id
           label.last_publish_date.should be >= old_date if old_date
-        
+
           old_id = label.id
           old_date = label.last_publish_date
         end
       end
-    
+
       it "should get arbitrary labels with filter metadata for all genre names and label names" do
         labels = Label.all :return_facets => ['genre_name', 'performer_name']
-        
+
         # no worky
 #        labels.facets['fields']['performer_name'].count) { should be > 1
-        labels.facets['fields']['genre_name'].count.should be > 1      
+        labels.facets['fields']['genre_name'].count.should be > 1
       end
 
       it "should get all trance labels for above & beyond" do
         labels = Label.all :facets => {:genre_name => ['Trance', 'Progessive House']}
-    
+
         labels.each do |label|
           labels = label['labels'].map { |a| a['name'] }
           labels.should include("Above & Beyond")
-        
+
           genres = label['genres'].map { |a| a['name'] }
           genres.should include('Trance')
         end
       end
     end
-    
+
     describe '.featured' do
       it "should get the featured labels for the Home page" do
         pending "deprecated?"
@@ -110,10 +111,10 @@ module Beatport::Catalog
         labels = Label.featured
         labels.length.should be > 1
       end
-      
+
       it "should get the featured labels for the Trance page" do
         pending "deprecated?"
-        
+
         labels = Label.featured :genre_id => 7
         labels.length.should be > 1
         labels.each do |label|
@@ -122,4 +123,4 @@ module Beatport::Catalog
       end
     end
   end
-end
+end

data/spec/catalog/release_spec.rb

@@ -12,7 +12,7 @@ module Beatport::Catalog
 
     describe 'structure' do
       subject { Release.find(164808) }
-      
+
       it { should be_a(Release) }
       its (:id) { should == 164808 }
       its (:type) { should == 'release' }
@@ -25,6 +25,7 @@ module Beatport::Catalog
       its (:current_status) { should == "General Content"}
       its (:catalog_number) { should == "ANJCDCO011D"}
       its (:purchasable) { should == true }
+      its (:url) { should == "http://www.beatport.com/release/anjunabeats-volume-6-unmixed-dj-ready/164808" }
       its (:'price.to_s') { should == "9.99" }
       its (:'tracks_price.to_s') { should == "43.21" }
       its (:'audio_format_fee.wav.to_s') { should == '21.75'}
@@ -34,64 +35,64 @@ module Beatport::Catalog
       specify { subject.genres.map(&:name).sort.should == ["Progressive House", "Trance"] }
       its (:'images.small.url') { should == "http://geo-media.beatport.com/image/392699.jpg" }
       its (:'images.medium.url') { should == "http://geo-media.beatport.com/image/392700.jpg" }
-      its (:'images.large.url') { should == "http://geo-media.beatport.com/image/392701.jpg" }      
+      its (:'images.large.url') { should == "http://geo-media.beatport.com/image/392701.jpg" }
       its (:'discount.to_s') { should == "33.22" }
 #      its (:'recommendations.releases.length') { should > 1 }
     end
-  
+
     describe '.find' do
       it "should get Anjunabeats Volume 6 when given id 164808" do
         release = Release.find(164808)
         release.id.should == 164808
       end
     end
-  
+
     describe '.all' do
       it "should get arbitrary releases" do
         releases = Release.all
         releases.length.should == 10
       end
-    
+
       it "should get the first page with 5 releases per page" do
         releases = Release.all :per_page => 5, :page => 1
         releases.length.should == 5
         releases.page.should == 1
         releases.per_page.should == 5
       end
-    
+
       it "should get the first page with 5 releases per page, sorted by publish date and release id, for the House genre" do
         releases = Release.all(:sort_by=> ['publishDate asc', 'releaseId asc'], :genre_id=> 5, :per_page=>5, :page=>1)
         releases.length.should == 5
-      
+
         old_id = nil
         old_date = releases.first.publish_date
-      
+
         releases.each do |release|
           old_id = nil if old_date.to_s != release.publish_date.to_s
-        
+
           release.genres.first.id.should == 5
           release.id.should be >= old_id if old_id
           release.publish_date.should be >= old_date if old_date
-        
+
           old_id = release.id
           old_date = release.publish_date
         end
       end
-    
+
       it "should get arbitrary releases with filter metadata for all genre names and artist names" do
         releases = Release.all :return_facets => ['genre_name', 'performer_name']
-    
+
         releases.facets['fields']['performer_name'].count.should be > 1
-        releases.facets['fields']['genre_name'].count.should be > 1      
+        releases.facets['fields']['genre_name'].count.should be > 1
       end
 
       it "should get all trance releases for above & beyond" do
         releases = Release.all :facets => {:genre_name => 'Trance', :performer_name => 'Above & Beyond'}
-    
+
         releases.each do |release|
           artists = release['artists'].map { |a| a['name'] }
           artists.should include("Above & Beyond")
-        
+
           genres = release['genres'].map { |a| a['name'] }
           genres.should include('Trance')
         end
@@ -103,29 +104,29 @@ module Beatport::Catalog
         releases = Release.featured
         releases.length.should be > 1
       end
-      
+
       it "should get the featured releases for the Trance page" do
         releases = Release.featured :genre_id => 7
         releases.length.should be > 1
         releases.each do |release|
           release.genres.map(&:id).should include(7)
-        end  
+        end
       end
-      
+
       it "should get 'Just Added' featured releases for the Trance page" do
         releases = Release.featured :genre_id => 7, :just_added => true
         releases.length.should be > 1
         releases.each do |release|
           release.genres.map(&:id).should include(7)
-        end  
+        end
       end
-      
+
       it "should not give the same releases with justAdded true and false" do
         pending "test will not give consistent results, revisit"
-        
+
         featured = Release.featured :genre_id => 7
         just_added = Release.featured :genre_id => 7, :just_added => true
-        
+
         featured.map(&:id).should_not == just_added.map(&:id)
       end
     end
@@ -135,15 +136,15 @@ module Beatport::Catalog
         release = Release.find(164808)
         release.tracks
       end
-      
+
       it "should return all 29 tracks for Anjunabeats Volume 6" do
         subject.count.should == 29
       end
-      
+
       it "should return paper jet as the first track" do
         subject.first.name.should == "Paper Jet"
       end
-      
+
     end
   end
-end
+end

data/spec/catalog/track_spec.rb

@@ -19,7 +19,7 @@ module Beatport::Catalog
 
     describe 'structure' do
       subject { Track.find(1217790) }
-      
+
       it { should be_a(Track) }
       its (:id) { should == 1217790 }
       its (:type) { should == 'track' }
@@ -29,9 +29,10 @@ module Beatport::Catalog
       its (:title) { should == "Tonight (IMS Anthem 2009) (Above & Beyond Remix)"}
       its (:release_date) { should == Date.new(2010,05,17) }
       its (:publish_date) { should == Date.new(2010,05,17) }
-      its (:sample_url) { should == 'http://geo-samples.beatport.com/lofi/1217790.LOFI.mp3' }
-      its (:rtmp_stream_url) { should == 'rtmp://geo-rtmp-samples.beatport.com/beatport/_definst_/mp3:lofi_samples/items/volumes/volume7/items/1000000/200000/10000/7000/700/90/1217790.LOFI'}
+      #its (:sample_url) { should == 'http://geo-samples.beatport.com/lofi/1217790.LOFI.mp3' }
+      #its (:rtmp_stream_url) { should == 'rtmp://geo-rtmp-samples.beatport.com/beatport/_definst_/mp3:lofi_samples/items/volumes/volume7/items/1000000/200000/10000/7000/700/90/1217790.LOFI'}
       its (:exclusive) { should be_false }
+      its (:url) { should == "http://www.beatport.com/track/tonight-ims-anthem-2009-above-and-beyond-remix/1217790" }
       its (:'price.to_s') { should == "1.49" }
       its (:'audio_format_fee.wav.to_s') { should == "0.75" }
       its (:'audio_format_fee.aiff.to_s') { should == "0.75" }
@@ -50,59 +51,65 @@ module Beatport::Catalog
       its (:'images.small.url') { should == 'http://geo-media.beatport.com/image/674759.jpg' }
       its (:'images.medium.url') { should == 'http://geo-media.beatport.com/image/674760.jpg' }
       its (:'images.large.url') { should == 'http://geo-media.beatport.com/image/674761.jpg' }
-      its (:'images.waveform.url') { should == 'http://geo-media.beatport.com/image/1268229.png' }                  
+      its (:'images.waveform.url') { should == 'http://geo-media.beatport.com/image/1268229.png' }
+      its (:'dynamic_images.main.url') { should == '//geo-media.beatport.com/image_size{hq}/{w}x{h}/674761.jpg' }
+
+      it "should render a dynamic url of the right size" do
+        subject.dynamic_images.main.dynamic_url(w: 120, h: 120).should == '//geo-media.beatport.com/image_size/120x120/674761.jpg'
+      end
+
     end
-    
+
     describe '.find' do
       it "should find the track with the id 1217790" do
         track = Track.find(1217790)
         track.id.should == 1217790
       end
     end
-  
+
     describe '.all' do
       it "should get arbitrary" do
         Track.all.length.should be > 1
       end
-  
+
       it "should get the first page with 5 tracks per page" do
         tracks = Track.all(:per_page => 5, :page => 1)
         tracks.length.should == 5
         tracks.page.should == 1
         tracks.per_page.should == 5
       end
-    
+
       it "should get the first page with 5 tracks per page, sorted by publish date and release if, for the House genre" do
         tracks = Track.all(:sort_by=> ['publishDate asc', 'releaseId asc'], :genre_id=> 5, :per_page=>5, :page=>1)
         tracks.length.should == 5
-      
+
         old_id = tracks.first.id
         old_date = tracks.first.publish_date
-      
+
         tracks.each do |track|
           track.genres.first.id.should == 5
           track.id.should be >= old_id
           track.publish_date.should be >= old_date
-        
+
           old_id = track.id
           old_date = track.publish_date
         end
       end
-    
+
       it "should get arbitrary tracks with filter metadata for all genre names and artist names" do
         tracks = Track.all :return_facets => ['genre_name', 'performer_name']
-    
+
         tracks.facets['fields']['performer_name'].count.should be > 1
-        tracks.facets['fields']['genre_name'].count.should be > 1      
+        tracks.facets['fields']['genre_name'].count.should be > 1
       end
 
       it "should get all trance tracks for above & beyond" do
         tracks = Track.all :facets => {:genre_name => 'Trance', :performer_name => 'Above & Beyond'}
-    
+
         tracks.each do |track|
           artists = track['artists'].map { |a| a['name'] }
           artists.should include("Above & Beyond")
-        
+
           genres = track['genres'].map { |a| a['name'] }
           genres.should include('Trance')
         end
@@ -115,7 +122,7 @@ module Beatport::Catalog
         tracks.count.should == 100
         tracks.length.should == 10
       end
-      
+
       it "should get the top classics for the home page" do
         tracks = Track.most_popular :status => 5
         tracks.count.should == 100
@@ -125,15 +132,15 @@ module Beatport::Catalog
       it "should not return the same results for most_popular and classics" do
         popular = Track.most_popular
         classics = Track.most_popular :status => 5
-        
+
         popular.map(&:id).should_not == classics.map(&:id)
       end
     end
-    
+
     describe '.most_popular_for_genre' do
       it "should get the top download for the trance page" do
         tracks = Track.most_popular_for_genre 7
-        
+
         tracks.count.should == 100
         tracks.length.should == 10
         tracks.each do |track|
@@ -143,19 +150,19 @@ module Beatport::Catalog
 
       it "should get the top classics for the trance page" do
         tracks = Track.most_popular_for_genre 7, :status => 5
-        
+
         tracks.each do |track|
           track.genres.map(&:id).should include(7)
         end
       end
-      
+
       it "should not return the same results for most_popular and classics" do
         popular = Track.most_popular_for_genre 7
         classics = Track.most_popular_for_genre 7, :status => 5
-        
+
         popular.map(&:id).should_not == classics.map(&:id)
-      end      
-      
+      end
+
     end
 
     describe '.most_popular_for_artist' do
@@ -175,7 +182,7 @@ module Beatport::Catalog
         tracks.each do |track|
           track.label.id.should == 804
         end
-      end      
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beatport
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +215,8 @@ files:
 - lib/beatport/catalog/country.rb
 - lib/beatport/catalog/currency.rb
 - lib/beatport/catalog/djprofile.rb
+- lib/beatport/catalog/dynamic_image.rb
+- lib/beatport/catalog/dynamic_images.rb
 - lib/beatport/catalog/feature.rb
 - lib/beatport/catalog/genre.rb
 - lib/beatport/catalog/home.rb
@@ -228,8 +246,10 @@ files:
 - lib/beatport/price.rb
 - lib/beatport/support.rb
 - lib/beatport/support/inflector.rb
+- lib/beatport/support/middleware.rb
 - lib/beatport/support/parser.rb
 - lib/beatport/support/query_builder.rb
+- lib/beatport/support/url.rb
 - spec/beatport_spec.rb
 - spec/catalog/account_type_spec.rb
 - spec/catalog/artist_spec.rb
@@ -270,7 +290,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3985965663943551168
+      hash: 746907513197344592
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: