tsunami 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/tsunami/bucket.rb

@@ -0,0 +1,37 @@
+require 'forwardable'
+
+class Tsunami
+  class Bucket
+    extend ::Forwardable
+
+    def_delegator :@values, :each, :each_value
+    def_delegator :@values, :each_with_index, :each_value_with_index
+
+    attr_reader :width, :height, :frames
+
+    def initialize(frames, width, height)
+      @values = []
+      @frames = frames
+      @width = width
+      @height = height
+    end
+
+    def set(frame, value)
+      values(frame)[:min] = value if value < values(frame)[:min]
+
+      values(frame)[:max] = value if value > values(frame)[:max]
+    end
+
+    def frames_per_pixel
+      @frames_per_pixel ||= frames / @width
+    end
+
+    def index(frame)
+      frame / frames_per_pixel
+    end
+
+    def values(frame)
+      @values[index(frame)] ||= { :max => -1, :min => 1 }
+    end
+  end
+end

data/lib/tsunami.rb

@@ -3,6 +3,7 @@ require 'rubygems'
 require 'RMagick'
 require 'ruby-audio'
 require 'buffer_ext.rb'
+require 'tsunami/bucket'
 
 class Tsunami
 
@@ -11,26 +12,49 @@ class Tsunami
   end
 
   def create_waveform(image_file, options = {})
-    @width = options[:width] || 100
-    @height = options[:height] || 50
+    dimensions = {
+      :width => options[:width] || 100,
+      :height => options[:height] || 50
+    }
 
-    buckets = fill_buckets
+    versions = {
+      image_file => dimensions
+    }
 
-    gc = build_graph buckets
+    create_waveforms(versions)
+  end
+
+  def create_waveforms(versions)
+    create_buckets versions
+    fill_buckets
+
+    @buckets.each do |key, bucket|
+      canvas = draw_waveform_from_bucket(bucket)
+      canvas.write(key.to_s)
+    end
+  end
+
+  def draw_waveform_from_bucket(bucket)
+    gc = build_graph bucket
 
-    canvas = Magick::Image.new(@width, @height) { self.background_color = 'transparent' }
+    canvas = Magick::Image.new(bucket.width, bucket.height) { self.background_color = 'transparent' }
 
     gc.draw(canvas)
 
-    canvas.write(image_file)
+    canvas
+  end
+
+  def create_buckets(versions)
+    @buckets = {}
+    versions.each_key do |key|
+      @buckets[key] = Bucket.new(total_frames, versions[key][:width], versions[key][:height])
+    end
   end
 
   def fill_buckets
     @audio_file.seek(0,0)
-    frames = @audio_file.read("float", @audio_file.info.frames)
-    buckets = []
+    frames = @audio_file.read("float", total_frames)
     frame_index = 0
-    frames_per_pixel = frames.size / @width
 
     frames.each do |channel_frames|
       if @audio_file.info.channels > 1
@@ -39,29 +63,22 @@ class Tsunami
         frame = channel_frames
       end
 
-      index = frame_index / frames_per_pixel
-      buckets[index] ||= { :max => -1, :min => 1 }
-
-      buckets[index][:min] = frame if frame < buckets[index][:min]
-
-      buckets[index][:max] = frame if frame > buckets[index][:max]
+      @buckets.values.each { |b| b.set(frame_index, frame) }
 
       frame_index += 1
     end
-
-    return buckets[0, @width]
   end
 
-  def build_graph buckets
+  def build_graph bucket
     gc = Magick::Draw.new
     gc.stroke('red')
     gc.stroke_width(1)
 
-    mid = @height/2
+    mid = bucket.height / 2
 
-    buckets.each_with_index do |bucket, i|
-      low = bucket[:min]
-      high = bucket[:max]
+    bucket.each_value_with_index do |values, i|
+      low = values[:min]
+      high = values[:max]
 
       low_point = mid * ( 1 - low )
       high_point = mid * ( 1 - high )
@@ -71,4 +88,9 @@ class Tsunami
 
     return gc
   end
+
+  def total_frames
+    @total_frames ||= @audio_file.info.frames
+  end
+
 end

data/tsunami.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tsunami}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andrei Bocan"]
-  s.date = %q{2010-03-25}
+  s.date = %q{2010-04-19}
   s.description = %q{For reals, it draws waveforms, man}
   s.email = %q{zmaxor@gmail.com}
   s.extra_rdoc_files = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/buffer_ext.rb",
      "lib/tsunami.rb",
+     "lib/tsunami/bucket.rb",
      "test/helper.rb",
      "test/test_tsunami.rb",
      "tsunami.gemspec"
@@ -32,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/zmack/tsunami}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{It draws waveforms.}
   s.test_files = [
     "test/helper.rb",

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tsunami
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Andrei Bocan
@@ -9,39 +14,47 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 +02:00
+date: 2010-04-19 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby-audio
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: For reals, it draws waveforms, man
 email: zmaxor@gmail.com
 executables: []
@@ -60,6 +73,7 @@ files:
 - VERSION
 - lib/buffer_ext.rb
 - lib/tsunami.rb
+- lib/tsunami/bucket.rb
 - test/helper.rb
 - test/test_tsunami.rb
 - tsunami.gemspec
@@ -76,18 +90,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: It draws waveforms.