mapel 0.1.5 → 0.1.6

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 name = 'mapel'
-version = '0.1.5'
+version = '0.1.6'
 
 begin
   require 'jeweler'

data/lib/mapel.rb

@@ -74,26 +74,8 @@ module Mapel
       end
 
       def resize!(*args)
-        @commands << lambda {
-          cmd = self.class.new
-          width, height = Geometry.new(*args).dimensions
-          if @source
-            origin_width, origin_height = Mapel.info(@source)[:dimensions]
-
-            # Crop dimensions should not exceed original dimensions.
-            width = [width, origin_width].min
-            height = [height, origin_height].min
-
-            if width != origin_width || height != origin_height
-              scale = [width/origin_width.to_f, height/origin_height.to_f].max
-              cmd.resize((scale*(origin_width+0.5)), (scale*(origin_height+0.5)))
-            end
-            cmd.crop(width, height).to_preview
-          else
-            "\{crop_resized #{args}\}"
-          end
-        }
-        self
+        width, height = Geometry.new(*args).dimensions
+        resize("#{width}x#{height}^").crop(width, height).repage
       end
 
       def scale(*args)
@@ -122,9 +104,14 @@ module Mapel
       end
 
       def to_info_hash
-        meta = {}
-        meta[:dimensions] = @output.split(' ')[2].split('x').map { |d| d.to_i }
-        meta
+        meta = @output.split(' ')
+        {
+          :path       => meta[0],
+          :format     => meta[1],
+          :dimensions => meta[2].split('x').map {|d| d.to_i},
+          :depth      => meta[4],
+          :size       => meta[6]
+        }
       end
     end
   end
@@ -132,23 +119,15 @@ module Mapel
   class Geometry
     attr_accessor :width, :height, :x, :y, :flag
 
-    FLAGS = ['', '%', '<', '>', '!', '@']
-    RFLAGS = {
-      '%' => :percent,
-      '!' => :aspect,
-      '<' => :<,
-      '>' => :>,
-      '@' => :area
-    }
+    FLAGS = ['', '%', '<', '>', '!', '@', '^']
 
     # Regex parser for geometry strings
-    RE = /\A(\d*)(?:x(\d+)?)?([-+]\d+)?([-+]\d+)?([%!<>@]?)\Z/
+    RE = /\A(\d*)(?:x(\d+)?)?([-+]\d+)?([-+]\d+)?([%!<>@\^]?)\Z/
 
     def initialize(*args)
       if (args.length == 1) && (args.first.kind_of?(String))
         raise(ArgumentError, "Invalid geometry string") unless m = RE.match(args.first)
         args = m.to_a[1..5]
-        args[4] = args[4] ? RFLAGS[args[4]] : nil
       end
       @width = args[0] ? args[0].to_i.round : 0
       @height = args[1] ? args[1].to_i.round : 0
@@ -156,7 +135,8 @@ module Mapel
       raise(ArgumentError, "Height must be >= 0") if @height < 0
       @x = args[2] ? args[2].to_i : 0
       @y = args[3] ? args[3].to_i : 0
-      @flag = (args[4] && RFLAGS.has_value?(args[4])) ? args[4] : nil
+      raise(ArgumentError, "Flags must be in: #{FLAGS.inspect}") if args[4] && !FLAGS.include?(args[4])
+      @flag = args[4]
     end
 
     def dimensions
@@ -170,7 +150,8 @@ module Mapel
       str << 'x' if @height > 0
       str << "%g" % @height if @height > 0
       str << "%+d%+d" % [@x, @y] if (@x != 0 || @y != 0 || crop)
-      str << (RFLAGS.respond_to?(:key) ? RFLAGS.key(@flag) : RFLAGS.index(@flag)).to_s
+      str << @flag if @flag
+      str
     end
   end
 

data/mapel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mapel}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksander Williams"]
-  s.date = %q{2010-02-24}
+  s.date = %q{2010-02-25}
   s.email = %q{alekswilliams@earthlink.net}
   s.extra_rdoc_files = [
     "README.rdoc"

data/spec/mapel_spec.rb

@@ -24,8 +24,12 @@ describe Mapel do
   end
 
   describe "#info" do
-    it "should return image dimensions" do
+    it "should return basic image metadata" do
+      Mapel.info(@logo)[:path].should == @logo
+      Mapel.info(@logo)[:format].should == 'JPEG'
       Mapel.info(@logo)[:dimensions].should == [572, 591]
+      Mapel.info(@logo)[:depth].should == '8-bit'
+      Mapel.info(@logo)[:size].should == '95.1kb'
     end
   end
 
@@ -51,7 +55,7 @@ describe Mapel do
     it "should be able to crop-resize an image" do
       cmd = Mapel(@logo).gravity(:west).resize!('50x100').to(@output + '/crop_resized.jpg').run
       cmd.status.should == true
-      Mapel.info(@output + '/crop_resized.jpg')[:dimensions].should == [50, 99]
+      Mapel.info(@output + '/crop_resized.jpg')[:dimensions].should == [50, 100]
     end
 
     it "should allow arbitrary addition of commands to the queue" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mapel
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Aleksander Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-24 00:00:00 -05:00
+date: 2010-02-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency