swiss_knife 0.1.2 → 0.1.3

data/Gemfile

@@ -1,8 +1,9 @@
 source :rubygems
 
-gem "rails", "3.0.0"
+gem "rails", "3.0.1"
 gem "rspec-rails", "2.0.0"
 gem "nokogiri"
+gem "fakeweb"
 
 platforms :mri_19 do
   gem "ruby-debug19", :require => "ruby-debug"

data/Gemfile.lock

@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.0)
-      actionpack (= 3.0.0)
+    actionmailer (3.0.1)
+      actionpack (= 3.0.1)
       mail (~> 2.2.5)
-    actionpack (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4.1)
@@ -15,19 +15,19 @@ GEM
       rack-mount (~> 0.6.12)
       rack-test (~> 0.5.4)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
+    activerecord (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.0)
-      activemodel (= 3.0.0)
-      activesupport (= 3.0.0)
-    activesupport (3.0.0)
+    activeresource (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+    activesupport (3.0.1)
     archive-tar-minitar (0.5.2)
     arel (1.0.1)
       activesupport (~> 3.0.0)
@@ -36,10 +36,11 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
+    fakeweb (1.3.0)
     i18n (0.4.1)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
-    mail (2.2.6.1)
+    mail (2.2.7)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
@@ -51,17 +52,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.6)
       rack (>= 1.0)
-    rails (3.0.0)
-      actionmailer (= 3.0.0)
-      actionpack (= 3.0.0)
-      activerecord (= 3.0.0)
-      activeresource (= 3.0.0)
-      activesupport (= 3.0.0)
+    rails (3.0.1)
+      actionmailer (= 3.0.1)
+      actionpack (= 3.0.1)
+      activerecord (= 3.0.1)
+      activeresource (= 3.0.1)
+      activesupport (= 3.0.1)
       bundler (~> 1.0.0)
-      railties (= 3.0.0)
-    railties (3.0.0)
-      actionpack (= 3.0.0)
-      activesupport (= 3.0.0)
+      railties (= 3.0.1)
+    railties (3.0.1)
+      actionpack (= 3.0.1)
+      activesupport (= 3.0.1)
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
@@ -96,7 +97,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  fakeweb
   nokogiri
-  rails (= 3.0.0)
+  rails (= 3.0.1)
   rspec-rails (= 2.0.0)
   ruby-debug19

data/README.rdoc

@@ -118,6 +118,30 @@ The are some action aliases:
   update => edit
   remove => destroy
 
+=== gravatar_tag
+
+  gravatar_tag user.email
+  gravatar_tag "098f6bcd4621d373cade4e832627b4f6"
+  gravatar_tag user.email, :size => 80
+  gravatar_tag user.email, :rating => :x
+
+  # Predefined default images provided by Gravatar. Can be
+  # :mm, :identicon, :monsterid, :wavatar, :retro, 404
+  gravatar_tag user.email, :default => :mm
+
+  gravatar_tag user.email, :default => "gravatar.png"
+  gravatar_tag user.email, :ssl => true
+  gravatar_tag user.email, :alt => user.name
+  gravatar_tag user.email, :title => user.name
+
+=== submit_or_cancel
+
+  submit_or_cancel root_path
+  submit_or_cancel root_path :button => "Save"
+  submit_or_cancel root_path :button => :"some.scope.for.save"
+  submit_or_cancel root_path :cancel => "Go back"
+  submit_or_cancel root_path :cancel => :"some.scope.for.go_back"
+
 === RSpec
 
 Swiss Knife includes some RSpec matchers. To use them, add the following like to your <tt>spec_helper.rb</tt> file:
@@ -139,21 +163,10 @@ The <tt>have_tag</tt> matcher uses Nokogiri, so you can use any CSS selector acc
 
 If you're inspecting some XML snippet, you can use the <tt>have_node</tt> matcher.
 
-=== gravatar_tag
-
-  gravatar_tag user.email
-  gravatar_tag "098f6bcd4621d373cade4e832627b4f6"
-  gravatar_tag user.email, :size => 80
-  gravatar_tag user.email, :rating => :x
-
-  # Predefined default images provided by Gravatar. Can be
-  # :mm, :identicon, :monsterid, :wavatar, :retro, 404
-  gravatar_tag user.email, :default => :mm
+==== have_text
 
-  gravatar_tag user.email, :default => "gravatar.png"
-  gravatar_tag user.email, :ssl => true
-  gravatar_tag user.email, :alt => user.name
-  gravatar_tag user.email, :title => user.name
+  string.should have_text("Lorem ipsum")
+  string.should have_text(/Lorem ipsum/)
 
 == Maintainer
 

data/Rakefile

