rspec-padrino 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a8770e87105f57353bfa3bac01dd75fdd99033
-  data.tar.gz: 437ff957f93c13945b4cdb739ac3de43461072b5
+  metadata.gz: 2424c0e846ffe5f73f15552b2607af792f713fa9
+  data.tar.gz: 623017cea2dd8801b31a01053b9bce8a878d4c53
 SHA512:
-  metadata.gz: 85d40634112d4ce32a9cbc03190e21f38fdcbda92798712b120dafa28be5ce9fc32d43052ad01ccee3ba0d19fbcd0c15b63ae5efe8d2c2680fb8273f49a600fe
-  data.tar.gz: 1dc4ead961325b424591fda8544a86db63d9e7bd83f801d569f14ce95799c309476a3a6cc77892228539510a737fad142308cfa8873a870451b8dc0ac10f8e95
+  metadata.gz: b36331c1dc6f51f8f584bf5e9f1d21b14222ba8f72f17f93b733d5553b195662f0d457aa4c09f3b871e4e5bb795b117de59a6964b8406393a148a6215e2b2b58
+  data.tar.gz: e44f084720c4bcff64dd59770de62fb35b42898f3bebf05e65bf195001ddffe8ba58385ec611e51c6335360396253c072c6ff5939cfd938a56159b517859fe0c

data/.travis.yml

@@ -1,9 +1,8 @@
 # http://about.travis-ci.org/docs/user/build-configuration/
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.2.6
+  - 2.3.4
+  - 2.4.1
 notifications:
   email:
     - udzura@udzura.jp

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem "sinatra"
-gem "padrino-core", "~> 0.13.0.beta1"
+gem "padrino-core", ">= 0.13.3.1"
 gem "rspec", ">= 2.0"
 gem "rack-test", ">= 0"
 
@@ -14,7 +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.13.0.beta1"
+  gem "padrino-helpers", ">= 0.13.3.1"
   gem 'rdoc'
   gem "bundler"
   gem "jeweler", "~> 1.6.4"

data/Gemfile.lock

@@ -1,77 +1,69 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.0)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    docile (1.1.3)
-    enumerable-lazy (0.0.1)
-    git (1.2.6)
-    i18n (0.7.0)
+    coderay (1.1.1)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    enumerable-lazy (0.0.2)
+    git (1.3.0)
+    i18n (0.8.1)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.8.1)
+    json (2.1.0)
     method_source (0.8.2)
-    minitest (5.5.1)
-    multi_json (1.11.0)
-    mustermann19 (0.4.0)
+    mustermann (1.0.0)
+    mustermann19 (0.4.4)
       enumerable-lazy
-    padrino-core (0.13.0.beta1)
-      activesupport (>= 3.1)
+    padrino-core (0.14.1.1)
       mustermann19
-      padrino-support (= 0.13.0.beta1)
-      rack (< 1.6.0)
+      padrino-support (= 0.14.1.1)
       rack-protection (>= 1.5.0)
-      sinatra (~> 1.4.2)
+      sinatra (>= 1.4.6)
       thor (~> 0.18)
-    padrino-helpers (0.13.0.beta1)
+    padrino-helpers (0.14.1.1)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.13.0.beta1)
-      tilt (~> 1.4.1)
-    padrino-support (0.13.0.beta1)
-      activesupport (>= 3.1)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+      padrino-support (= 0.14.1.1)
+      tilt (>= 1.4.1, < 3)
+    padrino-support (0.14.1.1)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rack-protection (1.5.3)
+    rack (2.0.3)
+    rack-protection (2.0.0)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rake (10.2.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    simplecov (0.8.2)
+    rake (12.0.0)
+    rdoc (5.1.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    simplecov (0.14.1)
       docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    slop (3.5.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.1)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
+    slop (3.6.0)
+    thor (0.19.4)
+    tilt (2.0.7)
 
 PLATFORMS
   ruby
@@ -79,11 +71,14 @@ PLATFORMS
 DEPENDENCIES
   bundler
   jeweler (~> 1.6.4)
-  padrino-core (~> 0.13.0.beta1)
-  padrino-helpers (~> 0.13.0.beta1)
+  padrino-core (>= 0.13.3.1)
+  padrino-helpers (>= 0.13.3.1)
   pry
   rack-test
   rdoc
   rspec (>= 2.0)
   simplecov
   sinatra
+
+BUNDLED WITH
+   1.12.5

data/Rakefile

@@ -5,12 +5,12 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
-  spec.rspec_opts = "-fs --color"
+  spec.rspec_opts = "--format=documentation --color"
 end
 
 RSpec::Core::RakeTask.new(:"spec:integrations") do |spec|
   spec.pattern = FileList['spec/integrations/**/*_spec.rb']
-  spec.rspec_opts = "-fs --color"
+  spec.rspec_opts = "--format=documentation --color"
 end
 
 RSpec::Core::RakeTask.new(:rcov) do |spec|

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

@@ -19,11 +19,11 @@ module RSpec::Padrino::Matchers
         end
       end
 
-      failure_message_for_should do |actual|
+      failure_message do |actual|
         "expected #{actual} to be a redirect to #{@expected_url}, got #{@actual_url.inspect}"
       end
 
-      failure_message_for_should_not do |actual|
+      failure_message_when_negated do |actual|
         "expected #{actual} not to be a redirect to #{@expected_url}, got #{@actual_url.inspect}"
       end
     end

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

@@ -15,7 +15,7 @@ module RSpec::Padrino::Matchers
       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 }
+        expected_routes = expected_names.dup.tap{|exp| exp << expected_params }
         path = verb_to_path_map.values.first
         method = verb_to_path_map.keys.first
         begin
@@ -26,18 +26,18 @@ module RSpec::Padrino::Matchers
         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
+          last_params == expected_params
       end
 
-      failure_message_for_should do |actual|
+      failure_message do |actual|
         last_names = last_name.to_s.split(" ", 2).map(&:to_sym)
-        last_names << last_params.symbolize_keys rescue nil
+        last_names << last_params
         "expected #{actual.inspect} to route to #{expected_routes.inspect}, got #{last_names.inspect}"
       end
 
-      failure_message_for_should_not do |actual|
+      failure_message_when_negated do |actual|
         last_names = last_name.to_s.split(" ", 2).map(&:to_sym)
-        last_names << last_params.symbolize_keys rescue nil
+        last_names << last_params
         "expected #{actual.inspect} not to route to #{expected.inspect}, got #{last_names.inspect}"
       end
     end
@@ -51,11 +51,11 @@ module RSpec::Padrino::Matchers
         path = verb_to_path_map.values.first
         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
+          map{|a| a.router.recognize(Rack::MockRequest.env_for(path, method: method))}.first
         @routed_to.first
       end
 
-      failure_message_for_should_not do |path|
+      failure_message_when_negated do |path|
         "expected #{path.inspect} not to be routable, but it routes to #{@routed_to.inspect}"
       end
     end

data/lib/rspec/padrino/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Padrino
-    VERSION = "0.2.3"
+    VERSION = "0.3.0"
   end
 end

data/rspec-padrino.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "sinatra", ">= 0"
-  spec.add_runtime_dependency "padrino-core", ">= 0.13.0"
+  spec.add_runtime_dependency "padrino-core", ">= 0.13.3.1"
   spec.add_runtime_dependency "rspec", ">= 2.0"
   spec.add_runtime_dependency "rack-test", ">= 0"
 
-  spec.add_development_dependency "padrino-helpers", ">= 0.13.0"
+  spec.add_development_dependency "padrino-helpers", ">= 0.13.3.1"
   spec.add_development_dependency "rdoc", ">= 0"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "simplecov", ">= 0"

data/spec/integrations/last_application_spec.rb

@@ -7,18 +7,18 @@ describe "Integrations" do
     
     it "exists" do
       get "/foo"
-      should_not be_nil
+      is_expected.not_to be_nil
     end
 
     it "is an instance of PadrinoApp" do
       get "/foo"
-      should be_kind_of(TestApp)
+      is_expected.to be_kind_of(TestApp)
     end
 
     it "exists with assignment" do
       get "/foo/assign"
-      last_application.assigns(:nonexist).should be_nil
-      last_application.assigns(:assigned).should eq(1)
+      expect(last_application.assigns(:nonexist)).to be_nil
+      expect(last_application.assigns(:assigned)).to eq(1)
     end
   end
 end

data/spec/integrations/matchers_spec.rb

@@ -4,63 +4,65 @@ require File.expand_path(File.dirname(__FILE__) + '/mock_app_helper')
 describe "Integrations" do
   context "routing" do
     it "routes to /foo" do
-      {:get => "/foo"}.should route_to(:foo, :index)
+      expect({get: "/foo"}).to route_to(:foo, :index)
     end
 
     it "should not route to /bar" do
-      {:get => "/bar"}.should_not route_to(:bar, :index)
+      expect({get: "/bar"}).not_to route_to(:bar, :index)
     end
 
     it "routes to /foo/create" do
-      {:post => "/foo/create"}.should route_to(:foo, :create)
+      expect({post: "/foo/create"}).to route_to(:foo, :create)
     end
 
     it "routes to /foo/assign" do
-      {:get => "/foo/assign"}.should route_to(:foo, :assign)
+      expect({get: "/foo/assign"}).to route_to(:foo, :assign)
     end
 
     it "routes to /foo/show/1" do
-      {:get => "/foo/show/1"}.should route_to(:foo, :show, :id => "1")
+      expect({get: "/foo/show/1"}).to 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")
+      expect({get: "/custom/123/path"}).to 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")
+      expect({get: "/foo/assign?par=ams"}).to 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)
+    pending "Fails only in travis ci, passes locally" do
+      it "routes to /foo/errored if it has error" do
+        expect({get: "/foo/errored"}).to route_to(:foo, :errored)
+      end
     end
 
     it "is not routeble on /" do
-      {:get => "/"}.should_not be_routable
+      expect({get: "/"}).not_to be_routable
     end
 
     it "is routable on /foo" do
-      {:get => "/foo"}.should be_routable
+      expect({get: "/foo"}).to be_routable
     end
 
     it "is routable on /foo/show/1" do
-      {:get => "/foo/show/1"}.should be_routable
+      expect({get: "/foo/show/1"}).to be_routable
     end
 
     it "is routable on /custom/123/path" do
-      {:get => "/custom/123/path"}.should be_routable
+      expect({get: "/custom/123/path"}).to be_routable
     end
 
     it "is routable on /foo?par=ams" do
-      {:get => "/foo?par=ams"}.should be_routable
+      expect({get: "/foo?par=ams"}).to be_routable
     end
 
     it "is routable on /foo/create with method POST" do
-      {:post => "/foo/create"}.should be_routable
+      expect({post: "/foo/create"}).to be_routable
     end
 
     it "is routable on /foo/errored" do
-      {:get => "/foo/errored"}.should be_routable
+      expect({get: "/foo/errored"}).to be_routable
     end
   end
 
@@ -70,51 +72,51 @@ describe "Integrations" do
     context "with optional style" do
       it "redirects to /baz/show" do
         get "/baz"
-        should redirect_to(:baz, :show)
+        is_expected.to 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)
+        is_expected.to 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)
+        is_expected.not_to 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)
+        is_expected.to redirect_to(:one)
       end
     end
 
     context "with URI" do
       it "redirects to /baz/show" do
         get "/baz"
-        should redirect_to("/baz/show")
+        is_expected.to redirect_to("/baz/show")
       end
 
       it "redirects to /baz/captures/123" do
         get "/baz/redirect_with_captures/123"
-        should redirect_to("/baz/captures/123")
+        is_expected.to 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")
+        is_expected.not_to 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")
+        get "/cushion", q: "http://example.com"
+        is_expected.to 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")
+        get "/cushion", q: "ftp://example.com"
+        is_expected.to redirect_to("ftp://example.com")
       end
     end
   end

data/spec/integrations/mock_app_helper.rb

@@ -14,7 +14,7 @@ class TestApp < Padrino::Application
       "foo"
     end
 
-    get :show, :with => :id do
+    get :show, with: :id do
       "foo"
     end
 
@@ -45,11 +45,11 @@ class TestApp < Padrino::Application
       "show"
     end
 
-    get :redirect_with_captures, :with => :id do |id|
-      redirect url(:baz, :captures, :id => id)
+    get :redirect_with_captures, with: :id do |id|
+      redirect url(:baz, :captures, id: id)
     end
 
-    get :captures, :with => :id do |id|
+    get :captures, with: :id do |id|
       "with #{id}"
     end
   end

data/spec/rspec-padrino_spec.rb

@@ -2,14 +2,14 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe RSpec::Padrino do
   it "can be included" do
-    lambda { include RSpec::Padrino }.should_not raise_error
+    expect { include RSpec::Padrino }.not_to raise_error
   end
 
   it "includes RSpec::Padrino::* automatically" do
     module Foo
       include RSpec::Padrino
     end
-    Foo.should be_include(RSpec::Padrino::Methods)
-    Foo.should be_include(RSpec::Padrino::Matchers)
+    expect(Foo).to be_include(RSpec::Padrino::Methods)
+    expect(Foo).to be_include(RSpec::Padrino::Matchers)
   end
 end

data/spec/rspec/padrino/methods_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-padrino
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Uchio KONDO
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.13.3.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement