ruby-echonest 0.3.0 → 0.4.0

data/.gitignore

@@ -0,0 +1,6 @@
+pkg
+coverage
+*.gem
+/example*
+*~
+Gemfile.lock

data/Gemfile

@@ -1,13 +1,3 @@
 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
-
+gemspec

data/Rakefile

@@ -1,31 +1,10 @@
-require 'bundler'
-Bundler.require
-
-$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
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 
+require 'rspec/core'
 require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:core) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :core
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "echonest %s" % Echonest::VERSION
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :spec

data/lib/echonest/api.rb

@@ -13,6 +13,7 @@ module Echonest
     include TraditionalApiMethods
 
     class Error < StandardError; end
+    class UnsupportedFiletypeError < StandardError; end
 
     attr_reader :user_agent
 
@@ -106,7 +107,7 @@ module Echonest
 
         if options.has_key?(:filename)
           filename = options.delete(:filename)
-          filetype = filename.to_s.match(/\.(mp3|au|ogg)$/)[1]
+          filetype = parse_filetype(filename)
 
           open(filename) do |f|
             @api.request('track/upload',
@@ -164,6 +165,20 @@ module Echonest
           sleep 5
         end
       end
+
+      private
+
+      def parse_filetype(filename)
+        filetype = filename.to_s.match(/\.(wav|mp3|au|ogg|m4a|mp4|aif|aiff)$/)
+
+        if !filetype
+          raise Api::UnsupportedFiletypeError
+        elsif ['aif', 'aiff'].include? filetype[1]
+          'wav'
+        else
+          filetype[1]
+        end
+      end
     end
   end
 end

data/lib/echonest/version.rb

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

data/ruby-echonest.gemspec

@@ -1,39 +1,25 @@
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/echonest/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{ruby-echonest}
-  s.version = "0.1.0"
+Gem::Specification.new do |gem|
+  gem.authors       = ["youpy"]
+  gem.email         = ["youpy@buycheapviagraonlinenow.com"]
+  gem.description   = %q{An Ruby interface for Echo Nest Developer API}
+  gem.summary       = %q{An Ruby interface for Echo Nest Developer API}
+  gem.homepage      = "http://github.com/youpy/ruby-echonest"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["youpy"]
-  s.date = %q{2010-08-24}
-  s.description = %q{An Ruby interface for Echo Nest Developer API}
-  s.email = %q{youpy@buycheapviagraonlinenow.com}
-  s.extra_rdoc_files = ["README.rdoc", "ChangeLog"]
-  s.files = ["README.rdoc", "ChangeLog", "Rakefile", "spec/analysis_spec.rb", "spec/api_spec.rb", "spec/echonest_spec.rb", "spec/fixtures", "spec/fixtures/analysis.json", "spec/fixtures/profile.json", "spec/fixtures/profile_failure.json", "spec/fixtures/profile_unknown.json", "spec/fixtures/sample.mp3", "spec/response_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/track_spec.rb", "lib/echonest", "lib/echonest/analysis.rb", "lib/echonest/api.rb", "lib/echonest/element", "lib/echonest/element/bar.rb", "lib/echonest/element/beat.rb", "lib/echonest/element/loudness.rb", "lib/echonest/element/section.rb", "lib/echonest/element/segment.rb", "lib/echonest/element/tatum.rb", "lib/echonest/response.rb", "lib/echonest/traditional_api_methods.rb", "lib/echonest/version.rb", "lib/echonest.rb"]
-  s.homepage = %q{http://github.com/youpy/ruby-echonest}
-  s.rdoc_options = ["--title", "ruby-echonest documentation", "--charset", "utf-8", "--opname", "index.html", "--line-numbers", "--main", "README.rdoc", "--inline-source", "--exclude", "^(examples|extras)/"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{ruby-echonest}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{An Ruby interface for Echo Nest Developer API}
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name          = "ruby-echonest"
+  gem.require_paths = ["lib"]
+  gem.version       = Echonest::VERSION
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  gem.add_dependency('httpclient')
+  gem.add_dependency('hashie')
+  gem.add_dependency('libxml-ruby')
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<libxml-ruby>, [">= 0"])
-      s.add_runtime_dependency(%q<httpclient>, [">= 0"])
-      s.add_runtime_dependency(%q<hashie>, [">= 0"])
-    else
-      s.add_dependency(%q<libxml-ruby>, [">= 0"])
-      s.add_dependency(%q<httpclient>, [">= 0"])
-      s.add_dependency(%q<hashie>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<libxml-ruby>, [">= 0"])
-    s.add_dependency(%q<httpclient>, [">= 0"])
-    s.add_dependency(%q<hashie>, [">= 0"])
-  end
+  gem.add_development_dependency('rspec', ['~> 2.8.0'])
+  gem.add_development_dependency('rake')
+  gem.add_development_dependency('ruby-echonest')
 end

data/spec/track_spec.rb

@@ -69,16 +69,43 @@ describe Echonest::ApiMethods::Track do
       @track.upload(:url => 'http://example.com/foo.mp3')
     end
 
-    it 'should upload by local filename' do
-      filename = fixture('sample.mp3')
+    %w{ wav mp3 au ogg m4a mp4 }.each do |filetype|
+      it "should upload '#{filetype}' by local filename" do
+        filename = fixture("sample.#{filetype}")
+
+        @api.should_receive(:request).with(
+          'track/upload',
+          :post,
+          { :bucket => 'audio_summary', :filetype => filetype },
+          instance_of(File))
+
+        @track.upload(:filename => filename)
+      end
+    end
 
-      @api.should_receive(:request).with(
-        'track/upload',
-        :post,
-        { :bucket => 'audio_summary', :filetype => 'mp3' },
-        instance_of(File))
+    %w{ aif aiff }.each do |filetype|
+      it "should upload '#{filetype}' as filetype wav" do
+        # we are tricking the echonest api here
+        # they do aiff, but only if we pretend it's wav
+
+        filename = fixture("sample.#{filetype}")
+
+        @api.should_receive(:request).with(
+          'track/upload',
+          :post,
+          { :bucket => 'audio_summary', :filetype => 'wav' },
+          instance_of(File))
+
+        @track.upload(:filename => filename)
+      end
+    end
+
+    it "should throw exception if unsupported FileType" do
+      filename = fixture("profile.json")
 
-      @track.upload(:filename => filename)
+      expect do
+        @track.upload(:filename => filename)
+      end.to raise_error(Echonest::Api::UnsupportedFiletypeError)
     end
   end
 

metadata

@@ -1,125 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-echonest
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - youpy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-09 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: rake
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 2
-        - 2
-        version: 0.9.2.2
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
+date: 2012-12-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httpclient
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   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
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   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
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: jeweler
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   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 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-echonest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rdoc
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An Ruby interface for Echo Nest Developer API
-email: youpy@buycheapviagraonlinenow.com
+email:
+- youpy@buycheapviagraonlinenow.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- ChangeLog
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
 - .rspec
 - ChangeLog
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - lib/echonest.rb
@@ -142,39 +140,63 @@ files:
 - spec/fixtures/profile.json
 - spec/fixtures/profile_failure.json
 - spec/fixtures/profile_unknown.json
+- spec/fixtures/sample.aif
+- spec/fixtures/sample.aiff
+- spec/fixtures/sample.au
+- spec/fixtures/sample.m4a
 - spec/fixtures/sample.mp3
+- spec/fixtures/sample.mp4
+- spec/fixtures/sample.ogg
+- spec/fixtures/sample.wav
 - spec/response_spec.rb
 - spec/spec_helper.rb
 - spec/track_spec.rb
-has_rdoc: true
 homepage: http://github.com/youpy/ruby-echonest
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+      hash: 1320993124817053134
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1320993124817053134
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An Ruby interface for Echo Nest Developer API
-test_files: []
-
+test_files:
+- spec/analysis_spec.rb
+- spec/api_spec.rb
+- spec/echonest_spec.rb
+- spec/fixtures/analysis.json
+- spec/fixtures/profile.json
+- spec/fixtures/profile_failure.json
+- spec/fixtures/profile_unknown.json
+- spec/fixtures/sample.aif
+- spec/fixtures/sample.aiff
+- spec/fixtures/sample.au
+- spec/fixtures/sample.m4a
+- spec/fixtures/sample.mp3
+- spec/fixtures/sample.mp4
+- spec/fixtures/sample.ogg
+- spec/fixtures/sample.wav
+- spec/response_spec.rb
+- spec/spec_helper.rb
+- spec/track_spec.rb

data/Gemfile.lock

@@ -1,36 +0,0 @@
-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)