imaginizer 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82ba111cb40bc4ffde4bb54212a371ce849b7876
-  data.tar.gz: ec933dd1678bf6ee211d9989fb5fac39e4c8ad16
+  metadata.gz: de494832c870f1af6fe744725bde17584a1af420
+  data.tar.gz: fae5df7e05998921daf031b480d5e87865aafcfb
 SHA512:
-  metadata.gz: 286af7a8402b9a6b55737b36bc39be6ddf5b371bb02741f65660bdc10f371e85af9e44921b5d5dc5dfa40abec54ecd0f660733f8bacde92414aa9ab93e25295e
-  data.tar.gz: 378ccaf62c45a887f1f1cf7d8ab9c8855d46dd546caf6fce19429ee42ed0275044827a4f70d2b3ca4bd82715dd778d68bbb9f626700d63550a561c68624a863e
+  metadata.gz: 69201581fdfa70b2b0b16afd4a3705a0bba1d4e0690f36acd50aad266b54721180486be1dc45167d680c307bb761bd4159239827355f6dedb8db8cf2102af1df
+  data.tar.gz: ba25e0f37d499d2768a8aef54827fd1e796b9e398a0fb5bd0ea783eed2501d880335205755352871d13cedba0faf9c8558502455053d5267123c0d91c41be826

data/lib/imaginizer/image.rb

@@ -20,36 +20,36 @@ class Imaginizer::Image
     @image_data.format 'jpg'
   end
 
-  def resize
-    @image_data.resize "#{image_width}x#{image_height}!"
+  def resize(w = image_width, h = image_height)
+    @image_data.resize "#{w}x#{h}!"
   end
 
-  def set_background(options = {})
+  def set_background(path_or_url)
     v = values_for :background
-    overlay_image options.merge(blur: '0x15', fill: true, x: v[:x],
-      y: v[:y], h: v[:h])
+    overlay_image img: path_or_url, blur: '0x15', fill: true, x: v[:x],
+      y: v[:y], h: v[:h]
   end
 
-  def set_foreground(options = {})
+  def set_foreground(path_or_url)
     v = values_for :foreground
-    overlay_image options.merge(h: v[:h], w: v[:w]) unless v[:skip]
+    overlay_image img: path_or_url, h: v[:h], w: v[:w] unless v[:skip]
   end
 
-  def set_title(options = {})
-    set_text :title, options do |v|
+  def set_title(text)
+    set_text :title, text do |v|
       {style: 'bold', uppercase: true, x: v[:x], y: v[:y], size: v[:size]}
     end
   end
 
-  def set_subtitle(options = {})
-    set_text :subtitle, options do |v|
+  def set_subtitle(text)
+    set_text :subtitle, text do |v|
       {style: 'italic', size: 14, x: v[:x], y: v[:y]}
     end
   end
 
-  def set_footer(options = {})
+  def set_footer(text)
     overlay_box values_for(:footer)
-    set_text :footer, options do |v|
+    set_text :footer, text do |v|
       {style: 'bold', uppercase: true, x: v[:x], y: v[:y], size: v[:size]}
     end
   end
@@ -128,15 +128,15 @@ private
     values_for :height
   end
 
-  def set_text(size, options = {})
+  def set_text(size, text)
     values = values_for size
-    size_options = options.merge yield(values)
+    options = {text: text}.merge yield(values)
     if values[:second_line_y]
       line1, line2 = word_wrap options[:text]
-      overlay_text size_options.merge(text: line1)
-      overlay_text size_options.merge(text: line2, y: values[:second_line_y])
+      overlay_text options.merge(text: line1)
+      overlay_text options.merge(text: line2, y: values[:second_line_y])
     else
-      overlay_text size_options
+      overlay_text options
     end
   end
 
@@ -146,7 +146,7 @@ private
 
   def overlay_text(options = {})
     return unless text = options[:text]
-    text.upcase! if options[:uppercase]
+    text = text.upcase if options[:uppercase]
     @image_data.combine_options do |c|
       c.fill 'white'
       c.font font_path(options[:style])
@@ -174,7 +174,7 @@ private
     image.blur options[:blur]
 
     image.crop options
-    image.resize image_size if options[:fill]
+    image.resize image_width, image_height if options[:fill]
     overlay_x = options[:x] || 0
     overlay_y = options[:y] || 0
     @image_data = @image_data.composite image.image_data do |c|

data/lib/imaginizer/parser.rb

@@ -20,29 +20,29 @@ class Imaginizer::Parser
         options[:sizes] << d
       end
 
-      opts.on('-b', '--background path', String,
+      opts.on('-b', '--background path_or_url', String,
         %q(Background image – either a local path or a URL)) do |path|
-        options[:background][:img] = path
+        options[:background] = path
       end
 
-      opts.on('-f', '--foreground path', String,
+      opts.on('-f', '--foreground path_or_url', String,
         %q(Foreground image – either a local path or a URL)) do |path|
-        options[:foreground][:img] = path
+        options[:foreground] = path
       end
 
       opts.on('-t', '--title text', String,
         %q(Title to overlay – maximum 15 characters)) do |text|
-        options[:title][:text] = text
+        options[:title] = text
       end
 
       opts.on('-s', '--subtitle text', String,
         %q(Subtitle to overlay – maximum 15 characters)) do |text|
-        options[:subtitle][:text] = text
+        options[:subtitle] = text
       end
 
       opts.on('-r', '--footer text', String,
         %q(Footer to overlay – maximum 20 characters)) do |text|
-        options[:footer][:text] = text
+        options[:footer] = text
       end
 
       opts.on('-o', '--output [OUTPUT]', [:image, :html],
@@ -74,11 +74,11 @@ class Imaginizer::Parser
     {}.tap do |opts|
       opts[:output] = :html
       opts[:sizes] = []
-      opts[:title] = {text: 'Title max 18 chars'}
-      opts[:subtitle] = {text: 'This subtitle is 30 characters'}
-      opts[:footer] = {text: 'A footer w/ 20 chars'}
-      opts[:background] = {img: 'http://lorempixel.com/300/300/abstract'}
-      opts[:foreground] = {img: 'http://lorempixel.com/300/300/people'}
+      opts[:title] = 'Title max 18 chars'
+      opts[:subtitle] = 'This subtitle is 30 characters'
+      opts[:footer] = 'A footer w/ 20 chars'
+      opts[:background] = 'http://lorempixel.com/300/300/abstract'
+      opts[:foreground] = 'http://lorempixel.com/300/300/people'
     end
   end
 

data/lib/imaginizer/version.rb

@@ -1,3 +1,3 @@
 module Imaginizer
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imaginizer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Claudio Baccigalupo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick