beatport 0.1.10 → 0.2.0

data/Gemfile

@@ -3,7 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem 'httparty'
+gem 'addressable'
+gem 'signet'
 gem 'money', '~> 5.1.1'    # https://github.com/RubyMoney/money
 
 # Add dependencies to develop your gem here.

data/README.md

@@ -8,6 +8,16 @@ Currently incomplete, but under development.
 
 [![Dependency Status](https://gemnasium.com/mateomurphy/beatport.png)](https://gemnasium.com/mateomurphy/beatport)
 
+## 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:
+
+    Beatport.consumer_key =        'consumer_key'
+    Beatport.consumer_secret =     'consumer_secret'
+    Beatport.access_token_key =    'access_token_key'
+    Beatport.access_token_secret = 'access_token_secret'
+
 ## 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:
@@ -19,8 +29,9 @@ Many queries to beatport support facets, but they aren't properly documentated o
 ## Examples
 
 ```ruby
-require 'beatport'
-# Search using the query "Mord Fustang" on Beatport
+  require 'beatport'
+  
+  # Search using the query "Mord Fustang" on Beatport
   query = Beatport::Catalog::Search.query("Mord Fustang")
   
   query.class # => returns a Beatport::Collection object
@@ -34,7 +45,7 @@ require 'beatport'
   # 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
+  # Find top downloads for a given genre
   genres = Beatport::Catalog::Genre.all # => list all genres
   # display each genre and its corresponding Beatport genre slug
 
@@ -54,9 +65,7 @@ require 'beatport'
 
   # An alternative for searching for genre by slug is searching by genre ID
   trance_genre = Beatport::Catalog::Genre.find(7) # => returns a Trance Genre object
-
-
-```
+  ```
 
 ## Contributing to beatport
  
@@ -70,6 +79,6 @@ require 'beatport'
 
 ## Copyright
 
-Copyright (c) 2011-2012 Mateo Murphy. See LICENSE.txt for
+Copyright (c) 2011-2013 Mateo Murphy. See LICENSE.txt for
 further details.
 

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.2.0

data/beatport.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "beatport"
-  s.version = "0.1.10"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mateo Murphy"]
-  s.date = "2013-08-14"
+  s.date = "2013-08-31"
   s.description = "A ruby gem for accessing the beatport api"
   s.email = "mateo.murphy@gmail.com"
   s.extra_rdoc_files = [
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
     "Rakefile",
@@ -61,6 +60,8 @@ Gem::Specification.new do |s|
     "lib/beatport/catalog/track.rb",
     "lib/beatport/client.rb",
     "lib/beatport/collection.rb",
+    "lib/beatport/config.rb",
+    "lib/beatport/error.rb",
     "lib/beatport/item.rb",
     "lib/beatport/price.rb",
     "lib/beatport/support.rb",
@@ -87,21 +88,6 @@ Gem::Specification.new do |s|
     "spec/catalog/source_type_spec.rb",
     "spec/catalog/track_spec.rb",
     "spec/collection_spec.rb",
-    "spec/fixtures/account_type.yml",
-    "spec/fixtures/artist.yml",
-    "spec/fixtures/audio_format.yml",
-    "spec/fixtures/autocomplete.yml",
-    "spec/fixtures/chart.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/price_spec.rb",
     "spec/spec_helper.rb",
@@ -118,7 +104,8 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     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<addressable>, [">= 0"])
+      s.add_runtime_dependency(%q<signet>, [">= 0"])
       s.add_runtime_dependency(%q<money>, ["~> 5.1.1"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
@@ -128,7 +115,8 @@ Gem::Specification.new do |s|
       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<addressable>, [">= 0"])
+      s.add_dependency(%q<signet>, [">= 0"])
       s.add_dependency(%q<money>, ["~> 5.1.1"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
@@ -139,7 +127,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<vcr>, [">= 0"])
     end
   else
-    s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_dependency(%q<addressable>, [">= 0"])
+    s.add_dependency(%q<signet>, [">= 0"])
     s.add_dependency(%q<money>, ["~> 5.1.1"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])

data/lib/beatport.rb

@@ -1,15 +1,19 @@
 # http://api.beatport.com/index.html
 require 'ostruct'
-require 'httparty'
+require 'signet/oauth_1/client'
 require 'money'
 
 module Beatport
   autoload :Catalog,         'beatport/catalog'
+  autoload :Config,          'beatport/config'
   autoload :Client,          'beatport/client'
   autoload :Collection,      'beatport/collection'
   autoload :Item,            'beatport/item'
   autoload :Price,           'beatport/price'
   autoload :Support,         'beatport/support'
+  autoload :Error,           'beatport/error'
+
+  extend Config
   
   def self.const_missing(name)
     if Beatport::Catalog.const_defined?(name)

data/lib/beatport/client.rb

@@ -1,15 +1,35 @@
 module Beatport
   module Client
-    include HTTParty
-    parser Beatport::Support::Parser
-    base_uri "http://api.beatport.com/catalog/3"
-    format :json
-#    default_params :v => '1.0', :format => 'json'
+    def self.client
+      @client ||= Signet::OAuth1::Client.new(
+        :client_credential_key =>     Beatport.consumer_key,
+        :client_credential_secret =>  Beatport.consumer_secret,
+        :token_credential_key =>      Beatport.access_token_key,
+        :token_credential_secret =>   Beatport.access_token_secret
+      )
+    end
+    
+    def self.builder
+      @builder ||= Support::QueryBuilder.new
+    end
     
     def self.retrieve(path, klass, *args)
-      builder = Support::QueryBuilder.new
+      uri = Addressable::URI.new(
+        :scheme => 'https',
+        :host => 'api.beatport.com',
+        :path => "/catalog/3/#{path}",
+        :query_values => builder.process(*args)
+      )
       
-      result = get("/#{path}", :query => 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) }
+
+      if result['metadata']['error']
+        raise Error.new("#{result['metadata']['error']}: #{result['metadata']['message']}")
+      end
 
       case result['results']
       when Array
@@ -21,7 +41,7 @@ module Beatport
       when Hash
         klass.new(result['results'])
       else
-        raise "results is an unexpected class #{result['results'].class}"
+        raise Error.new("results is an unexpected class #{result['results'].class}")
       end
     end 
   end

data/lib/beatport/config.rb

@@ -0,0 +1,8 @@
+module Beatport
+  module Config
+    attr_accessor :consumer_key
+    attr_accessor :consumer_secret
+    attr_accessor :access_token_key
+    attr_accessor :access_token_secret
+  end
+end

data/lib/beatport/error.rb

@@ -0,0 +1,5 @@
+module Beatport
+  class Error < StandardError
+    
+  end
+end

data/lib/beatport/support/query_builder.rb

@@ -2,7 +2,7 @@ module Beatport
   module Support
     # Converts a set of arguments into a format that beatport will understand
     class QueryBuilder
-      SPECIAL_OPTIONS = ['sortBy', 'facets', 'returnFacets']
+      SPECIAL_OPTIONS = ['sortBy', 'facets', 'returnFacets', 'subgenres']
       
       def single_result?
         @single_result
@@ -37,8 +37,13 @@ module Beatport
       
         options = camelize_keys(options)
       
+        # Handle special options that need to be generated in a specific manner
         options.map do |key, value|
-          options[key] = send(Inflector.underscore("process_#{key}"), value) if special_option?(key)
+          if special_option?(key)
+            options[key] = send(Inflector.underscore("process_#{key}"), value) 
+          elsif value.is_a?(Array)
+            options[key] = value.join(',')
+          end
         end
       
         options
@@ -71,6 +76,12 @@ module Beatport
         end
       end    
     
+      # Special processing for subgenres
+      def process_subgenres(value)
+        value ? 'true' : 'false'
+      end
+    
+      # Map values delimited by ,
       def map_values(values)
         values = values.split(/,\s*/) if values.is_a?(String)
         values.map do |value|

data/spec/catalog/account_type_spec.rb

@@ -11,7 +11,7 @@ module Beatport::Catalog
     end
 
     describe 'structure' do
-      subject do
+      subject :account_type do
         AccountType.all.first
       end
       

data/spec/catalog/artist_spec.rb

@@ -48,7 +48,7 @@ module Beatport::Catalog
       end
 
       context 'with an array of ids' do
-        subject { Artist.find(7181, 7182) }
+        subject { Artist.find([7181, 7182]) }
         
         # it { should be_a(Collection) }
         its (:length) { should == 2 }

data/spec/catalog/mixed_spec.rb

@@ -13,11 +13,11 @@ module Beatport::Catalog
     describe '.all' do
       subject do
         Mixed.all(
-          :label_ids => [804,1390],
+          :label_ids => [804, 1390],
           :artist_ids => [7181, 10395],
           :chart_ids => [15722, 29514],
           :release_ids => [164808, 385763],
-          :track_ids => [1873426,1746687]
+          :track_ids => [1873426, 1746687]
         )
       end
 

data/spec/spec_helper.rb

@@ -14,6 +14,8 @@ require 'beatport'
 require 'pp'
 require 'log_buddy'
 require 'vcr'
+require 'config'
+
 
 VCR.configure do |c|
   c.cassette_library_dir = 'spec/fixtures'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beatport
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: signet
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -166,7 +182,6 @@ files:
 - .document
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -207,6 +222,8 @@ files:
 - lib/beatport/catalog/track.rb
 - lib/beatport/client.rb
 - lib/beatport/collection.rb
+- lib/beatport/config.rb
+- lib/beatport/error.rb
 - lib/beatport/item.rb
 - lib/beatport/price.rb
 - lib/beatport/support.rb
@@ -233,21 +250,6 @@ files:
 - spec/catalog/source_type_spec.rb
 - spec/catalog/track_spec.rb
 - spec/collection_spec.rb
-- spec/fixtures/account_type.yml
-- spec/fixtures/artist.yml
-- spec/fixtures/audio_format.yml
-- spec/fixtures/autocomplete.yml
-- spec/fixtures/chart.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/price_spec.rb
 - spec/spec_helper.rb
@@ -268,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3099949540174036320
+      hash: -3985965663943551168
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/Gemfile.lock

@@ -1,52 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.2)
-    crack (0.3.2)
-    diff-lcs (1.1.3)
-    git (1.2.5)
-    httparty (0.10.2)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
-    i18n (0.6.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.6)
-    log_buddy (0.7.0)
-    money (5.1.1)
-      i18n (~> 0.6.0)
-    multi_json (1.5.0)
-    multi_xml (0.5.3)
-    rake (10.0.3)
-    rdoc (3.12.1)
-      json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    vcr (2.4.0)
-    webmock (1.9.0)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yard (0.8.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  httparty
-  jeweler
-  log_buddy
-  money (~> 5.1.1)
-  rspec
-  vcr
-  webmock
-  yard