frank 0.4.0 → 0.4.1

data/bin/frank

@@ -94,7 +94,7 @@ if ARGV.empty?
   puts opts
   exit
 else
-  if %w[server up export out upgrade].include? ARGV.first
+  if %w[server up export out upgrade s e].include? ARGV.first
     begin
       Frank.bootstrap(Dir.pwd)
     rescue Errno::ENOENT

data/frank.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frank}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["blahed", "nwah"]
-  s.date = %q{2010-09-02}
+  s.date = %q{2010-10-15}
   s.description = %q{Rapidly develop static sites using any supported templating language}
   s.email = %q{travis.dunn@thisismedium.com}
   s.executables = ["frank", "frankout", "frankup"]

data/lib/frank/base.rb

@@ -6,7 +6,7 @@ require 'frank/middleware/statik'
 require 'frank/middleware/refresh'
 
 module Frank
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
   extend Frank::Upgrades
 
   module Render; end

data/lib/frank/lorem.rb

@@ -98,7 +98,7 @@ module Frank
       end
     end
 
-    def image(size, options)
+    def image(size, options={})
       if @environment == :output && options[:replacement]
         options[:replacement]
       else

data/spec/template/dynamic/lorem_test.haml

@@ -4,6 +4,7 @@
 %p.date= lorem.date '%Y-%m-%d', 'replace-this'
 %p.name= lorem.name 'replace-this'
 %p.email= lorem.email 'replace-this'
+%img{:src => lorem.image('400x300')}
 %img{:src => lorem.image('400x300', :random_color => true)}
 %img{:src => lorem.image('400x300', :background_color => '444', :color => 'eee', :replacement => 'replace-this')}
 %img{:src => lorem.image('400x300', :color => 'aaa')}

data/spec/template_helpers_spec.rb

@@ -69,15 +69,17 @@ describe Frank::TemplateHelpers do
 
     it 'render image url using imager' do
       template = @app.render('lorem_test.haml')
-      reg1 = /<img src='http:\/\/placehold\.it\/400x300\/[a-z0-9]{6}\/[a-z0-9]{6}' \/>/
-      reg2 = /<img src='http:\/\/placehold\.it\/400x300\/444\/eee' \/>/
-      reg3 = /<img src='http:\/\/placehold\.it\/400x300\/ccc\/aaa' \/>/
-      reg4 = /<img src='http:\/\/placehold\.it\/400x300\/444(&amp;|&)text=blah' \/>/
+      reg1 = /<img src='http:\/\/placehold\.it\/400x300' \/>/
+      reg2 = /<img src='http:\/\/placehold\.it\/400x300\/[a-z0-9]{6}\/[a-z0-9]{6}' \/>/      
+      reg3 = /<img src='http:\/\/placehold\.it\/400x300\/444\/eee' \/>/
+      reg4 = /<img src='http:\/\/placehold\.it\/400x300\/ccc\/aaa' \/>/
+      reg5 = /<img src='http:\/\/placehold\.it\/400x300\/444(&amp;|&)text=blah' \/>/
 
       template.should =~ reg1
       template.should =~ reg2
       template.should =~ reg3
       template.should =~ reg4
+      template.should =~ reg5
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frank
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - blahed
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 -04:00
+date: 2010-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency