skeptick 0.1.1 → 0.2.0

data/lib/skeptick/sugar/resized_image.rb

@@ -0,0 +1,15 @@
+require 'skeptick/sugar/geometry'
+
+module Skeptick
+  module ResizedImage
+    def resized_image(path, options = {})
+      image("#{path}[#{geometry(options)}]")
+    end
+  end
+
+  include ResizedImage
+
+  class DslContext
+    include ResizedImage
+  end
+end

data/lib/skeptick/sugar/rounded_corners_image.rb

@@ -0,0 +1,42 @@
+require 'skeptick/sugar/compose'
+require 'skeptick/sugar/format'
+require 'skeptick/sugar/draw'
+
+module Skeptick
+  module RoundedCornersImage
+    def rounded_corners_image(*args, &blk)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      radius = opts[:radius] || 15
+      size   = opts[:size]
+      width  = opts[:width]
+      height = opts[:height]
+
+      if size
+        width, height = size.split('x').map(&:to_i)
+      end
+
+      border = if width && height
+        "roundrectangle 1,1 #{width},#{height} #{radius},#{radius}"
+      else
+        Convert.new(self, *args, to: 'info:') do
+          format "roundrectangle 1,1 %[fx:w], %[fx:h] #{radius},#{radius}"
+        end.run.strip
+      end
+
+      compose(:dstin, *args) do
+        convert(&blk) if block_given?
+
+        convert do
+          set '+clone'
+          set :draw, border
+        end
+      end
+    end
+  end
+
+  class DslContext
+    include RoundedCornersImage
+  end
+
+  include RoundedCornersImage
+end

data/lib/skeptick/sugar/swap.rb

@@ -0,0 +1,12 @@
+module Skeptick
+  class DslContext
+    def swap(*args)
+      if args.size != 0 && args.size != 2
+        raise ArgumentError,
+          "wrong number of arguments (#{args.size} for 0, 2)"
+      end
+
+      args.empty? ? set('+swap') : set(:swap, args.join(','))
+    end
+  end
+end

data/lib/skeptick/sugar/text.rb

@@ -0,0 +1,11 @@
+module Skeptick
+  class DslContext
+    def text(string, options = {})
+      if options[:left] && options[:top]
+        opts = "#{options[:left]},#{options[:top]} "
+      end
+
+      set :draw, "text #{opts}'#{string}'"
+    end
+  end
+end

data/lib/skeptick/sugar/torn_paper_image.rb

@@ -0,0 +1,32 @@
+require 'skeptick/sugar/compose'
+
+module Skeptick
+  module TornPaperImage
+    def torn_paper_image(*args, &blk)
+      opts = args.last.is_a?(Hash) ? args.pop : {}
+      spread    = opts[:spread]    || 1
+      blur      = opts[:blur]      || '0x.7'
+      threshold = opts[:threshold] || 50
+
+      compose(:copy_opacity, *args) do
+        convert(&blk) if block_given?
+        convert do
+          set '+clone'
+          set '-virtual-pixel', 'transparent'
+          set :spread, spread
+          set :channel, 'A'
+          set :blur, blur
+          set :threshold, "#{threshold}%"
+        end
+
+        set :blur, blur
+      end
+    end
+  end
+
+  class DslContext
+    include TornPaperImage
+  end
+
+  include TornPaperImage
+end

data/lib/skeptick/sugar/write.rb

@@ -0,0 +1,8 @@
+module Skeptick
+  class DslContext
+    def write(path)
+      append(:write, path)
+    end
+  end
+end
+

data/lib/skeptick/version.rb

@@ -1,3 +1,3 @@
 module Skeptick
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/logo.rb

@@ -1,4 +1,6 @@
-require_relative 'lib/skeptick'
+$: << 'lib'
+require 'skeptick'
+puts "Skeptick #{Skeptick::VERSION}"
 
 include Skeptick
 
@@ -7,18 +9,17 @@ image_size = '400x120'
 paper = rounded_corners_image(size: image_size, radius: 25) do
   set   :size, image_size
   image 'tile:granite:'
-  apply '-brightness-contrast', '38x-33'
-  apply :blur, '0x0.5'
+  set '-brightness-contrast', '38x-25'
+  set :blur, '0x0.5'
 end
 
 left, top = 8, 80
 text = image do
   canvas :none, size: '395x110'
-  font   'Handwriting - Dakota Regular'
+  font   'Handwriting - Dakota'
   set    :pointsize, 90
   set    :fill, 'gradient:#37e-#007'
-  write  'Skeptick', left: left, top: top
-  apply  :blur, '0x0.7'
+  text   'Skeptick', left: left, top: top
 end
 
 bezier = \
@@ -32,14 +33,14 @@ curve = image do
   draw   "fill none bezier #{bezier}"
 end
 
-result_path = "#{File.dirname(__FILE__)}/logo2.png"
+result_path = "#{File.dirname(__FILE__)}/logo.png"
 
-torn = torn_paper_image(
+final = torn_paper_image \
   paper * (text + curve),
   spread: 50,
   blur:   '3x10'
-)
 
-logo = convert(torn, to: result_path)
-logo.build
+logo_script = convert(final, to: result_path)
+puts logo_script.to_s
+logo_script.run
 # system "osascript refresh_preview.scpt"

data/refresh_preview.scpt

@@ -1,2 +1,2 @@
 tell application "Preview" to activate
-tell application "Sublime Text 2" to activate
+tell application "Sublime Text" to activate

data/skeptick.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'posix-spawn', '~> 0.3.6'
   gem.add_development_dependency 'rake', '>= 0.9.2'
+  gem.add_development_dependency 'pry'
 end

data/test/convert_test.rb

@@ -7,10 +7,34 @@ require_relative 'test_helper'
 class ConvertTest < Skeptick::TestCase
   include Skeptick
 
-  def test_dsl_method_available
+  def test_dsl_method_convert_available
     assert_respond_to self, :convert
   end
 
+  def test_dsl_method_image_available
+    assert_respond_to self, :image
+  end
+
+  def test_set_adds_setting_to_convert_segment
+    cmd = convert do
+      image 'bar'
+      set '-foo'
+    end
+
+    assert_equal 'convert bar -foo miff:-', cmd.to_s
+  end
+
+  def test_append_appends_to_convert_segment
+    cmd = convert do
+      image do
+        append '-foo'
+        image 'bar'
+      end
+    end
+
+    assert_equal 'convert bar -foo miff:-', cmd.to_s
+  end
+
   def test_lvars_from_external_context_are_accessible
     foo = '-test'
     cmd = convert { set foo }
@@ -78,30 +102,30 @@ class ConvertTest < Skeptick::TestCase
   end
 
   def test_convert_with_ops
-    cmd = convert { with '-foo' }
+    cmd = convert { set :foo }
     assert_equal 'convert -foo miff:-', cmd.to_s
   end
 
   def test_convert_with_concatenated_ops
-    cmd = convert { with '-foo', 'bar' }
+    cmd = convert { set '-foo', 'bar' }
     assert_equal 'convert -foo bar miff:-', cmd.to_s
   end
 
   def test_convert_with_multiple_ops
-    cmd = convert { with '-foo'; with '+bar' }
+    cmd = convert { set '-foo'; set '+bar' }
     assert_equal 'convert -foo +bar miff:-', cmd.to_s
   end
 
   def test_convert_with_multiple_concatenated_ops
-    cmd = convert { with '-foo', 'bar'; with '+baz', 'qux' }
+    cmd = convert { set '-foo', 'bar'; set '+baz', 'qux' }
     assert_equal 'convert -foo bar +baz qux miff:-', cmd.to_s
   end
 
   def test_convert_with_ops_inputs_and_output
     cmd = convert('foo', 'bar', to: 'baz') do
       image 'qux'
-      with '+quux'
-      with '-corge', 'grault'
+      set '+quux'
+      set :corge, 'grault'
     end
 
     assert_equal 'convert foo bar qux +quux -corge grault baz', cmd.to_s
@@ -109,69 +133,140 @@ class ConvertTest < Skeptick::TestCase
 
   def test_nested_convert
     cmd = convert(to: 'baz') do
-      convert('foo') { with 'bar' }
+      convert('foo') { set '-bar' }
     end
 
-    assert_equal 'convert ( foo bar ) baz', cmd.to_s
+    assert_equal 'convert foo -bar baz', cmd.to_s
   end
 
   def test_nested_convert_ignores_output
     cmd = convert(to: 'baz') do
-      convert('foo', to: 'nowhere') { with 'bar' }
+      convert('foo', to: 'nowhere') { set :bar }
     end
 
-    assert_equal 'convert ( foo bar ) baz', cmd.to_s
+    assert_equal 'convert foo -bar baz', cmd.to_s
   end
 
   def test_multi_image_nested_convert
     cmd = convert('foo', to: 'bar') do
       convert('qux') do
-        with '+asdf'
-        with '+fdsa'
+        set '+asdf'
+        set '+fdsa'
       end
 
       image 'bleh'
-      with '-resize'
+      set '-resize'
     end
 
     assert_equal 'convert foo ( qux +asdf +fdsa ) bleh -resize bar', cmd.to_s
   end
 
   def test_convert_composition
