makanai 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 045d01dcb6633aa95bb5e62f1714b477e80d9df4b29bb225f70ee22ce0b62677
-  data.tar.gz: 66dd196776a842b881097bf686e658054e0a32377dc1fea5564f540275030763
+  metadata.gz: 6c81e0de73a48146dc929239f380cba64b004c3517e9efc6f005d2c6a1f29f49
+  data.tar.gz: be85163a11c4e40cc0f3a43b122ce6396674dccb7fcd4bc14339888c9f45ef39
 SHA512:
-  metadata.gz: 7fbceba802f6ae1b6edd0477afa1e13dc0ca73f182527f616a013e23d32b72577eba0e42e65798b0ba3c9452c75638b47da153cd6f40aa42ff6644ca1803413d
-  data.tar.gz: 86fd67e171f26715f21e6725e18c5d564267387334e519d6ea2f7bffa7c002ba786300b79edf61b0f96f38f6745a81748909fe5aedc13b086bf3cd6b13ae9a12
+  metadata.gz: ebf556b401b54ee54b7921d907e324c03f5926f780c3fe9f39881d6a59a9727cb4d742f8f8f85fe4006626b24bad64b6c262c9725cb7fc31108f0861703c2f44
+  data.tar.gz: 5174bf19553fd347e15b27469e63224f1552288912b150f739f5b251f63227da3f3a88a408c2e305ecde170d0ee2aa1dc60f5750a765a398c8a32b9f1a769d9a

data/.gitignore

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

data/.rubocop.yml

@@ -1,13 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.6.3
+  TargetRubyVersion: 2.7.0
   Exclude:
     - './makanai.gemspec'
-
-Style/Documentation:
-  Enabled: false
-
-Metrics/LineLength:
-  Max: 90
+    - 'vendor/**/*'
 
 Metrics/ClassLength:
   Max: 120
@@ -15,9 +10,25 @@ Metrics/ClassLength:
 Metrics/BlockLength:
   Exclude:
     - '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,20 @@
 ---
-sudo: false
 language: ruby
 cache: bundler
+services:
+  - postgresql
+  - mysql
 rvm:
-  - 2.6.3
-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 database makanai;' -U postgres
+jobs:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -0,0 +1,41 @@
+# CHANGELOG
+
+## :gift: 2019/10/22 `v0.1.0` released.
+
+* :tada: first release
+
+## :gift: 2019/12/28 `v0.1.1` released.
+
+* :sparkles: add Makanai app genarator.  
+  Added `makanai init` command for initialize makanai application.  
+  https://github.com/Madogiwa0124/makanai/pull/5
+
+* :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.

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,76 @@
 PATH
   remote: .
   specs:
-    makanai (0.1.0)
-      rack (~> 2.0.7)
-      rake (~> 10.0)
+    makanai (0.1.5)
+      rack (>= 2.0.7, < 2.3.0)
+      rake (>= 10, < 14)
       sqlite3 (~> 1.4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    codecov (0.1.17)
+      json
+      simplecov
+      url
     diff-lcs (1.3)
-    jaro_winkler (1.5.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    docile (1.3.2)
+    json (2.3.0)
+    mysql2 (0.5.3)
+    parallel (1.19.1)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
-    rack (2.0.7)
+    pg (1.2.3)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    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.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.2)
+    rubocop (0.85.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
-    sqlite3 (1.4.1)
-    unicode-display_width (1.6.0)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    sqlite3 (1.4.2)
+    unicode-display_width (1.7.0)
+    url (0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.0)
+  codecov
   makanai!
+  mysql2 (~> 0.5)
+  pg (~> 1.2)
   rspec (~> 3.0)
   rubocop (~> 0.74)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -1,4 +1,9 @@
 # Makanai
+
+[![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.
 
 # Getting Start
@@ -29,26 +34,21 @@ Makanai depends on the following, so please install it in advance.
 Getting started with Makanai is easy.
 
 ```
-$ git clone https://github.com/Madogiwa0124/makanai.git
-$ bundle install
-$ cd makanai/sample
-$ be ruby app.rb
-[2019-09-09 23:20:05] INFO  WEBrick 1.4.2
-[2019-09-09 23:20:05] INFO  ruby 2.6.3 (2019-04-16) [x86_64-darwin18]
-[2019-09-09 23:20:05] INFO  WEBrick::HTTPServer#start: pid=30871 port=8080
+$ mkdir sample
+$ cd sample
+$ makanai init
+$ ruby app.rb
+[2019-12-28 12:27:13] INFO  WEBrick 1.6.0
+[2019-12-28 12:27:13] INFO  ruby 2.7.0 (2019-12-25) [x86_64-darwin18]
+[2019-12-28 12:27:13] INFO  WEBrick::HTTPServer#start: pid=22676 port=8080
 ```
 
-## How to customize
-You can customize the Makanai project by changing the sample directory. (You can also change the directory name from the sample.)
-
-To see what features are available, see Usage.
-
 # Usage
 
 create a ruby ​​file(ex. app.rb).
 
 ``` ruby
-require_relative '../lib/main.rb'
+require 'makanai/main'
 
 router.get '/' do
   'Hello Makanai!'
@@ -59,9 +59,9 @@ start server(WEBrick) at  execute `$ ruby app.rb`.
 
 ```
 $ ruby app.rb
-[2019-08-12 20:44:20] INFO  WEBrick 1.4.2
-[2019-08-12 20:44:20] INFO  ruby 2.6.3 (2019-04-16) [x86_64-darwin18]
-[2019-08-12 20:44:20] INFO  WEBrick::HTTPServer#start: pid=26043 port=8080
+[2019-12-28 12:27:13] INFO  WEBrick 1.6.0
+[2019-12-28 12:27:13] INFO  ruby 2.7.0 (2019-12-25) [x86_64-darwin18]
+[2019-12-28 12:27:13] INFO  WEBrick::HTTPServer#start: pid=22676 port=8080
 ```
 
 When accessing root, `Hello Makanai!` is displayed.
@@ -77,10 +77,55 @@ 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 other dbms
+
+install dbms(postgresql, mysql, sqlite). And add dbms gem (ex. pg) 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
@@ -92,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
@@ -123,7 +174,7 @@ end
 Define instance variables used in the routing view.
 
 ``` ruby
-require_relative '../lib/main.rb'
+require 'makanai/main'
 
 router.get '/index' do
   @title = 'Makanai title'
@@ -149,7 +200,7 @@ Create an erb file in `src/views` with the name specified in render.
 
 ## 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
@@ -179,7 +230,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.
@@ -216,6 +267,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

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

data/lib/makanai.rb

@@ -1,6 +1,12 @@
-require "makanai/version"
+# frozen_string_literal: true
+
+require 'makanai/version'
 
 module Makanai
+  def self.root
+    File.dirname __dir__
+  end
+
   class Error < StandardError; end
   # Your code goes here...
 end

data/lib/makanai/application.rb

@@ -3,6 +3,7 @@
 require 'json'
 require 'uri'
 require 'rack'
+require_relative './settings.rb'
 require_relative './request.rb'
 require_relative './response.rb'
 require_relative './router.rb'
@@ -11,13 +12,18 @@ 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,27 +1,31 @@
 # frozen_string_literal: true
 
-require 'sqlite3'
+require_relative './dbms/sqlite.rb'
 require_relative './settings.rb'
 
 module Makanai
   class Database
-    DATABASE_PATH = "#{Settings::APP_ROOT_PATH}#{Settings::DATABASE_PATH}"
+    class UnsupportedException < StandardError; end
 
-    def initialize
-      @handler = SQLite3::Database
-      @db = handler.new DATABASE_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
 
-    def close_db
-      db.close
+    private
+
+    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,35 @@
+# frozen_string_literal: true
+
+require 'mysql2'
+require_relative './base.rb'
+module Makanai
+  module Dbms
+    class Mysql < Base
+      def initialize(config)
+        @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,35 @@
+# frozen_string_literal: true
+
+require 'pg'
+require_relative './base.rb'
+module Makanai
+  module Dbms
+    class Postgres < Base
+      def initialize(config)
+        @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,26 @@
+# frozen_string_literal: true
+
+require 'sqlite3'
+require_relative './base.rb'
+module Makanai
+  module Dbms
+    class Sqlite < Base
+      def initialize(config)
+        @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

@@ -5,8 +5,8 @@ require_relative './response.rb'
 require_relative './settings.rb'
 
 def render(path)
-  template_root_path = "#{Dir.pwd}#{Makanai::Settings::TEMPLATE_ROOT_PATH}"
-  full_path = "#{template_root_path}#{path}.erb"
+  template_root_path = Makanai::Settings.template_full_path
+  full_path = File.join(template_root_path, "#{path}.erb")
   Makanai::Template.new(path: full_path).render
 end
 

data/lib/makanai/generator.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'erb'
+require 'yaml'
+require_relative '../makanai.rb'
+
+module Makanai
+  class Generator
+    ROOT_PATH = "#{Makanai.root}/lib/makanai/generator"
+    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")
+
+    def initialize(path = Dir.pwd)
+      @path = path
+    end
+
+    attr_reader :path
+
+    def create_app_directories(directory_names = DIRECTORY_NAMES)
+      directory_names.map do |name|
+        dir_path = File.join(path, name)
+        Dir.mkdir(dir_path)
+        file_path = File.join(dir_path, '.keep')
+        create_file(file_path, nil)
+        file_path
+      end
+    end
+
+    def create_app_rb(template = APP_TEMPLATE)
+      File.join(path, 'app.rb').tap do |file_path|
+        create_file(file_path, ERB.new(template).result)
+      end
+    end
+
+    def create_rakefile(template = RAKEFILE_TEMPLATE)
+      File.join(path, 'Rakefile').tap do |file_path|
+        create_file(file_path, ERB.new(template).result)
+      end
+    end
+
+    private
+
+    def create_file(file_path, content)
+      File.open(file_path, 'w') { |f| f.puts content }
+    end
+  end
+end

data/lib/makanai/generator/application/directories.yaml

@@ -0,0 +1,4 @@
+- db
+- migration
+- models
+- views

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'makanai/main'
+
+router.get '/' do
+  'Hello Makanai!'
+end

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

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

data/lib/makanai/migration.rb

@@ -5,14 +5,14 @@ require_relative './database.rb'
 
 module Makanai
   module Migration
-    def execute_sql(sql_path:)
+    def execute_sql(sql_path:, db: Makanai::Database.new)
       sql = File.read(sql_path)
       puts "execute: #{sql_path}"
-      Makanai::Database.new.execute_sql(sql)
+      db.execute_sql(sql)
     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

@@ -13,38 +13,45 @@ module Makanai
 
     attr_reader :origin_attributes
 
-    def self.execute_sql(sql)
-      Makanai::Database.new.execute_sql(sql)
+    def self.execute_sql(sql, db = Makanai::Database.new)
+      db.execute_sql(sql)
     end
 
-    def self.all
-      results = execute_sql("SELECT * FROM #{self::TABLE_NAME};")
+    def self.all(db = Makanai::Database.new)
+      results = execute_sql("SELECT * FROM #{self::TABLE_NAME};", db)
       results.map { |result| new(result) }
     end
 
-    def self.find(key)
-      results = execute_sql(
-        <<~SQL
-          SELECT *
-          FROM #{self::TABLE_NAME}
-          WHERE #{self::PRYMARY_KEY} = #{buid_sql_text(key)}
-          LIMIT 1;
-        SQL
-      )
+    def self.find(key, db = Makanai::Database.new)
+      sql = <<~SQL
+        SELECT *
+        FROM #{self::TABLE_NAME}
+        WHERE #{self::PRYMARY_KEY} = #{buid_sql_text(key)}
+        LIMIT 1;
+      SQL
+      results = execute_sql(sql, db)
       raise Makanai::Model::NotFound if results.empty?
       new(results.pop)
     end
 
-    def self.last
-      results = execute_sql(
-        <<~SQL
-          SELECT *
-          FROM #{self::TABLE_NAME}
-          ORDER BY #{self::PRYMARY_KEY} DESC
-          LIMIT 1;
-        SQL
-      )
-      new(results.pop)
+    def self.first(db = Makanai::Database.new)
+      sql = <<~SQL
+        SELECT *
+        FROM #{self::TABLE_NAME}
+        ORDER BY #{self::PRYMARY_KEY} ASC
+        LIMIT 1;
+      SQL
+      new(execute_sql(sql, db).pop)
+    end
+
+    def self.last(db = Makanai::Database.new)
+      sql = <<~SQL
+        SELECT *
+        FROM #{self::TABLE_NAME}
+        ORDER BY #{self::PRYMARY_KEY} DESC
+        LIMIT 1;
+      SQL
+      new(execute_sql(sql, db).pop)
     end
 
     def self.buid_sql_text(value)
@@ -64,39 +71,36 @@ module Makanai
       origin_attributes.map { |key, _val| [key, send(key)] }.to_h
     end
 
-    def create
-      self.class.execute_sql(
-        <<~SQL
-          INSERT
-          INTO #{self.class::TABLE_NAME}(#{clumns.join(',')})
-          VALUES (#{insert_values.join(',')});
-        SQL
-      )
-      @origin_attributes = self.class.last.attributes
+    def create(db = Makanai::Database.new)
+      sql = <<~SQL
+        INSERT
+        INTO #{self.class::TABLE_NAME}(#{clumns.join(',')})
+        VALUES (#{insert_values.join(',')});
+      SQL
+      self.class.execute_sql(sql, db)
+      @origin_attributes = attributes
       difine_attribute_methods
       self
     end
 
-    def update
-      self.class.execute_sql(
-        <<~SQL
-          UPDATE #{self.class::TABLE_NAME}
-          SET #{update_values.join(',')}
-          WHERE #{self.class::PRYMARY_KEY} = #{self.class.buid_sql_text(send(self.class::PRYMARY_KEY))};
-        SQL
-      )
+    def update(db = Makanai::Database.new)
+      sql = <<~SQL
+        UPDATE #{self.class::TABLE_NAME}
+        SET #{update_values.join(',')}
+        WHERE #{self.class::PRYMARY_KEY} = #{self.class.buid_sql_text(send(self.class::PRYMARY_KEY))};
+      SQL
+      self.class.execute_sql(sql, db)
       @origin_attributes = attributes
       difine_attribute_methods
       self
     end
 
-    def delete
-      self.class.execute_sql(
-        <<~SQL
-          DELETE FROM #{self.class::TABLE_NAME}
-          WHERE #{self.class::PRYMARY_KEY} = #{self.class.buid_sql_text(send(self.class::PRYMARY_KEY))};
-        SQL
-      )
+    def delete(db = Makanai::Database.new)
+      sql = <<~SQL
+        DELETE FROM #{self.class::TABLE_NAME}
+        WHERE #{self.class::PRYMARY_KEY} = #{self.class.buid_sql_text(send(self.class::PRYMARY_KEY))};
+      SQL
+      self.class.execute_sql(sql, db)
       nil
     end
 

data/lib/makanai/rake_tasks.rb

@@ -3,8 +3,21 @@
 require 'rake'
 require 'sqlite3'
 require_relative './migration.rb'
+require_relative './generator.rb'
 
 namespace :makanai do
+  namespace :initialize do
+    desc 'create directies and files for makanai initialization.'
+    task :app do
+      generator = Makanai::Generator.new
+      puts 'INFO: start ganerate app'
+      puts generator.create_app_directories
+      puts generator.create_app_rb
+      puts generator.create_rakefile
+      puts 'INFO: finished ganerate app'
+    end
+  end
+
   namespace :db do
     desc 'execute migration'
     task :migration do
@@ -16,7 +29,7 @@ namespace :makanai do
         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,66 @@
 # frozen_string_literal: true
 
+require 'rack'
+require_relative './dbms/sqlite.rb'
+require_relative './dbms/postgres.rb'
+
 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
+
+    @app_root_path = DEFAULT_APP_ROOT_PATH
+    @database_path = DEFAULT_DATABASE_PATH
+    @template_root_path = DEFAULT_TEMPLATE_ROOT_PATH
+    @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,
+                    :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/version.rb

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

data/makanai.gemspec

@@ -25,10 +25,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rake", "~> 10.0"
-  spec.add_dependency "rack", "~> 2.0.7"
+  spec.add_dependency "rake", ">= 10", "< 14"
+  spec.add_dependency "rack", ">= 2.0.7", "< 2.3.0"
   spec.add_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"
 end

metadata

@@ -1,43 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: makanai
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Madogiwa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '14'
 - !ruby/object:Gem::Dependency
   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
@@ -94,17 +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'
 description: simple web application framework for learning.
 email:
 - madogiwa0124@gmail.com
-executables: []
+executables:
+- makanai
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -113,10 +156,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/rakefile.erb
 - lib/makanai/main.rb
 - lib/makanai/migration.rb
 - lib/makanai/model.rb
@@ -155,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: simple web application framework for learning.