beatport 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/beatport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beatport}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = %q{2011-12-18}
+  s.date = %q{2011-12-21}
   s.description = %q{A ruby gem for accessing the beatport api}
   s.email = %q{mateo.murphy@gmail.com}
   s.extra_rdoc_files = [
@@ -58,11 +58,12 @@ Gem::Specification.new do |s|
     "lib/beatport/catalog/track.rb",
     "lib/beatport/client.rb",
     "lib/beatport/collection.rb",
-    "lib/beatport/inflector.rb",
     "lib/beatport/item.rb",
-    "lib/beatport/parser.rb",
     "lib/beatport/price.rb",
-    "lib/beatport/query_builder.rb",
+    "lib/beatport/support.rb",
+    "lib/beatport/support/inflector.rb",
+    "lib/beatport/support/parser.rb",
+    "lib/beatport/support/query_builder.rb",
     "spec/catalog/account_type_spec.rb",
     "spec/catalog/artist_spec.rb",
     "spec/catalog/audio_format_spec.rb",
@@ -82,10 +83,10 @@ Gem::Specification.new do |s|
     "spec/catalog/source_type_spec.rb",
     "spec/catalog/track_spec.rb",
     "spec/collection_spec.rb",
-    "spec/inflector_spec.rb",
     "spec/item_spec.rb",
-    "spec/query_builder_spec.rb",
-    "spec/spec_helper.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.licenses = ["MIT"]

data/lib/beatport.rb

@@ -7,9 +7,7 @@ module Beatport
   autoload :Catalog,         'beatport/catalog'
   autoload :Client,          'beatport/client'
   autoload :Collection,      'beatport/collection'
-  autoload :Inflector,       'beatport/inflector'
   autoload :Item,            'beatport/item'
-  autoload :Parser,          'beatport/parser'
   autoload :Price,           'beatport/price'
-  autoload :QueryBuilder,    'beatport/query_builder'
+  autoload :Support,         'beatport/support'
 end

data/lib/beatport/catalog/account_type.rb

@@ -3,9 +3,15 @@ module Beatport
     class AccountType < Item
       has_one :images, Images
       
+      # Returns the account type with the name given
+      def self.find(key)
+        Client.retrieve 'account-types', AccountType, :key => key
+      end
+      
+      # Returns all the account types
       def self.all
         Client.retrieve 'account-types', AccountType
-      end      
+      end
     end
   end
 end

data/lib/beatport/catalog/artist.rb

@@ -5,16 +5,19 @@ module Beatport
       has_many :subgenres, Genre
       has_one :images, Images
       has_many :top_downloads, Track
-      has_many :featured_releases, Release
+#      has_many :featured_releases, Release
     
-      def self.find(id)
-        Client.retrieve('artists/detail', Artist, :id => id)
+      def self.find(*args)
+        Client.retrieve 'artists', Artist, *args
       end
 
-      def self.all(*args)
-        Client.retrieve 'artists', Artist, *args
+      def self.all(options = {})
+        Client.retrieve 'artists', Artist, options
       end
     
+      def top_downloads(options = {})
+        @top_downloads ||= Track.most_popular_for_artist(id, options)
+      end
     end
   end
 end

data/lib/beatport/catalog/audio_format.rb

@@ -2,6 +2,11 @@ module Beatport
   module Catalog
     class AudioFormat < Item
       
+      # Returns the audio format with the name given
+      def self.find(key)
+        Client.retrieve 'audio-formats', AudioFormat, :key => key
+      end
+            
       def self.all
         Client.retrieve 'audio-formats', AudioFormat
       end

data/lib/beatport/catalog/autocomplete.rb

@@ -4,7 +4,7 @@ module Beatport
       def self.query(query, options = {})
         options['query'] = query
       
-        Client.retrieve('autocomplete', Autocomplete, options)
+        Client.retrieve 'autocomplete', Autocomplete, options
       end
     end
   end

data/lib/beatport/catalog/chart.rb

@@ -7,12 +7,12 @@ module Beatport
       has_one :price, Price
       has_many :tracks, Track
     
-      def self.find(id)
-        Client.retrieve('charts/detail', Chart, :id => id)
+      def self.find(*keys)
+        Client.retrieve 'charts', Chart, *keys
       end
   
-      def self.all(*args)
-        Client.retrieve 'charts', Chart, *args
+      def self.all(options = {})
+        Client.retrieve 'charts', Chart, options
       end    
     
       def self.overview
@@ -20,8 +20,14 @@ module Beatport
       end
     
       def self.featured(*args)
-        Client.retrieve('featured/charts', Chart, *args)
-      end    
+        Client.retrieve 'featured/charts', Chart, *args
+      end
+      
+      def tracks(options = {})
+        options[:chart_id] = id
+        @tracks ||= Track.all(options)
+      end
+      
     end
   end
 end

data/lib/beatport/catalog/country.rb

@@ -9,7 +9,7 @@ module Beatport
       end
       
       def self.find(code)
-        Client.retrieve('countries', Country, :code_short => code).first
+        Client.retrieve 'countries', Country, :key => code, :string_key_type => :code_short
       end
     end
   end

data/lib/beatport/catalog/feature.rb

@@ -6,7 +6,7 @@ module Beatport
       attr_reader :items
     
       def initialize(data = {})
-        item_klass = Inflector.constantize("Beatport::Catalog::#{data['type']}")
+        item_klass = Support::Inflector.constantize("Beatport::Catalog::#{data['type']}")
 
         associate(data, 'items', true, item_klass)
         super

data/lib/beatport/catalog/genre.rb

@@ -8,22 +8,26 @@ module Beatport
       has_one :counts, Item
       has_one :list, List
     
-      def self.find(id)
-        Client.retrieve('genres', Genre, :id => id, :subgenres => true).first
+      # Returns the genre with the given id or slug
+      def self.find(key)
+        Client.retrieve 'genres', Genre, :key => key, :string_key_type => :slug, :subgenres => true
       end
   
-      def self.all(*args)
-        Client.retrieve('genres', Genre, *args)
+      # Returns all the genres
+      def self.all(options = {})
+        Client.retrieve 'genres', Genre, options
       end
     
       def self.overview
-        Client.retrieve('genres/overview', Genre)
+        Client.retrieve 'genres/overview', Genre
       end
-    
+      
+      # Returns the top downloads for the genre
       def top_downloads
         @top_downloads ||= Track.most_popular_for_genre(id)
       end
     
+      # Returns the slideshow for the genre
       def slideshow
         @slideshow ||= Slideshow.find(id)
       end

data/lib/beatport/catalog/label.rb

@@ -8,16 +8,16 @@ module Beatport
       has_many :most_popular_releases, Release
       has_one :images, Images
       
-      def self.find(id)
-        Client.retrieve('labels/detail', Label, :id => id)
+      def self.find(*args)
+        Client.retrieve 'labels', Label, *args
       end
 
-      def self.all(*args)
-        Client.retrieve('labels', Label, *args)
+      def self.all(options = {})
+        Client.retrieve 'labels', Label, options
       end
     
       def self.featured(*args)
-        Client.retrieve('featured/labels', Label, *args)
+        Client.retrieve 'featured/labels', Label, *args
       end    
     
       def releases(options)

data/lib/beatport/catalog/mixed.rb

@@ -2,7 +2,7 @@ module Beatport
   module Catalog  
     class Mixed
       def self.all(options = {})
-        Client.retrieve('mixed', :auto, options)
+        Client.retrieve 'mixed', :auto, options
       end
     end
   end

data/lib/beatport/catalog/release.rb

@@ -15,16 +15,21 @@ module Beatport
         tracks_price - price
       end
     
-      def self.find(id)
-        Client.retrieve('releases/detail', Release, :id => id)
+      def self.find(*args)
+        Client.retrieve 'releases', Release, *args
       end
 
-      def self.all(*args)
-        Client.retrieve('releases', Release, *args)
+      def self.all(options={})
+        Client.retrieve 'releases', Release, options
       end    
     
       def self.featured(*args)
-        Client.retrieve('featured/releases', Release, *args)
+        Client.retrieve 'featured/releases', Release, *args
+      end
+
+      def tracks(options = {})
+        options[:release_id] = id
+        @tracks ||= Track.all(options)
       end
     end
   end

data/lib/beatport/catalog/search.rb

@@ -4,7 +4,7 @@ module Beatport
       def self.query(query, options = {})
         options['query'] = query
       
-        Client.retrieve('search', :auto, options)
+        Client.retrieve 'search', :auto, options
       end
     end
   end

data/lib/beatport/catalog/slide.rb

@@ -2,15 +2,15 @@ module Beatport
   module Catalog
     class Slide < Item
       def self.header(*args)
-        Client.retrieve('slideshows/header', Slide, *args)
+        Client.retrieve 'slideshows/header', Slide, *args
       end
     
       def self.feature(*args)
-        Client.retrieve('slideshows/feature', Slide, *args)
+        Client.retrieve 'slideshows/feature', Slide, *args
       end
 
       def self.small(*args)
-        Client.retrieve('slideshows/small', Slide, *args)
+        Client.retrieve 'slideshows/small', Slide, *args
       end
     end
   end

data/lib/beatport/catalog/track.rb

@@ -13,29 +13,35 @@ module Beatport
       has_one :key, Keys
     
       # Returns the track with the given id
-      def self.find(id)
-        Client.retrieve('tracks', Track, :id => id).first
+      def self.find(key)
+        Client.retrieve 'tracks', Track, :key => key
       end
   
       # Returns all the tracks matching the criterea
-      def self.all(*args)
-        Client.retrieve 'tracks', Track, *args
+      def self.all(options = {})
+        Client.retrieve 'tracks', Track, options
       end    
     
-      def self.most_popular(*args)
-        Client.retrieve 'most-popular', Track, *args
+      def self.most_popular(options = {})
+        Client.retrieve 'most-popular', Track, options
       end
     
-      def self.most_popular_for_genre(*args)
-        Client.retrieve "most-popular/genre", Track, *args    
+      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(*args)
-        Client.retrieve "most-popular/artist", Track, *args    
+      def self.most_popular_for_artist(id, options = {})
+        options[:id] = id
+        options[:collection] = true
+        Client.retrieve "most-popular/artist", Track, options
       end
 
-      def self.most_popular_for_label(*args)
-        Client.retrieve "most-popular/label", Track, *args    
+      def self.most_popular_for_label(id, options = {})
+        options[:id] = id
+        options[:collection] = true
+        Client.retrieve "most-popular/label", Track, options
       end
     
     end

data/lib/beatport/client.rb

@@ -1,17 +1,23 @@
 module Beatport
   module Client
     include HTTParty
-    parser Beatport::Parser
+    parser Beatport::Support::Parser
     base_uri "http://api.beatport.com/catalog/3"
     format :json
 #    default_params :v => '1.0', :format => 'json'
     
     def self.retrieve(path, klass, *args)
-      result = get("/#{path}", :query => QueryBuilder.process(*args))
+      builder = Support::QueryBuilder.new
+      
+      result = get("/#{path}", :query => builder.process(*args))
 
       case result['results']
       when Array
-        Collection.new(klass, result)
+        if builder.single_result?
+          klass.new(result['results'].first) if result['results'].any?
+        else
+          Collection.new(klass, result)
+        end
       when Hash
         klass.new(result['results'])
       else

data/lib/beatport/collection.rb

@@ -21,7 +21,7 @@ module Beatport
       
       @results = if klass == :auto
         data['results'].map do |r|
-          item_klass = Inflector.constantize("Beatport::Catalog::#{r['type'].capitalize}")
+          item_klass = Support::Inflector.constantize("Beatport::Catalog::#{r['type'].capitalize}")
           item_klass.new(r)
         end
       else

data/lib/beatport/support.rb

@@ -0,0 +1,7 @@
+module Beatport
+  module Support
+    autoload :Inflector,       'beatport/support/inflector'
+    autoload :Parser,          'beatport/support/parser'
+    autoload :QueryBuilder,    'beatport/support/query_builder'
+  end
+end

data/lib/beatport/support/inflector.rb

@@ -0,0 +1,47 @@
+module Beatport
+  module Support
+    module Inflector
+      extend self
+      
+      def constantize(camel_cased_word)
+        names = camel_cased_word.split('::')
+        names.shift if names.empty? || names.first.empty?
+
+        constant = Object
+        names.each do |name|
+          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+        end
+        constant
+      end
+    
+      def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
+        if first_letter_in_uppercase
+          lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+        else
+          lower_case_and_underscored_word.to_s[0].chr.downcase + camelize(lower_case_and_underscored_word)[1..-1]
+        end
+      end    
+    
+      def underscore(camel_cased_word)
+        word = camel_cased_word.to_s.dup
+        word.gsub!(/::/, '/')
+        word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+        word.tr!("-", "_")
+        word.downcase!
+        word
+      end
+    
+      def process_keys(obj, &block)
+        case obj
+        when Hash
+          Hash[obj.map {|k, v| [yield(k), process_keys(v, &block)]}]
+        when Array
+          obj.map {|o| process_keys(o, &block)}
+        else
+          obj
+        end
+      end
+    end
+  end
+end