rspec-padrino 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 716aaff460bc44ec48bb47d15c5e97ccaa6fc434
-  data.tar.gz: 02efe422e54090291777f64a2071862ccd4e8b50
+  metadata.gz: 39274cd9e7510e23434cdb21f3342779a7f0f77c
+  data.tar.gz: 34eee1053ea25ce9b5c7581dcdc9a96f3baef386
 SHA512:
-  metadata.gz: 9602945e07b00d722d61da60ad54e2bd44426226e346e991ca0fec8bf9f87b495b14de9a795f9c0cd74b95f5a3dee8835348f5cdfd0d3b120d646d3eac3146b6
-  data.tar.gz: a51db515b0956a75bcfd734b9030c1d2f9259dd2eefafa008070c5f04001ca74e82050adf9d63d9730b31a145d671f4b9ee968ade16f7445e3e6440adb1b5a52
+  metadata.gz: cbd22223c7362d386714cab843cc38c3e953f3e67a9cb5b58aa6ab4d12437201a6470fc37f094335b611b6b53a82c98a5d5fdebfaf3b666dca75cc5af00c37ee
+  data.tar.gz: 7b9c41da3e753395c460ee678c753a3eb634a33d2ec4db9789c7b8c308ad00abff7e498a82fc0b9477c25fdf97c848d5c7b2dc7495e1a9648d7c4251e69098bd

data/.travis.yml

@@ -2,7 +2,9 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1
+  - 2.2
 notifications:
   email:
     - udzura@udzura.jp
+    - namusyaka@gmail.com

data/{README.rdoc → README.md}

@@ -1,18 +1,18 @@
-= rspec-padrino
+# rspec-padrino
 
 rspec-padrino is a gem including helpers for testing a Padrino app using RSpec. Taking much from rspec-rails.
 
-== Install
+## Install
 
     gem install rspec-padrino
 
-Depends on padrino-core >= 0.10.2, sinatra, rack-test, and RSpec 2.
+Depends on padrino-core <~ 0.12.0, sinatra, rack-test, and RSpec 2.
 
-== Usage
+## Usage
 
 Create a Padrino project with option <tt>-t rspec</tt>. Required files will be generated.
 
-Then edit <tt>spec_helper.rb</tt> like:
+Then edit `spec_helper.rb` like:
 
     RSpec.configure do |conf|
       conf.include Rack::Test::Methods
@@ -25,16 +25,15 @@ Then edit <tt>spec_helper.rb</tt> like:
       Padrino.application
     end
 
