swiss_knife 0.1.4 → 0.1.5

data/.rspec

@@ -0,0 +1 @@
+--format=documentation

data/Gemfile

@@ -1,10 +1,2 @@
 source :rubygems
-
-gem "rails", "3.0.3"
-gem "rspec-rails", "2.1.0"
-gem "nokogiri"
-gem "fakeweb"
-
-platforms :mri_19 do
-  gem "ruby-debug19", :require => "ruby-debug"
-end
+gemspec

data/Gemfile.lock

@@ -1,95 +1,90 @@
+PATH
+  remote: .
+  specs:
+    swiss_knife (0.1.5)
+      rails (~> 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    archive-tar-minitar (0.5.2)
-    arel (2.0.4)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
     builder (2.1.2)
-    columnize (0.3.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     fakeweb (1.3.0)
-    i18n (0.4.2)
-    linecache19 (0.5.11)
-      ruby_core_source (>= 0.1.4)
-    mail (2.2.10)
+    i18n (0.5.0)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
-      i18n (~> 0.4.1)
+      i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.3.1)
+    nokogiri (1.4.4)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    rspec-rails (2.1.0)
-      rspec (~> 2.1.0)
-    ruby-debug-base19 (0.11.24)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
-      archive-tar-minitar (>= 0.5.2)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
     thor (0.14.6)
-    treetop (1.4.8)
+    treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby
@@ -97,6 +92,5 @@ PLATFORMS
 DEPENDENCIES
   fakeweb
   nokogiri
-  rails (= 3.0.3)
-  rspec-rails (= 2.1.0)
-  ruby-debug19
+  rspec-rails (~> 2.5.0)
+  swiss_knife!

data/lib/swiss_knife/helpers.rb

@@ -49,17 +49,24 @@ module SwissKnife
       image_tag url, { :class => "gravatar", :alt => options[:alt], :title => options[:title] }
     end
 
+    # Display flash messages.
+    #
+    #   flash_messages
+    #   #=> '<p class="message alert">This is just an alert!</p>
+    #
     def flash_messages
-      html = ""
-
-      flash.each do |name, message|
-        html << content_tag(:p, message, :class => "message #{name}")
-        flash.discard(name)
+      safe_buffer do |html|
+        flash.each do |name, message|
+          html << content_tag(:p, message, :class => "message #{name}")
+          flash.discard(name)
+        end
       end
-
-      html.html_safe
     end
 
+    # Create a meta tag for http://github.com/fnando/dispatcher-js.
+    #
+    #   <%= dispatcher %>
+    #
     def dispatcher_tag
       controller_name = controller.class.name.underscore
       controller_name.gsub!(/\//, "_")
@@ -68,12 +75,29 @@ module SwissKnife
       %[<meta name="page" content="#{controller_name}##{controller.action_name}" />].html_safe
     end
 
+    # Wrap the content in a <BODY> tag.
+    #
+    #   <%= body do %>
+    #     <h1>Hi there!</h1>
+    #   <% end %>
+    #
+    # This will set some attributes like <tt>id</tt> and <tt>class</tt>,
+    # with controller and action name.
+    #
+    # You can set additional CSS classes by using the <tt>:append_class</tt> option.
+    #
+    #   body(:append_class => "theme-red") { ...some content }
+    #
     def body(options = {}, &block)
       action_name = ACTION_ALIASES[controller.action_name] || controller.action_name
 
       options = {
         :id => "#{controller.controller_name}-page",
-        :class => "#{controller.controller_name}-#{action_name} #{I18n.locale}"
+        :class => [
+          "#{controller.controller_name}-#{action_name}",
+          "#{controller.controller_name}-#{controller.action_name}",
+          I18n.locale
+        ].join(" ")
       }.merge(options)
 
       options[:class] << (" " + options.delete(:append_class).to_s) if options[:append_class]
@@ -113,6 +137,12 @@ module SwissKnife
       content_tag(tag, capture(&block), options)
     end
 
+    # Create a encrypted mailto link.
+    # <b>THIS API IS NOT RAILS COMPLIANT.</b>
+    #
+    #   mail_to "john@doe.com"
+    #   mail_to "john@doe.com", "Contact me"
+    #
     def mail_to(email, label = nil)
       encrypt = proc do |text|
         text.to_enum(:each_byte).collect {|c| sprintf("&#%d;", c) }.join
@@ -126,44 +156,42 @@ module SwissKnife
 
     def javascript_includes(*args)
       options = args.extract_options!
-      html = ""
-
-      args.each do |name|
-        bundle = SwissKnife::Assets.config["javascripts"][name.to_s] rescue nil
 
-        if SwissKnife::Assets.merge? && bundle
-          html << javascript_include_tag("#{name}_packaged".html_safe, options)
-        elsif bundle
-          bundle.each do |file|
-            html << javascript_include_tag(file.to_s.html_safe, options)
+      safe_buffer do |html|
+        args.each do |name|
+          bundle = SwissKnife::Assets.config["javascripts"][name.to_s] rescue nil
+
+          if SwissKnife::Assets.merge? && bundle
+            html << javascript_include_tag("#{name}_packaged".html_safe, options)
+          elsif bundle
+            bundle.each do |file|
+              html << javascript_include_tag(file.to_s.html_safe, options)
+            end
+          else
+            html << javascript_include_tag(name.to_s.html_safe, options)
           end
-        else
-          html << javascript_include_tag(name.to_s.html_safe, options)
         end
       end
-
-      html.html_safe
     end
 
     def stylesheet_includes(*args)
       options = args.extract_options!
-      html = ""
 
-      args.each do |name|
-        bundle = SwissKnife::Assets.config["stylesheets"][name.to_s] rescue nil
-
-        if SwissKnife::Assets.merge? && bundle
-          html << stylesheet_link_tag("#{name}_packaged", options)
-        elsif bundle
-          bundle.each do |file|
-            html << stylesheet_link_tag("#{file}", options)
+      safe_buffer do |html|
+        args.each do |name|
+          bundle = SwissKnife::Assets.config["stylesheets"][name.to_s] rescue nil
+
+          if SwissKnife::Assets.merge? && bundle
+            html << stylesheet_link_tag("#{name}_packaged", options)
+          elsif bundle
+            bundle.each do |file|
+              html << stylesheet_link_tag("#{file}", options)
+            end
+          else
+            html << stylesheet_link_tag("#{name}", options)
           end
-        else
-          html << stylesheet_link_tag("#{name}", options)
         end
       end
-
-      html.html_safe
     end
 
     def fieldset(legend, options = {}, &block)
@@ -187,11 +215,11 @@ module SwissKnife
     def submit_or_cancel(url, options = {})
       options.reverse_merge!(:button => :"swiss_knife.submit", :cancel => :"swiss_knife.cancel")
 
-      String.new.tap do |html|
+      safe_buffer do |html|
         html << submit_tag(t(options[:button], :default => options[:button]), :class => "button")
         html << " "
         html << link_to(t(options[:cancel], :default => options[:cancel]), url, :class => "cancel")
-      end.html_safe
+      end
     end
 
     # Load jQuery from Google's CDN and if the world is collapsing and Google is down,
@@ -205,16 +233,45 @@ module SwissKnife
     def jquery_script_tag(version = "1.4.4")
       local_path = compute_public_path("jquery-#{version}.min.js", "javascripts")
       remote_path = "#{request.protocol}ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js"
-      html = <<-HTML
-  		<script type="text/javascript" src="#{remote_path}"></script>
-  		<script type="text/javascript">
-  			if (typeof jQuery === "undefined") {
-  				document.write(unescape("%3Cscript src='#{local_path}' type='text/javascript'%3E%3C/script%3E"));
-  			};
-  		</script>
-      HTML
-
-      html.html_safe
+
+      safe_buffer do
+        %[
+      		<script type="text/javascript" src="#{remote_path}"></script>
+      		<script type="text/javascript">
+      			if (typeof jQuery === "undefined") {
+      				document.write(unescape("%3Cscript src='#{local_path}' type='text/javascript'%3E%3C/script%3E"));
+      			};
+      		</script>
+        ]
+      end
+    end
+
+    # Return a string marked as safe html.
+    #
+    # Change the buffer object when block expects one argument.
+    #
+    #   safe_buffer {|html| html << "<p>Some content</p>"}
+    #
+    # Use block's return when block expects no argument.
+    #
+    #   safe_buffer { "<p>Some content</p>" }
+    #
+    # Get a safe buffer object.
+    #
+    #   buffer = safe_buffer
+    #
+    def safe_buffer(&block)
+      buffer = ActiveSupport::SafeBuffer.new
+
+      if block_given?
+        if block.arity == 1
+          yield buffer
+        else
+          buffer = yield(buffer)
+        end
+      end
+
+      buffer.html_safe
     end
   end
 end

data/lib/swiss_knife/version.rb

@@ -2,7 +2,7 @@ module SwissKnife
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 4
+    PATCH = 5
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/helpers/helpers_spec.rb

@@ -17,6 +17,8 @@ describe SwissKnife::Helpers do
 
     subject { helper.flash_messages }
 
+    it { should be_html_safe }
+
     it "should render multiple flash messages" do
       subject.should have_tag("p.message", :count => 3)
     end
@@ -36,41 +38,50 @@ describe SwissKnife::Helpers do
 
   describe "block wrappers" do
     context "body" do
-      it "should use defaults" do
-        html = helper.body { "Body" }
+      subject { helper.body { "Body" } }
 
-        html.should have_tag("body", :count => 1)
-        html.should have_tag("body#sample-page")
-        html.should have_tag("body.sample-index")
-        html.should have_tag("body.en")
+      it { should be_html_safe }
+
+      it "should use defaults" do
+        subject.should have_tag("body", :count => 1)
+        subject.should have_tag("body#sample-page")
+        subject.should have_tag("body.sample-index")
+        subject.should have_tag("body.en")
       end
 
-      it "should use alias for action" do
+      it "should use alias for create action" do
         @controller.stub(:action_name => "create")
-        helper.body { "Body" }.should have_tag("body.sample-new")
+        html = helper.body { "Body" }
+
+        html.should have_tag("body.sample-new")
+        html.should have_tag("body.sample-create")
+      end
 
+      it "should use alias for update action" do
         @controller.stub(:action_name => "update")
         helper.body { "Body" }.should have_tag("body.sample-edit")
+      end
 
+      it "should use alias for delete action" do
         @controller.stub(:action_name => "destroy")
         helper.body { "Body" }.should have_tag("body.sample-destroy")
       end
 
       it "should use custom settings" do
-        html = helper.body(:id => "page", :class => "dark", :onload => "init();") { "Body" }
+        subject = helper.body(:id => "page", :class => "dark", :onload => "init();") { "Body" }
 
-        html.should have_tag("body#page")
-        html.should have_tag("body.dark")
-        html.should have_tag("body[onload='init();']")
+        subject.should have_tag("body#page")
+        subject.should have_tag("body.dark")
+        subject.should have_tag("body[onload='init();']")
       end
 
       it "should append classes" do
-        html = helper.body(:append_class => "more classes") { "Body" }
+        subject = helper.body(:append_class => "more classes") { "Body" }
 
-        html.should have_tag("body.more")
-        html.should have_tag("body.classes")
-        html.should have_tag("body.en")
-        html.should have_tag("body.sample-index")
+        subject.should have_tag("body.more")
+        subject.should have_tag("body.classes")
+        subject.should have_tag("body.en")
+        subject.should have_tag("body.sample-index")
       end
 
       it "should not have append_class attribute" do
@@ -107,18 +118,22 @@ describe SwissKnife::Helpers do
     end
 
     it "should use other options like css class" do
-      html = helper.wrapper(:div, :id => "container", :class => "rounded") { "Some content" }
-      html.should have_tag("div#container.rounded", "Some content")
+      subject = helper.wrapper(:div, :id => "container", :class => "rounded") { "Some content" }
+      subject.should have_tag("div#container.rounded", "Some content")
     end
   end
 
   describe "#dispatcher_tag" do
+    it "should be html safe" do
+      helper.dispatcher_tag.should be_html_safe
+    end
+
     it "should contain meta tag" do
       @controller.class.stub!(:name).and_return("SampleController")
 
-      html = helper.dispatcher_tag
-      html.should have_tag("meta")
-      html.should have_tag("meta[name=page][content='sample#index']")
+      subject = helper.dispatcher_tag
+      subject.should have_tag("meta")
+      subject.should have_tag("meta[name=page][content='sample#index']")
     end
 
     it "should return normalized controller name for namespaced controller" do
@@ -130,6 +145,8 @@ describe SwissKnife::Helpers do
   describe "#mail_to" do
     subject { helper.mail_to("john@doe.com") }
 
+    it { should be_html_safe }
+
     it "should be encrypted" do
       subject.should_not match(/john@doe\.com/)
     end
@@ -152,99 +169,101 @@ describe SwissKnife::Helpers do
 
     describe "javascript includes" do
       it "should use defaults" do
-        html = helper.javascript_includes("application")
+        subject = helper.javascript_includes("application")
 
-        html.should have_tag("script[type='text/javascript']", :count => 1)
-        html.should match(%r{/javascripts/application.js(\?\d+)?})
+        subject.should have_tag("script[type='text/javascript']", :count => 1)
+        subject.should match(%r{/javascripts/application.js(\?\d+)?})
       end
 
       it "should return several includes for bundle when not in production" do
         SwissKnife::Assets.stub(:merge? => false)
-        html = helper.javascript_includes(:base)
+        subject = helper.javascript_includes(:base)
 
-        html.should have_tag("script[type='text/javascript']", :count => 3)
-        html.should match(%r{/javascripts/application.js(\?\d+)?})
-        html.should match(%r{/javascripts/jquery.js(\?\d+)?})
-        html.should match(%r{/javascripts/rails.js(\?\d+)?})
+        subject.should have_tag("script[type='text/javascript']", :count => 3)
+        subject.should match(%r{/javascripts/application.js(\?\d+)?})
+        subject.should match(%r{/javascripts/jquery.js(\?\d+)?})
+        subject.should match(%r{/javascripts/rails.js(\?\d+)?})
       end
 
       it "should return bundle only when in production" do
         SwissKnife::Assets.stub(:merge? => true)
-        html = helper.javascript_includes(:base)
+        subject = helper.javascript_includes(:base)
 
-        html.should have_tag("script[type='text/javascript']", :count => 1)
-        html.should match(%r{/javascripts/base_packaged.js(\?\d+)?})
+        subject.should have_tag("script[type='text/javascript']", :count => 1)
+        subject.should match(%r{/javascripts/base_packaged.js(\?\d+)?})
       end
     end
 
     describe "stylesheet includes" do
       it "should use defaults" do
-        html = helper.stylesheet_includes("application")
+        subject = helper.stylesheet_includes("application")
 
-        html.should have_tag("link[rel='stylesheet']", :count => 1)
-        html.should match(%r{/stylesheets/application.css(\?\d+)?})
+        subject.should have_tag("link[rel='stylesheet']", :count => 1)
+        subject.should match(%r{/stylesheets/application.css(\?\d+)?})
       end
 
       it "should return several includes for bundle when not in production" do
         SwissKnife::Assets.stub(:merge? => false)
-        html = helper.stylesheet_includes(:base)
+        subject = helper.stylesheet_includes(:base)
 
-        html.should have_tag("link[rel='stylesheet']", :count => 2)
-        html.should match(%r{/stylesheets/reset.css(\?\d+)?})
-        html.should match(%r{/stylesheets/main.css(\?\d+)?})
+        subject.should have_tag("link[rel='stylesheet']", :count => 2)
+        subject.should match(%r{/stylesheets/reset.css(\?\d+)?})
+        subject.should match(%r{/stylesheets/main.css(\?\d+)?})
       end
 
       it "should return only bundle when in production" do
         SwissKnife::Assets.stub(:merge? => true)
-        html = helper.stylesheet_includes(:base)
+        subject = helper.stylesheet_includes(:base)
 
-        html.should have_tag("link[rel='stylesheet']", :count => 1)
-        html.should match(%r{/stylesheets/base_packaged.css(\?\d+)?})
+        subject.should have_tag("link[rel='stylesheet']", :count => 1)
+        subject.should match(%r{/stylesheets/base_packaged.css(\?\d+)?})
       end
     end
   end
 
   describe "#fieldset" do
-    before do
-      @html = helper.fieldset("Nice legend", :class => "sample") { "<p>Fieldset</p>" }
-    end
+    subject { helper.fieldset("Nice legend", :class => "sample") { "<p>Fieldset</p>" } }
+
+    it { should be_html_safe }
 
     it "should use provided options" do
-      @html.should have_tag("fieldset.sample", :count => 1)
+      subject.should have_tag("fieldset.sample", :count => 1)
     end
 
     it "should use legend as text" do
-      @html.should have_tag("fieldset > legend", "Nice legend")
+      subject.should have_tag("fieldset > legend", "Nice legend")
     end
 
     it "should use translated legend" do
       I18n.locale = :pt
       I18n.backend.should_receive(:translations).and_return(:pt => {:sample => "Legenda"})
 
-      @html = helper.fieldset("sample") {}
-      @html.should have_tag("fieldset > legend", "Legenda")
+      subject = helper.fieldset("sample") {}
+      subject.should have_tag("fieldset > legend", "Legenda")
     end
 
     it "should return content" do
-      @html.should have_tag("fieldset > p", "Fieldset")
+      subject.should have_tag("fieldset > p", "Fieldset")
     end
   end
 
   describe "#gravatar_tag" do
     before do
       ActionController::Base.asset_host = "http://example.com"
-      @email = "john@doe.com"
     end
 
+    let(:email) { "john@doe.com" }
+    subject { helper.gravatar_tag(email) }
+
     it "should return an image" do
-      helper.gravatar_tag(@email).should have_tag("img.gravatar", :count => 1)
+      subject.should have_tag("img.gravatar", :count => 1)
     end
 
     it "should use default options" do
-      uri = uri_for(helper.gravatar_tag(@email))
+      uri = uri_for(subject)
       uri.scheme.should == "http"
       uri.host.should == "www.gravatar.com"
-      uri.path.should == "/avatar/#{Digest::MD5.hexdigest(@email)}.jpg"
+      uri.path.should == "/avatar/#{Digest::MD5.hexdigest(email)}.jpg"
       uri.params.should == {"s" => "32", "r" => "g", "d" => "http://example.com/images/gravatar.jpg"}
     end
 
@@ -254,49 +273,49 @@ describe SwissKnife::Helpers do
     end
 
     it "should use custom default image" do
-      uri = uri_for(helper.gravatar_tag(@email, :default => "custom.jpg"))
+      uri = uri_for(helper.gravatar_tag(email, :default => "custom.jpg"))
       uri.params["d"].should == "http://example.com/images/custom.jpg"
     end
 
     it "should use custom default image" do
-      uri = uri_for(helper.gravatar_tag(@email, :default => "custom.jpg"))
+      uri = uri_for(helper.gravatar_tag(email, :default => "custom.jpg"))
       uri.params["d"].should == "http://example.com/images/custom.jpg"
     end
 
     it "should use predefined default image" do
-      uri = uri_for(helper.gravatar_tag(@email, :default => :mm))
+      uri = uri_for(helper.gravatar_tag(email, :default => :mm))
       uri.params["d"].should == "mm"
     end
 
     it "should use custom size" do
-      uri = uri_for(helper.gravatar_tag(@email, :size => 80))
+      uri = uri_for(helper.gravatar_tag(email, :size => 80))
       uri.params["s"].should == "80"
     end
 
     it "should use custom rating" do
-      uri = uri_for(helper.gravatar_tag(@email, :rating => "pg"))
+      uri = uri_for(helper.gravatar_tag(email, :rating => "pg"))
       uri.params["r"].should == "pg"
     end
 
     it "should use secure host when in a secure request" do
       helper.request.should_receive(:ssl?).and_return(true)
-      uri = uri_for(helper.gravatar_tag(@email))
+      uri = uri_for(helper.gravatar_tag(email))
       uri.host.should == "secure.gravatar.com"
       uri.scheme.should == "https"
     end
 
     it "should use secure host when using :ssl option" do
-      uri = uri_for(helper.gravatar_tag(@email, :ssl => true))
+      uri = uri_for(helper.gravatar_tag(email, :ssl => true))
       uri.host.should == "secure.gravatar.com"
       uri.scheme.should == "https"
     end
 
     it "should use alt" do
-      helper.gravatar_tag(@email, :alt => "alt text").should match(/\balt="alt text"/)
+      helper.gravatar_tag(email, :alt => "alt text").should match(/\balt="alt text"/)
     end
 
     it "should use title" do
-      helper.gravatar_tag(@email, :title => "title text").should match(/\btitle="title text"/)
+      helper.gravatar_tag(email, :title => "title text").should match(/\btitle="title text"/)
     end
 
     private
@@ -315,54 +334,56 @@ describe SwissKnife::Helpers do
 
   describe "#submit_or_cancel" do
     it "should use defaults" do
-      html = helper.submit_or_cancel("/some/path")
-      html.should have_tag("a.cancel[href='/some/path']", :text => "Cancel")
-      html.should have_tag("input.button[type=submit][value=Submit]")
+      subject = helper.submit_or_cancel("/some/path")
+      subject.should have_tag("a.cancel[href='/some/path']", :text => "Cancel")
+      subject.should have_tag("input.button[type=submit][value=Submit]")
     end
 
     it "should use custom link text from I18n file" do
       I18n.backend.stub :translations => {:en => {:go_back => "Go back"}}
-      html = helper.submit_or_cancel("/some/path", :cancel => :go_back)
-      html.should have_tag("a.cancel", :text => "Go back")
+      subject = helper.submit_or_cancel("/some/path", :cancel => :go_back)
+      subject.should have_tag("a.cancel", :text => "Go back")
     end
 
     it "should use custom link text" do
-      html = helper.submit_or_cancel("/some/path", :cancel => "Go back")
-      html.should have_tag("a.cancel", :text => "Go back")
+      subject = helper.submit_or_cancel("/some/path", :cancel => "Go back")
+      subject.should have_tag("a.cancel", :text => "Go back")
     end
 
     it "should use custom button text from I18n file" do
       I18n.backend.stub :translations => {:en => {:send => "Send"}}
-      html = helper.submit_or_cancel("/some/path", :button => :send)
-      html.should have_tag("input[type=submit][value=Send]")
+      subject = helper.submit_or_cancel("/some/path", :button => :send)
+      subject.should have_tag("input[type=submit][value=Send]")
     end
 
     it "should use custom button text" do
-      html = helper.submit_or_cancel("/some/path", :button => "Send")
-      html.should have_tag("input[type=submit][value=Send]")
+      subject = helper.submit_or_cancel("/some/path", :button => "Send")
+      subject.should have_tag("input[type=submit][value=Send]")
     end
   end
 
   describe "#jquery_script_tag" do
+    subject { helper.jquery_script_tag }
+
+    it { should be_html_safe }
+
     it "should default to version 1.4.4" do
-      html = helper.jquery_script_tag("1.4.4")
-      html.should have_tag("script[src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js']")
+      subject.should have_tag("script[src='http://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js']")
     end
 
     it "should use specified version" do
-      html = helper.jquery_script_tag("1.2.3")
-      html.should have_tag("script[src='http://ajax.googleapis.com/ajax/libs/jquery/1.2.3/jquery.min.js']")
+      subject = helper.jquery_script_tag("1.2.3")
+      subject.should have_tag("script[src='http://ajax.googleapis.com/ajax/libs/jquery/1.2.3/jquery.min.js']")
     end
 
     it "should use https protocol" do
       helper.request.stub :protocol => "https://"
-      html = helper.jquery_script_tag
-      html.should have_tag("script[src='https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js']")
+      subject = helper.jquery_script_tag
+      subject.should have_tag("script[src='https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js']")
     end
 
     it "should set fallback path" do
-      html = helper.jquery_script_tag
-      html.should match(%r[src='http://example.com/javascripts/jquery-1.4.4.min.js'])
+      subject.should match(%r[src='http://example.com/javascripts/jquery-1.4.4.min.js'])
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require "swiss_knife"
 require File.dirname(__FILE__) + "/support/config/boot"
 require "rspec/rails"
 require "swiss_knife/rspec"
+require "fakeweb"
+require "nokogiri"
 
 FakeWeb.allow_net_connect = false
 

data/swiss_knife.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 3.0.0"
-  s.add_development_dependency "rspec", ">= 2.0.0"
+  s.add_dependency "rails", "~> 3.0.0"
+  s.add_development_dependency "rspec-rails", "~> 2.5.0"
+  s.add_development_dependency "nokogiri"
+  s.add_development_dependency "fakeweb"
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: swiss_knife
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 -02:00
+date: 2011-03-14 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,30 +19,44 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rspec-rails
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+        version: 2.5.0
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Several helpers for Rails 3
 email: 
 - fnando.vieira@gmail.com
@@ -58,6 +68,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -126,21 +137,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Several helpers for Rails 3