thwomp 0.0.6 → 0.1.0

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.3
+
+before_install:
+ - sudo apt-get update -qq
+ - sudo apt-get install -qq gnash libagg-dev automake autoconf libtool libltdl-dev libjpeg-dev libgif-dev libboost-dev libboost-thread-dev libboost-program-options-dev libfontconfig1-dev libfreetype6-dev ffmpeg libpng-dev libspeex-dev libsdl-dev libspeexdsp-dev imagemagick
+
+script:
+  - rspec spec

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/README.rdoc

@@ -63,7 +63,7 @@ Option 1: Install from source
   make
   sudo make install
 
-Option 2: Install from tarbal from the intertubes:
+Option 2: Install from tarball from the intertubes:
   cd /tmp/
   wget ftp://ftp.mirror.nl/pub/mirror/gnu/gnash/0.8.9/gnash-0.8.9.tar.gz
   tar -xzf gnash-0.8.9.tar.gz
@@ -76,24 +76,27 @@ Don't forget to add sudo before gnash.
 
 === Ubuntu
 
-TODO
+  git clone git://git.sv.gnu.org/gnash.git
+  cd gnash
+  sudo apt-get install -y libagg-dev automake autoconf libtool libltdl-dev libjpeg-dev libgif-dev libboost-dev libboost-thread-dev libboost-program-options-dev libfontconfig1-dev libfreetype6-dev ffmpeg libpng-dev libspeex-dev libsdl-dev libspeexdsp-dev imagemagick
+  ./autogen.sh
+  ./configure --prefix=/usr/local/gnash-dump --enable-renderer=agg --enable-gui=dump --enable-media=no --disable-menus
+  make
+  sudo make install
 
 == Installing the thwomp gem
   gem install thwomp
 
 == Usage
 
-<b>Retrieiving image from frame:</b>
-  renderer = Thwomp::Renderer.new("http://www.example.com/flash.swf")
-  data = renderer.png_data(2)
+<b>Finding the most suitable thumbnail for a swf movie:</b>
+  thumbnail_path = Thwomp.pick("http://www.example.com/flash.swf")
 
-<b>Creating a thumbnail from a frame:</b>
-  renderer = Thwomp::Renderer.new("http://www.example.com/flash.swf")
-  data = Thwomp::Thumbnail.new(renderer).png_data(2)
+This picks the right renderer based on file extension. If that doesn't work
+for you, you can instantiate the right renderer yourself. Like this;
 
-<b>Finding the most suitble thumbnail for a swf movie:</b>
-  renderer = Thwomp::Renderer.new("http://www.example.com/flash.swf")
-  data = Thwomp::SuitableThumbnail.new(renderer).png_data
+  renderer = Thwomp::Renderers::SWF.new("http://www.example.com/flash.swf")
+  thumbnail_path = ThumbnailPicker.pick(renderer.frames)
 
 <b>Creating a GIF animation from a swf movie:</b>
   renderer = Thwomp::Renderer.new("http://www.example.com/flash.swf")

data/Rakefile

@@ -1,2 +1,5 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new

data/bin/install_gnash_osx

@@ -9,7 +9,7 @@ end
 
 if ask('Install required libs with homebrew? [y/n]') =~ /^[Yy]$/
   puts 'Installing required libs with homebrew'
-  `brew update && brew install giflib boost libagg`
+  `brew update && brew install libtool giflib boost libagg gconf`
 end
 
 if ask('Install gnash? This may take a while! [y/n]') =~ /^[Yy]$/
@@ -21,8 +21,8 @@ if ask('Install gnash? This may take a while! [y/n]') =~ /^[Yy]$/
    rm -fr gnash
    git clone git://git.sv.gnu.org/gnash.git
    cd gnash