-more usage on RDoc: [http://rubydoc.info/github/udzura/rspec-padrino/v0.0.1/frames]
+more usage on RDoc: <http://rubydoc.info/github/udzura/rspec-padrino/frames>
 
-== Related Sites
+## Related Sites
 
-* {rubygems.org}[https://rubygems.org/gems/rspec-padrino]
-* {github}[https://github.com/udzura/rspec-padrino]
-* {travis-ci}[http://travis-ci.org/udzura/rspec-padrino] {<img src="https://secure.travis-ci.org/udzura/rspec-padrino.png" alt="build status" />}[http://travis-ci.org/udzura/rspec-padrino]
-* {author's blog}[http://blog.udzura.jp] # Japanese
+* [rubygems.org](https://rubygems.org/gems/rspec-padrino)
+* [github](https://github.com/udzura/rspec-padrino)
+* [![Build Status](https://travis-ci.org/udzura/rspec-padrino.svg?branch=master)](https://travis-ci.org/udzura/rspec-padrino)
 
-== Contributing to rspec-padrino
+## Contributing to rspec-padrino
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
@@ -44,8 +43,7 @@ more usage on RDoc: [http://rubydoc.info/github/udzura/rspec-padrino/v0.0.1/fram
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+## LICENSE
 
-Copyright (c) 2011 Uchio Kondo <udzura@udzura.jp>. See LICENSE.txt for
-further details.
+See LICENSE.txt for further details.
 

data/lib/rspec/padrino/matchers.rb

@@ -1,8 +1,11 @@
 module RSpec::Padrino
   module Matchers
     require 'rspec/padrino/matchers/routing_matchers'
+    require 'rspec/padrino/matchers/redirect_to'
+
     def self.included(base)
       base.send :include, RSpec::Padrino::Matchers::RoutingMatchers
+      base.send :include, RSpec::Padrino::Matchers::RedirectTo
     end
   end
 end

data/lib/rspec/padrino/matchers/redirect_to.rb

@@ -0,0 +1,31 @@
+module RSpec::Padrino::Matchers
+  module RedirectTo
+    extend RSpec::Matchers::DSL
+    SCHEMA_REGEXP = /\A[A-z][A-z0-9\+\.\-]*:/.freeze
+
+    matcher :redirect_to do |*expected|
+      match do |response|
+        @expected_url = make_expected_url(*expected)
+        @actual_url = response.location
+        response.redirect? && @expected_url == @actual_url
+      end
+
+      def make_expected_url(*args)
+        head = args.first
+        if args.length == 1 && head.kind_of?(String) && head =~ SCHEMA_REGEXP
+          args.shift
+        else
+          last_application.absolute_url(*expected)
+        end
+      end
+
+      failure_message_for_should do |actual|
+        "expected #{actual} to be a redirect to #{@expected_url}, got #{@actual_url.inspect}"
+      end
+
+      failure_message_for_should_not do |actual|
+        "expected #{actual} not to be a redirect to #{@expected_url}, got #{@actual_url.inspect}"
+      end
+    end
+  end
+end

data/lib/rspec/padrino/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Padrino
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/integrations/matchers_spec.rb

@@ -63,4 +63,59 @@ describe "Integrations" do
       {:get => "/foo/errored"}.should be_routable
     end
   end
+
+  describe "redirect_to" do
+    subject { last_response }
+
+    context "with optional style" do
+      it "redirects to /baz/show" do
+        get "/baz"
+        should redirect_to(:baz, :show)
+      end
+
+      it "redirects to /baz/captures/123" do
+        get "/baz/redirect_with_captures/123"
+        should redirect_to(:baz, :captures, :id => 123)
+      end
+
+      it "should fail if does not redirect" do
+        get "/baz/captures/123"
+        should_not redirect_to(:baz, :captures, :id => 123)
+      end
+
+      it "should not fail even if only one argument is an instance of non-string" do
+        get "/cushion", q: "/one"
+        should redirect_to(:one)
+      end
+    end
+
+    context "with URI" do
+      it "redirects to /baz/show" do
+        get "/baz"
+        should redirect_to("/baz/show")
+      end
+
+      it "redirects to /baz/captures/123" do
+        get "/baz/redirect_with_captures/123"
+        should redirect_to("/baz/captures/123")
+      end
+
+      it "should fail if does not redirect" do
+        get "/baz/captures/123"
+        should_not redirect_to("/baz/captures/123")
+      end
+    end
+
+    context "with absolute URI" do
+      it "redirects to http://example.com" do
+        get "/cushion", :q => "http://example.com"
+        should redirect_to("http://example.com")
+      end
+
+      it "redirects to ftp://example.com" do
+        get "/cushion", :q => "ftp://example.com"
+        should redirect_to("ftp://example.com")
+      end
+    end
+  end
 end

data/spec/integrations/mock_app_helper.rb

@@ -36,6 +36,30 @@ class TestApp < Padrino::Application
     end
   end
 
+  controllers :baz do
+    get :index do
+      redirect url(:baz, :show)
+    end
+
+    get :show do
+      "show"
+    end
+
+    get :redirect_with_captures, :with => :id do |id|
+      redirect url(:baz, :captures, :id => id)
+    end
+
+    get :captures, :with => :id do |id|
+      "with #{id}"
+    end
+  end
+
+  get(:one){}
+
+  get :cushion do
+    redirect params[:q]
+  end
+
   helpers do
     def foo_index_path
       url_for(:foo, :index)

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: rspec-padrino
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Uchio KONDO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: padrino-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: rspec-padrino is a gem including helpers for testing a Padrino app using
@@ -158,21 +158,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .rspec
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - lib/rspec-padrino.rb
 - lib/rspec/padrino.rb
 - lib/rspec/padrino/initializers/last_application.rb
 - lib/rspec/padrino/matchers.rb
+- lib/rspec/padrino/matchers/redirect_to.rb
 - lib/rspec/padrino/matchers/routing_matchers.rb
 - lib/rspec/padrino/methods.rb
 - lib/rspec/padrino/version.rb
@@ -194,17 +195,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: rspec-padrino is a gem including helpers for testing a Padrino app using
@@ -217,3 +218,4 @@ test_files:
 - spec/rspec/padrino/methods_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+has_rdoc: