placeholder 0.0.2 → 0.0.3

data/README.markdown

@@ -10,6 +10,10 @@ How To Install
 --------------
 Install the gem: `[sudo] gem install placeholder`
 
+If you're using Rails, add `config.gem 'placeholder'` to your `config/environment.rb`.
+
+If you're using Sinatra, add `require 'placeholder'` to your main application file.
+
 Usage
 -----
 Placeholder requires a size as the first argument and can accept `:text`, `:fg_color` and `:bg_color` arguments.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/placeholder.rb

@@ -1,6 +1,6 @@
 class Placeholder
 
-  attr_accessor :size, :height, :width, :bg_color, :fg_color, :text
+  attr_accessor :height, :width, :bg_color, :fg_color, :text
 
   def initialize(size, options = {})
     measure(size)
@@ -33,7 +33,14 @@ class Placeholder
   end
 
   def color_str
-    (@bg_color != nil && @fg_color != nil) ? "/#{@bg_color}/#{@fg_color}" : ""
+    if @bg_color.nil? && @fg_color != nil
+      @text = "Set :bg_color when using :fg_color"
+    end
+
+    str = ""
+    str += "/#{@bg_color}" unless @bg_color.nil?
+    str += "/#{@fg_color}" unless @fg_color.nil?
+    str
   end
 
 end

data/placeholder.gemspec

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

data/spec/placeholder_spec.rb

@@ -12,11 +12,21 @@ describe "Placeholder" do
     p.to_s.should == "<img src=\"http://placehold.it/200x300\" alt=\"placeholder\" />"
   end
 
-  it "should know about a color" do
+  it "should know about a bg_color" do
+    p = Placeholder.new(400, :bg_color => "FFFFFF")
+    p.to_s.should == "<img src=\"http://placehold.it/400x400/FFFFFF\" alt=\"placeholder\" />"
+  end
+
+  it "should know about a fg_color" do
     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 alert the user if they set :fg_color and not :bg_color" do
+    p = Placeholder.new(400, :fg_color => "FE0000")
+    p.to_s.should == "<img src=\"http://placehold.it/400x400/FE0000&text=Set+:bg_color+when+using+:fg_color\" alt=\"placeholder\" />"
+  end
+
   it "should know about its text" do
     p = Placeholder.new(400, :text => "Sample Text")
     p.to_s.should == "<img src=\"http://placehold.it/400x400&text=Sample+Text\" alt=\"placeholder\" />"

metadata

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