rspec-padrino 0.0.5 → 0.1.0

data/.travis.yml

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

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# CHANGELOG
+
+## version 0.1.0 (2013-06-07)
+
+* Compatible with Padrino >= 0.11
+* Drops support against Padrino 0.10 and Ruby 1.8.7
+* Add a testing helper to test padrino helpers

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem "sinatra"
-gem "padrino-core", ">= 0.10.2"
+gem "padrino-core", "~> 0.11.0"
 gem "rspec", ">= 2.0"
 gem "rack-test", ">= 0"
 
@@ -14,6 +14,7 @@ end
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "padrino-helpers", "~> 0.11.0"
   gem 'rdoc'
   gem "bundler"
   gem "jeweler", "~> 1.6.4"

data/Gemfile.lock

@@ -1,60 +1,64 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.3)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    coderay (1.0.6)
-    diff-lcs (1.1.3)
+    coderay (1.0.9)
+    diff-lcs (1.2.4)
     git (1.2.5)
-    http_router (0.10.2)
+    http_router (0.11.0)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    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)
-    pry (0.9.9.6)
+    json (1.8.0)
+    method_source (0.8.1)
+    multi_json (1.7.5)
+    padrino-core (0.11.2)
+      activesupport (>= 3.1.0)
+      http_router (~> 0.11.0)
+      rack-protection (>= 1.5.0)
+      sinatra (~> 1.4.2)
+      thor (~> 0.17.0)
+      tilt (~> 1.3.7)
+    padrino-helpers (0.11.2)
+      i18n (~> 0.6)
+      padrino-core (= 0.11.2)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.5.2)
+    rack-protection (1.5.0)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
-    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)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
       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)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    slop (3.4.5)
+    thor (0.17.0)
+    tilt (1.3.7)
     url_mount (0.2.1)
       rack
 
@@ -64,7 +68,8 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler (~> 1.6.4)
-  padrino-core (>= 0.10.2)
+  padrino-core (~> 0.11.0)
+  padrino-helpers (~> 0.11.0)
   pry
   rack-test
   rdoc

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

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

@@ -3,20 +3,30 @@ require 'rack/test'
 
 last_app = nil
 
-Sinatra::Base.class_eval do
-  undef :call
-  define_method :call do |env|
-    _dup = dup
-    last_app = _dup
-    _dup.call!(env)
+Padrino::Application.class_eval do
+  # Padrino does not override call! now in version,
+  # So I override here
+  define_method :call! do |*args|
+    ret = nil
+    begin
+      ret = super(*args)
+    ensure
+      last_app = Thread.current['padrino.instance'] || self
+    end
+    return ret
   end
 
   def assigns(sym)
     valname = (RUBY_VERSION > '1.9') ? :"@#{sym}" : "@#{sym}"
     instance_variables.include?(valname) ? instance_variable_get(valname) : nil
   end
+
+  def get_requested_routes_and_params
+    [ request.route_obj, params ]
+  end
 end
 
+
 Rack::MockSession.class_eval do
   alias original_request request
   undef :request
@@ -32,12 +42,6 @@ Rack::MockSession.class_eval do
   end
 end
 
-module Rack::Test::Methods
-  def last_application
-    current_session.last_application
-  end
-end
-
 class Rack::Test::Session
   def_delegator :@rack_mock_session, :last_application
 end

data/lib/rspec/padrino/matchers.rb

@@ -3,12 +3,6 @@ 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(:all) {
-          RSpec::Padrino::Matchers::RoutingMatchers.hook!
-        }
-      end
     end
   end
 end
-

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

@@ -5,60 +5,39 @@ require 'pry' if RUBY_VERSION < '1.9'
 
 module RSpec::Padrino::Matchers
   module RoutingMatchers
-    last_params = nil
-    last_name = nil
-
-    @_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
-            last_name = request.route_obj && request.route_obj.named
-          end
-        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|
       expected_routes = nil
+      last_name = nil
+      last_params = nil
 
       match do |verb_to_path_map|
         expected_names = expected.select{|v| Symbol === v }
         expected_params = expected.select{|v| Hash === v }.first || {}
         expected_routes = expected_names.dup.tap{|exp| exp << expected_params.symbolize_keys }
-        path, query = *verb_to_path_map.values.first.split('?')
-        query = Rack::Utils::parse_query(query)
+        path = verb_to_path_map.values.first
         method = verb_to_path_map.keys.first
         begin
-          ret = Padrino.application.call(Rack::MockRequest.env_for(verb_to_path_map.values.first, :method => method.to_s.upcase))
+          self.send method, path
         rescue
           puts "something wrong"
         end
+        last_route, last_params = *last_application.get_requested_routes_and_params
+        last_name = last_route ? last_route.name : nil
         last_name == expected_names.join("_").to_sym &&
           last_params.symbolize_keys == expected_params.symbolize_keys
       end
 
       failure_message_for_should do |actual|
         last_names = last_name.to_s.split("_").map(&:to_sym)
-        last_names << last_params.symbolize_keys
+        last_names << last_params.symbolize_keys rescue nil
         "expected #{actual.inspect} to route to #{expected_routes.inspect}, got #{last_names.inspect}"
       end
 
       failure_message_for_should_not do |actual|
         last_names = last_name.to_s.split("_").map(&:to_sym)
-        last_names << last_params.symbolize_keys
+        last_names << last_params.symbolize_keys rescue nil
         "expected #{actual.inspect} not to route to #{expected.inspect}, got #{last_names.inspect}"
       end
     end
@@ -73,7 +52,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
+        @routed_to.first
       end
 
       failure_message_for_should_not do |path|

data/lib/rspec/padrino/methods.rb

@@ -1,7 +1,18 @@
 module RSpec
   module Padrino
     module Methods
-      
+      def last_application
+        current_session.last_application
+      end
+
+      def app_helpers(app=nil)
+        app ||= Padrino.mounted_apps.first.app_obj
+        if app and app.ancestors.include?(Sinatra::Base)
+          app.prototype.helpers
+        else
+          raise ArgumentError, "#{app} should be an subclass of Sinatra::Base"
+        end
+      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.5"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Uchio Kondo"]
-  s.date = "2012-05-12"
+  s.date = "2013-06-07"
   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 = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     ".travis.yml",
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -37,14 +38,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/rspec/padrino/methods_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.19"
+  s.rubygems_version = "1.8.23"
   s.summary = "rspec-padrino is a gem including helpers for testing a Padrino app."
 
   if s.respond_to? :specification_version then
@@ -52,10 +53,11 @@ 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<padrino-core>, ["~> 0.11.0"])
       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<padrino-helpers>, ["~> 0.11.0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -63,10 +65,11 @@ Gem::Specification.new do |s|
       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<padrino-core>, ["~> 0.11.0"])
       s.add_dependency(%q<rspec>, [">= 2.0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<padrino-helpers>, ["~> 0.11.0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
@@ -75,10 +78,11 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<padrino-core>, [">= 0.10.2"])
+    s.add_dependency(%q<padrino-core>, ["~> 0.11.0"])
     s.add_dependency(%q<rspec>, [">= 2.0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<padrino-helpers>, ["~> 0.11.0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/spec/integrations/matchers_spec.rb

@@ -31,6 +31,10 @@ describe "Integrations" do
       {:get => "/foo/assign?par=ams"}.should route_to(:foo, :assign, :par => "ams")
     end
 
+    it "routes to /foo/errored if it has error", pending: "Fails only in travis ci, passes locally" do
+      {:get => "/foo/errored"}.should route_to(:foo, :errored)
+    end
+
     it "is not routeble on /" do
       {:get => "/"}.should_not be_routable
     end
@@ -54,5 +58,9 @@ describe "Integrations" do
     it "is routable on /foo/create with method POST" do
       {:post => "/foo/create"}.should be_routable
     end
+
+    it "is routable on /foo/errored" do
+      {:get => "/foo/errored"}.should be_routable
+    end
   end
 end

data/spec/integrations/mock_app_helper.rb

@@ -1,8 +1,10 @@
 require 'padrino-core'
+require 'padrino-helpers'
 require 'rack/test'
 
 class TestApp < Padrino::Application
   register Padrino::Rendering
+  register Padrino::Helpers
   enable :sessions
   set :session_secret, "fooo"
   disable :logging
@@ -28,6 +30,16 @@ class TestApp < Padrino::Application
       @assigned = 1
       "bar"
     end
+
+    get :errored do
+      raise "Some error, but routable"
+    end
+  end
+
+  helpers do
+    def foo_index_path
+      url_for(:foo, :index)
+    end
   end
 end
 

data/spec/rspec/padrino/methods_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'integrations/mock_app_helper'
+require 'pry'
+
+describe RSpec::Padrino::Methods do
+  describe "#app_helpers" do
+    subject { app_helpers(TestApp) }
+    it { should respond_to :url_for }
+
+    it "should render content tag" do
+      subject.content_tag(:div, "foo").
+        should == "<div>foo</div>"
+    end
+
+    it "should respond to a custom helper" do
+      subject.foo_index_path.
+        should == "/foo"
+    end
+  end
+end

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-padrino
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-12 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: padrino-helpers
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +199,7 @@ files:
 - .document
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -200,7 +217,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/rspec/padrino/methods_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://github.com/udzura/rspec-padrino
@@ -218,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3565863233537445049
+      hash: 2139666621066804611
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: rspec-padrino is a gem including helpers for testing a Padrino app.

data/spec/rspec/padrino/matchers_spec.rb

@@ -1,15 +0,0 @@
-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