youpy-scissor-echonest 0.0.2 → 0.0.3

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.2"
+VERS              = "0.0.3"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -61,8 +61,8 @@ spec = Gem::Specification.new do |s|
   s.require_path      = "lib"
   s.test_files        = Dir["test/test_*.rb"]
 
-  s.add_dependency('scissor', '>=0.0.19')
-  s.add_dependency('ruby-echonest', '>=0.0.3')
+  s.add_dependency('youpy-scissor', '>=0.0.19')
+  s.add_dependency('youpy-ruby-echonest', '>=0.0.3')
   #s.required_ruby_version = '>= 1.8.2'
 
   s.files = %w(README.rdoc ChangeLog Rakefile) +

data/lib/scissor/echonest.rb

@@ -1,5 +1,6 @@
 require 'scissor'
 require 'echonest'
+require 'scissor/echonest/meta'
 
 module Scissor
   def self.echonest_api_key=(echonest_api_key)
@@ -22,7 +23,9 @@ module Scissor
 
         beats = echonest.get_beats(tmpfile)
         beats.inject do |m, beat|
-          chunks << self[m.start, beat.start - m.start]
+          chunk = self[m.start, beat.start - m.start]
+          Echonest::Meta::Beat.init(chunk, m)
+          chunks << chunk
           beat
         end
 
@@ -36,7 +39,9 @@ module Scissor
 
         segments = echonest.get_segments(tmpfile)
         segments.inject([]) do |chunks, segment|
-          chunks << self[segment.start, segment.duration]
+          chunk = self[segment.start, segment.duration]
+          Echonest::Meta::Segment.init(chunk, segment)
+          chunks << chunk
           chunks
         end
       end

data/lib/scissor/echonest/meta.rb

@@ -0,0 +1,32 @@
+module Scissor
+  module Echonest
+    module Meta
+      module Beat
+        def self.init(obj, beat)
+          obj.extend self
+          obj.instance_eval {
+            @confidence = beat.confidence
+            @start = beat.start
+          }
+        end
+
+        attr_reader :confidence, :start
+      end
+
+      module Segment
+        def self.init(obj, segment)
+          obj.extend self
+          obj.instance_eval {
+            @start = segment.start
+            @loudness = segment.loudness
+            @max_loudness = segment.max_loudness
+            @pitches = segment.pitches
+            @timbre = segment.timbre
+          }
+        end
+
+        attr_reader :start, :loudness, :max_loudness, :pitches, :timbre
+      end
+    end
+  end
+end

data/spec/scissor-echonest_spec.rb

@@ -24,7 +24,8 @@ describe Scissor do
     beats.size.should eql(384)
     beats[0].should be_an_instance_of(Scissor::Chunk)
     beats[0].duration.should eql(0.47604)
-    beats[0].fragments.first.filename.to_s.should eql(fixture('sample.mp3'))
+    beats[0].fragments.first.filename.should eql(fixture('sample.mp3'))
+    beats[0].confidence.should eql(0.296)
   end
 
   it 'should get segments' do
@@ -40,6 +41,13 @@ describe Scissor do
     segments.size.should eql(830)
     segments[0].should be_an_instance_of(Scissor::Chunk)
     segments[0].duration.should eql(0.30327)
-    segments[0].fragments.first.filename.to_s.should eql(fixture('sample.mp3'))
+    segments[0].fragments.first.filename.should eql(fixture('sample.mp3'))
+    segments[0].start.should eql(0.0)
+    segments[0].loudness.time.should eql(0.0)
+    segments[0].loudness.value.should eql(-60.0)
+    segments[0].max_loudness.time.should eql(0.31347)
+    segments[0].max_loudness.value.should eql(-56.818)
+    segments[0].pitches.first.should eql(0.835)
+    segments[0].timbre.first.should eql(0.079)
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,10 @@
 $:.unshift File.dirname(__FILE__) + '/../lib/'
 
 require "scissor/echonest"
+require "pathname"
 
 module SpecHelper
   def fixture(filename)
-    File.dirname(__FILE__) + '/fixtures/' + filename
+    Pathname.new(File.dirname(__FILE__) + '/fixtures/' + filename).realpath
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor-echonest
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - youpy
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-06 00:00:00 -07:00
+date: 2009-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: scissor
+  name: youpy-scissor
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -23,7 +23,7 @@ dependencies:
         version: 0.0.19
     version: 
 - !ruby/object:Gem::Dependency 
-  name: ruby-echonest
+  name: youpy-ruby-echonest
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -53,6 +53,8 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - lib/scissor
+- lib/scissor/echonest
+- lib/scissor/echonest/meta.rb
 - lib/scissor/echonest.rb
 has_rdoc: true
 homepage: http://scissorechonest.rubyforge.org