skeptick 0.1.1 → 0.2.0

data/lib/skeptick/command.rb

@@ -4,26 +4,15 @@ require 'skeptick/error'
 
 module Skeptick
   class Command
-    module Executable
-      def command
-        Command.new(self)
-      end
-
-      def execute
-        command.run
-      end
-      alias_method :build, :execute
-      alias_method :run,   :execute
-    end
+    attr_reader :shellwords
 
-    def initialize(command_obj)
-      @command_obj = command_obj
+    def initialize(shellwords)
+      @shellwords = shellwords
     end
 
-    def command
-      @command_obj.to_s.shellsplit.shelljoin
+    def to_s
+      shellwords.join(' ')
     end
-    alias_method :to_s, :command
 
     def run(spawn_options = {})
       opts = {}
@@ -32,14 +21,14 @@ module Skeptick
       opts.merge(spawn_options)
 
       if Skeptick.debug_mode?
-        Skeptick.log("Skeptick Command: #{command}")
+        Skeptick.log("Skeptick Command: #{to_s}")
       end
 
-      im_process = POSIX::Spawn::Child.new(command, opts)
+      im_process = POSIX::Spawn::Child.new(*shellwords, opts)
 
       if !im_process.success?
         raise ImageMagickError,
-          "ImageMagick error\nCommand: #{command}\nSTDERR:\n#{im_process.err}"
+          "ImageMagick error\nCommand: #{to_s}\nSTDERR:\n#{im_process.err}"
       end
 
       im_process.status

data/lib/skeptick/convert.rb

@@ -1,109 +1,92 @@
-require 'skeptick/helper'
-require 'skeptick/image'
-require 'skeptick/chain'
-require 'skeptick/convert/dsl_context'
+require 'skeptick/dsl_context'
 require 'skeptick/command'
 
 module Skeptick
   class Convert
-    include Command::Executable
+    attr_reader :context, :prepends, :subjects, :appends
 
-    attr_accessor :prepends, :appends
+    BINARY_PATH = 'convert'.freeze
+    DEFAULT_OUTPUT = 'miff:-'.freeze
 
     def initialize(context, *args, &blk)
       @context = context
-      @options = Helper.extract_options!(args)
-      @args    = args.map {|a| Image.new(@context, a)}
-      @block   = blk
-      @to      = parse_pipe(@options[:to])
-      @inner   = false
-
-      @beginning = nil
-      @ending    = nil
-      @prepends  = []
-      @appends   = []
-
-      reset
-    end
-
-    def prepend(*args)
-      @prepends << Helper.process_args(*args)
-    end
-
-    def append(*args)
-      @appends << Helper.process_args(*args)
-    end
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+
+      @objects = [
+        @beginning = BINARY_PATH.dup,
+        @prepends  = setup_prepends,
+        @subjects  = setup_subjects,
+        @appends   = setup_appends,
+        @ending    = opts.fetch(:to) { DEFAULT_OUTPUT.dup }
+      ]
+
+      args.each do |arg|
+        subjects << if arg.is_a?(Convert)
+          arg
+        else
+          Convert.new(@context).tap{ |c| c.subjects << arg }
+        end
+      end
 
-    def set(*args)
-      @objects << Helper.process_args(*args)
+      DslContext.new(self).instance_eval(&blk) if block_given?
     end
-    alias_method :apply, :set
-    alias_method :with,  :set
 
+    def run; command.run end
+    def to_s; shellwords.join(' ') end
+    def inspect; "#{self.class}(\"#{to_s}\")" end
+    def shellwords; tokens.map { |obj| token_to_str(obj) } end
+    def command; Command.new(shellwords) end
 
-    def convert(*args, &blk)
-      Convert.new(@context, *args, &blk).tap do |c_obj|
-        @objects << Image.new(@context, c_obj)
-      end
-    end
+    protected
 
-    def image(obj = nil, &blk)
-      @objects << Image.new(@context, obj, &blk)
-    end
+    def nest!
+      add_parenth = (@subjects.size > 1) ||
+        (@subjects.size < 2 && (!appends.empty? || !prepends.empty?))
 
-    def destination=(to)
-      if inner?
-        raise 'cannot assign output to parentheses-wrapped image conversion'
+      if add_parenth
+        @beginning.replace('(')
+        @ending.replace(')')
       else
-        @to = to
+        @beginning.clear
+        @ending.clear
       end
     end
 
-    def piping?
-      !inner? && parts.last == Chain::PIPE
-    end
-
-    def become_inner
-      @inner = true
-      self
-    end
-
-    def parts
-      reset
-      @objects = []
-      DslContext.new(self).instance_eval(&@block) if @block
-      wrap
-      [@beginning, *@prepends, *@args, *@objects, *@appends, @ending].compact
-    end
-
-    def to_s
-      parts.join(' ')
-    end
-
-    def inspect
-      "Skeptick::Convert(#{to_s})"
-    end
-
-    def process_method_missing(*args, &blk)
-      @context.send(*args, &blk)
+    def tokens
+      @objects.flatten.reject{ |obj| empty_string?(obj) }.map { |obj|
+        if obj.is_a?(Convert)
+          obj.nest!
+          obj.tokens
+        else
+          obj
+        end
+      }.flatten.tap do |array|
+        if array[1] == '(' && array[-2] == ')'
+          array.delete_at(1)
+          array.delete_at(-2)
+        end
+      end
     end
 
     private
-      def reset
-        @objects = []
-      end
 
-      def inner?
-        @inner
-      end
+    def setup_prepends; [] end
+    def setup_subjects; [] end
+    def setup_appends;  [] end
 
-      def wrap
-        @beginning = inner? ? '(' : 'convert'
-        @ending    = inner? ? ')' : @to || Chain::PIPE
-      end
+    def empty_string?(obj)
+      obj.is_a?(String) && obj.empty?
+    end
 
-      def parse_pipe(obj)
-        obj == :pipe ? Chain::PIPE : obj
+    def token_to_str(obj)
+      case obj
+      when Symbol
+        "-#{obj}"
+      when Range
+        "#{obj.min}-#{obj.max}"
+      else
+        obj.to_s
       end
+    end
   end
 end

data/lib/skeptick/core.rb

@@ -1,7 +1,5 @@
 require 'skeptick/version'
 require 'skeptick/convert'
-require 'skeptick/image'
-require 'skeptick/chain'
 require 'skeptick/railtie' if defined?(Rails)
 
 module Skeptick
@@ -34,10 +32,6 @@ module Skeptick
   end
 
   def image(*args, &blk)
-    Skeptick::Image.new(self, *args, &blk)
-  end
-
-  def chain(*args, &blk)
-    Skeptick::Chain.new(self, *args, &blk)
+    Skeptick::Convert.new(self, *args, &blk)
   end
 end

data/lib/skeptick/dsl_context.rb

@@ -0,0 +1,32 @@
+module Skeptick
+  class DslContext
+    def initialize(convert)
+      @convert = convert
+    end
+
+    def prepend(*args)
+      @convert.prepends.push(*args)
+    end
+
+    def set(*args)
+      @convert.subjects.push(*args)
+    end
+
+    def append(*args)
+      @convert.appends.push(*args)
+    end
+
+    def convert(*args, &blk)
+      @convert.subjects << Convert.new(self, *args, &blk)
+    end
+    alias_method :image, :convert
+
+    def method_missing(*args, &blk)
+      @convert.context.send(*args, &blk)
+    end
+
+    def respond_to_missing?(meth, include_all)
+      @convert.context.respond_to?(meth, include_all)
+    end
+  end
+end

data/lib/skeptick/sugar.rb

@@ -1,8 +1,14 @@
-require 'skeptick/sugar/composition'
-require 'skeptick/sugar/debugging'
-require 'skeptick/sugar/drawing'
+require 'skeptick/sugar/compose'
+require 'skeptick/sugar/write'
+require 'skeptick/sugar/draw'
+require 'skeptick/sugar/canvas'
+require 'skeptick/sugar/font'
+require 'skeptick/sugar/text'
 require 'skeptick/sugar/geometry'
-require 'skeptick/sugar/resizing'
-require 'skeptick/sugar/sequence_manipulation'
-require 'skeptick/sugar/formatting'
-require 'skeptick/sugar/edges'
+require 'skeptick/sugar/clone'
+require 'skeptick/sugar/delete'
+require 'skeptick/sugar/swap'
+require 'skeptick/sugar/format'
+require 'skeptick/sugar/resized_image'
+require 'skeptick/sugar/rounded_corners_image'
+require 'skeptick/sugar/torn_paper_image'

data/lib/skeptick/sugar/canvas.rb

@@ -0,0 +1,8 @@
+module Skeptick
+  class DslContext
+    def canvas(string, options = {})
+      set(:size, options[:size]) if options[:size]
+      set "canvas:#{string}"
+    end
+  end
+end

data/lib/skeptick/sugar/clone.rb

@@ -0,0 +1,9 @@
+module Skeptick
+  class DslContext
+    def clone(*args)
+      obj = (args.size < 2 ? args.first : args)
+      obj  = obj.join(',') if obj.is_a?(Array)
+      obj ? set(:clone, obj) : set('+clone')
+    end
+  end
+end

data/lib/skeptick/sugar/compose.rb

@@ -0,0 +1,50 @@
+module Skeptick
+  class Compose < Convert
+    def initialize(context, *args, &blk)
+      @blending = args.shift.to_s
+      super
+    end
+
+    def setup_appends
+      [:compose, @blending, :composite]
+    end
+  end
+
+  class Convert
+    def +(other)
+      Compose.new(@context, :over, self, other)
+    end
+
+    def -(other)
+      Compose.new(@context, :dstout, self, other)
+    end
+
+    def *(other)
+      Compose.new(@context, :multiply, self, other)
+    end
+
+    def /(other)
+      Compose.new(@context, :divide, self, other)
+    end
+
+    def &(other)
+      Compose.new(@context, :dstin, self, other).tap do |c|
+        c.subjects << :alpha << 'Set'
+      end
+    end
+
+    def |(other)
+      Compose.new(@context, :dstover, self, other)
+    end
+  end
+
+  class DslContext
+    def compose(blending, *args, &blk)
+      @convert.subjects << Compose.new(self, blending, *args, &blk)
+    end
+  end
+
+  def compose(blending, *args, &blk)
+    Compose.new(self, blending, *args, &blk)
+  end
+end

data/lib/skeptick/sugar/delete.rb

@@ -0,0 +1,9 @@
+module Skeptick
+  class DslContext
+    def delete(*args)
+      obj = (args.size < 2 ? args.first : args)
+      obj = obj.join(',') if obj.is_a?(Array)
+      obj ? set(:delete, obj) : set('+delete')
+    end
+  end
+end

data/lib/skeptick/sugar/draw.rb

@@ -0,0 +1,7 @@
+module Skeptick
+  class DslContext
+    def draw(*args)
+      set :draw, args.join(' ')
+    end
+  end
+end

data/lib/skeptick/sugar/font.rb

@@ -0,0 +1,7 @@
+module Skeptick
+  class DslContext
+    def font(name)
+      set '-font', name.split(/\s/).map(&:capitalize).join('-')
+    end
+  end
+end

data/lib/skeptick/sugar/format.rb

@@ -0,0 +1,7 @@
+module Skeptick
+  class DslContext
+    def format(*args)
+      set '-format', args.join(' ')
+    end
+  end
+end

data/lib/skeptick/sugar/geometry.rb

@@ -1,38 +1,32 @@
 module Skeptick
-  module Sugar
-    module Geometry
-      def geometry(options = {})
-        result = ''
+  def geometry(options = {})
+    result = ''
 
-        result << if options[:size]
-          options[:size]
-        else
-          if options[:width] && options[:height]
-            "#{options[:width]}x#{options[:height]}"
-          elsif options[:width]
-            "#{options[:width]}x"
-          elsif options[:height]
-            "x#{options[:height]}"
-          else
-            ''
-          end
-        end
+    result << if options[:size]
+      options[:size]
+    else
+      if options[:width] && options[:height]
+        "#{options[:width]}x#{options[:height]}"
+      elsif options[:width]
+        "#{options[:width]}x"
+      elsif options[:height]
+        "x#{options[:height]}"
+      else
+        ''
+      end
+    end
 
-        if options[:left] || options[:top]
-          left = '%+d' % (options[:left] || 0)
-          top  = '%+d' % (options[:top]  || 0)
-          result << "#{left}#{top}"
-        end
+    if options[:left] || options[:top]
+      left = '%+d' % (options[:left] || 0)
+      top  = '%+d' % (options[:top]  || 0)
+      result << "#{left}#{top}"
+    end
 
-        result << '%' if options[:percentage]
-        result << '!' if options[:exact]
-        result << '<' if options[:expand_only]
-        result << '>' if options[:shrink_only]
+    result << '%' if options[:percentage]
+    result << '!' if options[:exact]
+    result << '<' if options[:expand_only]
+    result << '>' if options[:shrink_only]
 
-        result
-      end
-    end
+    result
   end
-
-  include Sugar::Geometry
 end