makanai 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50ec7b4b39d4f324b5bb6d2c36c0f9f03274fd5b224862b4142d28cde7950a0f
-  data.tar.gz: d3b3716c39366f43b142c67f82ab7763ce6b65d07e3ef19a40347a56c71920a7
+  metadata.gz: 607ef9008aa96fb7c280d3c0008997ad827167bc3a304ba89ca31f7300ce055d
+  data.tar.gz: '096ca3a1b65a84402d5872c548d8c6cd5d339a10e680fa335b0e5fd84b3cdb6e'
 SHA512:
-  metadata.gz: 181e579b7e1d48853f06756c1f23f74b4ed15bcc083ac504df6fc716010ce99b3552216ebea3854a484a35256d6e7ef69031c2b8cc11c5d5c6165fcef3e53bc0
-  data.tar.gz: ed57e62dabd988e754728cd7677bfb397e1836bd499cde76ebaed7ccc27849e728fed84b473eb325ba7cb5e527d97a52cdcdf4cef183df4cb295f348827efae3
+  metadata.gz: ed2c690d61a98de06ebdeee12f5a8bc5d51941265dd547b6fe26f09606f7c13081a137b7ed95b83e78c170bdc59791ff30c1e01cf0dc6ae3304db6a1e9f49ce2
+  data.tar.gz: 2290b7bbf2b392853a9d133392e5d69e4103a457b008254eb735036e5c0a41064c95633fa10389d9cf5987d637d5046b2d981c8e0f54b524de68c07a9d29fe74

data/.gitignore

@@ -11,3 +11,4 @@
 
 # rspec failure tracking
 .rspec_status
+/**/.DS_Store

data/.ruby-version

@@ -0,0 +1 @@
+2.7.1

data/.travis.yml

@@ -1,14 +1,20 @@
 ---
-sudo: false
 language: ruby
 cache: bundler
 services:
   - postgresql
   - mysql
 rvm:
-  - 2.7.0
+  - 2.6.6
+  - 2.7.1
+  - ruby-head
+os:
+  - linux
 before_install:
-  - gem install bundler -v 2.0.2
+  - gem install bundler -v 2.1.4
   - mysql -e 'CREATE DATABASE IF NOT EXISTS makanai;'
 before_script:
   - psql -c 'create database makanai;' -U postgres
+jobs:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -24,3 +24,15 @@
 * :sparkles: Multiple DBMS available.  
   you can use dbms(MySQL :dolphin:, PostgreSQL :elephant:) other then SQLite.  
   https://github.com/Madogiwa0124/makanai/pull/19
+
+## :gift: 2020/04/08 `v0.1.4` released.
+* :sparkles: support lastest ruby versions(2.6.6, 2.7.1)
+* :sparkles: support for dynamic URL routing.
+
+  ``` ruby
+  router.get '/hoge/:id' do
+    request.params['id']
+  end
+  ```
+
+  https://github.com/Madogiwa0124/makanai/commit/e256368fd0a13f1d0d2d6c6af17caef7760e64f0

data/Gemfile

@@ -5,3 +5,5 @@ source 'https://rubygems.org'
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gemspec
+
+gem 'codecov', :require => false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    makanai (0.1.3)
+    makanai (0.1.4)
       rack (>= 2.0.7, < 2.3.0)
       rake (>= 10, < 14)
       sqlite3 (~> 1.4.1)
@@ -10,13 +10,19 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    codecov (0.1.16)
+      json
+      simplecov
+      url
     diff-lcs (1.3)
+    docile (1.3.2)
     jaro_winkler (1.5.4)
+    json (2.3.0)
     mysql2 (0.5.3)
     parallel (1.19.1)
-    parser (2.7.0.4)
+    parser (2.7.1.0)
       ast (~> 2.4.0)
-    pg (1.2.2)
+    pg (1.2.3)
     rack (2.2.2)
     rainbow (3.0.0)
     rake (13.0.1)
@@ -25,32 +31,38 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.80.1)
+    rspec-support (3.9.2)
+    rubocop (0.81.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
     sqlite3 (1.4.2)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
+    url (0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.0)
+  codecov
   makanai!
   mysql2 (~> 0.5)
   pg (~> 1.2)
@@ -58,4 +70,4 @@ DEPENDENCIES
   rubocop (~> 0.74)
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/makanai.svg)](https://badge.fury.io/rb/makanai)
 [![Build Status](https://travis-ci.com/Madogiwa0124/makanai.svg?branch=master)](https://travis-ci.com/Madogiwa0124/makanai)
+[![codecov](https://codecov.io/gh/Madogiwa0124/makanai/branch/master/graph/badge.svg)](https://codecov.io/gh/Madogiwa0124/makanai)
 
 simple web application framework for learning.
 
@@ -121,6 +122,7 @@ Makanai::Settings.databse_config = {
 ```
 
 ## routing
+Routing is searched in the order defined and call block args.
 
 ``` ruby
 require 'makanai/main'
@@ -135,11 +137,17 @@ router.get '/hoge' do
   'Hello Hoge!'
 end
 
-# enable access to /params with get parameter
-router.get '/check' do |request|
+# enable access to /hoge with get parameter(?hoge=fuga)
+router.get '/hoge' do |request|
   request.params['hoge']
 end
 
+# enable access to /hoge/:id with dinamic url args({ 'id' => '1'})
+# NOTE: dinamics prefix is `:`.
+router.get '/hoge/:id' do
+  request.params['id']
+end
+
 # enable access to /resources with method post and redirect other url.
 router.post '/resources' do |request|
   Resource.new(request.params).create

data/lib/makanai/application.rb

@@ -38,7 +38,10 @@ module Makanai
     private
 
     def execute_route
-      router.bind!(url: request.url, method: request.method).process.call(request)
+      route = router.bind!(url: request.url, method: request.method)
+      # NOTE: merge dynamic url params (ex. /resources/1 -> { 'id' => '1' })
+      @request.params.merge!(route.url_args)
+      route.process.call(request)
     rescue Makanai::Router::NotFound
       @response.status = 404
       nil

data/lib/makanai/request.rb

@@ -6,7 +6,8 @@ require 'uri'
 
 module Makanai
   class Request < Rack::Request
-    attr_reader :env, :url, :query, :origin_body, :method, :params
+    attr_reader :env, :url, :query, :origin_body, :method
+    attr_accessor :params
 
     def initialize(env)
       super

data/lib/makanai/router.rb

@@ -30,19 +30,50 @@ module Makanai
 
     def bind!(url:, method:)
       path = URI.parse(url).path
-      routes.find { |route| route.path == path && route.method == method }.tap do |route|
+      routes.find { |route| route.match?(path: path, method: method) }.tap do |route|
         raise NotFound if route.nil?
       end
     end
 
     class Route
+      DYNAMIC_PREFIX = ':' # Prefix for dynamic path
+
       def initialize(path:, process:, method:)
         @path = path
         @process = process
         @method = method
+        @url_args = {}
+      end
+
+      attr_reader :path, :process, :method, :url_args
+
+      def match?(path:, method:)
+        build_url_args(path: path)
+        path_match?(path) && self.method == method
+      end
+
+      private
+
+      def dynamic_indx
+        @dynamic_indx ||= path.split('/').map.with_index do |val, i|
+          i if val.include?(DYNAMIC_PREFIX)
+        end.compact
       end
 
-      attr_reader :path, :process, :method
+      def path_match?(path)
+        request_path, route_path = [path, self.path].map(&->(array) { array.split('/') })
+        request_path.each.with_index do |val, i|
+          route_path[i] = val if dynamic_indx.include?(i)
+        end
+        route_path == request_path
+      end
+
+      def build_url_args(path:)
+        request_path, route_path = [path, self.path].map(&->(array) { array.split('/') })
+        dynamic_indx.each do |i|
+          @url_args.merge!({ route_path[i].gsub(DYNAMIC_PREFIX, '') => request_path[i] })
+        end
+      end
     end
   end
 end

data/lib/makanai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Makanai
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makanai
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Madogiwa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -145,6 +145,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md