@@ -17,7 +17,7 @@ begin
     gem.has_rdoc = true
     gem.add_dependency "rails", ">= 3.0.0"
     gem.add_development_dependency "rspec", ">= 2.0.0"
-    gem.files = FileList["{Gemfile,Gemfile.lock,Rakefile,README.*,swiss_knife.gemspec}", "{spec,lib}/**/*"]
+    gem.files = FileList["{Gemfile,Gemfile.lock,Rakefile,README.*,swiss_knife.gemspec}", "{spec,lib,locales}/**/*"]
   end
 
   Jeweler::GemcutterTasks.new

data/lib/swiss_knife/helpers.rb

@@ -57,7 +57,7 @@ module SwissKnife
         flash.discard(name)
       end
 
-      html
+      html.html_safe
     end
 
     def dispatcher_tag
@@ -175,5 +175,23 @@ module SwissKnife
         body
       end
     end
+
+    # Create a submit button with a cancel link besides.
+    #
+    #   submit_or_cancel root_path
+    #   submit_or_cancel root_path, :button => "Save"
+    #   submit_or_cancel root_path, :button => :"some.scope.for.button"
+    #   submit_or_cancel root_path, :cancel => "Go back"
+    #   submit_or_cancel root_path, :cancel => :"some.scope.for.link"
+    #
+    def submit_or_cancel(url, options = {})
+      options.reverse_merge!(:button => :"swiss_knife.submit", :cancel => :"swiss_knife.cancel")
+
+      String.new.tap 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
 end

data/lib/swiss_knife/railtie.rb

@@ -10,12 +10,14 @@ module SwissKnife
       require "swiss_knife/rake_tasks"
     end
 
-    config.after_initialize do
-      ActiveSupport.on_load(:action_controller) do
+    initializer "swiss_knife.initialize" do
+      ::ActionController::Base.instance_eval do
         include SwissKnife::ActionController
         helper SwissKnife::Helpers
         helper_method :page_title
       end
+
+      ::I18n.load_path += Dir[File.dirname(__FILE__) + "/../../locales/*.yml"]
     end
   end
 end

data/lib/swiss_knife/rspec/have_tag.rb

@@ -55,6 +55,10 @@ module SwissKnife
           !matches.empty?
         end
 
+        def description
+          "have tag #{selector.inspect} with #{options.inspect}"
+        end
+
         def failure_message
           explanation = actual_count ? "but found #{actual_count}" : "but did not"
           "expected\n#{doc.to_s}\nto have #{failure_count_phrase} #{failure_selector_phrase}, #{explanation}"

data/lib/swiss_knife/rspec/have_text.rb

@@ -0,0 +1,40 @@
+module SwissKnife
+  module RSpec
+    module Matchers
+      def have_text(matcher)
+        HaveText.new(matcher)
+      end
+
+      class HaveText
+        attr_accessor :matcher, :subject, :regex
+
+        def initialize(matcher)
+          @matcher = matcher
+        end
+
+        def matches?(text)
+          @subject = text.to_s
+
+          case matcher
+          when String
+            subject.index(matcher)
+          when Regexp
+            subject.match(matcher)
+          end
+        end
+
+        def description
+          "have text #{matcher.inspect}"
+        end
+
+        def failure_message
+          "expected #{subject.inspect} to include #{matcher.inspect}"
+        end
+
+        def negative_failure_message
+          "expected #{subject.inspect} to exclude #{matcher.inspect}"
+        end
+      end
+    end
+  end
+end

data/lib/swiss_knife/rspec.rb

@@ -1,3 +1,4 @@
 require "swiss_knife/rspec/have_tag"
+require "swiss_knife/rspec/have_text"
 
 RSpec.configure {|config| config.include(SwissKnife::RSpec::Matchers)} if defined?(RSpec)

data/lib/swiss_knife/version.rb

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

data/locales/en.yml

@@ -0,0 +1,4 @@
+en:
+  swiss_knife:
+    submit: "Submit"
+    cancel: "Cancel"

data/locales/pt.yml

@@ -0,0 +1,8 @@
+pt:
+  swiss_knife: &PT
+    submit: "Submit"
+    cancel: "Cancel"
+
+"pt-BR":
+  swiss_knife:
+    <<: *PT

data/spec/helpers/helpers_spec.rb

@@ -299,6 +299,7 @@ describe SwissKnife::Helpers do
       helper.gravatar_tag(@email, :title => "title text").should match(/\btitle="title text"/)
     end
 
+    private
     def uri_for(html)
       html = Nokogiri(html)
       uri = URI.parse(html.css("img.gravatar").first["src"])
@@ -311,4 +312,34 @@ describe SwissKnife::Helpers do
       })
     end
   end
+
+  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]")
+    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")
+    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")
+    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]")
+    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]")
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,8 @@ require File.dirname(__FILE__) + "/support/config/boot"
 require "rspec/rails"
 require "swiss_knife/rspec"
 
+FakeWeb.allow_net_connect = false
+
 # Load support files
 Dir[File.dirname(__FILE__) + "/support/rspec/**/*.rb"].each {|file| require file}
 

data/spec/support/rspec/remote_file_shared.rb

@@ -3,8 +3,7 @@ shared_examples_for "remote file" do
   let(:file_path) { directory.join(file) }
 
   it "should update file" do
-    mock = mock(:read => "FILE CONTENT")
-    subject.should_receive(:open).with(url).and_return(mock)
+    FakeWeb.register_uri(:get, url, :body => "FILE CONTENT")
     subject.update
 
     File.read(file_path).should == "FILE CONTENT"
@@ -12,8 +11,7 @@ shared_examples_for "remote file" do
 
   it "should overwrite previous file" do
     File.open(file_path, "w+") << "OLD CONTENT"
-    mock = mock(:read => "UPDATED CONTENT")
-    subject.should_receive(:open).with(url).and_return(mock)
+    FakeWeb.register_uri(:get, url, :body => "UPDATED CONTENT")
     subject.update
 
     File.read(file_path).should == "UPDATED CONTENT"

data/spec/swiss_knife/rspec/have_text_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe SwissKnife::RSpec::Matchers::HaveText do
+  it "should match string" do
+    "abc".should have_text("abc")
+  end
+
+  it "should match regexp" do
+    "abc".should have_text(/b/)
+  end
+
+  it "should not match string" do
+    "abc".should_not have_text("d")
+  end
+
+  it "should not match regexp" do
+    "abc".should_not have_text(/d/)
+  end
+end

data/swiss_knife.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swiss_knife}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira"]
-  s.date = %q{2010-10-12}
+  s.date = %q{2010-10-14}
   s.description = %q{Several helpers for Rails 3}
   s.email = %q{fnando.vieira@gmail.com}
   s.extra_rdoc_files = [
@@ -34,8 +34,11 @@ Gem::Specification.new do |s|
      "lib/swiss_knife/rake_tasks.rb",
      "lib/swiss_knife/rspec.rb",
      "lib/swiss_knife/rspec/have_tag.rb",
+     "lib/swiss_knife/rspec/have_text.rb",
      "lib/swiss_knife/support/remote_file.rb",
      "lib/swiss_knife/version.rb",
+     "locales/en.yml",
+     "locales/pt.yml",
      "spec/controllers/application_controller_spec.rb",
      "spec/helpers/helpers_spec.rb",
      "spec/resources/assets.yml",
@@ -62,6 +65,7 @@ Gem::Specification.new do |s|
      "spec/swiss_knife/jquery_spec.rb",
      "spec/swiss_knife/jquery_ujs_spec.rb",
      "spec/swiss_knife/modernizr_spec.rb",
+     "spec/swiss_knife/rspec/have_text_spec.rb",
      "swiss_knife.gemspec"
   ]
   s.homepage = %q{http://github.com/fnando/swiss_knife}
@@ -81,7 +85,8 @@ Gem::Specification.new do |s|
      "spec/swiss_knife/i18n_js_spec.rb",
      "spec/swiss_knife/jquery_spec.rb",
      "spec/swiss_knife/jquery_ujs_spec.rb",
-     "spec/swiss_knife/modernizr_spec.rb"
+     "spec/swiss_knife/modernizr_spec.rb",
+     "spec/swiss_knife/rspec/have_text_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 -03:00
+date: 2010-10-14 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,8 +74,11 @@ files:
 - lib/swiss_knife/rake_tasks.rb
 - lib/swiss_knife/rspec.rb
 - lib/swiss_knife/rspec/have_tag.rb
+- lib/swiss_knife/rspec/have_text.rb
 - lib/swiss_knife/support/remote_file.rb
 - lib/swiss_knife/version.rb
+- locales/en.yml
+- locales/pt.yml
 - spec/controllers/application_controller_spec.rb
 - spec/helpers/helpers_spec.rb
 - spec/resources/assets.yml
@@ -102,6 +105,7 @@ files:
 - spec/swiss_knife/jquery_spec.rb
 - spec/swiss_knife/jquery_ujs_spec.rb
 - spec/swiss_knife/modernizr_spec.rb
+- spec/swiss_knife/rspec/have_text_spec.rb
 - swiss_knife.gemspec
 has_rdoc: true
 homepage: http://github.com/fnando/swiss_knife
@@ -148,3 +152,4 @@ test_files:
 - spec/swiss_knife/jquery_spec.rb
 - spec/swiss_knife/jquery_ujs_spec.rb
 - spec/swiss_knife/modernizr_spec.rb
+- spec/swiss_knife/rspec/have_text_spec.rb