painter 0.1.1 → 0.1.2

data/lib/painter.rb

@@ -9,6 +9,7 @@ require 'painter/pixel'
 require 'painter/text'
 require 'painter/point'
 require 'painter/line'
+require 'painter/image'
 
 class Painter
   attr_reader :image_pointer
@@ -33,10 +34,13 @@ class Painter
   end
   def self.open(path, format = nil)
     instance = new
-    instance.initializeFromOpen(path, format)
-    yield instance
-  ensure
-    instance.release!
+    raise "File not found: #{path}" unless File.exists?(path)
+    begin
+      instance.initializeFromOpen(path, format)
+      yield instance
+    ensure
+      instance.release!
+    end
   end
 
   def release!
@@ -89,7 +93,7 @@ class Painter
   end
 
   # Operations
-  {'pixel' => 'Pixel', 'rect' => 'Rect', 'text' => 'Text', 'line' => 'Line'}.each do |op, klass|
+  {'pixel' => 'Pixel', 'rect' => 'Rect', 'text' => 'Text', 'line' => 'Line', 'image' => 'Image'}.each do |op, klass|
     class_eval <<-END
       def #{op}
         #{op}_instance = #{klass}.new(self)

data/lib/painter/image.rb

@@ -0,0 +1,24 @@
+class Painter
+  class Image < Operation
+    pretty_accessor :width, :height, :toWidth, :toHeight, :source, :format
+
+    def fromTopLeft(x,y)
+      @_fromTopLeft = Point.new(x,y)
+    end
+
+    def toTopLeft(x,y)
+      @_toTopLeft = Point.new(x,y)
+    end
+
+    def draw
+      Painter.open(@_source, @_format) do |source_image|
+        CGD2::gdImageCopyResampled(@image.image_pointer,
+          source_image.image_pointer,
+          @_toTopLeft.x, @_toTopLeft.y,
+          @_fromTopLeft.x, @_fromTopLeft.y,
+          (@_toWidth || @_width), (@_toHeight || @_height),
+          @_width, @_height)
+      end
+    end
+  end
+end

data/spec/integration.rb

@@ -4,10 +4,13 @@ describe 'integration' do
   it "should draw an image" do
     srand(Time.now.to_i)
     Painter.write("#{File.dirname(__FILE__)}/output/captcha.png", 200, 100, :png) do |painter|
-      painter.rect do |rect|
-        rect.color 255, 255, 255
-        rect.topLeft 0, 0
-        rect.bottomRight 200, 100
+      painter.image do |image|
+        image.source "#{File.dirname(__FILE__)}/fixtures/sample.jpg"
+        image.format :jpg
+        image.fromTopLeft 0, 0
+        image.toTopLeft 0, 0
+        image.width 200
+        image.height 100
       end
       painter.text do |text|
         text.font "#{File.dirname(__FILE__)}/fixtures/Vera.ttf"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: painter
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ben Sandofsky
@@ -43,6 +43,7 @@ extra_rdoc_files: []
 files: 
 - lib/painter/cgd2.rb
 - lib/painter/color.rb
+- lib/painter/image.rb
 - lib/painter/image_struct.rb
 - lib/painter/line.rb
 - lib/painter/operation.rb