rutter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f91432538209a198ac676ddfe072b83d469b382
-  data.tar.gz: b8fb9fe0e6ff41ccfb91b30fe34b67a189b89c38
+  metadata.gz: 7e0af90882ec8c36cf23e278e384a38e38aa3959
+  data.tar.gz: '0387e7a032da114cb32b1635330dd878f207e960'
 SHA512:
-  metadata.gz: f66d79b45f86bf37aad68fa4a0374b8594d954711fef0de1b4ca738acb1e4d48269d2d16d14a85cbcda6e3a35fbddfa0fe58b3ceb04e5faa40c084fbd0081ba3
-  data.tar.gz: ee48cfa27b6d7e9fe557f108eeb48fab5f32647d9c4a0ee4fa7cddb6baeda25233da0e78da58b5bd79693f70f112bb56a19b2b921a54ca0a9c7efeca5b8d337d
+  metadata.gz: 236b39818113ff5910c9be230bbb7ec42478c30b891a56ecbfe2083756b5c16299f44b9e603ab0c5d6cbae33643699d988a03f66668c44a2cd9cd401309154c9
+  data.tar.gz: 8ffd27decede4f74d81a374296376692b47918946f9aab638f8369a1d539c088c803a9d3ad5551f6e942ffa0a94344147d251482c78f975b164760745d41e9e7

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -2,20 +2,17 @@ language: ruby
 script: "bundle exec rake spec:coverage"
 cache: bundler
 before_install:
-  - rvm @global do gem uninstall bundler -a -x
-  - rvm @global do gem install bundler -v 1.15.0
+  - "gem update --system"
 after_script:
-  - "CODECLIMATE_REPO_TOKEN=d8f51b92273019156d95fcf54adf51bee10c42f9419101eae0d638f1c94075aa bundle exec codeclimate-test-reporter"
+  - "CODECLIMATE_REPO_TOKEN=05a406e21e530e8210057604aa78eccebb988a8201c6b1e78187dff978bdee07 bundle exec codeclimate-test-reporter"
 rvm:
-  - 2.4.2
+  - 2.5.0
   - 2.4.0
   - ruby-head
-  - jruby-9.1.13.0
   - jruby-head
 matrix:
   allow_failures:
     - rvm: jruby-head
-    - rvm: jruby-9.1.13.0
     - rvm: ruby-head
 branches:
   only:

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Tobias Sandelius
+Copyright (c) 2018 Tobias Sandelius
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -132,7 +132,7 @@ end
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/sandelius/skeletor. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/sandelius/rutter. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 
 ## License

data/Rakefile

@@ -1,12 +1,10 @@
+
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new(:spec) do |t|
-  t.pattern = "spec/**/*_spec.rb"
-  t.libs.push "spec"
-end
+RSpec::Core::RakeTask.new(:spec)
 
 namespace :spec do
   task :coverage do

data/lib/rutter/builder.rb

@@ -9,11 +9,11 @@ module Rutter
   # The router redirect incoming requests to defined endpoints. Most often
   # it's to a controller and an action or a Rack endpoint.
   #
-  # @attr_reader [Array<Rutter::Route>] flat_map
+  # @attr_reader flat_map [Array<Rutter::Route>]
   #   Defined routes.
-  # @attr_reader [Hash<String => Array>] verb_map
+  # @attr_reader verb_map [Hash<String => Array>]
   #   Routes group by verb.
-  # @attr_reader [Hash<Symbol => Rutter::Route>] named_map
+  # @attr_reader named_map [Hash<Symbol => Rutter::Route>]
   #   Named routes.
   #
   # @example basic usage
@@ -32,13 +32,13 @@ module Rutter
 
     # Initializes the router.
     #
-    # @param [String] scheme
+    # @param scheme [String]
     #   URL scheme.
-    # @param [String] host
+    # @param host [String]
     #   URL host.
-    # @param [Integer] port
+    # @param port [Integer]
     #   URL port.
-    # @param [String] controller_suffix
+    # @param controller_suffix [String]
     #   Suffix string for controllers (BooksController).
     #
     # @yield
@@ -65,9 +65,9 @@ module Rutter
 
     # Mount a Rack application at the specified path.
     #
-    # @param [Class, Object] app
+    # @param app [Class, Object]
     #   A class or an object that responds to `call`.
-    # @param [String] at
+    # @param at [String]
     #   Path prefix to match.
     #
     # @return [void]
@@ -77,9 +77,9 @@ module Rutter
 
     # Convenient method to create a redirect endpoint.
     #
-    # @param [String] destination
+    # @param destination [String]
     #   The destination.
-    # @param [Integer] status
+    # @param status [Integer]
     #   Response status code.
     #
     # @return [Proc]
@@ -109,13 +109,13 @@ module Rutter
 
     # Adds a new route to the collection.
     #
-    # @param [String, Symbol] method
+    # @param method [String, Symbol]
     #   Request method.
-    # @param [String] path
+    # @param path [String]
     #   Path template.
-    # @param [String, Symbol] as
+    # @param as [String, Symbol]
     #   Route identifier (name).
-    # @param [String, Proc] to
+    # @param to [String, Proc]
     #   Route endpoint.
     #
     # @return [Rutter::Route]
@@ -171,9 +171,9 @@ module Rutter
 
     # Transforms a named route into a URL path.
     #
-    # @param [Symbol] name
+    # @param name [Symbol]
     #   Name of the route.
-    # @param [Hash] params
+    # @param params [Hash]
     #   Route paremeters.
     #
     # @return [String]
@@ -192,7 +192,7 @@ module Rutter
 
     # Transforms a named route into a full URL with scheme and host.
     #
-    # @param [Symbol] name
+    # @param name [Symbol]
     #   Name of the route.
     # @option params [String] :_scheme (configuration.scheme)
     #   Override scheme.
@@ -220,7 +220,7 @@ module Rutter
 
     # Process the request and is compatible with the Rack protocol.
     #
-    # @param [Hash] env
+    # @param env [Hash]
     #   Rack environment hash.
     #
     # @return [Array]
@@ -262,7 +262,7 @@ module Rutter
     #
     # @private
     def match(env)
-      path = env["PATH_INFO"].downcase
+      path = (env["PATH_INFO"] || "/").downcase
       path = path.chomp("/") if path != "/" && path.end_with?("/")
 
       routes = verb_map[env["REQUEST_METHOD"]]

data/lib/rutter/route.rb

@@ -5,11 +5,11 @@ require "cgi"
 module Rutter
   # Represents a single route.
   #
-  # @attr_reader [String] method
+  # @attr_reader method [String]
   #   Request method to match.
-  # @attr_reader [String] path
+  # @attr_reader path [String]
   #   Path to match.
-  # @attr_reader [Hash] endpoint
+  # @attr_reader endpoint [Hash]
   #   Route endpoint.
   class Route
     # Valid request verbs.
@@ -19,13 +19,13 @@ module Rutter
 
     # Initializes the route.
     #
-    # @param [Symbol, String] method
+    # @param method [Symbol, String]
     #   Requets method to match.
-    # @param [String] path
+    # @param path [String]
     #   Path template.
-    # @param [String, Proc, Hash] endpoint
+    # @param endpoint [String, Proc, Hash]
     #    Route endpoint.
-    # @param [String, false] controller_suffix
+    # @param controller_suffix [String, false]
     #   Suffix for string controllers.
     #
     # @return [self]
@@ -52,7 +52,7 @@ module Rutter
 
     # Matches the given path to the route pattern.
     #
-    # @param [String] path_info
+    # @param path_info [String]
     #   Requested path to match against.
     #
     # @return [Boolean]
@@ -64,7 +64,7 @@ module Rutter
     #
     # NOTE: If the path does not match, `nil` is returned.
     #
-    # @param [String] path
+    # @param path [String]
     #   Requested path to extract params from.
     #
     # @return [nil, Hash<String => String>]
@@ -76,7 +76,7 @@ module Rutter
 
     # Expands the pattern with the given arguments.
     #
-    # @param [Hash] params
+    # @param params [Hash]
     #   Expand parameters.
     #
     # @return [String] Expanded string.

data/lib/rutter/routes.rb

@@ -15,7 +15,7 @@ module Rutter
 
     # Initializes the helper.
     #
-    # @param [Rutter::Builder] builder
+    # @param builder [Rutter::Builder]
     #   Route builder object.
     #
     # @return [self]
@@ -35,7 +35,7 @@ module Rutter
     # @private
     def respond_to_missing?(method_name, include_private = false)
       meth = method_name.to_s
-      meth.end_with?("_path") || meth.end_with?("_url") || super
+      meth.end_with?("_path", "_url") || super
     end
   end
 end

data/lib/rutter/scope.rb

@@ -5,7 +5,7 @@ module Rutter
   class Scope
     # Initializes the scope.
     #
-    # @param [Rutter::Builder] router
+    # @param router [Rutter::Builder]
     #   Root router object.
     # @option opts [String] :path (nil)
     #   Path prefix

data/lib/rutter/version.rb

@@ -2,5 +2,5 @@
 
 module Rutter
   # Current version number.
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/rutter.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest"
-  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "rack-test"
 end

data/spec/integration/mount_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
-describe "Rutter::Builder#mount" do
+RSpec.describe "Rutter::Builder#mount" do
   let(:router) do
     Rutter.new do
       mount ->(_env) { [200, {}, ["Admin App"]] }, at: "/admin"
@@ -15,6 +13,6 @@ describe "Rutter::Builder#mount" do
 
   it "forwards the request to the given application" do
     get "/admin/with/sub/paths"
-    assert_equal "Admin App", last_response.body
+    expect(last_response.body).to eq("Admin App")
   end
 end

data/spec/integration/params_spec.rb

@@ -11,7 +11,7 @@ class TestController
   end
 end
 
-describe "ramverk.router_params" do
+RSpec.describe "ramverk.router_params" do
   let(:router) { Rutter.new(controller_suffix: "Controller") }
 
   def app
@@ -21,8 +21,8 @@ describe "ramverk.router_params" do
   it "calls the endpoint (controller)" do
     router.get "/books/:title", to: "Test#index"
     get "/books/eloquent-ruby"
-    assert_equal 100, last_response.status
-    assert_equal '{"title":"eloquent-ruby","action":"index"}',
-                 last_response.body
+    expect(last_response.status).to eq(100)
+    expect(last_response.body)
+      .to eq('{"title":"eloquent-ruby","action":"index"}')
   end
 end

data/spec/integration/rack_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Rack integration" do
+RSpec.describe "Rack integration" do
   let(:router) do
     Rutter.new do
       get "/books", to: ->(_env) { [200, {}, ["Books"]] }
@@ -16,17 +16,18 @@ describe "Rack integration" do
   describe "with match" do
     it "calls the matched endpoint" do
       get "/books"
-      assert_equal 200, last_response.status
-      assert_equal "Books", last_response.body
+      expect(last_response.status).to eq(200)
+      expect(last_response.body).to eq("Books")
     end
   end
 
   describe "with no match" do
     it "returns 404" do
       get "/authors"
-      assert_equal 404, last_response.status
-      assert_equal "Route Not Found", last_response.body
-      assert_equal "pass", last_response.headers["X-Cascade"]
+
+      expect(last_response.status).to eq(404)
+      expect(last_response.body).to eq("Route Not Found")
+      expect(last_response.headers["X-Cascade"]).to eq("pass")
     end
   end
 end

data/spec/integration/redirect_spec.rb

@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Rutter::Builder#redirect" do
+RSpec.describe "Rutter::Builder#redirect" do
   let(:router) do
     Rutter.new do
       get "/legacy-path", to: redirect("/new_path")
@@ -17,17 +17,20 @@ describe "Rutter::Builder#redirect" do
 
   it "redirect the request to the new path" do
     get "/legacy-path"
-    assert_equal 302, last_response.status
-    assert_equal "", last_response.body
+
+    expect(last_response.status).to eq(302)
+    expect(last_response.body).to eq("")
+
     follow_redirect!
-    assert_equal 200, last_response.status
-    assert_equal "Redirected", last_response.body
+
+    expect(last_response.status).to eq(200)
+    expect(last_response.body).to eq("Redirected")
   end
 
   it "support setting custom status" do
     get "/legacy-path-custom-status"
-    assert_equal 301, last_response.status
+    expect(last_response.status).to eq(301)
     follow_redirect!
-    assert_equal 200, last_response.status
+    expect(last_response.status).to eq(200)
   end
 end

data/spec/spec_helper.rb

@@ -12,16 +12,88 @@ if ENV["COVERAGE"] == "true"
   end
 end
 
-require "minitest/autorun"
-require "minitest/pride"
-require "rack/test"
-require "mocha/mini_test"
-
 # Require support (helper) modules
 Dir["./spec/support/**/*.rb"].each { |f| require f }
 
+# Require library
+require "rack/test"
 require "rutter"
 
-class Minitest::Spec
-  include Rack::Test::Methods
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.include Rack::Test::Methods
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
+  # have no way to turn it off -- the option exists only for backwards
+  # compatibility in RSpec 3). It causes shared context metadata to be
+  # inherited by the metadata hash of host groups and examples, rather than
+  # triggering implicit auto-inclusion in groups with matching metadata.
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
+  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end

data/spec/unit/builder_spec.rb

@@ -1,53 +1,49 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 module Rutter
-  describe Builder do
+  RSpec.describe Builder do
     let(:router) { Builder.new }
 
     describe "#add" do
       it "returns the created route object" do
         route = router.get "/books", to: ->(env) {}
         named_route = router.get "/named_books", to: ->(env) {}, as: :books
-        assert_instance_of Route, route
-        assert_instance_of Route, named_route
+
+        expect(route).to be_a(Route)
+        expect(named_route).to be_a(Route)
       end
 
       it "adds a route to the collection" do
         router.get "/books", to: ->(env) {}
         router.post "/books", to: ->(env) {}
 
-        assert_equal 2, router.flat_map.size
+        expect(router.flat_map.size).to eq(2)
       end
 
       it "stores the name of the route" do
         route = router.add "GET", "/books", as: :books, to: ->(env) {}
-        assert_equal route, router.named_map[:books]
+        expect(router.named_map[:books]).to eq(route)
       end
 
       it "normalizes route names" do
         router.get "/books", as: :_bookie__books__, to: ->(env) {}
-        assert router.named_map.key?(:bookie_books)
+        expect(router.named_map.key?(:bookie_books)).to eq(true)
       end
 
       it "raises an error if named route already been defined" do
         router.get "/books", as: :books, to: ->(env) {}
 
-        err = assert_raises RuntimeError do
-          router.get "/books", as: :books, to: ->(env) {}
-        end
-
-        assert_equal "a route called 'books' has already been defined",
-                     err.message
+        expect { router.get "/books", as: :books, to: ->(env) {} }
+          .to raise_error("a route called 'books' has already been defined")
       end
     end
 
     describe "#root" do
       it "adds a root path with a root name" do
         route = router.root to: ->(env) {}
-        assert_equal "/", route.path
-        assert_equal route, router.named_map[:root]
+
+        expect(route.path).to eq("/")
+        expect(router.named_map[:root]).to eq(route)
       end
     end
 
@@ -55,7 +51,7 @@ module Rutter
       Route::VERBS.each do |verb|
         it "accept the #{verb} verb as method" do
           router.send verb.downcase, "/", to: ->() {}
-          assert_equal verb, router.flat_map[0].method
+          expect(router.flat_map[0].method).to eq(verb)
         end
       end
     end
@@ -63,42 +59,41 @@ module Rutter
     describe "#path" do
       it "generates a URL path from the arguments" do
         router.get "/users/:id(/:username)", to: "Users#show", as: :user
-        assert_equal "/users/45/sandelius",
-                     router.path(:user, id: 45, username: "sandelius")
-        assert_equal "/users/45", router.path(:user, id: 45)
+
+        expect(router.path(:user, id: 45, username: "sandelius"))
+          .to eq("/users/45/sandelius")
+        expect(router.path(:user, id: 45)).to eq("/users/45")
       end
 
       it "raises an error if route has not been defined" do
-        err = assert_raises ArgumentError do
-          router.path(:user)
-        end
-        assert_equal "no route called 'user'", err.message
+        expect { router.path(:user) }
+          .to raise_error("no route called 'user'")
       end
     end
 
     describe "#url" do
       it "generates a full URL" do
         router.get "/users/:id", to: "Users#show", as: :user
-        assert_equal "http://example.com/users/54", router.url(:user, id: 54)
+
+        expect(router.url(:user, id: 54)).to eq("http://example.com/users/54")
       end
 
       it "allows host scheme and subdomain to be set" do
         router.get "/users/:id", to: "Users#show", as: :user
-        assert_equal(
-          "https://api.example.com/users/54",
-          router.url(
-            :user,
-            id: 54, _host: "example.com", _scheme: "https", _subdomain: "api"
-          )
+
+        url = router.url(
+          :user,
+          id: 54, _host: "example.com", _scheme: "https", _subdomain: "api"
         )
+
+        expect(url).to eq("https://api.example.com/users/54")
       end
 
       it "adds port if no 80 or 433" do
         router.get "/users/:id", to: "Users#show", as: :user
-        assert_equal(
-          "http://example.com:333/users/54",
-          router.url(:user, id: 54, _port: 333)
-        )
+
+        expect(router.url(:user, id: 54, _port: 333))
+          .to eq("http://example.com:333/users/54")
       end
     end
 
@@ -106,10 +101,10 @@ module Rutter
       it "freezes all objects" do
         router.freeze
 
-        assert router.frozen?
-        assert router.flat_map.frozen?
-        assert router.named_map.frozen?
-        assert router.verb_map.frozen?
+        expect(router).to be_frozen
+        expect(router.flat_map).to be_frozen
+        expect(router.named_map).to be_frozen
+        expect(router.verb_map).to be_frozen
       end
     end
   end

data/spec/unit/route_spec.rb

@@ -1,87 +1,80 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 module Rutter
-  describe Route do
+  RSpec.describe Route do
     it "raises an error if request method is invalid" do
-      err = assert_raises ArgumentError do
-        Route.new("NONE", "/", ->(env) {})
-      end
-
-      assert_equal "invalid verb: 'NONE'", err.message
+      expect { Route.new("NONE", "/", ->(env) {}) }
+        .to raise_error(ArgumentError, "invalid verb: 'NONE'")
     end
 
     it "normalizes path" do
       route = Route.new("GET", "//about////us/", ->(env) {})
-      assert_equal "/about/us", route.path
+      expect(route.path).to eq("/about/us")
     end
 
     describe "#expand" do
       it "expand dynamic routes" do
         route = Route.new("GET", "/books/:id(/:title)", -> {})
-        assert_equal "/books/54/eloquent?include[]=foo",
-                     route.expand(id: 54, title: "eloquent", include: [:foo])
-        assert_equal "/books/54?include[]=foo",
-                     route.expand(id: 54, include: [:foo])
-        assert_equal "/books/54/eloquent",
-                     route.expand(id: 54, title: "eloquent")
-        assert_equal "/books/54", route.expand(id: 54)
+
+        expect(route.expand(id: 54, title: "eloquent", include: [:foo]))
+          .to eq("/books/54/eloquent?include[]=foo")
+        expect(route.expand(id: 54, include: [:foo]))
+          .to eq("/books/54?include[]=foo")
+        expect(route.expand(id: 54, title: "eloquent"))
+          .to eq("/books/54/eloquent")
+        expect(route.expand(id: 54)).to eq("/books/54")
       end
 
       it "expand static routes" do
         route = Route.new("GET", "/books", -> {})
-        assert_equal "/books?include[]=foo", route.expand(include: [:foo])
-        assert_equal "/books", route.expand
+        expect(route.expand(include: [:foo])).to eq("/books?include[]=foo")
+        expect(route.expand).to eq("/books")
       end
     end
 
     describe "#match?" do
       it "matches non regexp" do
-        route = Route.new("GET", "/books", -> {})
-        assert route.match?("/books")
+        expect(Route.new("GET", "/books", -> {}).match?("/books"))
+          .to eq(true)
       end
 
       it "support named parameters" do
         route = Route.new("GET", "/pages/:id(/:title)", -> {})
 
-        assert route.match?("/pages/54/eloquent-ruby")
-        assert route.match?("/pages/54")
-        refute route.match?("/pages/54.rb")
-        refute route.match?("/pages")
+        expect(route.match?("/pages/54/eloquent-ruby")).to eq(true)
+        expect(route.match?("/pages/54")).to eq(true)
+        expect(route.match?("/pages/54.rb")).to eq(false)
+        expect(route.match?("/pages")).to eq(false)
       end
 
       it "support catch-all parameter" do
         route = Route.new("GET", "/pages/*slug", -> {})
-        assert route.match?("/pages/54/eloquent-ruby")
-        assert route.match?("/pages/54/eloquent-ruby.rb")
-        assert route.match?("/pages/54/eloquent-ruby/with/more/parts")
-        refute route.match?("/pages")
+
+        expect(route.match?("/pages/54/eloquent-ruby")).to eq(true)
+        expect(route.match?("/pages/54/eloquent-ruby.rb")).to eq(true)
+        expect(route.match?("/pages/54/eloquent-ruby/with/more/parts")).to eq(true)
+        expect(route.match?("/pages")).to eq(false)
       end
     end
 
     describe "#params" do
       it "extract params" do
         route = Route.new("GET", "/pages/:id(/:title)", -> {})
-        assert_equal(
-          { "id" => "54", "title" => "eloquent-ruby" },
-          route.params("/pages/54/eloquent-ruby")
-        )
 
-        assert_equal(
-          { "id" => "54", "title" => nil },
-          route.params("/pages/54")
-        )
+        expect(route.params("/pages/54/eloquent-ruby"))
+          .to eq("id" => "54", "title" => "eloquent-ruby")
+        expect(route.params("/pages/54"))
+          .to eq("id" => "54", "title" => nil)
       end
 
       it "returns nil if no match" do
         route = Route.new("GET", "/books/:id", -> {})
-        assert_nil route.params("/posts/54")
+        expect(route.params("/posts/54")).to be_nil
       end
 
       it "returns empty array if no params present" do
         route = Route.new("GET", "/books", -> {})
-        assert_equal({}, route.params("/books"))
+        expect(route.params("/books")).to eq({})
       end
     end
   end

data/spec/unit/routes_spec.rb

@@ -1,36 +1,35 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 module Rutter
-  describe Routes do
+  RSpec.describe Routes do
     let(:router) { Builder.new }
     let(:routes) { Routes.new(router) }
 
     it "has a *_path helper method" do
       router.get "/books/:id", to: "Books#show", as: :book
-      assert_equal "/books/54", routes.book_path(id: 54)
+      expect(routes.book_path(id: 54)).to eq("/books/54")
     end
 
     it "has a *_url helper method" do
       router.get "/books/:id", to: "Books#show", as: :book
-      assert_equal "http://example.com/books/54",
-                   routes.book_url(id: 54)
+      expect(routes.book_url(id: 54)).to eq("http://example.com/books/54")
     end
 
     it "raises ArgumentError if route not found" do
-      assert_raises(ArgumentError) { routes.invalid_path }
+      expect { routes.invalid_path }
+        .to raise_error(ArgumentError)
     end
 
     it "raises NoMethodError if unknown method is called" do
-      assert_raises(NoMethodError) { routes.invalid }
+      expect { routes.invalid }
+        .to raise_error(NoMethodError)
     end
 
     it "support respond_to?" do
       router.get "/books/:id", to: "Books#show", as: :book
-      refute routes.respond_to?(:book)
-      assert routes.respond_to?(:book_path)
-      assert routes.respond_to?(:book_url)
+      expect(routes.respond_to?(:book)).to eq(false)
+      expect(routes.respond_to?(:book_path)).to eq(true)
+      expect(routes.respond_to?(:book_url)).to eq(true)
     end
   end
 end

data/spec/unit/rutter_spec.rb

@@ -1,15 +1,13 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
-describe Rutter do
+RSpec.describe Rutter do
   it "has a version number" do
-    assert_instance_of String, Rutter::VERSION
+    expect(Rutter::VERSION).to be_a(String)
   end
 
   describe ".new" do
     it "returns a new Builder object" do
-      assert_instance_of Rutter::Builder, Rutter.new
+      expect(Rutter.new).to be_a(Rutter::Builder)
     end
   end
 end

data/spec/unit/scope_spec.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-require "spec_helper"
-
 module Rutter
-  describe Builder do
+  RSpec.describe Builder do
     let(:router) { Builder.new }
 
     describe "scope" do
@@ -13,8 +11,9 @@ module Rutter
         end
 
         route = router.flat_map.first
-        assert_equal "/web/books", route.path
-        assert_equal "Web::Books", route.endpoint[:controller]
+
+        expect(route.path).to eq("/web/books")
+        expect(route.endpoint[:controller]).to eq("Web::Books")
       end
 
       it "recognizes all verbs" do
@@ -29,14 +28,14 @@ module Rutter
           trace "/", to: ->(env) {}
         end
 
-        assert_equal "GET", router.flat_map[0].method
-        assert_equal "POST", router.flat_map[1].method
-        assert_equal "PUT", router.flat_map[2].method
-        assert_equal "PATCH", router.flat_map[3].method
-        assert_equal "DELETE", router.flat_map[4].method
-        assert_equal "OPTIONS", router.flat_map[5].method
-        assert_equal "HEAD", router.flat_map[6].method
-        assert_equal "TRACE", router.flat_map[7].method
+        expect(router.flat_map[0].method).to eq("GET")
+        expect(router.flat_map[1].method).to eq("POST")
+        expect(router.flat_map[2].method).to eq("PUT")
+        expect(router.flat_map[3].method).to eq("PATCH")
+        expect(router.flat_map[4].method).to eq("DELETE")
+        expect(router.flat_map[5].method).to eq("OPTIONS")
+        expect(router.flat_map[6].method).to eq("HEAD")
+        expect(router.flat_map[7].method).to eq("TRACE")
       end
 
       describe "#root" do
@@ -45,8 +44,8 @@ module Rutter
             root to: ->(env) {}
           end
 
-          assert_equal "/admin", router.flat_map.first.path
-          assert router.named_map.key?(:koolaid_root)
+          expect(router.flat_map.first.path).to eq("/admin")
+          expect(router.named_map.key?(:koolaid_root)).to eq(true)
         end
       end
 
@@ -58,16 +57,18 @@ module Rutter
         end
 
         route = router.flat_map.first
-        assert_equal "/animals/mammals/cats", route.path
-        assert_equal "Species::Mammals::Cats", route.endpoint[:controller]
-        assert_equal "index", route.endpoint[:action]
-        assert router.named_map.key?(:animals_mammals_cats)
+
+        expect(route.path).to eq("/animals/mammals/cats")
+        expect(route.endpoint[:controller]).to eq("Species::Mammals::Cats")
+        expect(route.endpoint[:action]).to eq("index")
+        expect(router.named_map.key?(:animals_mammals_cats)).to eq(true)
       end
 
       describe "#mount" do
         it "calls the root mount with path prefix" do
           app = ->(_env) {}
-          router.expects(:mount).with(app, at: "/admin/books")
+
+          expect(router).to receive(:mount).with(app, at: "/admin/books")
           router.scope(path: "/admin") { mount app, at: "books" }
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rutter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tobias Sandelius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-23 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -53,21 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
-  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: mocha
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,6 +87,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
@@ -127,7 +114,6 @@ files:
 - spec/integration/rack_spec.rb
 - spec/integration/redirect_spec.rb
 - spec/spec_helper.rb
-- spec/support/assertions.rb
 - spec/unit/builder_spec.rb
 - spec/unit/route_spec.rb
 - spec/unit/routes_spec.rb
@@ -153,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: HTTP router for Rack.
@@ -163,7 +149,6 @@ test_files:
 - spec/integration/rack_spec.rb
 - spec/integration/redirect_spec.rb
 - spec/spec_helper.rb
-- spec/support/assertions.rb
 - spec/unit/builder_spec.rb
 - spec/unit/route_spec.rb
 - spec/unit/routes_spec.rb

data/spec/support/assertions.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Minitest::Assertions
-  def assert_file_exist(file)
-    assert File.exist?(file), "Expected #{file} to be a file"
-  end
-end