-   ./autogen
-   ./configure --prefix=/usr/local/gnash-dump --enable-renderer=agg --enable-gui=dump --enable-media=no --disable-kparts --disable-nsapi --disable-menus  make
+   ./autogen.sh
+   ./configure --prefix=/usr/local/gnash-dump --enable-renderer=agg --enable-gui=dump --enable-media=no --disable-kparts --disable-nsapi --disable-menus
    make
    sudo make install`
 end

data/lib/thwomp.rb

@@ -1,10 +1,26 @@
 require 'thwomp/version'
 require 'thwomp/renderer'
+require 'thwomp/renderers/helper'
+require 'thwomp/renderers/swf'
+require 'thwomp/renderers/ffmpeg'
 require 'thwomp/color_counter'
 require 'thwomp/downloader'
+require 'thwomp/thumbnail_picker'
 require 'thwomp/thumbnail'
-require 'thwomp/suitable_thumbnail'
 require 'thwomp/animation_preview'
+require 'thwomp/command'
 
 module Thwomp
+
+  class << self
+
+    attr_accessor :gnash_path, :ffmpeg_path
+
+    def pick(url)
+      renderer = Renderer.new(url)
+      ThumbnailPicker.pick(renderer.frames.reverse)
+    end
+
+  end
+
 end

data/lib/thwomp/animation_preview.rb

@@ -1,58 +1,27 @@
 require 'tmpdir'
 
 module Thwomp
-  class AnimationPreview < Struct.new(:renderer)
+  class AnimationPreview
 
-    attr_accessor :renderer, :max_width, :max_height, :max_frames
+    # TODO: (optional) use Thumbnail class to make png's from the
+    # rendered frames, instead of passing the frames directly to 'convert'
 
-    DEFAULT_OPTIONS = { :max_width => 128,
-                        :max_height => 128,
-                        :max_frames => 10 }
+    attr_reader :frames
 
-    #
-    # Creates an GIF animation from a given SWF
-    #
-    # Options
-    #   :max_width    Maximum width of GIF
-    #   :max_height   Maximum height of GIF
-    #
-    def initialize(renderer, options = {})
-      DEFAULT_OPTIONS.merge(options).each { |k,v| send(:"#{k}=", v) if v }
-      @renderer = renderer
+    def initialize(frames)
+      @frames = frames
     end
 
-    # returns the gif binary data of generated animation
-    def gif_data
-      File.open(filename, 'rb') { |f| f.read }
-    end
-
-    # returns temp filename of generated animation
-    def filename
-      @filename ||= generate_gif!
-    end
-
-    private
-
-    def thumbnail
-      @thumbnail ||= Thumbnail.new(renderer, :max_width => max_width, :max_height => max_height)
-    end
-
-    # returns all filenames of the seperate frames in the flash animation
-    def frame_filenames
-      unless @frame_filenames
-        frames = (0..max_frames).to_a + ['last']
-        renderer.render_batch!(frames)
-        @frame_filenames = frames.map { |frame| thumbnail.filename(frame) }.compact
-      end
-
-      @frame_filenames
-    end
-
-    def generate_gif!
+    def generate!
       filename = "#{Dir.tmpdir}/animation_#{Time.now.to_i}.gif"
-      `convert #{frame_filenames.join(' ')} #{filename}`
+      Command.exec("convert #{frames.join(' ')} #{filename}")
       filename
     end
 
+    # returns the gif binary data of generated animation
+    def gif_data
+      File.open(generate!, 'rb') { |f| f.read }
+    end
+
   end
 end

data/lib/thwomp/color_counter.rb

@@ -22,10 +22,18 @@ module Thwomp
       !empty?
     end
 
+    def valid_png?
+      !!png
+    end
+
     private
 
     def png
-      @png ||= ChunkyPNG::Image.from_file(image_filename)
+      @png ||= begin
+        ChunkyPNG::Image.from_file(image_filename)
+      rescue Errno::ENOENT, ChunkyPNG::Exception, RangeError, NoMethodError
+        false
+      end
     end
 
     def width
@@ -72,7 +80,7 @@ module Thwomp
 
     # returns the color at pixel X,Y
     def color_at(x,y)
-      png[y, x]
+      png[x, y]
     end
 
     def flattened_color_at(x,y)

data/lib/thwomp/command.rb

@@ -0,0 +1,11 @@
+module Thwomp
+
+  class Command
+
+    def self.exec(cmd)
+      system(cmd)
+    end
+
+  end
+
+end

data/lib/thwomp/renderer.rb

@@ -1,98 +1,17 @@
-require 'tmpdir'
-
 module Thwomp
 
-  # Renders SWF files
   class Renderer
 
-    attr_accessor :url, :max_width, :max_height, :max_frames
-
-    DEFAULT_OPTIONS = { :max_width => 500,
-                        :max_height => 500,
-                        :max_frames => 10 }
-
-    # Initializer the Thwomp renderer
-    #
-    # Options:
-    #   :max_width        Maximum width of renderer
-    #   :max_height       Maximum height of renderer
-    #   :max_frames       Maximum number of frames the renderer can handle
-    def initialize(url, options = {})
-      DEFAULT_OPTIONS.merge(options).each { |k,v| send(:"#{k}=", v) if v }
-      @url = url
-    end
-
-    # returns filename of frame
-    def frame_filename(frame)
-      frame_exists?(frame) ? @frame_filename[frame] : nil
-    end
-
-    # returns PNG data from given frame
-    def png_data(frame)
-      frame_exists?(frame) ? frame_data(frame) : nil
-    end
-
-    # renders a batch of frames
-    def render_batch!(frames)
-      @frame_filename ||= {}
+    def self.new(*args)
+      url = args.first
 
-      frame_batch = frames.join(',')
-      file_mask   = frame_output_filename('%f')
-
-      `#{self.class.gnash_binary} -s1 --screenshot=#{frame_batch} --screenshot-file=#{file_mask} -1 -r1 --timeout 200 #{filename} -j #{max_width} -k #{max_height}`
-
-      frames.each do |frame|
-        @frame_filename[frame] = file_mask.gsub('%f', frame.to_s)
+      if url.match(/\.swf$/)
+        Renderers::SWF.new(*args)
+      else
+        Renderers::FFMPEG.new(*args)
       end
     end
 
-    def frame_exists?(frame)
-      render_frame!(frame)
-      File.exists?(@frame_filename[frame])
-    end
-
-    # returns the current set gnash binary
-    def self.gnash_binary
-      @gnash_binary ||= 'gnash-dump'
-    end
-
-    # sets the path to the gnash binary
-    def self.gnash_binary=(binary)
-      @gnash_binary = binary
-    end
-
-    private
-
-    def frame_data(frame)
-      File.open(@frame_filename[frame], 'rb') { |f| f.read }
-    end
-
-    # renders all the frames from the SWF file and dump them to a RAW file
-    def render_frame!(frame)
-      @frame_filename ||= {}
-
-      unless @frame_filename[frame]
-        @frame_filename[frame] = frame_output_filename(frame)
-
-        `#{self.class.gnash_binary} -s1 --screenshot=#{frame} --screenshot-file #{@frame_filename[frame]} -1 -r1 --timeout 200 #{filename} -j #{max_width} -k #{max_height}`
-      end
-
-      @frame_filename[frame]
-    end
-
-    def filename
-      downloader.filename
-    end
-
-    # returns the downloader
-    def downloader
-      @downloader ||= Downloader.new(url)
-    end
-
-    # returns temp filename for given frame no.
-    def frame_output_filename(frame)
-      "#{Dir.tmpdir}/frame_#{Time.now.to_i}_#{frame}.png"
-    end
-
   end
+
 end

data/lib/thwomp/renderers/ffmpeg.rb

@@ -0,0 +1,31 @@
+module Thwomp
+
+  module Renderers
+
+    class FFMPEG
+      include Renderers::Helper
+
+      attr_reader :filename
+
+      def initialize(url)
+        @filename = Downloader.new(url).filename
+      end
+
+      def frames
+        timestamp = Time.now.to_i
+        output_file_name = "#{Dir.tmpdir}/frame_#{timestamp}_%d.png"
+
+        Command.exec("#{executable} -i #{filename} -f image2 -r 1 -vf scale=128:-1 #{output_file_name} &> /dev/null")
+
+        sort Dir.glob("#{Dir.tmpdir}/frame_#{timestamp}_*.png")
+      end
+
+      def executable
+        Thwomp.ffmpeg_path || "ffmpeg"
+      end
+
+    end
+
+  end
+
+end

data/lib/thwomp/renderers/helper.rb

@@ -0,0 +1,21 @@
+module Thwomp
+
+  module Renderers
+
+    module Helper
+
+      def sort(frames)
+        frames.sort do |a, b|
+          frame_number(File.basename(a)) <=> frame_number(File.basename(b))
+        end
+      end
+
+      def frame_number(file_name)
+        file_name.scan(/\d+/).last.to_i
+      end
+
+    end
+
+  end
+
+end

data/lib/thwomp/renderers/swf.rb

@@ -0,0 +1,63 @@
+require 'tmpdir'
+
+module Thwomp
+
+  # Renders SWF files
+  module Renderers
+
+    class SWF
+
+      include Renderers::Helper
+
+      attr_reader :filename, :frame_count, :width, :height
+
+      def initialize(url, options={})
+        @filename = Downloader.new(url).filename
+        @frame_count = options.fetch(:frame_count) { 10 }
+        @width = options.fetch(:width) { 500 }
+        @height = options.fetch(:height) { 500 }
+      end
+
+      def frames
+        timestamp = Time.now.to_i
+
+        Command.exec(
+          "#{executable} -s1 --screenshot=#{frame_batch}" \
+          " --screenshot-file=#{output_file(timestamp)}" \
+          " -1 -r1 --timeout 200 #{filename} -j #{width}" \
+          " -k #{height} > /dev/null 2>&1"
+        )
+
+        sort Dir.glob("#{Dir.tmpdir}/frame_#{timestamp}_*.png")
+      end
+
+      def frame(number)
+        timestamp = Time.now.to_i
+
+        Command.exec(
+          "#{executable} -s1 --screenshot=#{number}" \
+          " --screenshot-file=#{output_file(timestamp)}" \
+          " -1 -r1 --timeout 200 #{filename} -j #{width}" \
+          " -k #{height} > /dev/null 2>&1"
+        )
+
+        "#{Dir.tmpdir}/frame_#{timestamp}_#{number}.png"
+      end
+
+      def frame_batch
+        batch = ['last'] + (0..frame_count).to_a.reverse
+        batch.join(',')
+      end
+
+      def output_file(timestamp)
+        "#{Dir.tmpdir}/frame_#{timestamp}_%f.png"
+      end
+
+      def executable
+        Thwomp.gnash_path || "gnash-dump"
+      end
+
+    end
+
+  end
+end

data/lib/thwomp/thumbnail.rb

@@ -3,52 +3,25 @@ require 'oily_png'
 
 module Thwomp
 
-  # Creates thumbnail of SWF movies
   class Thumbnail
 
-    attr_accessor :renderer, :max_width, :max_height
-
-    DEFAULT_OPTIONS = { :max_width => 128,
-                        :max_height => 128 }
-
-    #
-    # Intializes thumbnail renderer
-    #
-    # Options
-    #   :max_width      Maximum width of thumbnail
-    #   :max_height     Maximum height of thumbnail
-    #
-    def initialize(renderer, options = {})
-      DEFAULT_OPTIONS.merge(options).each { |k,v| send(:"#{k}=", v) if v }
-      @renderer = renderer
-    end
-
-    # returns the png binary data of the generated thumbnail
-    def png_data(frame)
-      File.open(filename(frame), 'rb') { |f| f.read } if renderer.frame_exists?(frame)
-    end
-
-    # returns the temp filename of the generated thumbnail
-    def filename(frame)
-      @filename ||= {}
-      @filename[frame] ||= generate_thumbnail!(frame) if renderer.frame_exists?(frame)
-    end
+    def self.generate!(path, options={})
+      width = options.fetch(:width, 128)
+      height = options.fetch(:height, 128)
 
-    def render_batch!(frames)
+      filename = path.gsub(/frame/, 'thumbnail')
 
-    end
-
-    private
-
-    def generate_thumbnail!(frame)
-      filename = "#{Dir.tmpdir}/thumbnail_#{Time.now.to_i}_#{frame}.png"
+      begin
+        thumbnail = ChunkyPNG::Image.from_file(path)
+        thumbnail.resample_bilinear!(width, height)
+        thumbnail.save(filename)
 
