makanai 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90461a7d5e372f93f13f282e5f20b0410db84438b4eb9cbb587f0e739bd0c19
-  data.tar.gz: a3dbff0cd0661110d7503889d768e6e277d8b3bf1241fcb13c62589ca8133d9d
+  metadata.gz: 8c7b32701bd75c6ea7cae7f893310a50e5e70a9fea7c14e9a99ba9559b2e7a39
+  data.tar.gz: 8890f0956507a1d0bfa92197718f40b4ed7da313737fe4501032565154f68e08
 SHA512:
-  metadata.gz: 83066b43bf8207fdc6cc99763cd546504a324420e679c09c5aad6d98f65b7fb308cfd034af1b3e8508735de9693fb93919f55424b3ef04b53e45d5ae7ec8655f
-  data.tar.gz: 047dcbdf9ed4afe1c4991b0355ba58f469d63211f840c7f6f28c24f47be07b6a20f595e6eb19636e018152f636f44acffd9ede2cf7993e4a143b0663d7a8a9ec
+  metadata.gz: 268af34e32c0cfd48753227a04bf604f6b1fe3fae0a2ef4bb709965c8d6ac73ec3b78a6c6813a2576c33e69e9c00506d60ef1edecd8fd4046bdb013f96081574
+  data.tar.gz: d112687c6207e860f5c0513f2530c26c0d388472d3058aae069dc98771c7e637636ef61dfb2300727fa7952c8d03d018d3649b7d086a3b395d98a4c33bb2e8eb

data/.gitignore

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

data/.rubocop.yml

@@ -1,13 +1,9 @@
 AllCops:
   TargetRubyVersion: 2.7.0
+  NewCops: enable
   Exclude:
     - './makanai.gemspec'
-
-Style/Documentation:
-  Enabled: false
-
-Metrics/LineLength:
-  Max: 90
+    - 'vendor/**/*'
 
 Metrics/ClassLength:
   Max: 120
@@ -17,8 +13,23 @@ Metrics/BlockLength:
     - 'spec/**/*'
     - 'lib/makanai/rake_tasks.rb'
 
+Style/Documentation:
+  Enabled: false
+
 Style/ParallelAssignment:
   Enabled: false
 
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+Layout/LineLength:
+  Max: 90
+
 Layout/EmptyLineAfterGuardClause:
   Enabled: false

data/.ruby-version

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

data/.travis.yml

@@ -1,7 +1,24 @@
 ---
-sudo: false
 language: ruby
 cache: bundler
+services:
+  - postgresql
+  - mysql
 rvm:
-  - 2.7.0
-before_install: gem install bundler -v 2.0.2
+  - 2.6.6
+  - 2.7.1
+  - ruby-head
+os:
+  - linux
+before_install:
+  - gem install bundler -v 2.1.4
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS makanai;'
+before_script:
+  - psql -c "create user makanai WITH PASSWORD 'password';" -U postgres
+  - psql -c 'create database makanai;' -U postgres
+script:
+  - bundle exec rubocop --parallel
+  - bundle exec rspec
+jobs:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -13,3 +13,36 @@
 * :sparkles: add `Makanai::Model#first`.  
   execute `SELECT * FROM table_name ORDER BY prymary_key asc limit 1` and return record object.  
   https://github.com/Madogiwa0124/makanai/commit/8949796bf7428f5e2d854041b35397ef4d442ee6
+
+## :gift: 2020/02/22 `v0.1.2` released.
+* :sparkles: use config object by Makanai::Settings for replaceable app config.  
+  Changed the setting so that it is retained by the Class variable, and made it configurable.
+  The big advantage is that you can use any web server(ex. puma) except WEBrick.  
+  https://github.com/Madogiwa0124/makanai/pull/18/commits/e6ea10e596c685ef77c042fa1e8f0294c85166f2
+
+## :gift: 2020/03/04 `v0.1.3` released.
+* :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
+
+## :gift: 2020/06/16 `v0.1.5` released.
+* :package: dependency update.
+
+## :gift: 2020/08/07 `v0.1.6` released.
+* :sparkles: enabled to switch template engine Haml and ERB.  
+  https://github.com/Madogiwa0124/makanai/commit/b9f977fe9e974aa1abbf2764a2fdad989e2767ec
+
+* :zap: remove sqlite3 from runtime_dependency.  
+  https://github.com/Madogiwa0124/makanai/commit/d63c3b12cf6fc412a8d88806dca9710e210e5fe0

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,55 +1,82 @@
 PATH
   remote: .
   specs:
-    makanai (0.1.1)
-      rack (~> 2.0.7)
+    makanai (0.1.6)
+      rack (>= 2.0.7, < 2.3.0)
       rake (>= 10, < 14)
-      sqlite3 (~> 1.4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.1)
+    codecov (0.2.3)
+      colorize
+      json
+      simplecov
+    colorize (0.8.1)
     diff-lcs (1.3)
-    jaro_winkler (1.5.4)
-    parallel (1.19.1)
-    parser (2.7.0.0)
-      ast (~> 2.4.0)
-    rack (2.0.8)
+    docile (1.3.2)
+    haml (5.1.2)
+      temple (>= 0.8.0)
+      tilt
+    json (2.3.1)
+    mysql2 (0.5.3)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pg (1.2.3)
+    rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       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.78.0)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.2)
+    rubocop (0.89.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
     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.0)
+    temple (0.8.2)
+    tilt (2.0.10)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.0)
+  codecov
+  haml (~> 5.0)
   makanai!
+  mysql2 (~> 0.5)
+  pg (~> 1.2)
   rspec (~> 3.0)
   rubocop (~> 0.74)
+  sqlite3 (~> 1.4.1)
 
 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.
 
@@ -23,12 +24,6 @@ Or install it yourself as:
 
     $ gem install makanai
 
-## Dependencies
-
-Makanai depends on the following, so please install it in advance.
-
-* [SQLite3](https://www.sqlite.org/index.html)
-
 ## Start sample project
 Getting started with Makanai is easy.
 
@@ -47,7 +42,7 @@ $ ruby app.rb
 create a ruby ​​file(ex. app.rb).
 
 ``` ruby
-require_relative '../lib/main.rb'
+require 'makanai/main'
 
 router.get '/' do
   'Hello Makanai!'
@@ -76,10 +71,57 @@ root ┬ app.rb    # main application file
      └ db        # use Sqlite3 dabase file
 ```
 
+## override application config
+
+You can overwrite the settings (`Makanai :: Settings`) with the created ruby ​​file(ex. app.rb).
+
+ex) When overriding rack app settings.
+
+``` ruby
+Makanai::Settings.rack_app_config = { handler: :webrick, host: '0.0.0.0', port: '8081' }
+```
+
+### use other application server
+
+Add rack web server(ex. puma) gem in your Gemfile.
+
+``` ruby
+gem 'puma'
+```
+
+Overwrite the `handler` in `rack_app_config` with the created ruby ​​file(ex. app.rb).
+
+``` ruby
+Makanai::Settings.rack_app_config = { handler: :puma, host: '0.0.0.0', port: '8080' }
+```
+
+### use dbms
+
+Makanai use `sqlite` by default, and make `db/makanai.db`.
+
+If you use another dbms, install dbms(PostgreSQL or MySQL). And add dbms gem (`pg` or `mysql2`) in your Gemfile.
+
+``` ruby
+gem 'pg'
+```
+
+Overwrite the `databse_client` and `databse_config` with the created ruby ​​file(ex. app.rb) and Rakefile.
+
+``` ruby
+Makanai::Settings.databse_client = :postgres
+Makanai::Settings.databse_config = {
+  host: 'localhost',
+  password:'password',
+  dbname: 'makanai',
+  port: 5432
+}
+```
+
 ## routing
+Routing is searched in the order defined and call block args.
 
 ``` ruby
-require_relative '../lib/main.rb'
+require 'makanai/main'
 
 # root path
 router.get '/' do
@@ -91,11 +133,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
@@ -117,22 +165,33 @@ router.delete '/resources' do |request|
 end
 ```
 
-## erb render
+## rendering
 
-Define instance variables used in the routing view.
+Define instance variables used in the routing view. And specify template engine(`ERB` or `Haml`).
 
 ``` ruby
-require_relative '../lib/main.rb'
+require 'makanai/main'
+
+# setting template engine(default: :erb).
+Makanai::Settings.template_engine = :haml
+
+router.get '/index' do
+  @title = 'Makanai title'
+  @body = 'Makanai body'
+  render :index # render default template engine.
+end
 
 router.get '/index' do
   @title = 'Makanai title'
   @body = 'Makanai body'
-  render :index
+  render :index, :haml # render specified template engine.
 end
 ```
 
 Create an erb file in `src/views` with the name specified in render.
 
+erb
+
 ``` html
 <!-- src/views/index.erb -->
 <html>
@@ -146,9 +205,22 @@ Create an erb file in `src/views` with the name specified in render.
 </html>
 ```
 
+haml
+
+``` haml
+!!!
+%html
+  %head
+    %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+    %meta{:charset => "UTF-8"}/
+    %title= @title
+  %body
+    = @body
+```
+
 ## migration
 
-makanai uses `sqlite3` as db. create db and migrate schema when executed `rake makanai:db:migration`.
+migrate schema when executed `rake makanai:db:migration`.
 
 ```
 # execute all migraiton sql
@@ -178,7 +250,7 @@ INFO: finished migration all
 It can be used by creating a class that inherits `Makanai::Model`.
 
 ``` ruby
-require_relative '../../lib/model.rb'
+require 'makanai/model'
 
 class Resource < Makanai::Model
   # target table when executing sql.
@@ -215,6 +287,22 @@ Resource.find(1).delete
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/Madogiwa0124/makanai. 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.
 
+## setup develop enviroment
+
+Use docker-compose to build `mysql` and` postgres` containers for development.
+
+``` sh
+$ docker-compose up -d
+Creating makanai_mysql_1    ... done
+Creating makanai_postgres_1 ... done
+
+$ docker-compose ps
+       Name                     Command              State                 Ports
+----------------------------------------------------------------------------------------------
+makanai_mysql_1      docker-entrypoint.sh mysqld     Up      0.0.0.0:3306->3306/tcp, 33060/tcp
+makanai_postgres_1   docker-entrypoint.sh postgres   Up      0.0.0.0:5432->5432/tcp
+```
+
 # License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "makanai"
+require 'bundler/setup'
+require 'makanai'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "makanai"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/docker-compose.yml

@@ -0,0 +1,14 @@
+mysql:
+  image: mysql
+  ports:
+    - 3306:3306
+  environment:
+    - MYSQL_DATABASE=makanai
+    - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+postgres:
+  image: postgres
+  ports:
+    - 5432:5432
+  environment:
+    - POSTGRES_USER=makanai
+    - POSTGRES_PASSWORD=password

data/exe/makanai

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'makanai'
 require 'makanai/rake_tasks'
 
-if ARGV[0] == 'init'
-  Rake::Task['makanai:initialize:app'].execute
-end
+Rake::Task['makanai:initialize:app'].execute if ARGV[0] == 'init'

data/lib/makanai.rb

@@ -1,4 +1,6 @@
-require "makanai/version"
+# frozen_string_literal: true
+
+require 'makanai/version'
 
 module Makanai
   def self.root

data/lib/makanai/application.rb

@@ -3,21 +3,27 @@
 require 'json'
 require 'uri'
 require 'rack'
-require_relative './request.rb'
-require_relative './response.rb'
-require_relative './router.rb'
+require_relative './settings'
+require_relative './request'
+require_relative './response'
+require_relative './router'
 
 module Makanai
   class Application
     def initialize(router:)
       @router = router
-      @handler = Rack::Handler::WEBrick
+      @config = Settings
     end
 
-    attr_reader :router, :handler, :request, :response
+    attr_reader :router, :config, :request, :response
 
     def run!
-      handler.run self
+      app_config = config.rack_app_config
+      handler = Rack::Handler.get(app_config[:handler])
+      handler.run(self, { Host: app_config[:host], Port: app_config[:port] })
+    rescue Interrupt
+      handler.shutdown
+      puts '==== Goodbye! :) ===='
     end
 
     def call(env)
@@ -32,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/database.rb

@@ -1,29 +1,30 @@
 # frozen_string_literal: true
 
-require 'sqlite3'
-require_relative './settings.rb'
+require_relative './settings'
 
 module Makanai
   class Database
-    DATABASE_PATH = "#{Settings::APP_ROOT_PATH}#{Settings::DATABASE_PATH}"
+    class UnsupportedException < StandardError; end
 
-    def initialize(path: DATABASE_PATH)
-      @handler = SQLite3::Database
-      @db = handler.new path
-      db.tap { |db| db.results_as_hash = true }
+    def initialize(client: Settings.databse_client, config: Settings.databse_config)
+      client_class = client_class(client)
+      @client = client_class.new(config)
     end
 
-    attr_reader :handler, :db
+    attr_reader :client
 
     def execute_sql(sql)
       puts "SQL: #{sql.gsub("\n", ' ')}"
-      db.execute(sql).tap { close_db }
+      client.execute_sql(sql)
     end
 
     private
 
-    def close_db
-      db.close
+    def client_class(client)
+      require_relative File.join('dbms', client.to_s)
+      Object.const_get("Makanai::Dbms::#{client.capitalize}")
+    rescue LoadError
+      raise UnsupportedException
     end
   end
 end

data/lib/makanai/dbms/base.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Makanai
+  module Dbms
+    class Base
+      def db
+        raise NotImplementedError
+      end
+
+      def execute_sql
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/makanai/dbms/mysql.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'mysql2'
+require_relative './base'
+module Makanai
+  module Dbms
+    class Mysql < Base
+      def initialize(config)
+        super()
+        @db = Mysql2::Client.new(config || default_config)
+      end
+
+      attr_reader :db
+
+      def execute_sql(sql)
+        db.query(sql).to_a.tap { close_db }
+      end
+
+      private
+
+      def default_config
+        {
+          host: '0.0.0.0',
+          username: 'root',
+          password: 'password',
+          database: 'makanai',
+          port: 3306
+        }
+      end
+
+      def close_db
+        db.close
+      end
+    end
+  end
+end

data/lib/makanai/dbms/postgres.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'pg'
+require_relative './base'
+module Makanai
+  module Dbms
+    class Postgres < Base
+      def initialize(config)
+        super()
+        @db = PG.connect(config || default_config)
+        db.type_map_for_results = PG::BasicTypeMapForResults.new(db)
+      end
+
+      attr_reader :db
+
+      def execute_sql(sql)
+        db.exec(sql).each.to_a.tap { close_db }
+      end
+
+      private
+
+      def default_config
+        {
+          host: 'localhost',
+          password: nil,
+          dbname: 'makanai',
+          port: 5432
+        }
+      end
+
+      def close_db
+        db.finish
+      end
+    end
+  end
+end

data/lib/makanai/dbms/sqlite.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'sqlite3'
+require_relative './base'
+module Makanai
+  module Dbms
+    class Sqlite < Base
+      def initialize(config)
+        super()
+        @db = SQLite3::Database.new(config[:path])
+        db.tap { |db| db.results_as_hash = true }
+      end
+
+      attr_reader :db
+
+      def execute_sql(sql)
+        db.execute(sql).tap { close_db }
+      end
+
+      private
+
+      def close_db
+        db.close
+      end
+    end
+  end
+end

data/lib/makanai/dsl.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
-require_relative './template.rb'
-require_relative './response.rb'
-require_relative './settings.rb'
+require_relative './template'
+require_relative './response'
+require_relative './settings'
 
-def render(path)
-  template_root_path = "#{Dir.pwd}#{Makanai::Settings::TEMPLATE_ROOT_PATH}"
-  full_path = "#{template_root_path}#{path}.erb"
-  Makanai::Template.new(path: full_path).render
+def render(path, engine = Makanai::Settings.template_engine)
+  template_root_path = Makanai::Settings.template_full_path
+  full_path = File.join(template_root_path, path.to_s)
+  # NOTE: Get all instance variables in main by Hash
+  locals = instance_variables.map { |name| [name, instance_variable_get(name)] }.to_h
+  Makanai::Template.new(path: full_path, engine: engine, locals: locals).render
 end
 
 def redirect_to(url)

data/lib/makanai/generator.rb

@@ -2,7 +2,7 @@
 
 require 'erb'
 require 'yaml'
-require_relative '../makanai.rb'
+require_relative '../makanai'
 
 module Makanai
   class Generator
@@ -10,6 +10,7 @@ module Makanai
     DIRECTORY_NAMES = YAML.load_file("#{ROOT_PATH}/application/directories.yaml")
     APP_TEMPLATE = File.read("#{ROOT_PATH}/application/templates/app.erb")
     RAKEFILE_TEMPLATE = File.read("#{ROOT_PATH}/application/templates/rakefile.erb")
+    GEMFILE_TEMPLATE = File.read("#{ROOT_PATH}/application/templates/gemfile.erb")
 
     def initialize(path = Dir.pwd)
       @path = path
@@ -39,6 +40,12 @@ module Makanai
       end
     end
 
+    def create_gemfile(template = GEMFILE_TEMPLATE)
+      File.join(path, 'Gemfile').tap do |file_path|
+        create_file(file_path, ERB.new(template).result)
+      end
+    end
+
     private
 
     def create_file(file_path, content)

data/lib/makanai/generator/application/templates/gemfile.erb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+gem 'makanai'
+gem 'sqlite3'

data/lib/makanai/main.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative './application.rb'
-require_relative './router.rb'
-require_relative './dsl.rb'
+require_relative './application'
+require_relative './router'
+require_relative './dsl'
 
 def router
   @router ||= Makanai::Router.new

data/lib/makanai/migration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative './settings.rb'
-require_relative './database.rb'
+require_relative './settings'
+require_relative './database'
 
 module Makanai
   module Migration
@@ -12,7 +12,7 @@ module Makanai
     end
 
     def migration_root_path
-      "#{Settings::APP_ROOT_PATH}#{Settings::MIGRATION_ROOT_PATH}"
+      Settings.migration_full_path
     end
   end
 end

data/lib/makanai/model.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './database.rb'
+require_relative './database'
 
 module Makanai
   class Model

data/lib/makanai/rake_tasks.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
 require 'rake'
-require 'sqlite3'
-require_relative './migration.rb'
-require_relative './generator.rb'
+require_relative './migration'
+require_relative './generator'
 
 namespace :makanai do
   namespace :initialize do
@@ -14,6 +13,7 @@ namespace :makanai do
       puts generator.create_app_directories
       puts generator.create_app_rb
       puts generator.create_rakefile
+      puts generator.create_gemfile
       puts 'INFO: finished ganerate app'
     end
   end
@@ -25,11 +25,12 @@ namespace :makanai do
 
       puts "INFO: start migration #{ENV['target']}"
       target = ENV['target']
+      pp migration_root_path
       if target == 'all'
         sql_paths = Dir.glob("#{migration_root_path}*")
         sql_paths.each { |sql_path| execute_sql(sql_path: sql_path) }
       else
-        execute_sql(sql_path: "#{migration_root_path}#{target}")
+        execute_sql(sql_path: File.join(migration_root_path, target))
       end
       puts "INFO: finished migration #{ENV['target']}"
     end

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/settings.rb

@@ -1,10 +1,67 @@
 # frozen_string_literal: true
 
+require 'rack'
+
 module Makanai
   class Settings
-    APP_ROOT_PATH = Dir.pwd
-    DATABASE_PATH = '/db/makanai.db'
-    TEMPLATE_ROOT_PATH = '/views/'
-    MIGRATION_ROOT_PATH = '/migration/'
+    DEFAULT_APP_ROOT_PATH = Dir.pwd
+    DEFAULT_DATABASE_PATH = '/db/makanai.db'
+    DEFAULT_TEMPLATE_ROOT_PATH = '/views/'
+    DEFAULT_MIGRATION_ROOT_PATH = '/migration/'
+    DEFAULT_RACK_APP_CONFIG = { handler: :webrick, host: '0.0.0.0', port: '8080' }.freeze
+    DEFAULT_TEMPLATE_ENGINE = :erb
+
+    @app_root_path = DEFAULT_APP_ROOT_PATH
+    @database_path = DEFAULT_DATABASE_PATH
+    @template_root_path = DEFAULT_TEMPLATE_ROOT_PATH
+    @template_engine = DEFAULT_TEMPLATE_ENGINE
+    @migration_root_path = DEFAULT_MIGRATION_ROOT_PATH
+    @rack_app_config = DEFAULT_RACK_APP_CONFIG
+
+    # NOTE: Use Sqlite3
+    @databse_client = :sqlite
+    @databse_config = { path: File.join(@app_root_path, @database_path) }
+
+    # NOTE: Use Postgresql
+    # @databse_client = :postgres
+    # @databse_config = {
+    #   host: 'localhost',
+    #   password: 'password',
+    #   dbname: 'makanai',
+    #   port: 5432
+    # }.freeze
+
+    # NOTE: Use MySQL
+    # @databse_client = :mysql
+    # @databse_config = {
+    #   host: 'localhost',
+    #   username: 'root',
+    #   password: 'password',
+    #   database: 'makanai',
+    #   port: 3306
+    # }.freeze
+
+    class << self
+      attr_accessor :app_root_path,
+                    :database_path,
+                    :template_root_path,
+                    :template_engine,
+                    :migration_root_path,
+                    :rack_app_config,
+                    :databse_client,
+                    :databse_config
+
+      def database_full_path
+        File.join(app_root_path, database_path)
+      end
+
+      def template_full_path
+        File.join(app_root_path, template_root_path)
+      end
+
+      def migration_full_path
+        File.join(app_root_path, migration_root_path)
+      end
+    end
   end
 end

data/lib/makanai/template.rb

@@ -1,18 +1,29 @@
 # frozen_string_literal: true
 
-require 'erb'
-
 module Makanai
   class Template
-    def initialize(path:)
+    class UnsupportedException < StandardError; end
+
+    def initialize(path:, engine: :erb, locals: {})
       @path = path
+      @engine = engine
+      @locals = locals
     end
 
-    attr_reader :path
+    attr_reader :path, :engine, :locals
 
     def render
-      template_file = File.read(path)
-      ERB.new(template_file).result
+      template_file = File.read("#{path}.#{engine}")
+      engine_class.new(text: template_file, locals: locals).result
+    end
+
+    private
+
+    def engine_class
+      require_relative File.join('template_engine', engine.to_s)
+      Object.const_get("Makanai::TemplateEngine::#{engine.capitalize}")
+    rescue LoadError
+      raise UnsupportedException
     end
   end
 end

data/lib/makanai/template_engine/base.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Makanai
+  module TemplateEngine
+    class Base
+      def result
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/makanai/template_engine/erb.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'erb'
+require 'ostruct'
+require_relative './base'
+
+module Makanai
+  module TemplateEngine
+    class Erb < Base
+      def initialize(text:, locals: {})
+        super()
+        @text = text
+        @locals = locals
+      end
+
+      attr_reader :text, :locals
+
+      def result
+        # NOTE: ERB is need to pass the binding.
+        # So, pass the binding of the object that defined the instance variable.
+        # ref: https://docs.ruby-lang.org/en/2.7.0/ERB.html#method-i-result
+        ERB.new(text).result(Locals.new(locals).self_binding)
+      end
+      class Locals
+        def initialize(locals)
+          locals.each { |key, val| instance_variable_set(key, val) }
+        end
+
+        def self_binding
+          binding
+        end
+      end
+
+      private_constant :Locals
+    end
+  end
+end

data/lib/makanai/template_engine/haml.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'haml'
+require_relative './base'
+
+module Makanai
+  module TemplateEngine
+    class Haml < Base
+      def initialize(text:, locals: {})
+        super()
+        @text = text
+        @locals = locals
+      end
+
+      attr_reader :text, :locals
+
+      def result
+        # ref: http://haml.info/docs/yardoc/Haml/Engine.html#render-instance_method
+        ::Haml::Engine.new(text).render(Object.new, locals)
+      end
+    end
+  end
+end

data/lib/makanai/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Makanai
-  VERSION = "0.1.1"
+  VERSION = '0.1.6'
 end

data/makanai.gemspec

@@ -26,9 +26,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rake", ">= 10", "< 14"
-  spec.add_dependency "rack", "~> 2.0.7"
-  spec.add_dependency "sqlite3", "~> 1.4.1"
+  spec.add_dependency "rack", ">= 2.0.7", "< 2.3.0"
+  spec.add_development_dependency "sqlite3", "~> 1.4.1"
   spec.add_development_dependency "rubocop", "~> 0.74"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "pg", "~> 1.2"
+  spec.add_development_dependency "mysql2", "~> 0.5"
+  spec.add_development_dependency "haml", "~> 5.0"
 end

data/sample/Rakefile

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'makanai/rake_tasks.rb'
+require 'makanai/rake_tasks'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makanai
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Madogiwa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-28 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -34,16 +34,22 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +57,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -100,6 +106,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: simple web application framework for learning.
 email:
 - madogiwa0124@gmail.com
@@ -111,6 +159,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -121,14 +170,20 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- docker-compose.yml
 - exe/makanai
 - lib/makanai.rb
 - lib/makanai/application.rb
 - lib/makanai/database.rb
+- lib/makanai/dbms/base.rb
+- lib/makanai/dbms/mysql.rb
+- lib/makanai/dbms/postgres.rb
+- lib/makanai/dbms/sqlite.rb
 - lib/makanai/dsl.rb
 - lib/makanai/generator.rb
 - lib/makanai/generator/application/directories.yaml
 - lib/makanai/generator/application/templates/app.erb
+- lib/makanai/generator/application/templates/gemfile.erb
 - lib/makanai/generator/application/templates/rakefile.erb
 - lib/makanai/main.rb
 - lib/makanai/migration.rb
@@ -139,6 +194,9 @@ files:
 - lib/makanai/router.rb
 - lib/makanai/settings.rb
 - lib/makanai/template.rb
+- lib/makanai/template_engine/base.rb
+- lib/makanai/template_engine/erb.rb
+- lib/makanai/template_engine/haml.rb
 - lib/makanai/version.rb
 - makanai.gemspec
 - sample/Rakefile