rspec-padrino 0.0.4 → 0.0.5

data/.travis.yml

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

data/Gemfile

@@ -4,14 +4,19 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 gem "sinatra"
 gem "padrino-core", ">= 0.10.2"
-gem "rspec", ">= 2.3"
+gem "rspec", ">= 2.0"
 gem "rack-test", ">= 0"
 
+platform :mri_18 do
+  gem 'pry'
+end
+
 # 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 "bundler"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
+  gem "simplecov", ">= 0"
+  gem 'pry'
 end

data/Gemfile.lock

@@ -1,46 +1,58 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
+    coderay (1.0.6)
     diff-lcs (1.1.3)
     git (1.2.5)
     http_router (0.10.2)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
+    i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.3)
-    multi_json (1.0.4)
-    padrino-core (0.10.5)
-      activesupport (~> 3.1.0)
+    json (1.7.3)
+    method_source (0.7.1)
+    multi_json (1.3.5)
+    padrino-core (0.10.6)
+      activesupport (~> 3.2.0)
       http_router (~> 0.10.2)
       sinatra (~> 1.3.1)
       thor (~> 0.14.3)
       tilt (~> 1.3.0)
-    rack (1.3.5)
-    rack-protection (1.1.4)
+    pry (0.9.9.6)
+      coderay (~> 1.0.5)
+      method_source (~> 0.7.1)
+      slop (>= 2.4.4, < 3)
+    rack (1.4.1)
+    rack-protection (1.2.0)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.11)
+    rdoc (3.12)
       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.7.0)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
+    slop (2.4.4)
     thor (0.14.6)
     tilt (1.3.3)
     url_mount (0.2.1)
@@ -50,11 +62,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler
   jeweler (~> 1.6.4)
   padrino-core (>= 0.10.2)
+  pry
   rack-test
-  rcov
   rdoc
-  rspec (>= 2.3)
+  rspec (>= 2.0)
+  simplecov
   sinatra

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

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

@@ -10,7 +10,7 @@ Sinatra::Base.class_eval do
     last_app = _dup
     _dup.call!(env)
   end
-  
+
   def assigns(sym)
     valname = (RUBY_VERSION > '1.9') ? :"@#{sym}" : "@#{sym}"
     instance_variables.include?(valname) ? instance_variable_get(valname) : nil

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

@@ -1,5 +1,7 @@
 require 'sinatra/base'
 require 'padrino-core'
+# defining Proc#source_location
+require 'pry' if RUBY_VERSION < '1.9'
 
 module RSpec::Padrino::Matchers
   module RoutingMatchers
@@ -9,6 +11,7 @@ module RSpec::Padrino::Matchers
     @_routing_matchers_hook = lambda do
       apps = Padrino.mounted_apps.map(&:app_obj)
       apps.each do |the_app|
+        next if the_app.filters[:after].find{|filter| filter.source_location[0] =~ /#{__FILE__}/ }
         the_app.class_eval do
           after do
             last_params = params
@@ -17,11 +20,15 @@ module RSpec::Padrino::Matchers
         end
       end
     end
-    
+
     def self.hook!
       @_routing_matchers_hook.call
     end
 
+    def self.after_hook!
+      @_routing_matchers_hook.call
+    end
+
     extend RSpec::Matchers::DSL
 
     matcher :route_to do |*expected|

data/lib/rspec/padrino/matchers.rb

@@ -4,7 +4,7 @@ module RSpec::Padrino
     def self.included(base)
       base.send :include, RSpec::Padrino::Matchers::RoutingMatchers
       RSpec.configure do |c|
-        c.before {
+        c.before(:all) {
           RSpec::Padrino::Matchers::RoutingMatchers.hook!
         }
       end

data/rspec-padrino.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rspec-padrino"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Uchio Kondo"]
-  s.date = "2011-12-10"
+  s.date = "2012-05-12"
   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 = [
@@ -37,13 +37,14 @@ Gem::Specification.new do |s|
     "spec/integrations/matchers_spec.rb",
     "spec/integrations/mock_app_helper.rb",
     "spec/rspec-padrino_spec.rb",
+    "spec/rspec/padrino/matchers_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/udzura/rspec-padrino"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.19"
   s.summary = "rspec-padrino is a gem including helpers for testing a Padrino app."
 
   if s.respond_to? :specification_version then
@@ -52,31 +53,37 @@ 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"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.0"])
       s.add_runtime_dependency(%q<rack-test>, [">= 0"])
+      s.add_runtime_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
     else
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<padrino-core>, [">= 0.10.2"])
-      s.add_dependency(%q<rspec>, [">= 2.3"])
+      s.add_dependency(%q<rspec>, [">= 2.0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<padrino-core>, [">= 0.10.2"])
-    s.add_dependency(%q<rspec>, [">= 2.3"])
+    s.add_dependency(%q<rspec>, [">= 2.0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
   end
 end
 

data/spec/integrations/mock_app_helper.rb

@@ -11,11 +11,11 @@ class TestApp < Padrino::Application
     get :index do
       "foo"
     end
-    
+
     get :show, :with => :id do
       "foo"
     end
-    
+
     get :show2, '/custom/:id/path' do
       "foo"
     end

data/spec/rspec/padrino/matchers_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../integrations/mock_app_helper')
+
+describe RSpec::Padrino::Matchers do
+  describe 'RoutingMatchers.hook! adds a filter' do
+    subject { TestApp.filters[:after] }
+    before { RSpec::Padrino::Matchers::RoutingMatchers.hook! }
+    it { should have(1).filter }
+
+    describe 'should not add second filter hook' do
+      before { RSpec::Padrino::Matchers::RoutingMatchers.hook! }
+      it { should have(1).filter }
+    end
+  end
+end

data/spec/rspec-padrino_spec.rb

@@ -4,7 +4,7 @@ describe RSpec::Padrino do
   it "can be included" do
     lambda { include RSpec::Padrino }.should_not raise_error
   end
-  
+
   it "includes RSpec::Padrino::* automatically" do
     module Foo
       include RSpec::Padrino

data/spec/spec_helper.rb

@@ -8,5 +8,5 @@ require 'rspec-padrino'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+  # none
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-padrino
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-10 00:00:00.000000000Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &89263400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *89263400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: padrino-core
-  requirement: &89263130 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +37,47 @@ dependencies:
         version: 0.10.2
   type: :runtime
   prerelease: false
-  version_requirements: *89263130
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &89262890 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *89262890
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &89262640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *89262640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &89262320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,32 +101,63 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *89262320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &89239830 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *89239830
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &89239420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.4
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *89239420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &89239060 !ruby/object:Gem::Requirement
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +165,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *89239060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: rspec-padrino is a gem including helpers for testing a Padrino app using
   RSpec. Taking much from rspec-rails.
 email: udzura@udzura.jp
@@ -128,6 +200,7 @@ files:
 - spec/integrations/matchers_spec.rb
 - spec/integrations/mock_app_helper.rb
 - spec/rspec-padrino_spec.rb
+- spec/rspec/padrino/matchers_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://github.com/udzura/rspec-padrino
@@ -145,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -531388223
+      hash: -3565863233537445049
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: rspec-padrino is a gem including helpers for testing a Padrino app.