skeptick 0.1.1 → 0.2.0

data/test/sugar/swap_test.rb

@@ -0,0 +1,28 @@
+require_relative '../test_helper'
+require 'skeptick/sugar/swap'
+
+class SwapTest < Skeptick::TestCase
+  include Skeptick
+
+  def test_swap_without_args
+    cmd = convert { swap }
+    assert_equal 'convert +swap miff:-', cmd.to_s
+  end
+
+  def test_swap_with_one_arg_raises_error
+    assert_raises(ArgumentError) do
+      convert{ swap(1) }.to_s
+    end
+  end
+
+  def test_swap_with_two_args
+    cmd = convert('foo', 'bar') { swap(1,2) }
+    assert_equal 'convert foo bar -swap 1,2 miff:-', cmd.to_s
+  end
+
+  def test_swap_with_three_args_raises_error
+    assert_raises(ArgumentError) do
+      convert{ swap(1,2,3) }.to_s
+    end
+  end
+end

data/test/sugar/text_test.rb

@@ -0,0 +1,22 @@
+require_relative '../test_helper'
+require 'skeptick/sugar/text'
+
+class TextTest < Skeptick::TestCase
+  include Skeptick
+
+  def test_text_in_convert_without_left_top
+    cmd = convert { text 'Foo bar baz.' }
+    assert_equal 'convert -draw text \'Foo bar baz.\' miff:-', cmd.to_s
+  end
+
+  def test_text_in_convert_with_left_top
+    cmd = convert { text 'Foo bar baz.', left: 7, top: 9 }
+    assert_equal 'convert -draw text 7,9 \'Foo bar baz.\' miff:-',
+      cmd.to_s
+  end
+
+  def test_text_in_convert_with_top_only
+    cmd = convert { text 'Foo bar baz.', top: 9 }
+    assert_equal 'convert -draw text \'Foo bar baz.\' miff:-', cmd.to_s
+  end
+end

data/test/sugar/torn_paper_image_test.rb

@@ -0,0 +1,53 @@
+require_relative '../test_helper'
+require 'skeptick/sugar/torn_paper_image'
+
+class TornPaperImageTest < Skeptick::TestCase
+  include Skeptick
+
+  def test_torn_paper_image_without_block_spread_blur_threshold
+    img = torn_paper_image('foo')
+    assert_equal 'convert foo ( +clone -virtual-pixel transparent ' +
+      '-spread 1 -channel A -blur 0x.7 -threshold 50% ) -blur 0x.7 ' +
+      '-compose copy_opacity -composite miff:-', img.to_s
+  end
+
+  def test_torn_paper_image_with_block_spread_blur_threshold
+    img = torn_paper_image('foo', spread: 17, blur: '1x4', threshold: 70) do
+      image 'tile:granite:'
+      append '-brightness-contrast', '38x-33'
+    end
+
+    assert_equal 'convert foo ( tile:granite: -brightness-contrast 38x-33 ) ( '\
+      '+clone -virtual-pixel transparent -spread 17 -channel A -blur 1x4 '\
+      '-threshold 70% ) -blur 1x4 -compose copy_opacity -composite miff:-',
+      img.to_s
+  end
+
+  def test_nested_torn_paper_image
+    cmd = convert(to: 'bar') do
+      torn_paper_image('foo')
+    end
+
+    assert_equal 'convert foo ( +clone -virtual-pixel transparent ' +
+      '-spread 1 -channel A -blur 0x.7 -threshold 50% ) -blur 0x.7 -compose ' +
+      'copy_opacity -composite bar', cmd.to_s
+  end
+
+  def test_nested_torn_paper_image_via_lvar_arg
+    img = torn_paper_image('foo')
+    cmd = convert(img, to: 'bar')
+
+    assert_equal 'convert foo ( +clone -virtual-pixel transparent ' +
+      '-spread 1 -channel A -blur 0x.7 -threshold 50% ) -blur 0x.7 -compose ' +
+      'copy_opacity -composite bar', cmd.to_s
+  end
+
+  def test_nested_torn_paper_image_via_lvar_in_block
+    img = torn_paper_image('foo')
+    cmd = convert(to: 'bar') { image(img) }
+
+    assert_equal 'convert foo ( +clone -virtual-pixel transparent ' +
+      '-spread 1 -channel A -blur 0x.7 -threshold 50% ) -blur 0x.7 -compose ' +
+      'copy_opacity -composite bar', cmd.to_s
+  end
+end

data/test/sugar/write_test.rb

@@ -0,0 +1,14 @@
+require_relative '../test_helper'
+require 'skeptick/sugar/write'
+
+class WriteTest < Skeptick::TestCase
+  include Skeptick
+
+  def test_write_in_convert
+    cmd = convert('foo') do
+      write 'path'
+    end
+
+    assert_equal 'convert foo -write path miff:-', cmd.to_s
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skeptick
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Maxim Chernyak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Thin ImageMagick DSL with smart command composition
 email:
 - max@bitsonnet.com
@@ -52,42 +66,47 @@ files:
 - README.md
 - Rakefile
 - lib/skeptick.rb
-- lib/skeptick/chain.rb
-- lib/skeptick/chain/dsl_context.rb
 - lib/skeptick/command.rb
 - lib/skeptick/convert.rb
-- lib/skeptick/convert/dsl_context.rb
 - lib/skeptick/core.rb
+- lib/skeptick/dsl_context.rb
 - lib/skeptick/error.rb
-- lib/skeptick/helper.rb
-- lib/skeptick/image.rb
-- lib/skeptick/image/dsl_context.rb
 - lib/skeptick/railtie.rb
 - lib/skeptick/sugar.rb
-- lib/skeptick/sugar/composition.rb
-- lib/skeptick/sugar/debugging.rb
-- lib/skeptick/sugar/drawing.rb
-- lib/skeptick/sugar/edges.rb
-- lib/skeptick/sugar/formatting.rb
+- lib/skeptick/sugar/canvas.rb
+- lib/skeptick/sugar/clone.rb
+- lib/skeptick/sugar/compose.rb
+- lib/skeptick/sugar/delete.rb
+- lib/skeptick/sugar/draw.rb
+- lib/skeptick/sugar/font.rb
+- lib/skeptick/sugar/format.rb
 - lib/skeptick/sugar/geometry.rb
-- lib/skeptick/sugar/resizing.rb
-- lib/skeptick/sugar/sequence_manipulation.rb
+- lib/skeptick/sugar/resized_image.rb
+- lib/skeptick/sugar/rounded_corners_image.rb
+- lib/skeptick/sugar/swap.rb
+- lib/skeptick/sugar/text.rb
+- lib/skeptick/sugar/torn_paper_image.rb
+- lib/skeptick/sugar/write.rb
 - lib/skeptick/version.rb
 - logo.png
 - logo.rb
 - refresh_preview.scpt
 - skeptick.gemspec
-- test/chain_test.rb
 - test/convert_test.rb
-- test/image_test.rb
-- test/sugar/composition_test.rb
-- test/sugar/debugging_test.rb
-- test/sugar/drawing_test.rb
-- test/sugar/edges_test.rb
-- test/sugar/formatting_test.rb
+- test/sugar/canvas_test.rb
+- test/sugar/clone_test.rb
+- test/sugar/compose_test.rb
+- test/sugar/delete_test.rb
+- test/sugar/draw_test.rb
+- test/sugar/font_test.rb
+- test/sugar/format_test.rb
 - test/sugar/geometry_test.rb
-- test/sugar/resizing_test.rb
-- test/sugar/sequence_manipulation_test.rb
+- test/sugar/resized_image_test.rb
+- test/sugar/rounded_corners_image_test.rb
+- test/sugar/swap_test.rb
+- test/sugar/text_test.rb
+- test/sugar/torn_paper_image_test.rb
+- test/sugar/write_test.rb
 - test/test_helper.rb
 homepage: https://github.com/maxim/skeptick
 licenses: []
@@ -108,21 +127,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Skeptick doesn't believe in Magick
 test_files:
-- test/chain_test.rb
 - test/convert_test.rb
-- test/image_test.rb
-- test/sugar/composition_test.rb
-- test/sugar/debugging_test.rb
-- test/sugar/drawing_test.rb
-- test/sugar/edges_test.rb
-- test/sugar/formatting_test.rb
+- test/sugar/canvas_test.rb
+- test/sugar/clone_test.rb
+- test/sugar/compose_test.rb
+- test/sugar/delete_test.rb
+- test/sugar/draw_test.rb
+- test/sugar/font_test.rb
+- test/sugar/format_test.rb
 - test/sugar/geometry_test.rb
-- test/sugar/resizing_test.rb
-- test/sugar/sequence_manipulation_test.rb
+- test/sugar/resized_image_test.rb
+- test/sugar/rounded_corners_image_test.rb
+- test/sugar/swap_test.rb
+- test/sugar/text_test.rb
+- test/sugar/torn_paper_image_test.rb
+- test/sugar/write_test.rb
 - test/test_helper.rb
 has_rdoc: 

data/lib/skeptick/chain.rb

@@ -1,55 +0,0 @@
-require 'skeptick/helper'
-require 'skeptick/convert'
-require 'skeptick/chain/dsl_context'
-require 'skeptick/command'
-
-module Skeptick
-  class Chain
-    include Command::Executable
-
-    PIPE = 'miff:-'
-
-    def initialize(context, *args, &blk)
-      options = Helper.extract_options!(args)
-      @to = options[:to]
-      @context = context
-      @block = blk
-      reset
-    end
-
-    def convert(*args, &blk)
-      @executables << Convert.new(@context, *args, &blk)
-    end
-
-    def piping?
-      @executables.last && @executables.last.piping?
-    end
-
-    def process_method_missing(*args, &blk)
-      @context.send(*args, &blk)
-    end
-
-    def to_s
-      process_dsl
-      @executables.map(&:command).join(' | ')
-    end
-
-    def inspect
-      "Skeptick::Chain(#{to_s})"
-    end
-
-    private
-      def reset
-        @executables = []
-      end
-
-      def process_dsl
-        reset
-        DslContext.new(self).instance_eval(&@block)
-
-        if @executables.size > 0 && @to && piping?
-          @executables.last.destination = @to
-        end
-      end
-  end
-end

data/lib/skeptick/chain/dsl_context.rb

@@ -1,21 +0,0 @@
-module Skeptick
-  class Chain
-    class DslContext
-      def initialize(chain)
-        @chain = chain
-      end
-
-      def convert(*args, &blk)
-        @chain.convert(*args, &blk)
-      end
-
-      def pipe_or(path)
-        @chain.piping? ? :pipe : path
-      end
-
-      def method_missing(*args, &blk)
-        @chain.process_method_missing(*args, &blk)
-      end
-    end
-  end
-end

data/lib/skeptick/convert/dsl_context.rb

@@ -1,27 +0,0 @@
-module Skeptick
-  class Convert
-    class DslContext
-      def initialize(convert)
-        @convert = convert
-      end
-
-      def set(*args)
-        @convert.set(*args)
-      end
-      alias_method :apply, :set
-      alias_method :with,  :set
-
-      def convert(*args, &blk)
-        @convert.convert(*args, &blk)
-      end
-
-      def image(obj = nil, &blk)
-        @convert.image(obj, &blk)
-      end
-
-      def method_missing(*args, &blk)
-        @convert.process_method_missing(*args, &blk)
-      end
-    end
-  end
-end

data/lib/skeptick/helper.rb

@@ -1,26 +0,0 @@
-module Skeptick
-  module Helper
-    module_function
-
-    def extract_options!(array)
-      array.last.is_a?(Hash) ? array.pop : {}
-    end
-
-    def object_to_index_range_list(obj)
-      case obj
-      when Integer, String
-        obj
-      when Range
-        "#{obj.min}-#{obj.max}"
-      when Array
-        obj.join(',')
-      else
-        raise "invalid sequence reference"
-      end
-    end
-
-    def process_args(*args)
-      args.map{ |arg| arg.is_a?(Symbol) ? "-#{arg.to_s}" : arg }.join(' ')
-    end
-  end
-end

data/lib/skeptick/image.rb

@@ -1,69 +0,0 @@
-require 'skeptick/helper'
-require 'skeptick/convert'
-require 'skeptick/chain'
-require 'skeptick/image/dsl_context'
-
-module Skeptick
-  class Image
-    attr_accessor :prepends, :appends
-
-    def initialize(context, obj = nil, &blk)
-      @context = context
-      @obj = obj || blk
-      reset
-    end
-
-    def set(*args)
-      @prepends << Helper.process_args(*args)
-    end
-
-    def apply(*args)
-      @appends << Helper.process_args(*args)
-    end
-
-    def image(obj, &blk)
-      @image = Image.new(@context, obj, &blk)
-    end
-
-    def convert(*args, &blk)
-      @image = Convert.new(@context, *args, &blk).become_inner
-    end
-
-    def process_method_missing(*args, &blk)
-      @context.send(*args, &blk)
-    end
-
-    def to_s
-      parts.join(' ')
-    end
-
-    def inspect
-      "Skeptick::Image(#{to_s})"
-    end
-
-    def parts
-      case @obj
-      when :pipe   then [ Chain::PIPE ]
-      when Convert then @obj.become_inner.parts
-      when Image   then @obj.parts
-      when Array   then @obj
-      when Proc    then build_parts
-      else         [ @obj ]
-      end
-    end
-
-    private
-
-      def build_parts
-        reset
-        DslContext.new(self).instance_eval(&@obj)
-        [*@prepends, @image, *@appends].compact
-      end
-
-      def reset
-        @image    = nil
-        @prepends = []
-        @appends  = []
-      end
-  end
-end