rutter 0.1.2 → 0.2.0

data/spec/unit/routes_spec.rb

@@ -2,22 +2,27 @@
 
 module Rutter
   RSpec.describe Routes do
-    let(:router) { Builder.new }
+    let(:router) { Rutter.new }
     let(:routes) { Routes.new(router) }
+    let(:endpoint) { ->(_) {} }
 
     it "has a *_path helper method" do
-      router.get "/books/:id", to: "Books#show", as: :book
-      expect(routes.book_path(id: 54)).to eq("/books/54")
+      router.get "/books/:id", to: endpoint, as: :book
+
+      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
-      expect(routes.book_url(id: 54)).to eq("http://example.com/books/54")
+      router.get "/books/:id", to: endpoint, as: :book
+
+      expect(routes.book_url(id: 54))
+        .to eq("http://localhost:9292/books/54")
     end
 
-    it "raises ArgumentError if route not found" do
+    it "raises RuntimeError if route not found" do
       expect { routes.invalid_path }
-        .to raise_error(ArgumentError)
+        .to raise_error(RuntimeError)
     end
 
     it "raises NoMethodError if unknown method is called" do
@@ -26,10 +31,14 @@ module Rutter
     end
 
     it "support respond_to?" do
-      router.get "/books/:id", to: "Books#show", as: :book
-      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)
+      router.get "/books/:id", to: endpoint, as: :book
+
+      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

@@ -6,8 +6,9 @@ RSpec.describe Rutter do
   end
 
   describe ".new" do
-    it "returns a new Builder object" do
-      expect(Rutter.new).to be_a(Rutter::Builder)
+    it "creates a new builder object" do
+      expect(Rutter.new)
+        .to be_a(Rutter::Builder)
     end
   end
 end

data/spec/unit/scope_spec.rb

@@ -1,75 +1,68 @@
 # frozen_string_literal: true
 
 module Rutter
-  RSpec.describe Builder do
-    let(:router) { Builder.new }
+  RSpec.describe Scope do
+    let(:router) { Rutter.new }
+    let(:endpoint) { ->(_) {} }
 
-    describe "scope" do
-      it "prepends prefixes" do
-        router.scope path: "web", namespace: "Web" do
-          get "/books", to: "Books#index"
+    it "support nested scopes" do
+      router.scope path: "animals", namespace: "species", as: :animals do
+        scope path: "mammals", namespace: "mammals", as: :mammals do
+          get "/cats", to: "cats#index", as: :cats
         end
-
-        route = router.flat_map.first
-
-        expect(route.path).to eq("/web/books")
-        expect(route.endpoint[:controller]).to eq("Web::Books")
       end
 
-      it "recognizes all verbs" do
-        router.scope path: "/admin", namespace: "Secure", as: :koolaid do
-          get "/", to: ->(env) {}
-          post "/", to: ->(env) {}
-          put "/", to: ->(env) {}
-          patch "/", to: ->(env) {}
-          delete "/", to: ->(env) {}
-          options "/", to: ->(env) {}
-          head "/", to: ->(env) {}
-          trace "/", to: ->(env) {}
-        end
+      route = router.flat_map.first
 
-        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
+      expect(route.path)
+        .to eq("/animals/mammals/cats")
+      expect(route.endpoint)
+        .to eq(controller: "Species::Mammals::Cats", action: "index")
+      expect(router.named_map[:animals_mammals_cats])
+        .to eq(route)
+    end
 
-      describe "#root" do
-        it "adds a root path with a root name" do
-          router.scope path: "/admin", namespace: "Secure", as: :koolaid do
-            root to: ->(env) {}
-          end
+    describe "#add" do
+      it "support using route constraints" do
+        scope = router.scope path: "/books"
+        route = scope.get "/:id",
+                          to: endpoint,
+                          constraints: { id: /\d+/ }
 
-          expect(router.flat_map.first.path).to eq("/admin")
-          expect(router.named_map.key?(:koolaid_root)).to eq(true)
-        end
+        expect(route.match?(env_for("/books/82")))
+          .to be(true)
+        expect(route.match?(env_for("/books/pickaxe")))
+          .to be(false)
       end
+    end
 
-      it "support nested scopes" do
-        router.scope path: "animals", namespace: "Species", as: :animals do
-          scope path: "mammals", namespace: "Mammals", as: :mammals do
-            get "/cats", to: "Cats#index", as: :cats
-          end
-        end
-
-        route = router.flat_map.first
+    describe "#mount" do
+      it "matches path prefixes" do
+        scope = router.scope path: "/api"
+        route = scope.mount endpoint, at: "/v1"
 
-        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)
+        expect(route.match?(env_for("/")))
+          .to be_nil
+        expect(route.match?(env_for("/api")))
+          .to be_nil
+        expect(route.match?(env_for("/api/v1")))
+          .to eq("/api/v1")
+        expect(route.match?(env_for("/api/v1/books")))
+          .to eq("/api/v1")
       end
+    end
+
+    describe "verbs" do
+      let(:scope) { router.scope }
 
-      describe "#mount" do
-        it "calls the root mount with path prefix" do
-          app = ->(_env) {}
+      VERBS.each do |verb|
+        describe "##{verb.downcase}" do
+          it "recognize #{verb} verb" do
+            route = scope.public_send verb.downcase, "/", to: endpoint
 
-          expect(router).to receive(:mount).with(app, at: "/admin/books")
-          router.scope(path: "/admin") { mount app, at: "books" }
+            expect(router.verb_map[verb])
+              .to eq([route])
+          end
         end
       end
     end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rutter
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Tobias Sandelius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: mustermann
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -96,25 +110,21 @@ files:
 - README.md
 - Rakefile
 - bench/config.ru
-- bench/dynamic_routes
-- bench/expand
-- bench/helper.rb
-- bench/mount
-- bench/routes_helper
-- bench/static_routes
 - lib/rutter.rb
 - lib/rutter/builder.rb
+- lib/rutter/mount.rb
+- lib/rutter/naming.rb
 - lib/rutter/route.rb
 - lib/rutter/routes.rb
 - lib/rutter/scope.rb
+- lib/rutter/verbs.rb
 - lib/rutter/version.rb
 - rutter.gemspec
-- spec/integration/mount_spec.rb
-- spec/integration/params_spec.rb
 - spec/integration/rack_spec.rb
-- spec/integration/redirect_spec.rb
 - spec/spec_helper.rb
+- spec/support/rack.rb
 - spec/unit/builder_spec.rb
+- spec/unit/namespace_spec.rb
 - spec/unit/route_spec.rb
 - spec/unit/routes_spec.rb
 - spec/unit/rutter_spec.rb
@@ -131,25 +141,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: HTTP router for Rack.
 test_files:
-- spec/integration/mount_spec.rb
-- spec/integration/params_spec.rb
 - spec/integration/rack_spec.rb
-- spec/integration/redirect_spec.rb
 - spec/spec_helper.rb
+- spec/support/rack.rb
 - spec/unit/builder_spec.rb
+- spec/unit/namespace_spec.rb
 - spec/unit/route_spec.rb
 - spec/unit/routes_spec.rb
 - spec/unit/rutter_spec.rb

data/bench/dynamic_routes

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby -W0
-
-require_relative "helper"
-
-router = Rutter.new
-app = Rack::MockRequest.new(router)
-
-Benchmark.bm(50) do |b|
-  b.report "generating routes" do
-    DICT.each do |route|
-      router.get "#{route}/:id", to: $endpoint
-    end
-  end
-
-  b.report "recognizing routes" do
-    TIMES.times do
-      app.get("#{DICT.sample}/54")
-    end
-  end
-end

data/bench/expand

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby -W0
-
-require_relative "helper"
-
-router = Rutter.new
-
-Benchmark.bm(50) do |b|
-  b.report "generating routes" do
-    DICT.each do |route|
-      router.get "#{route}/:id", to: $endpoint, as: route
-    end
-  end
-
-  b.report "expand routes" do
-    TIMES.times do
-      router.path(DICT.sample.to_sym, id: 54, key: "value")
-    end
-  end
-end

data/bench/helper.rb

@@ -1,19 +0,0 @@
-require "benchmark"
-require "rack"
-require_relative "../lib/rutter"
-
-BATCH_SIZE = 1000
-TIMES = 100000
-DICT = IO.foreach("/usr/share/dict/words")
-         .lazy
-         .map { |word| word.chomp.downcase }
-         .uniq
-         .take(BATCH_SIZE)
-         .sort_by(&:length)
-         .reverse
-
-$endpoint = ->(env) { [200, {}, ["Hello World"]] }
-
-puts "Loading #{BATCH_SIZE} routes, calling them #{TIMES} times...\n"
-
-GC.disable

data/bench/mount

@@ -1,32 +0,0 @@
-#!/usr/bin/env ruby -W0
-
-require_relative "helper"
-
-router = Rutter.new
-app = Rack::MockRequest.new(router)
-
-DICT.each do |route|
-  router.mount $endpoint, at: route
-end
-
-builder = Rack::Builder.app do
-  DICT.each do |route|
-    map("/#{route}") { run $endpoint }
-  end
-end
-
-rack_app = Rack::MockRequest.new(builder)
-
-Benchmark.bm(50) do |b|
-  b.report "recognizing mounts" do
-    TIMES.times do
-      app.get("/#{DICT.sample}/sub/path")
-    end
-  end
-
-  b.report "recognizing rack map" do
-    TIMES.times do
-      rack_app.get("/#{DICT.sample}/sub/path")
-    end
-  end
-end

data/bench/routes_helper

@@ -1,24 +0,0 @@
-#!/usr/bin/env ruby -W0
-
-require_relative "helper"
-
-router = Rutter.new
-routes = Rutter::Routes.new(router)
-
-DICT.each do |route|
-  router.get "#{route}/:id", to: $endpoint, as: route
-end
-
-Benchmark.bm(50) do |b|
-  b.report "dynamic *_path" do
-    TIMES.times do
-      routes.public_send "#{DICT.sample}_path", id: 54, key: "value"
-    end
-  end
-
-  b.report "dynamic *_url" do
-    TIMES.times do
-      routes.public_send "#{DICT.sample}_url", id: 54, key: "value"
-    end
-  end
-end

data/bench/static_routes

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby -W0
-
-require_relative "helper"
-
-router = Rutter.new
-app = Rack::MockRequest.new(router)
-
-Benchmark.bm(50) do |b|
-  b.report "generating routes" do
-    DICT.each do |route|
-      router.get route, to: $endpoint
-    end
-  end
-
-  b.report "recognizing routes" do
-    TIMES.times do
-      app.get(DICT.sample)
-    end
-  end
-end

data/spec/integration/mount_spec.rb

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