crabgrass_media 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40c8e1f187d11bcbecb98fc62a1d65e51e1f6aa8
-  data.tar.gz: b8a0028cb81ce0114a3cf297d4e480eb74e1102f
+  metadata.gz: e3292a6224e3e8970bc305a69a1c734bf6e56901
+  data.tar.gz: 7c6ce2640a3a283f069e736ab01dc2bf7e9207b5
 SHA512:
-  metadata.gz: 9ffe49ed118b569dc55d3f6aa9ab212da09a07640bb592d14603f407a7ac718d933c8fd9dabc2bfe16e38ea8d5abafab23f5641463811f50d1f0dc74623b7f66
-  data.tar.gz: 9f9f857ac9b809c86aae626c25ccc7b9d6eb9402284253039012af2287534c3396b203e7d2c9cf73565ebef6ce5860165d403555ffdc70e34d13cfb994b1e44a
+  metadata.gz: 9bbffb27cb8f8fd0eb5c440ca2a9e522d70249aca48f1d92cfd83c3240260a7b58e68c07a93a3275187a113561932efc9f2a5c26931d8b982bfc08ac91e9cdd7
+  data.tar.gz: 2b6a46d543d853031c6cc6662aed2c722cf9019a43639e379242632d6d9c7117de3252434a2174eaaf3392b4c067237a99bb5d13949f7c9031f7097d95167848

data/README.md

