rspec-padrino 0.0.1 → 0.0.4

data/.travis.yml

@@ -0,0 +1,8 @@
+# http://about.travis-ci.org/docs/user/build-configuration/
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3-p0
+notifications:
+  email:
+    - udzura@udzura.jp

data/Gemfile

@@ -4,12 +4,13 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 gem "sinatra"
 gem "padrino-core", ">= 0.10.2"
-gem "rspec", "~> 2.3.0"
+gem "rspec", ">= 2.3"
 gem "rack-test", ">= 0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem 'rdoc'
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.0)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
     diff-lcs (1.1.3)
     git (1.2.5)
@@ -12,29 +12,35 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    multi_json (1.0.3)
-    padrino-core (0.10.2)
+    json (1.6.3)
+    multi_json (1.0.4)
+    padrino-core (0.10.5)
       activesupport (~> 3.1.0)
       http_router (~> 0.10.2)
-      sinatra (~> 1.2.6)
+      sinatra (~> 1.3.1)
       thor (~> 0.14.3)
       tilt (~> 1.3.0)
-    rack (1.3.4)
+    rack (1.3.5)
+    rack-protection (1.1.4)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.9.2)
-    rcov (0.9.10)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rdoc (3.11)
+      json (~> 1.4)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    sinatra (1.2.7)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+    rspec-mocks (2.7.0)
+    sinatra (1.3.1)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
     thor (0.14.6)
     tilt (1.3.3)
     url_mount (0.2.1)
@@ -49,5 +55,6 @@ DEPENDENCIES
   padrino-core (>= 0.10.2)
   rack-test
   rcov
-  rspec (~> 2.3.0)
+  rdoc
+  rspec (>= 2.3)
   sinatra

data/README.rdoc

@@ -1,6 +1,38 @@
 = rspec-padrino
 
-Description goes here.
+rspec-padrino is a gem including helpers for testing a Padrino app using RSpec. Taking much from rspec-rails.
+
+== Install
+
+    gem install rspec-padrino
+
+Depends on padrino-core >= 0.10.2, sinatra, rack-test, and RSpec 2.
+
+== Usage
+
+Create a Padrino project with option <tt>-t rspec</tt>. Required files will be generated.
+
+Then edit <tt>spec_helper.rb</tt> like:
+
+    RSpec.configure do |conf|
+      conf.include Rack::Test::Methods
+      conf.include RSpec::Padrino # add this
+    end
+    
+    def app
+      ##
+      # You should point toplevel #app method to:
+      Padrino.application
+    end
+
+more usage on RDoc: [http://rubydoc.info/github/udzura/rspec-padrino/v0.0.1/frames]
+
+== 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
 
 == Contributing to rspec-padrino
  
@@ -14,6 +46,6 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) 2011 Uchio Kondo. See LICENSE.txt for
+Copyright (c) 2011 Uchio Kondo <udzura@udzura.jp>. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -32,6 +32,11 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = "-fs --color"
 end
 
+RSpec::Core::RakeTask.new(:"spec:integrations") do |spec|
+  spec.pattern = FileList['spec/integrations/**/*_spec.rb']
+  spec.rspec_opts = "-fs --color"
+end
+
 RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
@@ -39,8 +44,8 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.4

data/lib/rspec/padrino/initializers/last_application.rb

@@ -4,7 +4,6 @@ require 'rack/test'
 last_app = nil
 
 Sinatra::Base.class_eval do
-  attr_reader :last_app
   undef :call
   define_method :call do |env|
     _dup = dup

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

@@ -1,15 +1,26 @@
 require 'sinatra/base'
 require 'padrino-core'
+
 module RSpec::Padrino::Matchers
   module RoutingMatchers
     last_params = nil
     last_name = nil
-    Padrino::Application.class_eval do
-      before do
-        last_params = params
-        last_name = request.route_obj.named rescue nil
+
+    @_routing_matchers_hook = lambda do
+      apps = Padrino.mounted_apps.map(&:app_obj)
+      apps.each do |the_app|
+        the_app.class_eval do
+          after do
+            last_params = params
+            last_name = request.route_obj && request.route_obj.named
+          end
+        end
       end
     end
+    
+    def self.hook!
+      @_routing_matchers_hook.call
+    end
 
     extend RSpec::Matchers::DSL
 
@@ -24,8 +35,9 @@ module RSpec::Padrino::Matchers
         query = Rack::Utils::parse_query(query)
         method = verb_to_path_map.keys.first
         begin
-          Padrino.application.call(Rack::MockRequest.env_for(verb_to_path_map.values.first, :method => method.to_s.upcase))
+          ret = Padrino.application.call(Rack::MockRequest.env_for(verb_to_path_map.values.first, :method => method.to_s.upcase))
         rescue
+          puts "something wrong"
         end
         last_name == expected_names.join("_").to_sym &&
           last_params.symbolize_keys == expected_params.symbolize_keys
@@ -54,6 +66,7 @@ module RSpec::Padrino::Matchers
         method = verb_to_path_map.keys.first.to_s.upcase
         @routed_to = Padrino.mounted_apps.map(&:app_obj).
           map{|a| a.router.recognize(Rack::MockRequest.env_for(path, :method => method))}.first
+        @routed_to
       end
 
       failure_message_for_should_not do |path|

data/lib/rspec/padrino/matchers.rb

@@ -3,6 +3,11 @@ module RSpec::Padrino
     require 'rspec/padrino/matchers/routing_matchers'
     def self.included(base)
       base.send :include, RSpec::Padrino::Matchers::RoutingMatchers