-      thumbnail = ChunkyPNG::Image.from_file(renderer.frame_filename(frame))
-      thumbnail.resample_bilinear!(max_width, max_height)
-      thumbnail.save(filename)
-
-      filename
+        filename
+      rescue ChunkyPNG::Exception, RangeError, NoMethodError
+        false
+      end
     end
 
   end
+
 end

data/lib/thwomp/thumbnail_picker.rb

@@ -0,0 +1,16 @@
+module Thwomp
+
+  class ThumbnailPicker
+
+    def self.pick(image_paths)
+      path = image_paths.find do |path|
+        counter = ColorCounter.new(path)
+        counter.valid_png? && counter.present?
+      end
+
+      Thumbnail.generate!(path)
+    end
+
+  end
+
+end

data/lib/thwomp/version.rb

@@ -1,3 +1,3 @@
 module Thwomp
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/spec/animation_preview_spec.rb

@@ -1,12 +1,22 @@
 require 'spec_helper'
 
-describe Thwomp::AnimationPreview do
+module Thwomp
 
-  let(:renderer) { Thwomp::Renderer.new("#{File.dirname(__FILE__)}/fixtures/test.swf") }
+  describe AnimationPreview do
+
+    it "shells out to 'convert' to create an animated gif" do
+      frames = %w(a.png b.png c.png)
+      now = Time.now
+      output_file = "#{Dir.tmpdir}/animation_#{now.to_i}.gif"
+
+      cmd = "convert #{frames.join(' ')} #{output_file}"
+      Command.should_receive(:exec).with(cmd)
+
+      Time.stub(:now).and_return(now)
+      preview = AnimationPreview.new(frames)
+      preview.generate!.should == output_file
+    end
 
-  it 'generates a gif animation' do
-    animation = Thwomp::AnimationPreview.new(renderer, :max_width => 60, :max_height => 60)
-    animation.gif_data.should == get_contents("#{File.dirname(__FILE__)}/fixtures/frames.gif")
   end
 
 end

data/spec/renderer_spec.rb

@@ -1,30 +1,29 @@
 require 'spec_helper'
 require 'thwomp'
 
-describe Thwomp::Renderer do
-  describe 'extracting frames from flash' do
+module Thwomp
 
-    subject { Thwomp::Renderer.new("#{File.dirname(__FILE__)}/fixtures/test.swf") }
+  describe Renderer do
 
-    it 'extracts frame 1' do
-      subject.png_data(0).should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame0.png")
+    it "instantiates the ffmpeg renderer for flv" do
+      path = "/some/path/test.flv"
+      Renderers::FFMPEG.should_receive(:new).with(path)
+      renderer = Renderer.new(path)
     end
 
-    it 'extracts frame 2' do
-      subject.png_data(1).should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame1.png")
+    it "instantiates the gnash renderer for swf" do
+      path = "/some/path/test.swf"
+      Renderers::SWF.should_receive(:new).with(path)
+      renderer = Renderer.new(path)
     end
 
-    it 'extracts frame 3' do
-      subject.png_data(2).should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame2.png")
-    end
-
-    it 'extracts frame 4' do
-      subject.png_data(3).should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame3.png")
-    end
-
-    it 'extracts frame 5' do
-      subject.png_data(4).should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame4.png")
+    it "passes all arguments to the renderer" do
+      path = "/some/path/test.swf"
+      options = { :width => 200, :height => 200 }
+      Renderers::SWF.should_receive(:new).with(path, options)
+      renderer = Renderer.new(path, options)
     end
 
   end
+
 end

data/spec/renderers/ffmpeg_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+require 'thwomp'
+
+module Thwomp
+
+  describe Renderers::FFMPEG do
+
+    let(:path) { File.expand_path("./spec/fixtures/test.flv") }
+
+    it "creates a screenshot every second" do
+      renderer = Renderers::FFMPEG.new(path)
+      now = Time.now
+      output_file = "#{Dir.tmpdir}/frame_#{now.to_i}_%d.png"
+      cmd = "ffmpeg -i #{path} -f image2 -r 1 -vf scale=128:-1 #{output_file} &> /dev/null"
+
+      Time.stub(:now).and_return(now)
+      Command.should_receive(:exec).with(cmd)
+      renderer.frames
+    end
+
+  end
+
+end

data/spec/renderers/swf_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'thwomp'
+
+module Thwomp
+
+  describe Renderers::SWF do
+
+    let(:input) { "./some/path/to/test.swf" }
+
+    it "shells out to 'gnash' to extract frames from an SWF movie" do
+      renderer = Renderers::SWF.new(input)
+      now = Time.now
+      Time.stub(:now).and_return(now)
+      output_file = "#{Dir.tmpdir}/frame_#{now.to_i}_%f.png"
+      cmd = "gnash-dump -s1 --screenshot=last,10,9,8,7,6,5,4,3,2,1,0 --screenshot-file=#{output_file} -1 -r1 --timeout 200 #{input} -j 500 -k 500 > /dev/null 2>&1"
+      Command.should_receive(:exec).with(cmd)
+      renderer.frames
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -9,4 +9,4 @@ def get_contents(file)
   File.open(file, 'rb') { |f| f.read }
 end
 
-Thwomp::Renderer.gnash_binary = '/usr/local/gnash-dump/bin/dump-gnash'
+# Thwomp::Renderer.gnash_binary = '/usr/local/gnash-dump/bin/dump-gnash'

data/spec/thumbnail_spec.rb

@@ -2,30 +2,8 @@ require 'spec_helper'
 require 'thwomp'
 
 describe Thwomp::Thumbnail do
-  describe 'creating thumbnails from frames' do
-
-    let(:renderer) { Thwomp::Renderer.new("#{File.dirname(__FILE__)}/fixtures/test.swf") }
-    subject { Thwomp::Thumbnail.new(renderer, :max_width => 128, :max_height => 128) }
-
-    it 'creates thumbnail from frame 1' do
-      subject.png_data(0).should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame0_thumbnail.png")
-    end
-
-    it 'creates thumbnail from frame 2' do
-      subject.png_data(1).should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame1_thumbnail.png")
-    end
-
-    it 'creates thumbnail from frame 3' do
-      subject.png_data(2).should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame2_thumbnail.png")
-    end
-
-    it 'creates thumbnail from frame 4' do
-      subject.png_data(3).should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame3_thumbnail.png")
-    end
-
-    it 'creates thumbnail from frame 5' do
-      subject.png_data(4).should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame4_thumbnail.png")
-    end
 
+  describe 'creating thumbnails from frames' do
+    pending
   end
 end

metadata

@@ -1,77 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: thwomp
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
 platform: ruby
-authors: 
+authors:
 - Altovista
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-11 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: oily_png
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oily_png
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Creates thumbnails or gif animations using Gnash as SWF renderer
-email: 
+email:
 - webmaster@altovista.nl
-executables: 
+executables:
 - install_gnash_osx
 - install_gnash_ubuntu
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .ruby-version
+- .travis.yml
+- Gemfile
 - README.rdoc
 - Rakefile
 - bin/install_gnash_osx
@@ -79,11 +79,14 @@ files:
 - lib/thwomp.rb
 - lib/thwomp/animation_preview.rb
 - lib/thwomp/color_counter.rb
+- lib/thwomp/command.rb
 - lib/thwomp/downloader.rb
-- lib/thwomp/raw_renderer.rb
 - lib/thwomp/renderer.rb
-- lib/thwomp/suitable_thumbnail.rb
+- lib/thwomp/renderers/ffmpeg.rb
+- lib/thwomp/renderers/helper.rb
+- lib/thwomp/renderers/swf.rb
 - lib/thwomp/thumbnail.rb
+- lib/thwomp/thumbnail_picker.rb
 - lib/thwomp/version.rb
 - spec/animation_preview_spec.rb
 - spec/color_counter_spec.rb
@@ -102,45 +105,36 @@ files:
 - spec/fixtures/insignificant.png
 - spec/fixtures/significant.png
 - spec/renderer_spec.rb