@@ -15,15 +15,8 @@ Example usage:
   end
 ```
 
-Requirements:
-
-
-Strongly suggested:
-
-```sh
-  gem install mime-types
-```
+Tests require the 'file' utility to be installed to determine the file
+type of the created files.
 
 Crabgrass and Crabgrass::Media are based on Ruby on Rails and MySQL.
 They are released under the AGPL license, version 3.
-

data/lib/media.rb

@@ -49,15 +49,13 @@ module Media
   #
 
   def self.has_dimensions?(mime_type)
-    if Transmogrifier.list["Media::GraphicsMagickTransmogrifier"]
-      Transmogrifier.list["Media::GraphicsMagickTransmogrifier"].input_types.include? mime_type
-    end
+    Media::GraphicsMagickTransmogrifier.available? &&
+      Media::GraphicsMagickTransmogrifier.converts_from?(mime_type)
   end
 
   def self.dimensions(filepath)
-    if Transmogrifier.list["Media::GraphicsMagickTransmogrifier"]
-      Transmogrifier.list["Media::GraphicsMagickTransmogrifier"].dimensions filepath
-    end
+    return unless Media::GraphicsMagickTransmogrifier.available?
+    Media::GraphicsMagickTransmogrifier.dimensions filepath
   end
 
 end

data/lib/media/mime_type.rb

@@ -1,10 +1,4 @@
-begin
-  require 'mime/types'
-rescue LoadError => exc
-  puts "WARNING! no mime-types gem installed"
-  puts "you should really do 'gem install mime-types'"
-end
-
+require 'mime/types'
 
 module Media
   module MimeType
@@ -121,22 +115,22 @@ module Media
       'application/excel-template'      => [:xlt,:msexcel,'asset/spreadsheet','MS Excel Template'],
       'application/powerpoint-template' => [:pot,:mspowerpoint,'asset/doc','MS Powerpoint Template'],
 
-      'application/vnd.openxmlformats-officedocument.presentationml.presentation' =>
-        [:pptx, :mspowerpoint,'asset/doc','MS Powerpoint'],
+      # 'application/vnd.openxmlformats-officedocument.presentationml.presentation' =>
+      #   [:pptx, :mspowerpoint,'asset/doc','MS Powerpoint'],
       'application/vnd.openxmlformats-officedocument.presentationml.presentation' =>
         [:pptm, :mspowerpoint,'asset/doc','MS Powerpoint'],
       'application/vnd.openxmlformats-officedocument.presentationml.template' =>
         [:potx,:mspowerpoint,'asset/doc','MS Powerpoint Template'],
 
-      'application/vnd.openxmlformats-officedocument.wordprocessingml.document' =>
-        [:docm,:msword,'asset/text','MS Word'],
+      # 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' =>
+      #   [:docm,:msword,'asset/text','MS Word'],
       'application/vnd.openxmlformats-officedocument.wordprocessingml.document' =>
         [:docx,:msword,'asset/text','MS Word'],
       'application/vnd.openxmlformats-officedocument.wordprocessingml.template' =>
         [:dotx,:msword,'asset/text','MS Word Template'],
 
-      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' =>
-        [:xlsm,:msexcel,'asset/spreadsheet','MS Excel'],
+      # 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' =>
+      #   [:xlsm,:msexcel,'asset/spreadsheet','MS Excel'],
       'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' =>
         [:xlsx,:msexcel,'asset/spreadsheet','MS Excel'],
       'application/vnd.openxmlformats-officedocument.spreadsheetml.template' =>
@@ -250,15 +244,6 @@ module Media
       'svg' => 'image/svg+xml',
       'mod' => 'video/mpeg',
 
-      'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-      'pptm' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-      'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-      'docm' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-      'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-      'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-      'xlsm' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-      'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-      'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template'
     }.freeze
 
     #

data/lib/media/transmogrifier.rb

@@ -18,12 +18,13 @@ module Media
     end
 
     mattr_accessor :verbose, instance_writer: false
-    mattr_accessor :suppress_errors, instance_writer: false
 
-    delegate :debug, :info, :warning, :error, to: :logger
+    class << self
+      delegate :debug, :info, :warning, :error, to: :logger
+    end
 
+    delegate :debug, :info, :warning, :error, to: :logger
 
-    attr_accessor :name
 
     attr_accessor :input
     attr_accessor :input_file
@@ -38,17 +39,12 @@ module Media
     attr_accessor :command_output # output of last command run
 
     #
-    # takes a has of options, some of which are required:
+    # takes a hash of options, some of which are required:
     #
     # - :input_file  or (:input and :input_type)
     # - :output_file or :output_type
     #
     def initialize(options=nil)
-      self.name = self.class.to_s
-      # we keep an instance in the transmogrifier list.
-      # They only need to have the name set.
-      return if options.nil?
-
       options = options.dup
       self.input       = options.delete(:input)
       self.input_file  = options.delete(:input_file)
@@ -88,7 +84,7 @@ module Media
     end
 
     def self.inherited(base)
-      add(base.new)
+      add base
     end
 
     ##
@@ -119,17 +115,17 @@ module Media
         select{|tm| tm.converts_to?(output_type)}.
         select{|tm| tm.available?}.
         first
-      return transmog.class if transmog
+      return transmog if transmog
       logger.error 'could not find a transmogrifier for "%s" -> "%s"' %
         [input_type, output_type]
       return nil
     end
 
-    def converts_from?(input_type)
+    def self.converts_from?(input_type)
       input_types.include? input_type
     end
 
-    def converts_to?(output_type)
+    def self.converts_to?(output_type)
       output_types.include? output_type
     end
 
@@ -147,21 +143,23 @@ module Media
     # runs a shell command, passing each line that is output, as it is output
     # to the block.
     #
-    # returns the status of the command, as one of the following symbols:
-    # :success, :failure, :not_found, :error
+    # returns
+    #  * the status of the command, as one of the following symbols:
+    #    :success, :failure, :not_found, :error
+    #  * the output to STDOUT and STDERR of the command
     #
-    def run_command(*args)
+    def self.run_command(*args)
 
       # run the command
       cmdstr = command_string(*args)
-      self.command_output = ""
+      output = ""
       before = Time.now
       IO.popen(cmdstr + ' 2>&1', 'r') do |pipe|
         while line = pipe.gets
           if block_given?
             yield(line)
           end
-          self.command_output << line << "\n"
+          output << line << "\n"
         end
       end
       took = Time.now - before
@@ -176,15 +174,21 @@ module Media
       if status == :success
         log_command cmdstr
         debug "took #{took} seconds."
-        debug command_output
+        debug output
       else
         msg = ' exited with "%s"' % $?.exitstatus
         error cmdstr
         error msg
-        error command_output if command_output.present?
+        error output if !output.empty?
         yield(msg) if block_given?
       end
 
+      return status, output
+    end
+
+    def run_command(*args)
+      status, self.command_output = self.class.run_command(*args)
+
       # restore the original output_file name
       unless restore_temporary_outfile
         msg = 'could not restore temporary outfile'
@@ -195,11 +199,7 @@ module Media
       return status
     end
 
-    #def self.command_available?(command)
-    #  command.present? and File.file?(command) and File.executable?(command)
-    #end
-
-    def command_available?(command)
+    def self.command_available?(command)
       command and
       File.file?(command) and
       File.executable?(command)
@@ -211,7 +211,7 @@ module Media
 
     protected
 
-    def log_command(command)
+    def self.log_command(command)
       debug "COMMAND " + command
     end
 
@@ -262,11 +262,11 @@ module Media
 
     private
 
-    def command_string(*args)
+    def self.command_string(*args)
       args.collect {|arg| shell_escape(arg.to_s)}.join(' ')
     end
 
-    def shell_escape(str)
+    def self.shell_escape(str)
       if str.empty?
         "''"
       elsif str =~ %r{\A[0-9A-Za-z+_-]+\z}

data/lib/media/transmogrifiers/graphicsmagick.rb

@@ -18,22 +18,19 @@ module Media
 
   class GraphicsMagickTransmogrifier < Media::Transmogrifier
 
-    def input_types
-      %w( application/pdf application/bzpdf application/gzpdf
-        application/postscript application/xpdf image/jpeg image/pjpeg image/gif
+    def self.input_types
+      %w( image/jpeg image/pjpeg image/gif
         image/png image/x-png image/jpg image/tiff )
+      # application/pdf application/bzpdf application/gzpdf
+      # application/postscript application/xpdf
     end
 
-    #def input_types
-    #  self.class.input_types
-    #end
-
-    def output_types
+    def self.output_types
       %w( application/pdf image/jpeg image/pjpeg
         image/gif image/png image/jpg image/tiff )
     end
 
-    def available?
+    def self.available?
       command_available?(GRAPHICSMAGICK_COMMAND)
     end
 
@@ -43,6 +40,12 @@ module Media
     # on the pipe, since the progress is updated on a single line.
     #
     def run(&block)
+      if !File.exist?(input_file.to_s) ||
+        ( File.size(input_file.to_s) == 0 )
+        debug "Could not find input file: #{input_file}"
+        return :not_fould
+      end
+
       # try converting first page only
       status = convert(input_file.to_s + '[0]', &block)
       # retry with full file if result was empty
@@ -58,7 +61,7 @@ module Media
     def convert(input = input_file.to_s, &block)
       # +profile '*' will remove all the image profiles, which will save
       # space (sometimes) and are not useful for thumbnails
-      arguments = [gm_command, 'convert', '+profile', "*"]
+      arguments = [self.class.gm_command, 'convert', '+profile', "*"]
       if options[:size]
         # handle multiple size options, if it is an array.
         sizes = options[:size].is_a?(Array) ? options[:size] : [options[:size]]
@@ -83,40 +86,23 @@ module Media
 
     # try to detect the dimensions of the first page.
     # fallback to detecting dimensions of all pages.
-    def dimensions(filename)
+    def self.dimensions(filename)
+      return unless available?
       run_dimensions(filename.to_s + '[0]') ||
         run_dimensions(filename.to_s)
     end
 
-    def run_dimensions(filename)
-      if available?
-        args = [gm_command, 'identify', '-format', '%m %w %h', filename]
-        dimensions = nil
-        status = run_command(*args) do |output|
-          dimensions = output
-        end
-        if status == :success
-          type, width, height = dimensions.split /\s/
-          return [width,height]
-        else
-          return nil
-        end
-      end
-    end
-
     #
     # returns the average color of an image, as represented by an array of red, green, blue values, integers
     # in the range 0..255
     #
     # note: it is important that the geometry is "1x1!" ... without the ! this function might die a fiery death.
     #
-    def average_color(filename)
+    def self.average_color(filename)
       if available?
         args = [gm_command, 'convert', '-resize', '1x1!', filename, 'text:-']
         color = nil
-        status = run_command(*args) do |output|
-          color = output
-        end
+        status, color = run_command(*args)
         if status == :success
           match = color.match(/^0,0: \(\s*(?<red>\d+),\s*(?<green>\d+),\s*(?<blue>\d+)\)/)
           if match
@@ -128,8 +114,19 @@ module Media
       return [256,256,256]
     end
 
+    protected
+
+    def self.run_dimensions(filename)
+      args = [gm_command, 'identify', '-format', '%m %w %h', filename]
+      status, dimensions = run_command(*args)
+      if status == :success
+        _type, width, height = dimensions.split(/\s/)
+        return [width,height]
+      end
+    end
+
     # this override is just used for test, at the moment.
-    def gm_command
+    def self.gm_command
       GRAPHICSMAGICK_COMMAND
     end
 

data/lib/media/transmogrifiers/inkscape.rb

@@ -5,19 +5,19 @@ module Media
 
   class InkscapeTransmogrifier < Media::Transmogrifier
 
-    def magick
+    def self.magick
       Media::Transmogrifier.list["Media::GraphicsMagickTransmogrifier"]
     end
 
-    def output_types
+    def self.output_types
       magick.output_types
     end
 
-    def input_types
+    def self.input_types
       %w(image/svg+xml image/svg+xml-compressed application/illustrator image/bzeps image/eps image/gzeps)
     end
 
-    def available?
+    def self.available?
       command_available?(INKSCAPE_COMMAND) and magick and magick.available?
     end
 
@@ -30,7 +30,7 @@ module Media
         arguments = [INKSCAPE_COMMAND, '--without-gui', '--export-area-drawing', '--export-area-snap', input_file, '--export-png', png_output_file]
         status = run_command(*arguments, &block)
         return status if status != :success
-        magick_transmog = magick.class.new(
+        magick_transmog = self.class.magick.new(
           options.merge({
             input_file: png_output_file,  input_type: "image/png",
             output_file: output_file,     output_type: output_type
@@ -39,20 +39,5 @@ module Media
         magick_transmog.run(&block)
       end
     end
-
-    #=begin
-    #    def dimensions(filename)
-    #      if INKSCAPE_COMMAND.present?
-    #        args = [INKSCAPE_COMMAND, '--query-height', filename]
-    #        success_h, height = cmd(*args)
-    #        args = [INKSCAPE_COMMAND, '--query-width', filename]
-    #        success_w, width = cmd(*args)
-    #        if success_h and success_w
-    #          return [width,height]
-    #        end
-    #      end
-    #    end
-    #=end
-
   end
 end

data/lib/media/transmogrifiers/libremagick.rb

@@ -6,25 +6,34 @@ module Media
 
   class LibreMagickTransmogrifier < Media::Transmogrifier
 
-    def libre
+    def self.libre
       Media::Transmogrifier.list["Media::LibreOfficeTransmogrifier"]
     end
 
-    def magick
+    def self.magick
       Media::Transmogrifier.list["Media::GraphicsMagickTransmogrifier"]
     end
 
-    def input_types
+    def self.input_types
       libre.input_types
     end
 
-    def output_types
+    def self.output_types
       # we don't want to use this for pdf, since libreoffice by itself can generate pdf
       magick.output_types - ['application/pdf']
     end
 
-    def available?
-      libre and magick and libre.available? and magick.available?
+    def self.available?
+      libre &&
+        magick &&
+        libre.available? &&
+        magick.available? &&
+        ghostscript_available?
+    end
+
+    def self.ghostscript_available?
+      cmd = `which ghostscript`.chomp
+      !cmd.empty? && command_available?(cmd)
     end
 
     #
@@ -35,12 +44,12 @@ module Media
     #
     def run(&block)
       pdf_output_file = Media::TempFile.new(nil, "application/pdf")
-      libre_transmog = libre.class.new(
+      libre_transmog = self.class.libre.new(
         input_file: input_file,       input_type: input_type,
         output_file: pdf_output_file, output_type: "application/pdf")
       status = libre_transmog.run(&block)
       return status if status != :success
-      magick_transmog = magick.class.new(
+      magick_transmog = self.class.magick.new(
         options.merge({
           input_file: pdf_output_file,  input_type: "application/pdf",
           output_file: output_file,     output_type: output_type

data/lib/media/transmogrifiers/libreoffice.rb

@@ -21,7 +21,7 @@ module Media
 
   class LibreOfficeTransmogrifier < Media::Transmogrifier
 
-    def input_types
+    def self.input_types
       %w(
       text/plain text/html text/richtext application/rtf
       text/csv text/comma-separated-values
@@ -48,11 +48,11 @@ module Media
       )
     end
 
-    def output_types
+    def self.output_types
       ["application/pdf"] + input_types
     end
 
-    def available?
+    def self.available?
       command_available?(LIBREOFFICE_COMMAND)
     end
 
@@ -75,7 +75,7 @@ module Media
             msg = ["Error: Could not find libreoffice output %s \n" % output_file]
             msg << arguments.join(' ')
             msg += Dir[work_directory + '/*']
-            if command_output.present?
+            unless command_output.empty?
               msg << 'LibreOffice said:'
               msg << command_output
             end
@@ -93,63 +93,4 @@ module Media
     end
 
   end
-
-  #
-  # old daemon stuff
-  #
-
-
-  #
-  #require 'socket'
-  #
-  #unless defined?(PYTHON_COMMAND)
-  #  # TODO: pick which python to use. on some platforms, we may need to run
-  #  # an openoffice specific python.
-  #  PYTHON_COMMAND = `which python`.chomp
-  #end
-
-  #if LIBREOFFICE_COMMAND
-  #  unless defined?(LIBREOFFICE_CONVERTER_COMMAND)
-  #    LIBREOFFICE_CONVERTER_COMMAND = File.dirname(__FILE__) + '/od_converter.py'
-  #  end
-  #  unless defined?(LIBREOFFICE_DAEMON_PORT)
-  #    LIBREOFFICE_DAEMON_PORT = 8100
-  #  end
-  #  unless defined?(LIBREOFFICE_DAEMON_COMMAND)
-  #    LIBREOFFICE_DAEMON_COMMAND = '%s -headless -nolockcheck -nologo -norestore -accept="socket,host=127.0.0.1,port=%s;urp;tcpNoDelay=1"' % [LIBREOFFICE_COMMAND, LIBREOFFICE_DAEMON_PORT]
-  #  end
-  #end
-
-  #cmd = `which openoffice`.chomp unless cmd.present?
-  #cmd = `which openoffice.org`.chomp unless cmd.present?
-
-  #  def try_starting_daemon
-  #    info 'attempting to start libreoffice in daemon mode'
-  #    output = `#{LIBREOFFICE_DAEMON_COMMAND}`
-  #    if $? == 0
-  #      info 'libreoffice started'
-  #    else
-  #      error 'not able to start libreoffice'
-  #      error LIBREOFFICE_DAEMON_COMMAND
-  #      error output
-  #    end
-  #  end
-
-  #  def daemon_running?
-  #    begin
-  #      TCPSocket.new 'localhost', LIBREOFFICE_DAEMON_PORT
-  #      return true
-  #    rescue Errno::ECONNREFUSED
-  #      return false
-  #    end
-  #  end
-
-  #    if !daemon_running?
-  #      try_starting_daemon
-  #      sleep 1
-  #      if !daemon_running?
-  #        return :error
-  #      end
-  #    end
-  #    arguments = [PYTHON_COMMAND, LIBREOFFICE_CONVERTER_COMMAND, input_file, output_file]
 end

data/lib/media/version.rb

@@ -1,3 +1,3 @@
 module Media
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/test/graphicsmagick_transmogrifier_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+require 'media/transmogrifiers/graphicsmagick'
+
+class GraphicsMagickTransmogrifierTest < Minitest::Test
+
+  def test_scaling_png_to_jpg
+    input = file('lyra.png')
+    transmog = Media::GraphicsMagickTransmogrifier.new input_file: input,
+      output_type: 'image/jpg',
+      size: '100x100!'
+    assert transmog
+    status = transmog.run
+    assert_equal :success, status
+    assert File.exist?(transmog.output_file.to_s)
+
+    assert file_info_matches?(transmog.output_file, /JPEG/),
+      "output should be a jpg: #{file_info(transmog.output_file)}"
+    assert_equal ['100','100'], Media.dimensions(transmog.output_file),
+      "output should be resized: #{file_info(transmog.output_file)}"
+  end
+
+  # libremagic transmogrifier uses this internally.
+  def test_pdf_as_input
+    skip('ghostscript required') if ghostscript_missing?
+    input = file('kaos.pdf')
+    transmog = Media::GraphicsMagickTransmogrifier.new input_file: input,
+      output_type: 'image/jpg'
+    status = transmog.run
+    assert_equal :success, status
+    assert File.exist?(transmog.output_file.to_s)
+
+    assert file_info_matches?(transmog.output_file, /JPEG/),
+      "output should be a jpg: #{file_info(transmog.output_file)}"
+  end
+
+  def ghostscript_missing?
+    `which ghostscript`.empty?
+  end
+
+end

data/test/libremagick_transmogrifier_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+require 'media/transmogrifiers/libremagick'
+
+class LibreMagickTransmogrifierTest < Minitest::Test
+
+  def test_libremagick_transmog
+    skip 'dependencies missing' unless klass.available?
+    input = file('msword.doc')
+    transmog =
+      klass.new input_file: input,
+      output_type: 'image/jpg'
+    status = transmog.run
+    assert_equal :success, status
+    assert File.exist?(transmog.output_file.to_s)
+
+    assert file_info_matches?(transmog.output_file, /JPEG/),
+      "output should be a jpg: #{file_info(transmog.output_file)}"
+  end
+
+  protected
+
+  def klass
+    Media::LibreMagickTransmogrifier
+  end
+end

data/test/media_test.rb

@@ -0,0 +1,14 @@
+require 'test_helper'
+require 'media'
+
+class MediaTest < Minitest::Test
+
+  def test_has_dimensions
+    assert Media.has_dimensions? 'image/png'
+  end
+
+  def test_has_no_dimensions
+    refute Media.has_dimensions? 'text/plain'
+  end
+
+end

data/test/sleepy_transmogrifier.rb

@@ -9,11 +9,11 @@ class SleepyTransmogrifier < Media::Transmogrifier
     :sleepy
   end
 
-  def input_types
+  def self.input_types
     ['test']
   end
 
-  def output_types
+  def self.output_types
     ['test']
   end
 

data/test/transmogrifier_test.rb

@@ -47,7 +47,6 @@ class TransmogrifierTest < Minitest::Test
   def test_with_output_file
     input = file('lyra.png')
     Media::TempFile.open(nil,'image/jpg') do |dest_file|
-      filename = dest_file.to_s
       transmog = Media.transmogrifier(input_file: input, output_file: dest_file)
       assert transmog, 'should find transmog'
       status = transmog.run
@@ -69,6 +68,7 @@ class TransmogrifierTest < Minitest::Test
   end
 
   def test_doc_to_jpg_twostep_transmog
+    skip "We're currently not exposing transformations from pdf. So this has to be done in one step"
     input = file('msword.doc')
     transmog = Media.transmogrifier(input_file: input, output_type: 'application/pdf')
     transmog.run
@@ -81,10 +81,16 @@ class TransmogrifierTest < Minitest::Test
     assert file_info_matches?(transmog.output_file, /JPEG/), "output should be a jpg: #{file_info(transmog.output_file)}"
   end
 
+  def test_no_pdf_transmog
+    input = file('kaos.pdf')
+    transmog = Media.transmogrifier(input_file: input, output_type: 'image/jpg')
+    assert_nil transmog
+  end
+
   def test_libremagick_transmog
     input = file('msword.doc')
     transmog = Media.transmogrifier(input_file: input, output_type: 'image/jpg')
-    assert transmog
+    skip('libremagic is not available') unless transmog
     status = transmog.run
     assert_equal :success, status
     assert File.exist?(transmog.output_file.to_s)

metadata

@@ -1,57 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: crabgrass_media
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Azul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: conventional-changelog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '1.2'
 description: |2
       Crabgrass::Media is the Media engine of Crabgrass.
 
@@ -76,22 +104,24 @@ files:
 - lib/media/transmogrifiers/libremagick.rb
 - lib/media/transmogrifiers/libreoffice.rb
 - lib/media/version.rb
-- lib/media/version.rb.orig
 - lib/tasks/media_tasks.rake
 - test/dummy/db/test.sqlite3
 - test/dummy/log/test.log
 - test/files/anarchism.svg
 - test/files/corrupt.jpg
+- test/files/kaos.pdf
 - test/files/lyra.png
 - test/files/msword.doc
+- test/graphicsmagick_transmogrifier_test.rb
+- test/libremagick_transmogrifier_test.rb
+- test/media_test.rb
 - test/sleepy_transmogrifier.rb
 - test/support/file.rb
-- test/tempfile_test.rb
 - test/test_helper.rb
 - test/transmogrifier_test.rb
 homepage: https://github.com/riseuplabs/crabgrass-media
 licenses:
-- AGPL 3
+- AGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -114,14 +144,17 @@ signing_key:
 specification_version: 4
 summary: Media processing for the Crabgrass social wiki
 test_files:
+- test/libremagick_transmogrifier_test.rb
+- test/test_helper.rb
 - test/sleepy_transmogrifier.rb
-- test/tempfile_test.rb
-- test/transmogrifier_test.rb
+- test/media_test.rb
+- test/support/file.rb
 - test/files/anarchism.svg
 - test/files/msword.doc
-- test/files/corrupt.jpg
 - test/files/lyra.png
-- test/dummy/db/test.sqlite3
+- test/files/kaos.pdf
+- test/files/corrupt.jpg
 - test/dummy/log/test.log
-- test/test_helper.rb
-- test/support/file.rb
+- test/dummy/db/test.sqlite3
+- test/graphicsmagick_transmogrifier_test.rb
+- test/transmogrifier_test.rb

data/lib/media/version.rb.orig

@@ -1,7 +0,0 @@
-module Media
-<<<<<<< HEAD
-  VERSION = "0.1.0"
-=======
-  VERSION = "0.0.5"
->>>>>>> 0_0
-end

data/test/tempfile_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class TempfileTest < Minitest::Test
-
-  def test_instantiation
-    tmp = Media::TempFile.new file('lyra.png')
-  end
-end