youpy-ruby-echonest 0.0.5 → 0.0.6

data/lib/echonest.rb

@@ -1,6 +1,5 @@
 require 'echonest/version'
 require 'echonest/api'
-require 'echonest/connection'
 require 'echonest/response'
 require 'echonest/element/value_with_confidence'
 require 'echonest/element/bar'

data/lib/echonest/api.rb

@@ -1,17 +1,19 @@
 require 'digest/md5'
+require 'httpclient'
 
 module Echonest
   class Api
     VERSION = '3'
-    URL = 'http://developer.echonest.com/api/'
+    BASE_URL = 'http://developer.echonest.com/api/'
+    USER_AGENT = '%s/%s' % ['ruby-echonest', ::Echonest::VERSION]
 
     class Error < StandardError; end
 
-    attr_reader :connection
+    attr_reader :user_agent
 
     def initialize(api_key)
       @api_key = api_key
-      @connection = Connection.new(URL)
+      @user_agent = HTTPClient.new(:agent_name => USER_AGENT)
     end
 
     def get_bars(filename)
@@ -147,7 +149,7 @@ module Echonest
 
     def get_analysys(method, filename)
       get_trackinfo(method, filename) do |response|
-        yield response.xml.find('/response/analysis').first
+        yield response.xml.find_first('/response/analysis')
       end
     end
 
@@ -175,16 +177,14 @@ module Echonest
     end
 
     def upload(filename)
-      content = open(filename).read
-
-      request(:upload, :file => content)
+      open(filename) do |f|
+        request(:upload, :file => f)
+      end
     end
 
     def request(name, params)
-      response_body = @connection.__send__(
-        name == :upload ? :post : :get,
-        name,
-        build_params(params))
+      method = (name == :upload ? 'post' : 'get')
+      response_body = @user_agent.__send__(method + '_content', URI.join(BASE_URL, name.to_s), build_params(params))
       response = Response.new(response_body)
 
       unless response.success?
@@ -195,3 +195,9 @@ module Echonest
     end
   end
 end
+
+class HTTPClient
+  def agent_name
+    @session_manager.agent_name
+  end
+end

data/lib/echonest/version.rb

@@ -1,3 +1,3 @@
 module Echonest
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/api_spec.rb

@@ -209,7 +209,11 @@ EOM
     time_signature.value.should eql(4)
   end
 
+  it "should make http request with agent name" do
+    @api.user_agent.agent_name.should eql('ruby-echonest/' + Echonest::VERSION)
+  end
+
   def make_connection_stub(xml)
-    @api.connection.stub!(:request).and_return(xml)
+    @api.user_agent.stub!(:get_content).and_return(xml)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-ruby-echonest
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - youpy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,6 @@ files:
 - ChangeLog
 - Rakefile
 - spec/api_spec.rb
-- spec/connection_spec.rb
 - spec/echonest_spec.rb
 - spec/fixtures
 - spec/fixtures/get_bars.xml
@@ -59,7 +58,6 @@ files:
 - spec/spec_helper.rb
 - lib/echonest
 - lib/echonest/api.rb
-- lib/echonest/connection.rb
 - lib/echonest/element
 - lib/echonest/element/bar.rb
 - lib/echonest/element/beat.rb

data/lib/echonest/connection.rb

@@ -1,89 +0,0 @@
-require 'cgi'
-require 'net/https'
-
-module Echonest
-  class Connection
-     def initialize(base_url)
-       @base_url = base_url
-     end
-
-    def get(resource, args = nil)
-      url = url(resource.to_s)
-
-      if args
-        url.query = query(args)
-      end
-
-      req = make_request(url, 'get')
-
-      request(req, url)
-    end
-
-    def post(resource, args = nil)
-      url = url(resource.to_s)
-      req = make_request(url, 'post')
-
-      if args
-        data = post_data(args)
-        req['Content-Length'] = data.size.to_s
-        req['Content-Type'] = "multipart/form-data; boundary=#{boundary}"
-      end
-
-      request(req, url, data)
-    end
-
-    def url(path)
-      URI.join(@base_url, path)
-    end
-
-    def post_data(params)
-      data = params.inject([]) do |memo, param|
-        name, value = param
-
-        memo << "--#{boundary}"
-
-        if name.to_s == 'file'
-          memo << "Content-Disposition: form-data; name=\"#{name}\"; filename=\"file.mp3\""
-          memo << "Content-Type: application/octet-stream"
-        else
-          memo << "Content-Disposition: form-data; name=\"#{name}\""
-        end
-
-        memo << ''
-        memo << value
-      end
-
-      data << "--#{boundary}--"
-      data << ''
-
-      data.join("\r\n")
-    end
-
-    def boundary
-      '----BOUNDARYBOUNDARY----'
-    end
-
-    def request(req, url, data = nil)
-      http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = (url.port == 443)
-
-      res = http.start() { |conn| conn.request(req, data) }
-      res.body
-    end
-
-    def query(params)
-      params.map { |k,v| "%s=%s" % [CGI.escape(k.to_s), CGI.escape(v.to_s)] }.join("&")
-    end
-
-    def make_request(uri, method)
-      req = (method == 'post' ? Net::HTTP::Post : Net::HTTP::Get).new(uri.request_uri)
-      req['User-Agent'] = user_agent
-
-      req
-    end
-
-    def user_agent
-      '%s/%s' % ['ruby-echonest', VERSION]
-    end
-  end
-end

data/spec/connection_spec.rb

@@ -1,19 +0,0 @@
-$:.unshift File.dirname(__FILE__)
-
-require 'spec_helper'
-require "echonest"
-
-include SpecHelper
-
-describe Echonest::Connection do
-  before do
-    @connection = Echonest::Connection.new(Echonest::Api::URL)
-  end
-
-  it "should make http request with user agent" do
-    req = @connection.make_request(URI('http://example.com/xxx'), 'get')
-
-    req.method.should eql('GET')
-    req['User-Agent'].should eql('ruby-echonest/' + Echonest::VERSION)
-  end
-end