thumbkit 0.0.3 → 0.0.4

data/README.md

@@ -158,8 +158,6 @@ of the extension of the output file provided.
 
 ### Composite thumbnails
 
-NOT YET IMPLEMENTED
-
 ```ruby
   composite = Thumbkit.new(['path/to/audio.mp3', 'path/to/text_file.txt'])
   composite.write_thumbnail('path/to/collection.png')

data/lib/thumbkit/processor/collection.rb

@@ -0,0 +1,84 @@
+class Thumbkit::Processor::Collection < Thumbkit::Processor
+
+  alias_method :paths, :path
+
+  def determine_outfile
+    raise ArgumentError, 'Thumbkit: At output file must be provided for collections'
+  end
+
+  def write
+    sources = generate_each
+    command = build_montage_command(sources)
+    run(command)
+
+    command = build_resize_command(outfile)
+    run(command)
+
+    outfile
+  end
+
+  def collection
+    self.paths.map do |path|
+      Thumbkit.new(path)
+    end
+  end
+
+  private
+
+  def generate_each
+    collection.map do |thumbkit|
+      outdir = File.dirname(outfile)
+      output_filename = File.basename(thumbkit.processor_instance.outfile)
+
+      thumbkit.write_thumbnail(File.join(outdir, output_filename), options)
+    end
+  end
+
+
+  # montage arabic.png greek.png png_file.png -geometry '1x1<+0+0' collection.png; open collection.png
+  def build_montage_command(sources)
+    MiniMagick::CommandBuilder.new('montage').tap do |montage|
+      sources.each do |source|
+        montage << source
+      end
+
+      montage.geometry '1x1<+0+0'
+
+      montage.background options[:colors][:background]
+      montage.gravity(options[:gravity] || 'Center')
+
+      montage << outfile
+    end
+  end
+
+  def build_resize_command(outfile)
+    MiniMagick::CommandBuilder.new('mogrify').tap do |resize|
+      resize.resize "#{ options[:width] }x#{ options[:height] }>"
+      resize.background options[:colors][:background]
+      resize.extent "#{ options[:width] }x#{ options[:height] }"
+      resize << outfile
+    end
+  end
+
+  # Mostly copied from MiniMagick
+  def run(command_builder)
+    command = command_builder.command
+
+    sub = Subexec.run(command, timeout: MiniMagick.timeout)
+
+    if sub.exitstatus != 0
+
+      # Raise the appropriate error
+      if sub.output =~ /no decode delegate/i || sub.output =~ /did not return an image/i
+        raise MiniMagick::Invalid, sub.output
+      else
+        # TODO: should we do something different if the command times out ...?
+        # its definitely better for logging.. otherwise we dont really know
+        raise MiniMagick::Error, "Command (#{command.inspect.gsub("\\", "")}) failed: #{{:status_code => sub.exitstatus, :output => sub.output}.inspect}"
+      end
+    else
+      sub.output
+    end
+  end
+
+end

data/lib/thumbkit/processor/text.rb

@@ -73,6 +73,7 @@ class Thumbkit::Processor::Text < Thumbkit::Processor
       mogrify << '+repage'
       # This extra gravity call prevents left-to-right text from rendering centered
       mogrify.gravity 'NorthWest'
+      mogrify << '+strip'
       mogrify.write outfile
       mogrify << "label:@#{path}"
     end

data/lib/thumbkit/processor.rb

@@ -2,6 +2,7 @@ class Thumbkit::Processor
   autoload :Text, 'thumbkit/processor/text'
   autoload :Audio, 'thumbkit/processor/audio'
   autoload :Image, 'thumbkit/processor/image'
+  autoload :Collection, 'thumbkit/processor/collection'
 
   def self.processors
     @processors ||= {

data/lib/thumbkit/version.rb

@@ -1,3 +1,3 @@
 class Thumbkit
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/thumbkit.rb

@@ -5,8 +5,6 @@ class Thumbkit
   autoload :Options, 'thumbkit/options'
   autoload :Adapters, 'thumbkit/adapters'
 
-  attr_accessor :path, :filename, :type
-
   def self.defaults
     @defaults ||= Thumbkit::Options.new({
       width: 200,
@@ -31,10 +29,17 @@ class Thumbkit
     Thumbkit::Processor.processors
   end
 
+  attr_accessor :path, :filename, :type
+
   def initialize(path)
-    @path = File.expand_path(path)
-    @filename = File.basename(@path)
-    @type = File.extname(@filename)[1..-1]
+    if Array === path
+      @processor = Thumbkit::Processor::Collection
+      @path = path.map { |p| File.expand_path(p) }
+    else
+      @path = File.expand_path(path)
+      @filename = File.basename(@path)
+      @type = File.extname(@filename)[1..-1]
+    end
   end
 
   def processor

data/spec/thumbkit/processor/collection_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe Thumbkit::Processor::Collection do
+
+  let(:fixtures) {
+    ['png_file.png', 'text_file.txt', 'jpg_file.jpg', '16Hz-20kHz-Exp-1f-5sec.mp3']
+  }
+  let(:paths) { fixtures.map { |fixture| File.expand_path(path_to_fixture(fixture)) } }
+  let(:options) { {} }
+  let(:processor) { Thumbkit::Processor::Collection.new(paths, outfile, options) }
+  subject { processor }
+
+  describe '#determine_outfile' do
+    let(:outfile) { nil }
+    it 'raises an error' do
+      expect { processor.determine_outfile }.to raise_error(ArgumentError)
+    end
+  end
+
+  describe '#collection' do
+    let(:outfile) { path_for_output('collection.png').to_s }
+    subject { processor.collection }
+
+    it 'returns an array of ThumbkitS' do
+      subject.should be_kind_of(Array)
+      subject.each { |e| e.should be_kind_of(Thumbkit) }
+    end
+
+    it 'there are 4 of them' do
+      subject.size.should == 4
+    end
+
+    it 'they haz the right paths' do
+      subject.map(&:path).should == paths
+    end
+  end
+
+  describe '#write' do
+    let(:outfile) { path_for_output('collection.png').to_s }
+    subject { processor.write }
+
+    it 'returns the path of the outfile' do
+      subject.should == outfile
+    end
+
+    it 'writes a file' do
+      File.should exist(subject)
+    end
+
+    its_size_should_be('200x200')
+    its_mimetype_should_be('image/png')
+
+    context 'with only 3 sources' do
+      let(:outfile) { path_for_output('collection-3.png').to_s }
+      let(:fixtures) {
+        ['png_file.png', 'text_file.txt', 'jpg_file.jpg']
+      }
+
+      it 'writes a file' do
+        File.should exist(subject)
+      end
+
+      its_size_should_be('200x200')
+      its_mimetype_should_be('image/png')
+    end
+
+    context 'with only 5 sources' do
+      let(:outfile) { path_for_output('collection-5.png').to_s }
+      let(:fixtures) {
+        ['16Hz-20kHz-Exp-1f-5sec.mp3', 'arabic.txt', 'png_file.png', 'text_file.txt', 'jpg_file.jpg']
+      }
+
+      it 'writes a file' do
+        File.should exist(subject)
+      end
+
+      its_size_should_be('200x200')
+      its_mimetype_should_be('image/png')
+    end
+  end
+end

data/spec/thumbkit/processor/text_spec.rb

@@ -40,6 +40,11 @@ describe Thumbkit::Processor::Text do
       File.should exist(subject)
     end
 
+    it "doesn't have label in the metadata" do
+      result = `identify -verbose #{ subject }|grep label:`.chomp
+      result.should be_empty
+    end
+
     its_size_should_be('200x200')
     its_mimetype_should_be('image/png')
 

data/spec/thumbkit_spec.rb

@@ -18,8 +18,14 @@ describe Thumbkit do
     its(:processor) { should == Thumbkit::Processor::Audio }
     its(:type) { should == 'mp3' }
   end
-end
 
+  context 'with an array' do
+    let(:files) { [path_to_fixture('16Hz-20kHz-Exp-1f-5sec.mp3'), path_to_fixture('text_file.txt')] }
+    subject { Thumbkit.new files }
+
+    its(:processor) { should == Thumbkit::Processor::Collection }
+  end
+end
 
 describe Thumbkit, '.defaults' do
   subject { Thumbkit.defaults }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thumbkit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -30,6 +30,7 @@ files:
 - lib/thumbkit/options.rb
 - lib/thumbkit/processor.rb
 - lib/thumbkit/processor/audio.rb
+- lib/thumbkit/processor/collection.rb
 - lib/thumbkit/processor/image.rb
 - lib/thumbkit/processor/text.rb
 - lib/thumbkit/version.rb
@@ -43,6 +44,7 @@ files:
 - spec/spec_helper.rb
 - spec/thumbkit/options_spec.rb
 - spec/thumbkit/processor/audio_spec.rb
+- spec/thumbkit/processor/collection_spec.rb
 - spec/thumbkit/processor/image_spec.rb
 - spec/thumbkit/processor/text_spec.rb
 - spec/thumbkit/processor_spec.rb
@@ -83,6 +85,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/thumbkit/options_spec.rb
 - spec/thumbkit/processor/audio_spec.rb
+- spec/thumbkit/processor/collection_spec.rb
 - spec/thumbkit/processor/image_spec.rb
 - spec/thumbkit/processor/text_spec.rb
 - spec/thumbkit/processor_spec.rb