-    complex_image = convert('qux') do
-      with '+asdf'
-      with '+fdsa'
+    complex_image = convert('image1') do
+      set '+image1-x'
+      set '+image1-y'
     end
 
-    cmd = convert('foo', to: 'bar') do
+    cmd = convert('image2', to: 'bar') do
       image complex_image
-      image 'bleh'
-      with '-resize'
+      image 'image3'
+      set '-setting-for-all-images'
     end
 
-    assert_equal 'convert foo ( qux +asdf +fdsa ) bleh -resize bar', cmd.to_s
+    assert_equal 'convert image2 ( image1 +image1-x +image1-y ) image3 '\
+      '-setting-for-all-images bar', cmd.to_s
   end
 
   def test_convert_double_nesting_with_composition
-    complex_image = convert('foo', to: 'nowhere') do
-      convert('bar', to: 'nowhere') do
-        convert('baz') do
-          image 'image1'
-          with '-option', 'qux'
+    complex_image = convert('image1', to: 'nowhere') do
+      convert('image2', to: 'nowhere') do
+        convert('image3') do
+          image 'image4'
+          set :option, 'qux'
         end
 
-        image 'image2'
-        with '+option'
+        image 'image5'
+        set '+option'
       end
     end
 
-    cmd = convert('image3') do
+    cmd = convert('image6') do
       image complex_image
-      image 'image4'
-      with '-option', 'quux'
+      image 'image7'
+      set '-option', 'quux'
+    end
+
+    assert_equal 'convert image6 ( image1 ( image2 ( image3 image4 -option '\
+      'qux ) image5 +option ) ) image7 -option quux miff:-', cmd.to_s
+  end
+
+  def test_convert_reusing_variable
+    cmd = 'foo'
+    cmd = convert('bar') { set(:arg); image(cmd) }
+    assert_equal 'convert bar -arg foo miff:-', cmd.to_s
+  end
+
+  def test_inject_image_into_convert
+    sample = image do
+      set   :size, '400x400'
+      image 'tile:granite:'
+      set '-brightness-contrast', '38x-33'
+      set :blur, '0x0.5'
+    end
+
+    cmd = convert do
+      set '-foo'
+      image sample
+      set '-bar'
+    end
+
+    assert_equal 'convert -foo ( -size 400x400 tile:granite: ' +
+      '-brightness-contrast 38x-33 -blur 0x0.5 ) -bar miff:-', cmd.to_s
+  end
+
+  def test_inject_image_into_convert_as_argument
+    sample = image do
+      set   :size, '400x400'
+      image 'tile:granite:'
+      append '-brightness-contrast', '38x-33'
+      append :blur, '0x0.5'
+    end
+
+    cmd = convert(sample)
+    assert_equal 'convert -size 400x400 tile:granite: -brightness-contrast ' +
+      '38x-33 -blur 0x0.5 miff:-', cmd.to_s
+  end
+
+  def test_declare_image_inside_convert
+    cmd = convert do
+      set '-foo'
+      image do
+        set   :size, '400x400'
+        image 'tile:granite:'
+        append '-brightness-contrast', '38x-33'
+        append :blur, '0x0.5'
+      end
+      set '-bar'
+    end
+
+    assert_equal 'convert -foo ( -size 400x400 tile:granite: ' +
+      '-brightness-contrast 38x-33 -blur 0x0.5 ) -bar miff:-', cmd.to_s
+  end
+
+  def test_convert_as_image_object
+    sample = convert('foo', to: 'bar') do
+      set :baz
+    end
+
+    cmd = convert do
+      image do
+        set :setting
+        append :operation
+        image sample
+      end
     end
 
-    assert_equal 'convert image3 ( foo ( bar ( baz image1 -option qux ) ' +
-      'image2 +option ) ) image4 -option quux miff:-', cmd.to_s
+    assert_equal 'convert -setting ( foo -baz ) -operation miff:-',
+      cmd.to_s
   end
 end

data/test/sugar/canvas_test.rb

@@ -0,0 +1,16 @@
+require_relative '../test_helper'
+require 'skeptick/sugar/canvas'
+
+class CanvasTest < Skeptick::TestCase
+  include Skeptick
+
+  def test_canvas_in_convert_with_size
+    cmd = convert { canvas :none, size: '100x200' }
+    assert_equal 'convert -size 100x200 canvas:none miff:-', cmd.to_s
+  end
+
+  def test_canvas_in_convert_without_size
+    cmd = convert { canvas :none }
+    assert_equal 'convert canvas:none miff:-', cmd.to_s
+  end
+end