scissor-echonest 0.1.0 → 0.1.1

data/Rakefile

@@ -21,7 +21,7 @@ DESCRIPTION       = "Scissor extension to use Echo Nest Developers API"
 RUBYFORGE_PROJECT = "scissorechonest"
 HOMEPATH          = "http://github.com/youpy/scissor-echonest"
 BIN_FILES         = %w(  )
-VERS              = "0.1.0"
+VERS              = "0.1.1"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -61,7 +61,7 @@ spec = Gem::Specification.new do |s|
   s.require_path      = "lib"
   s.test_files        = Dir["test/test_*.rb"]
 
-  s.add_dependency('scissor', '>=0.0.22')
+  s.add_dependency('scissor', '>=0.2.3')
   s.add_dependency('ruby-echonest', '>=0.1.1')
   #s.required_ruby_version = '>= 1.8.2'
 

data/lib/scissor/echonest.rb

@@ -1,13 +1,13 @@
 require 'scissor'
 require 'echonest'
-require 'scissor/echonest/chunk_ext.rb'
+require 'scissor/echonest/tape_ext.rb'
 
 module Scissor
   def self.echonest_api_key=(echonest_api_key)
-    Scissor::Chunk.echonest_api_key = echonest_api_key
+    Scissor::Tape.echonest_api_key = echonest_api_key
   end
 
-  class Chunk
+  class Tape
     class << self
       attr_accessor :echonest_api_key
 
@@ -19,46 +19,46 @@ module Scissor
     def bars
       analyze do |analysis|
         bars = analysis.bars
-        bars.inject([]) do |chunks, bar|
-          chunk = self[bar.start, bar.duration]
-          chunk.set_delegate(bar)
-          chunks << chunk
-          chunks
+        bars.inject([]) do |tapes, bar|
+          tape = self[bar.start, bar.duration]
+          tape.set_delegate(bar)
+          tapes << tape
+          tapes
         end
       end
     end
 
     def beats
       analyze do |analysis|
-        chunks = []
+        tapes = []
         beats = analysis.beats
 
         if beats.size != 0
-          chunk = self[0, beats.first.start]
+          tape = self[0, beats.first.start]
           beat = Beat.new(0.0, beats.first.start, 1.0)
-          chunk.set_delegate(beat)
-          chunks << chunk
+          tape.set_delegate(beat)
+          tapes << tape
         end
 
         beats.inject do |m, beat|
-          chunk = self[m.start, beat.start - m.start]
-          chunk.set_delegate(m)
-          chunks << chunk
+          tape = self[m.start, beat.start - m.start]
+          tape.set_delegate(m)
+          tapes << tape
           beat
         end
 
-        chunks
+        tapes
       end
     end
 
     def segments
       analyze do |analysis|
         segments = analysis.segments
-        segments.inject([]) do |chunks, segment|
-          chunk = self[segment.start, segment.duration]
-          chunk.set_delegate(segment)
-          chunks << chunk
-          chunks
+        segments.inject([]) do |tapes, segment|
+          tape = self[segment.start, segment.duration]
+          tape.set_delegate(segment)
+          tapes << tape
+          tapes
         end
       end
     end

data/lib/scissor/echonest/{chunk_ext.rb → tape_ext.rb}

@@ -1,5 +1,5 @@
 module Scissor
-  class Chunk
+  class Tape
     def set_delegate(delegate)
       @delegate = delegate
     end

data/spec/scissor-echonest_spec.rb

@@ -8,17 +8,17 @@ describe Scissor do
   it 'should set Echo Nest API key' do
     Scissor.echonest_api_key = 'XXX'
 
-    Scissor::Chunk.echonest_api_key.should eql('XXX')
+    Scissor::Tape.echonest_api_key.should eql('XXX')
   end
 
   it 'should get an instance of EchoNest::Api' do
     Scissor.echonest_api_key = 'XXX'
 
-    echonest = Scissor::Chunk.echonest
+    echonest = Scissor::Tape.echonest
     echonest.user_agent.send_timeout = 300
 
     echonest.should be_an_instance_of(Echonest::Api)
-    Scissor::Chunk.echonest.user_agent.send_timeout.should eql(300)
+    Scissor::Tape.echonest.user_agent.send_timeout.should eql(300)
   end
 
   describe 'analysis' do |object|
@@ -31,7 +31,7 @@ describe Scissor do
       track_methods.stub!(:analysis).and_return(Echonest::Analysis.new(open(fixture('analysis.json')).read))
 
       @scissor = Scissor(fixture('sample.mp3'))
-      Scissor::Chunk.stub!(:echonest).and_return(api)
+      Scissor::Tape.stub!(:echonest).and_return(api)
     end
 
     it 'should get bars' do
@@ -48,12 +48,12 @@ describe Scissor do
       beats = @scissor.beats
 
       beats.size.should eql(324)
-      beats[0].should be_an_instance_of(Scissor::Chunk)
+      beats[0].should be_an_instance_of(Scissor::Tape)
       beats[0].start.should eql(0.0)
       beats[0].duration.should eql(0.27661)
       beats[0].fragments.first.filename.should eql(fixture('sample.mp3'))
       beats[0].confidence.should eql(1.0)
-      beats[1].should be_an_instance_of(Scissor::Chunk)
+      beats[1].should be_an_instance_of(Scissor::Tape)
       beats[1].start.should eql(0.27661)
       beats[1].duration.should eql(0.36476)
       beats[1].fragments.first.filename.should eql(fixture('sample.mp3'))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - youpy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 +09:00
+date: 2011-12-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +26,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 0
-        - 22
-        version: 0.0.22
+        - 2
+        - 3
+        version: 0.2.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,7 @@ files:
 - spec/scissor-echonest_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- lib/scissor/echonest/chunk_ext.rb
+- lib/scissor/echonest/tape_ext.rb
 - lib/scissor/echonest.rb
 - examples/afromb.rb
 has_rdoc: true