placeholder 0.0.1 → 0.0.2

data/README.markdown

@@ -12,11 +12,17 @@ Install the gem: `[sudo] gem install placeholder`
 
 Usage
 -----
-Placeholder requires a `:size` attribute, and can accept `:text`, `:height` and `:width` and even `:fg_color` and `:bg_color`
+Placeholder requires a size as the first argument and can accept `:text`, `:fg_color` and `:bg_color` arguments.
 
-This will place a 300x300 image placeholder into your page with the text "Whoa Now". The default text is just the image size.
+Examples
+--------
+This will place a 200x300 image placeholder into your page with the text "Whoa Now". The default text is the image size.
 
-`= Placeholder.new(:size => 300, :text => "Whoa Now")`
+`= Placeholder.new("200x300", :text => "Whoa Now")`
+
+If you just need a square image, simply do:
+
+`= Placeholder.new(100)`
 
 About the Author
 ----------------

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/placeholder.rb

@@ -2,16 +2,21 @@ class Placeholder
 
   attr_accessor :size, :height, :width, :bg_color, :fg_color, :text
 
-  def initialize(options = {})
-    options.each_pair do |k,v|
-      instance_variable_set "@#{k}", v
+  def initialize(size, options = {})
+    measure(size)
+    options.each{|(k,v)| instance_variable_set("@#{k}", v)}
+  end
+
+  def measure(size)
+    if size =~ /\d+x\d+/
+      @width, @height = size.split("x").map{|s| s.to_i}
+    else
+      @width, @height = size.to_i, size.to_i
     end
-    
-    @text.gsub!(" ", "+") unless @text == nil
   end
 
   def to_s
-    "<img src=\"#{url}\" alt=\"placeholder\"></img>"
+    "<img src=\"#{url}\" alt=\"placeholder\" />"
   end
 
   def url
@@ -19,11 +24,12 @@ class Placeholder
   end
 
   def size_str
-    @size != nil ? @size : "#{@width}x#{@height}"
+    "#{@width}x#{@height}"
   end
 
   def text_str
-    @text != nil ? "&text=#{@text}" : ""
+    return "" if @text == nil
+    "&text=" + @text.gsub(" ", "+")
   end
 
   def color_str

data/placeholder.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{placeholder}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Darby"]
-  s.date = %q{2010-08-07}
+  s.date = %q{2010-08-11}
   s.description = %q{Easy image placeholders via Placehold.it}
   s.email = %q{matt@protectedmethod.com}
   s.extra_rdoc_files = [

data/spec/placeholder_spec.rb

@@ -3,23 +3,27 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Placeholder" do
 
   it "should understand its size" do
-    p = Placeholder.new(:size => 300)
-    p.to_s.should == "<img src=\"http://placehold.it/300\" alt=\"placeholder\"></img>" 
+    p = Placeholder.new(300)
+    p.to_s.should == "<img src=\"http://placehold.it/300x300\" alt=\"placeholder\" />"
   end
 
   it "should understand its height and width" do
-    p = Placeholder.new(:height => 300, :width => 200)
-    p.to_s.should == "<img src=\"http://placehold.it/200x300\" alt=\"placeholder\"></img>" 
+    p = Placeholder.new("200x300")
+    p.to_s.should == "<img src=\"http://placehold.it/200x300\" alt=\"placeholder\" />"
   end
 
   it "should know about a color" do
-    p = Placeholder.new(:size => 400, :bg_color => "FFFFFF", :fg_color => "FE0000")
-    p.to_s.should == "<img src=\"http://placehold.it/400/FFFFFF/FE0000\" alt=\"placeholder\"></img>"
+    p = Placeholder.new(400, :bg_color => "FFFFFF", :fg_color => "FE0000")
+    p.to_s.should == "<img src=\"http://placehold.it/400x400/FFFFFF/FE0000\" alt=\"placeholder\" />"
   end
 
   it "should know about its text" do
-    p = Placeholder.new(:size => 400, :text => "Sample Text")
-    p.to_s.should == "<img src=\"http://placehold.it/400&text=Sample+Text\" alt=\"placeholder\"></img>"
+    p = Placeholder.new(400, :text => "Sample Text")
+    p.to_s.should == "<img src=\"http://placehold.it/400x400&text=Sample+Text\" alt=\"placeholder\" />"
   end
 
-end
+  it "should throw an error when a size isn't passed in" do
+    lambda{ Placeholder.new }.should raise_error
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: placeholder
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Matt Darby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-07 00:00:00 -04:00
+date: 2010-08-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency