ruby-echonest 0.2.0 → 0.3.0

data/Gemfile

@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'rake', '0.9.2.2'
+gem 'httpclient'
+gem 'hashie'
+gem 'libxml-ruby'
+gem 'jeweler'
+
+group :development do
+  gem 'rspec', '>= 2.0.0'
+  gem 'rdoc'
+end
+

data/Gemfile.lock

@@ -0,0 +1,36 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    git (1.2.5)
+    hashie (1.2.0)
+    httpclient (2.2.1)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.6.3)
+    libxml-ruby (2.2.2)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.7.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  hashie
+  httpclient
+  jeweler
+  libxml-ruby
+  rake (= 0.9.2.2)
+  rdoc
+  rspec (>= 2.0.0)

data/Rakefile

@@ -1,27 +1,17 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+Bundler.require
 
-begin
-  $LOAD_PATH.unshift "lib"
-  require 'echonest'
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "ruby-echonest"
-    gem.version = Echonest::VERSION
-    gem.summary = "An Ruby interface for Echo Nest Developer API"
-    gem.description = "An Ruby interface for Echo Nest Developer API"
-    gem.email = "youpy@buycheapviagraonlinenow.com"
-    gem.homepage = "http://github.com/youpy/ruby-echonest"
-    gem.authors = ["youpy"]
-    gem.add_development_dependency "rspec", ">= 2.0.0"
-    gem.add_dependency "httpclient"
-    gem.add_dependency "hashie"
-    gem.add_dependency "libxml-ruby"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+$LOAD_PATH.unshift "lib"
+require 'echonest'
+
+Jeweler::Tasks.new do |gem|
+  gem.name = "ruby-echonest"
+  gem.version = Echonest::VERSION
+  gem.summary = "An Ruby interface for Echo Nest Developer API"
+  gem.description = "An Ruby interface for Echo Nest Developer API"
+  gem.email = "youpy@buycheapviagraonlinenow.com"
+  gem.homepage = "http://github.com/youpy/ruby-echonest"
+  gem.authors = ["youpy"]
 end
 
 require 'rspec/core/rake_task'
@@ -30,7 +20,6 @@ RSpec::Core::RakeTask.new(:core) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
 end
 
-task :core => :check_dependencies
 task :default => :core
 
 require 'rdoc/task'

data/lib/echonest/api.rb

@@ -3,6 +3,7 @@ require 'digest/md5'
 require 'httpclient'
 require 'json'
 require 'fileutils'
+require 'cgi'
 
 module Echonest
   class Api
@@ -15,9 +16,13 @@ module Echonest
 
     attr_reader :user_agent
 
-    def initialize(api_key)
-      @api_key = api_key
+    def initialize(api_key = nil)
+      @api_key = api_key || read_api_key_from_file
       @user_agent = HTTPClient.new(:agent_name => USER_AGENT)
+
+      # for big files
+      @user_agent.send_timeout = 60 * 30
+      @user_agent.receive_timeout = 60 * 10
     end
 
     def track
@@ -35,7 +40,7 @@ module Echonest
         query = build_params(params).sort_by do |param|
           param[0].to_s
         end.inject([]) do |m, param|
-          m << [URI.encode(param[0].to_s), URI.encode(param[1])].join('=')
+          m << [CGI.escape(param[0].to_s), CGI.escape(param[1])].join('=')
         end.join('&')
 
         uri = URI.join(BASE_URL, name.to_s)
@@ -64,6 +69,16 @@ module Echonest
     rescue HTTPClient::BadResponseError => e
       raise Error.new('%s: %s' % [name, e.message])
     end
+
+    def self.api_key_file
+      DIRECTORY + 'api_key'
+    end
+
+    private
+
+    def read_api_key_from_file
+      self.class.api_key_file.read.chomp
+    end
   end
 
   module ApiMethods

data/lib/echonest/version.rb

@@ -1,3 +1,3 @@
 module Echonest
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/echonest.rb

@@ -12,7 +12,7 @@ require 'echonest/element/tatum'
 
 require 'pathname'
 
-def Echonest(api_key) Echonest::Api.new(api_key) end
+def Echonest(api_key = nil) Echonest::Api.new(api_key) end
 
 module Echonest
   DIRECTORY = Pathname.new("~/.echonest").expand_path

data/spec/api_spec.rb

@@ -1,12 +1,29 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'spec_helper'
+require 'tempfile'
 
 describe Echonest::Api do
   before do
     @api = Echonest::Api.new('8TPE3VC60ODJTNTFE')
   end
 
+  it "should have a filename for api key" do
+    Echonest::Api.api_key_file.to_s.should eql(Pathname('~/.echonest/api_key').expand_path.to_s)
+  end
+
+  it "should read api key from file" do
+    file = Tempfile.new('api_key')
+    file.write('XXXXX')
+    file.flush
+
+    Echonest::Api.should_receive(:api_key_file).and_return(Pathname(file.path))
+
+    api = Echonest::Api.new
+
+    api.instance_variable_get('@api_key').should eql('XXXXX')
+  end
+
   it "should build parameters" do
     params = @api.build_params(:id => 'TRXXHTJ1294CD8F3B3')
     params.keys.size.should eql(3)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - youpy
@@ -14,59 +14,98 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-30 00:00:00 +09:00
+date: 2012-01-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: rake
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
-        - 0
         - 0
-        version: 2.0.0
-  type: :development
-  version_requirements: *id001
+        - 9
+        - 2
+        - 2
+        version: 0.9.2.2
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: httpclient
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: hashie
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: libxml-ruby
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  name: jeweler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rspec
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rdoc
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id004
+  requirement: *id007
 description: An Ruby interface for Echo Nest Developer API
 email: youpy@buycheapviagraonlinenow.com
 executables: []
@@ -79,6 +118,8 @@ extra_rdoc_files:
 files: 
 - .rspec
 - ChangeLog
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - lib/echonest.rb