youpy-scissor 0.0.17 → 0.0.18

data/README.rdoc

@@ -38,7 +38,7 @@ supported file format:
 	 foo + bar > 'foobar.mp3'
 
 	 # slice + concat
-	 foo[10, 1] + bar.slice[2, 3] > 'slicefoobar.mp3'
+	 foo[10, 1] + bar[2, 3] > 'slicefoobar.mp3'
 
 	 # slice + concat + loop
 	 (foo[10, 1] + bar[2, 3]) * 4 > 'slicefoobarloop.mp3'

data/Rakefile

@@ -17,7 +17,7 @@ DESCRIPTION       = "utility to chop sound files"
 RUBYFORGE_PROJECT = "scissor"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
-VERS              = "0.0.17"
+VERS              = "0.0.18"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/scissor.rb

@@ -17,4 +17,10 @@ module Scissor
   def self.sequence(*args)
     Scissor::Sequence.new(*args)
   end
+
+  def self.join(scissor_array)
+    scissor_array.inject(Scissor()) do |m, scissor|
+      m + scissor
+    end
+  end
 end

data/lib/scissor/chunk.rb

@@ -2,7 +2,6 @@ require 'digest/md5'
 require 'pathname'
 require 'open4'
 require 'logger'
-require 'bigdecimal'
 
 module Scissor
   class Chunk
@@ -43,15 +42,14 @@ module Scissor
     end
 
     def duration
-      BigDecimal(
-        @fragments.inject(0) do |memo, fragment|
-          memo += fragment.duration
-        end.to_s).round(3).to_f
+      @fragments.inject(0) do |memo, fragment|
+        memo += fragment.duration
+      end
     end
 
     def slice(start, length)
       if start + length > duration
-        raise OutOfDuration
+        length = duration - start
       end
 
       new_instance = self.class.new
@@ -123,7 +121,7 @@ module Scissor
       remain = filled_duration
       new_instance = self.class.new
 
-      while filled_duration > new_instance.duration
+      while !remain.zero? && filled_duration > new_instance.duration
         if remain < duration
           added = slice(0, remain)
         else
@@ -134,6 +132,7 @@ module Scissor
         remain -= added.duration
       end
 
+
       new_instance
     end
 

data/lib/scissor/sound_file.rb

@@ -4,7 +4,7 @@ require 'riff/reader'
 
 module Scissor
   class SoundFile
-    SUPPORTED_FORMAT = %w/mp3 wav/
+    SUPPORTED_FORMATS = %w/mp3 wav/
 
     class Error < StandardError; end
     class UnknownFormat < Error; end
@@ -13,7 +13,7 @@ module Scissor
       @filename = Pathname.new(filename)
       @ext = @filename.extname.sub(/^\./, '').downcase
 
-      unless SUPPORTED_FORMAT.include?(@ext)
+      unless SUPPORTED_FORMATS.include?(@ext)
         raise UnknownFormat
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor
 version: !ruby/object:Gem::Version 
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors: 
 - youpy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 -07:00
+date: 2009-07-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency