ruby-echonest 0.1.2 → 0.2.0

data/lib/echonest.rb

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

data/lib/echonest/analysis.rb

@@ -3,8 +3,11 @@ require 'open-uri'
 
 module Echonest
   class Analysis
+    attr_reader :json
+
     def initialize(json)
-      @body = JSON.parse(json)
+      @json = json
+      @body = JSON.parse(@json)
     end
 
     def self.new_from_url(url)

data/lib/echonest/api.rb

@@ -2,6 +2,7 @@
 require 'digest/md5'
 require 'httpclient'
 require 'json'
+require 'fileutils'
 
 module Echonest
   class Api
@@ -104,13 +105,23 @@ module Echonest
       end
 
       def analysis(filename)
-        analysis_url = analysis_url(filename)
-        Analysis.new_from_url(analysis_url)
-      end
-
-      def analysis_url(filename)
         md5 = Digest::MD5.hexdigest(open(filename).read)
+        cache_path = DIRECTORY + 'analysis' + md5
+
+        if File.exists?(cache_path)
+          analysis = Analysis.new(open(cache_path).read)
+        else
+          analysis = Analysis.new_from_url(analysis_url(filename, md5))
+          cache_path.dirname.mkpath
+          open(cache_path, 'w') do |file|
+            file.write analysis.json
+          end
+        end
+
+        analysis
+      end
 
+      def analysis_url(filename, md5)
         while true
           begin
             response = profile(:md5 => md5)

data/lib/echonest/version.rb

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

data/spec/track_spec.rb

@@ -1,11 +1,17 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'spec_helper'
+require 'fileutils'
 
 describe Echonest::ApiMethods::Track do
   before do
     @api = Echonest::Api.new('8TPE3VC60ODJTNTFE')
     @track = Echonest::ApiMethods::Track.new(@api)
+    @cache_path = File.expand_path('~/.echonest/analysis/c2ee3cfddf1eb8631a928a4f662b587c')
+
+    if File.exists?(@cache_path)
+      FileUtils.rm @cache_path
+    end
   end
 
   describe '#profile' do
@@ -86,17 +92,38 @@ describe Echonest::ApiMethods::Track do
         with(:filename => fixture('sample.mp3')).
         and_return(Echonest::Response.new(open(fixture('profile.json')).read))
 
-      @track.analysis_url(fixture('sample.mp3')).
+      @track.analysis_url(fixture('sample.mp3'), 'c2ee3cfddf1eb8631a928a4f662b587c').
         should eql('https://echonest-analysis.s3.amazonaws.com:443/TR/TRXXHTJ1294CD8F3B3/3/full.json?Signature=GQMyRUdcO5MUPSHZej72oQHOg3g%3D&Expires=1278605254&AWSAccessKeyId=AKIAJTEJGOTDLQY2E77A')
     end
   end
 
   describe '#analysis' do
+    before do
+      @analysis = Echonest::Analysis.new(open(fixture('analysis.json')).read)
+      @analysis_url = 'https://echonest-analysis.s3.amazonaws.com:443/TR/TRXXHTJ1294CD8F3B3/3/full.json?Signature=GQMyRUdcO5MUPSHZej72oQHOg3g%3D&Expires=1278605254&AWSAccessKeyId=AKIAJTEJGOTDLQY2E77A'
+    end
+
     it 'should return analysis' do
-      analysis_url = 'https://echonest-analysis.s3.amazonaws.com:443/TR/TRXXHTJ1294CD8F3B3/3/full.json?Signature=GQMyRUdcO5MUPSHZej72oQHOg3g%3D&Expires=1278605254&AWSAccessKeyId=AKIAJTEJGOTDLQY2E77A'
-      @track.should_receive(:analysis_url).with(fixture('sample.mp3')).and_return(analysis_url)
-      Echonest::Analysis.should_receive(:new_from_url).with(analysis_url)
+      @track.should_receive(:analysis_url).with(fixture('sample.mp3'), 'c2ee3cfddf1eb8631a928a4f662b587c').and_return(@analysis_url)
+      Echonest::Analysis.should_receive(:new_from_url).with(@analysis_url).and_return(@analysis)
+
+      @track.analysis(fixture('sample.mp3'))
+    end
+
+    it 'should cache analysis' do
+      File.exist?(@cache_path).should_not be
+
+      # 1st (not cached)
+      @track.should_receive(:analysis_url).with(fixture('sample.mp3'), 'c2ee3cfddf1eb8631a928a4f662b587c').and_return(@analysis_url)
+      Echonest::Analysis.should_receive(:new_from_url).with(@analysis_url).and_return(@analysis)
+      @track.analysis(fixture('sample.mp3'))
+
+      File.exist?(@cache_path).should be
+      open(@cache_path).read.should eql(open(fixture('analysis.json')).read)
 
+      # 2nd (cached)
+      @track.should_not_receive(:analysis_url)
+      Echonest::Analysis.should_receive(:new).with(open(@cache_path).read).and_return(@analysis)
       @track.analysis(fixture('sample.mp3'))
     end
   end

metadata

@@ -1,68 +1,82 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ruby-echonest
-version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - youpy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-30 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70182523091860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
   type: :development
-  prerelease: false
-  version_requirements: *70182523091860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: httpclient
-  requirement: &70182523106840 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *70182523106840
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: &70182523106220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hashie
   prerelease: false
-  version_requirements: *70182523106220
-- !ruby/object:Gem::Dependency
-  name: libxml-ruby
-  requirement: &70182523105580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
   prerelease: false
-  version_requirements: *70182523105580
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: An Ruby interface for Echo Nest Developer API
 email: youpy@buycheapviagraonlinenow.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - ChangeLog
 - README.rdoc
-files:
+files: 
 - .rspec
 - ChangeLog
 - README.rdoc
@@ -91,28 +105,35 @@ files:
 - 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
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: An Ruby interface for Echo Nest Developer API
 test_files: []
+