rutter 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f5fb5ae85793cb16d135928e3a26cf043a3eda09338f8c2a03117a16985b2d
-  data.tar.gz: c9766d83b10a8b6f103f26cc100ca753ecace464770fb739eccd4ecb2f2a876e
+  metadata.gz: 12a5714cb11c9589f34960ce325c4a095f4d5c8dbeb15d95e8f9b9be560d15d8
+  data.tar.gz: f182eb9db7eb3205a003379fd937864e2dda69b615be63e37ad4cfbc8a523402
 SHA512:
-  metadata.gz: 1b0bcaae9355facffd058bf84021a4d62d1365312c254fd4e2ead08b6d907c68791572f47dc3451d35fcda32fb777ff3c94c5785b270cc290187aef3ce3e3260
-  data.tar.gz: 10e3b47288658c8dd7068447339fa54981684e225542c4c05ac7440dc2fa3f2112c8461ac849b855e16c740e4357d0f7e673a49eabac946a762c21b028882d3a
+  metadata.gz: '0885bcb1e09323e8d3e4753a04a2fd192d726c68d4546ba820fa29ae9d9492c847c296022b6e34cb4123808fa87633c5728b2042467d0e1e79ec1d9b679b200a'
+  data.tar.gz: 928d8dfd4b82989f196f0a0f25fcf734953c8b77f0884697f756382117de1aaa51f7049e832dc627d1a6dabea43143046ebf08e4e842497a899bd253cee45372

data/.rubocop.yml

@@ -1,8 +1,7 @@
-require:
-  - rubocop-performance
-
+require: rubocop-performance
 AllCops:
   TargetRubyVersion: 2.5
+  NewCops: enable
   DisplayCopNames: true
   Exclude:
     - "*.gemspec"
@@ -14,6 +13,9 @@ Performance:
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
+Style/ClassAndModuleChildren:
+  Enabled: false
+
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 
@@ -27,9 +29,3 @@ Metrics/BlockLength:
 Metrics/ModuleLength:
   Exclude:
     - "spec/**/*"
-
-ClassAndModuleChildren:
-  Enabled: false
-
-Naming/UncommunicativeMethodParamName:
-  MinNameLength: 2

data/.travis.yml

@@ -3,20 +3,15 @@ script: "bundle exec rake spec:coverage"
 cache: bundler
 env:
   global:
-    - CC_TEST_REPORTER_ID=c1b17cd36cd4d025298f11b2a3ee678e4977c3969986f9ee497d6984a2c82c56
+    - CODECOV_TOKEN="21653af2-874b-4597-942d-14ddc7c2f8fa"
 before_install:
   - "gem update --system"
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 rvm:
+  - 2.7.0
   - 2.6.0
   - 2.5.0
-  - jruby-9.2.0.0
   - ruby-head
+  - jruby
   - jruby-head
   - truffleruby
 matrix:

data/Gemfile

@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 gemspec
 
-unless ENV["CI"]
-  gem "byebug", platform: :mri
-end
+gem "rubocop"
+gem "rubocop-performance"
 
 gem "simplecov"
+gem 'codecov', require: false

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Tobias Sandelius
+Copyright (c) 2019-2020 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

@@ -1,13 +1,9 @@
 # Rutter
 
-HTTP router for Rack.
-
-## Status
-
-Under development, not ready for prime-time just yet.
+HTTP router for Ramverk and Rack.
 
 [![Build Status](https://travis-ci.org/sandelius/rutter.svg?branch=master)](https://travis-ci.org/sandelius/rutter)
-[![Test Coverage](https://codeclimate.com/github/sandelius/rutter/badges/coverage.svg)](https://codeclimate.com/github/sandelius/rutter/coverage)
+[![codecov](https://codecov.io/gh/sandelius/rutter/branch/master/graph/badge.svg)](https://codecov.io/gh/sandelius/rutter)
 [![Inline docs](http://inch-ci.org/github/sandelius/rutter.svg?branch=master)](http://inch-ci.org/github/sandelius/rutter)
 
 ## Installation

data/lib/rutter/builder.rb

@@ -91,10 +91,12 @@ module Rutter
     #   Application to mount.
     # @param at [String]
     #   Path prefix to match.
+    # @param host [Regexp]
+    #   Match the given host pattern.
     #
     # @return [Rutter::Mount]
-    def mount(app, at:)
-      route = Mount.new(at, app)
+    def mount(app, at:, host: nil)
+      route = Mount.new(at, app, host: host)
       @flat_map << route
       VERBS.each { |verb| @verb_map[verb] << route }
       route
@@ -131,12 +133,12 @@ module Rutter
     #     # => "/login?return_to=/"
     #   router.path(:book, id: 82)
     #     # => "/books/82"
-    def path(name, *args)
+    def path(name, **args)
       unless (route = @named_map[name])
         raise "No route called '#{name}' was found"
       end
 
-      route.expand(*args)
+      route.expand(**args)
     end
 
     # Generates a full URL from the given arguments.
@@ -178,7 +180,7 @@ module Rutter
       host += "#{args.delete(:subdomain)}." if args.key?(:subdomain)
       host += @uri.host
       host += ":#{@uri.port}" if @uri.port != 80 && @uri.port != 443
-      host + path(name, args)
+      host + path(name, **args)
     end
 
     # Add a new, frozen, route to the map.

data/lib/rutter/mount.rb

@@ -7,6 +7,15 @@ module Rutter
   #
   # @private
   class Mount < Route
+    # @see Rutter::Route#initialize
+    #
+    # @private
+    def initialize(path, endpoint, constraints = nil, host: nil)
+      @host = host
+
+      super(path, endpoint, constraints)
+    end
+
     # Matches the app pattern against environment.
     #
     # @param env [Hash]
@@ -15,7 +24,22 @@ module Rutter
     # @return [nil, String]
     #   Returns the matching substring or nil on no match.
     def match?(env)
+      return if @host && !@host.match?(host(env))
+
       @pattern.peek(env["PATH_INFO"])
     end
+
+    private
+
+    # @private
+    def host(env)
+      env["rutter.parsed_host"] ||= begin
+        if (forwarded = env["HTTP_X_FORWARDED_HOST"])
+          forwarded.split(/,\s?/).last
+        else
+          env["HTTP_HOST"] || env["SERVER_NAME"] || env["SERVER_ADDR"]
+        end
+      end
+    end
   end
 end

data/lib/rutter/routes.rb

@@ -53,10 +53,11 @@ module Rutter
     protected
 
     # @private
-    def method_missing(method_name, *args)
+    def method_missing(method_name, **args)
       named_route, type = method_name.to_s.split(/\_(path|url)\z/)
       return super unless type
-      @router.public_send(type, named_route.to_sym, *args)
+
+      @router.public_send(type, named_route.to_sym, **args)
     end
 
     # @private

data/lib/rutter/scope.rb

@@ -34,8 +34,8 @@ module Rutter
     end
 
     # @see Rutter::Builder#mount
-    def mount(app, at:)
-      @router.mount app, at: Naming.join(@path, at)
+    def mount(app, at:, host: nil)
+      @router.mount app, at: Naming.join(@path, at), host: host
     end
 
     # @see Rutter::Builder#scope

data/lib/rutter/version.rb

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

data/spec/integration/rack_spec.rb

@@ -21,8 +21,6 @@ RSpec.describe "Rack compatible", type: :request do
         .to eq(200)
       expect(last_response.body)
         .to eq("I say, hello-world")
-      expect(last_response.headers["Content-Length"])
-        .to eq("18")
     end
   end
 

data/spec/spec_helper.rb

@@ -2,10 +2,6 @@
 
 require "bundler/setup"
 
-unless ENV["CI"]
-  require "byebug"
-end
-
 if ENV["COVERAGE"] == "true"
   require "simplecov"
 
@@ -13,6 +9,11 @@ if ENV["COVERAGE"] == "true"
     command_name "spec"
     add_filter "spec"
   end
+
+  if ENV["CODECOV_TOKEN"]
+    require "codecov"
+    SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  end
 end
 
 # Require support (helper) modules

data/spec/unit/builder_spec.rb

@@ -18,6 +18,23 @@ module Rutter
         expect(route.match?(env_for("/admin/books")))
           .to eq("/admin")
       end
+
+      it "matches host if given" do
+        route = router.mount endpoint, at: "/v1", host: /\Aapi\./
+
+        expect(route.match?(env_for("http://example.com/v1/books")))
+          .to be_nil
+        expect(route.match?(env_for("http://api.example.com/v1/books")))
+          .to eq("/v1")
+      end
+
+      it "HTTP_X_FORWARDED_HOST are supported" do
+        route = router.mount endpoint, at: "/v1", host: /\Aapi\./
+        env = env_for("/v1/books", "HTTP_X_FORWARDED_HOST" => "api.example.com")
+
+        expect(route.match?(env))
+          .to eq("/v1")
+      end
     end
 
     describe "#path" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rutter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tobias Sandelius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-28 00:00:00.000000000 Z
+date: 2020-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustermann
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.5.0
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: HTTP router for Rack.