+      RSpec.configure do |c|
+        c.before {
+          RSpec::Padrino::Matchers::RoutingMatchers.hook!
+        }
+      end
     end
   end
 end

data/rspec-padrino.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rspec-padrino"
-  s.version = "0.0.1"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Uchio Kondo"]
-  s.date = "2011-10-03"
+  s.date = "2011-12-10"
   s.description = "rspec-padrino is a gem including helpers for testing a Padrino app using RSpec. Taking much from rspec-rails."
   s.email = "udzura@udzura.jp"
   s.extra_rdoc_files = [
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
-    ".rvmrc",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -52,16 +52,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0"])
       s.add_runtime_dependency(%q<padrino-core>, [">= 0.10.2"])
-      s.add_runtime_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.3"])
       s.add_runtime_dependency(%q<rack-test>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<padrino-core>, [">= 0.10.2"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+      s.add_dependency(%q<rspec>, [">= 2.3"])
       s.add_dependency(%q<rack-test>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -69,8 +71,9 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<padrino-core>, [">= 0.10.2"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
+    s.add_dependency(%q<rspec>, [">= 2.3"])
     s.add_dependency(%q<rack-test>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/spec/integrations/matchers_spec.rb

@@ -7,6 +7,10 @@ describe "Integrations" do
       {:get => "/foo"}.should route_to(:foo, :index)
     end
 
+    it "should not route to /bar" do
+      {:get => "/bar"}.should_not route_to(:bar, :index)
+    end
+
     it "routes to /foo/create" do
       {:post => "/foo/create"}.should route_to(:foo, :create)
     end
@@ -15,8 +19,16 @@ describe "Integrations" do
       {:get => "/foo/assign"}.should route_to(:foo, :assign)
     end
 
-    it "routes to /foo/assign?hoge=1234" do
-      {:get => "/foo/assign?hoge=1234"}.should route_to(:foo, :assign, :hoge => "1234")
+    it "routes to /foo/show/1" do
+      {:get => "/foo/show/1"}.should route_to(:foo, :show, :id => "1")
+    end
+
+    it "routes to /custom/123/path" do
+      {:get => "/custom/123/path"}.should route_to(:foo, :show2, :id => "123")
+    end
+
+    it "routes to /foo/assign?par=ams" do
+      {:get => "/foo/assign?par=ams"}.should route_to(:foo, :assign, :par => "ams")
     end
 
     it "is not routeble on /" do
@@ -27,6 +39,18 @@ describe "Integrations" do
       {:get => "/foo"}.should be_routable
     end
 
+    it "is routable on /foo/show/1" do
+      {:get => "/foo/show/1"}.should be_routable
+    end
+
+    it "is routable on /custom/123/path" do
+      {:get => "/custom/123/path"}.should be_routable
+    end
+
+    it "is routable on /foo?par=ams" do
+      {:get => "/foo?par=ams"}.should be_routable
+    end
+
     it "is routable on /foo/create with method POST" do
       {:post => "/foo/create"}.should be_routable
     end

data/spec/integrations/mock_app_helper.rb

@@ -12,6 +12,14 @@ class TestApp < Padrino::Application
       "foo"
     end
     
+    get :show, :with => :id do
+      "foo"
+    end
+    
+    get :show2, '/custom/:id/path' do
+      "foo"
+    end
+
     post :create do
       "foo"
     end
@@ -26,8 +34,10 @@ end
 Padrino.mount("TestApp").to('/')
 Padrino.load!
 
-include Rack::Test::Methods
-include RSpec::Padrino
+RSpec.configure do |c|
+  c.include Rack::Test::Methods
+  c.include RSpec::Padrino
+end
 
 def app
   Padrino.application

data/spec/rspec-padrino_spec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe Rspec::Padrino do
+describe RSpec::Padrino do
   it "can be included" do
-    lambda { include Rspec::Padrino }.should_not raise_error
+    lambda { include RSpec::Padrino }.should_not raise_error
   end
   
   it "includes RSpec::Padrino::* automatically" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-padrino
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
+date: 2011-12-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &13069780 !ruby/object:Gem::Requirement
+  requirement: &89263400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13069780
+  version_requirements: *89263400
 - !ruby/object:Gem::Dependency
   name: padrino-core
-  requirement: &13069240 !ruby/object:Gem::Requirement
+  requirement: &89263130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: 0.10.2
   type: :runtime
   prerelease: false
-  version_requirements: *13069240
+  version_requirements: *89263130
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13068660 !ruby/object:Gem::Requirement
+  requirement: &89262890 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *13068660
+  version_requirements: *89262890
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &13068060 !ruby/object:Gem::Requirement
+  requirement: &89262640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13068060
+  version_requirements: *89262640
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &89262320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *89262320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13067460 !ruby/object:Gem::Requirement
+  requirement: &89239830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13067460
+  version_requirements: *89239830
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13066840 !ruby/object:Gem::Requirement
+  requirement: &89239420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *13066840
+  version_requirements: *89239420
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &12936420 !ruby/object:Gem::Requirement
+  requirement: &89239060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12936420
+  version_requirements: *89239060
 description: rspec-padrino is a gem including helpers for testing a Padrino app using
   RSpec. Taking much from rspec-rails.
 email: udzura@udzura.jp
@@ -99,7 +110,7 @@ extra_rdoc_files:
 files:
 - .document
 - .rspec
-- .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -134,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3951091987802476587
+      hash: -531388223
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/.rvmrc

@@ -1 +0,0 @@
-rvm 1.9.2@padrino-rspec