youpy-scissor-echonest 0.0.1 → 0.0.2

data/README.rdoc

@@ -21,15 +21,17 @@ Scissor extension to use Echo Nest Developers API
 
 == Synopsis
 
+ require 'rubygems'
  require 'scissor/echonest'
 
  Scissor.echonest_api_key = 'YOUR_API_KEY'
- beats = Scissor('trans_europe_express.mp3').beats
 
- # sort beats by duration and write into file
- beats.
-  sort_by {|beat| beat.duration }.
-  inject(Scissor()) {|m, beat| m + beat } > 'sorted.mp3'
+ # sort beats by duration
+ beats = Scissor('trans_europe_express.mp3').beats.
+  sort_by {|beat| beat.duration }
+
+ # join beats and write into file
+ Scissor.join(beats) > 'sorted.mp3'
 
 == Copyright
 

data/Rakefile

@@ -21,7 +21,7 @@ DESCRIPTION       = "Scissor extension to use Echo Nest Developers API"
 RUBYFORGE_PROJECT = "scissorechonest"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
-VERS              = "0.0.1"
+VERS              = "0.0.2"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -61,7 +61,8 @@ spec = Gem::Specification.new do |s|
   s.require_path      = "lib"
   s.test_files        = Dir["test/test_*.rb"]
 
-  #s.add_dependency('activesupport', '>=1.3.1')
+  s.add_dependency('scissor', '>=0.0.19')
+  s.add_dependency('ruby-echonest', '>=0.0.3')
   #s.required_ruby_version = '>= 1.8.2'
 
   s.files = %w(README.rdoc ChangeLog Rakefile) +

data/lib/scissor/echonest.rb

@@ -16,18 +16,37 @@ module Scissor
     end
 
     def beats
-      chunks = []
-      tmpfile = Pathname.new('/tmp/scissor_echonest_temp_' + $$.to_s + '.mp3')
+      tempfile_for_echonest do |tmpfile|
+        chunks = []
+        scissor = to_file(tmpfile)
+
+        beats = echonest.get_beats(tmpfile)
+        beats.inject do |m, beat|
+          chunks << self[m.start, beat.start - m.start]
+          beat
+        end
+
+        chunks
+      end
+    end
 
-      scissor = to_file(tmpfile)
+    def segments
+      tempfile_for_echonest do |tmpfile|
+        scissor = to_file(tmpfile)
 
-      beats = echonest.get_beats(tmpfile)
-      beats.inject do |m, beat|
-        chunks << self[m.start, beat.start - m.start]
-        beat
+        segments = echonest.get_segments(tmpfile)
+        segments.inject([]) do |chunks, segment|
+          chunks << self[segment.start, segment.duration]
+          chunks
+        end
       end
+    end
 
-      chunks
+    private
+
+    def tempfile_for_echonest
+      tmpfile = Pathname.new('/tmp/scissor_echonest_temp_' + $$.to_s + '.mp3')
+      yield tmpfile
     ensure
       tmpfile.unlink
     end