+- spec/renderers/ffmpeg_spec.rb
+- spec/renderers/swf_spec.rb
 - spec/spec_helper.rb
-- spec/suitable_thumbnail_spec.rb
 - spec/thumbnail_spec.rb
 - thwomp.gemspec
-has_rdoc: true
 homepage: http://www.altovista.nl
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: thwomp
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Create thumbnails or gif animations from SWF files
-test_files: 
+test_files:
 - spec/animation_preview_spec.rb
 - spec/color_counter_spec.rb
 - spec/fixtures/frame0.png
@@ -158,6 +152,7 @@ test_files:
 - spec/fixtures/insignificant.png
 - spec/fixtures/significant.png
 - spec/renderer_spec.rb
+- spec/renderers/ffmpeg_spec.rb
+- spec/renderers/swf_spec.rb
 - spec/spec_helper.rb
-- spec/suitable_thumbnail_spec.rb
 - spec/thumbnail_spec.rb

data/lib/thwomp/raw_renderer.rb

@@ -1,40 +0,0 @@
-require 'tmpdir'
-
-# TODO maybe nice to use RAW files instead of screenshot files
-module Thwomp
-  # Renders SWF files
-  class RawRenderer < Renderer
-
-    attr_accessor :max_advances
-
-    private
-
-    # calculates offset of given frame
-    def frame_offset(frame)
-      frame_size * frame
-    end
-
-    # calculates size of frame
-    def frame_size
-      max_width * max_height * 4
-    end
-
-    # maximum number of captures frames
-    def max_advances
-      @max_advances ||= 100
-    end
-
-    # extracts one frame from dump and returns the raw data
-    def extract_frame_from_raw(frame)
-      #@render_frames ||= `#{gnash_binary} #{downloader.filename} -D #{raw_filename} --max-advances #{max_advances} 1 -j 500 -k 500`
-      render_frame!(frame)
-
-      File.open('rb', raw_filename) do |file|
-        file.seek(frame_offset(frame))
-        file.read(frame_size)
-      end
-    end
-
-  end
-end
-

data/lib/thwomp/suitable_thumbnail.rb

@@ -1,52 +0,0 @@
-module Thwomp
-
-  # Creates thumbnail of SWF movie and finds the most interesting frame in the movie
-  class SuitableThumbnail < Thumbnail
-
-    # returns the png binary data of the generated thumbnail
-    def png_data
-      File.open(filename, 'rb') { |f| f.read }
-    end
-
-    # returns the temp filename of the generated thumbnail
-    def filename
-      @filename ||= generate_thumbnail!
-    end
-
-    private
-
-    # loop till we find the most suitable frame
-    def suitable_frame
-      unless @suitable_frame
-        frames = ['last'] + (0..renderer.max_frames).to_a.reverse
-
-        # render a batch of frames to speed up the process
-        renderer.render_batch!(frames)
-
-        frames.each do |frame|
-          @suitable_frame = frame if !@suitable_frame && suitable_frame?(frame)
-        end
-
-        @suitable_frame ||= 'last'
-      end
-
-      @suitable_frame
-    end
-
-    # tests if the given frame no. is suitable for a thumbnail
-    # tests if the frame doesn't contain a too high concentration of one color
-    def suitable_frame?(frame)
-      renderer.frame_exists?(frame) && ColorCounter.new(renderer.frame_filename(frame)).present?
-    end
-
-    def suitable_frame_filename
-      @suitable_frame_filename ||= renderer.frame_filename(suitable_frame)
-    end
-
-    def generate_thumbnail!
-      super(suitable_frame)
-    end
-
-  end
-
-end

data/spec/suitable_thumbnail_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-require 'thwomp'
-
-describe Thwomp::SuitableThumbnail do
-  it 'finds a suitable preview image' do
-    renderer = Thwomp::Renderer.new("#{File.dirname(__FILE__)}/fixtures/test.swf")
-    subject = Thwomp::SuitableThumbnail.new(renderer, :max_width => 128, :max_height => 128)
-
-    subject.png_data.should == get_contents("#{File.dirname(__FILE__)}/fixtures/frame5_thumbnail.png")
-  end
-end