youpy-scissor-echonest 0.0.3 → 0.0.4

data/README.rdoc

@@ -1,6 +1,6 @@
 = scissor-echonest
 
-Scissor extension to use Echo Nest Developers API
+{Scissor}[http://github.com/youpy/scissor/tree/master] extension to use Echo Nest Developers API
 
 == Description
 

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.3"
+VERS              = "0.0.4"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/scissor/echonest.rb

@@ -1,6 +1,6 @@
 require 'scissor'
 require 'echonest'
-require 'scissor/echonest/meta'
+require 'scissor/echonest/chunk_ext.rb'
 
 module Scissor
   def self.echonest_api_key=(echonest_api_key)
@@ -22,9 +22,17 @@ module Scissor
         scissor = to_file(tmpfile)
 
         beats = echonest.get_beats(tmpfile)
+
+        if beats.size != 0
+          chunk = self[0, beats.first.start]
+          beat = Beat.new(beats.first.start, 1.0)
+          chunk.set_delegate(beat)
+          chunks << chunk
+        end
+
         beats.inject do |m, beat|
           chunk = self[m.start, beat.start - m.start]
-          Echonest::Meta::Beat.init(chunk, m)
+          chunk.set_delegate(m)
           chunks << chunk
           beat
         end
@@ -40,7 +48,7 @@ module Scissor
         segments = echonest.get_segments(tmpfile)
         segments.inject([]) do |chunks, segment|
           chunk = self[segment.start, segment.duration]
-          Echonest::Meta::Segment.init(chunk, segment)
+          chunk.set_delegate(segment)
           chunks << chunk
           chunks
         end

data/lib/scissor/echonest/chunk_ext.rb

@@ -0,0 +1,11 @@
+module Scissor
+  class Chunk
+    def set_delegate(delegate)
+      @delegate = delegate
+    end
+
+    def method_missing(name, *args, &block)
+      @delegate.send(name, *args, &block)
+    end
+  end
+end

data/spec/scissor-echonest_spec.rb

@@ -21,11 +21,15 @@ describe Scissor do
     scissor.stub!(:echonest).and_return(api)
 
     beats = scissor.beats
-    beats.size.should eql(384)
+    beats.size.should eql(385)
     beats[0].should be_an_instance_of(Scissor::Chunk)
-    beats[0].duration.should eql(0.47604)
+    beats[0].duration.should eql(0.35812)
     beats[0].fragments.first.filename.should eql(fixture('sample.mp3'))
-    beats[0].confidence.should eql(0.296)
+    beats[0].confidence.should eql(1.0)
+    beats[1].should be_an_instance_of(Scissor::Chunk)
+    beats[1].duration.should eql(0.47604)
+    beats[1].fragments.first.filename.should eql(fixture('sample.mp3'))
+    beats[1].confidence.should eql(0.296)
   end
 
   it 'should get segments' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor-echonest
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - youpy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-23 00:00:00 -07:00
+date: 2009-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,10 +54,11 @@ files:
 - spec/spec_helper.rb
 - lib/scissor
 - lib/scissor/echonest
-- lib/scissor/echonest/meta.rb
+- lib/scissor/echonest/chunk_ext.rb
 - lib/scissor/echonest.rb
 has_rdoc: true
 homepage: http://scissorechonest.rubyforge.org
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --title
@@ -89,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scissorechonest
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Scissor extension to use Echo Nest Developers API

data/lib/scissor/echonest/meta.rb

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