makanai 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e74d48c4c10a817b2dfad39c4aafb057a660152d27f9edd66cbfbb9293688749
-  data.tar.gz: 67ea0e86c3b9ad4228e623628f81b70bb2c6ff40de415790a1a8812180d6c002
+  metadata.gz: a9f69d757dc8cea982beb740cbd336682340611a9a38d30806f6957307acb46f
+  data.tar.gz: f3347824ed5141509983ed0e892d1b41ea85a853ff20ae099c08c313da890ba1
 SHA512:
-  metadata.gz: 99c175dffd8df4f05d1d371ac6eb2e2ba58bc4a90937606dc3c174c910642519da29fc8dcaa0a14e29a1b8b737e1fedfbacc8c6eff0d7bf8fad773ba5e891cb1
-  data.tar.gz: 44e7b1185134b873bda34309925422a46838e616641575dc03700cf8a8194d8cb393adf7fe22d33d823bc76df9be4bcbba22b4d6a8b1c3fe281848c956fbc706
+  metadata.gz: 611484278736c1625b16bf9d2127281b28716dcb9d85f6b0266074edad72963e1426bd282de376bb1b8a5823e71a20744413807301d9cfe14347a338fc77f56f
+  data.tar.gz: f16b7030bd5b779a69fe7fdb1af9f776bfcefd36d7d8c54cabffe1925ad8c82487e2036ba77ca4b5faa5cd8f6f80130e85a567765651ca84b14ce2e6ed22680d

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "17:00"
+  open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -0,0 +1,48 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ["2.7", "3.0", "3.1"]
+    services:
+      postgres:
+        image: postgres
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_USER: makanai
+          POSTGRES_PASSWORD: password
+      mysql:
+        image: mysql
+        ports:
+          - 3306:3306
+        env:
+          MYSQL_DATABASE: makanai
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: cache ruby deps
+        uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gem-
+      - name: install bundler
+        run: gem install bundler -v 2.3.22
+      - name: install ruby deps
+        run: bundle install --jobs 4 --retry 3 --path vendor/bundle
+      - name: lint
+        run: bundle exec rubocop --parallel
+      - name: test
+        run: bundle exec rspec
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

data/.rubocop.yml

@@ -1,17 +1,16 @@
 AllCops:
-  TargetRubyVersion: 3.0.0
   NewCops: enable
   Exclude:
-    - './makanai.gemspec'
-    - 'vendor/**/*'
+    - "./makanai.gemspec"
+    - "vendor/**/*"
 
 Metrics/ClassLength:
   Max: 120
 
 Metrics/BlockLength:
   Exclude:
-    - 'spec/**/*'
-    - 'lib/makanai/rake_tasks.rb'
+    - "spec/**/*"
+    - "lib/makanai/rake_tasks.rb"
 
 Style/Documentation:
   Enabled: false
@@ -33,3 +32,10 @@ Layout/LineLength:
 
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
+
+Style/HashSyntax:
+  Enabled: false
+
+Style/OpenStructUse:
+  Exclude:
+    - "spec/**/*"

data/.ruby-version

@@ -1 +1 @@
-3.0.0
+3.1.2

data/CHANGELOG.md

@@ -47,7 +47,12 @@
 * :zap: remove sqlite3 from runtime_dependency.  
   https://github.com/Madogiwa0124/makanai/commit/d63c3b12cf6fc412a8d88806dca9710e210e5fe0
 
-## :gift: 2021/01/05 `v.1.7` released.
+## :gift: 2021/01/05 `v0.1.7` released.
 * :package: dependency update.
 * :gem: supported ruby `3.0.0`.
   https://github.com/Madogiwa0124/makanai/pull/82
+
+## :gift: 2022/09/17 `v0.1.8` released.
+* :package: dependency update.
+* :gem: supported rack `3.0.0`.
+  https://github.com/madogiwa0124/makanai/pull/162

data/Gemfile.lock

@@ -1,68 +1,76 @@
 PATH
   remote: .
   specs:
-    makanai (0.1.7)
-      rack (>= 2.0.7, < 2.3.0)
+    makanai (0.1.8)
+      rack (>= 2.0.7, < 3.1.0)
+      rackup (~> 0.2)
       rake (>= 10, < 14)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    codecov (0.2.12)
-      json
-      simplecov
-    diff-lcs (1.4.4)
-    docile (1.3.4)
-    haml (5.2.1)
+    ast (2.4.2)
+    codecov (0.6.0)
+      simplecov (>= 0.15, < 0.22)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    json (2.5.1)
-    mysql2 (0.5.3)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    json (2.6.2)
+    mini_portile2 (2.8.0)
+    mysql2 (0.5.4)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    pg (1.2.3)
-    rack (2.2.3)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.0.2)
-    rexml (3.2.4)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.0)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.0)
+    pg (1.4.3)
+    rack (3.0.0)
+    rackup (0.2.2)
+      rack (>= 3.0.0.beta1)
+      webrick
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.0)
-    rubocop (1.7.0)
+      rspec-support (~> 3.11.0)
+    rspec-retry (0.6.2)
+      rspec-core (> 3.3)
+    rspec-support (3.11.0)
+    rubocop (1.36.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.20.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
-    simplecov (0.21.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
-    sqlite3 (1.4.2)
+    simplecov_json_formatter (0.1.3)
+    sqlite3 (1.5.0)
+      mini_portile2 (~> 2.8.0)
     temple (0.8.2)
     tilt (2.0.10)
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.3.0)
     webrick (1.7.0)
 
 PLATFORMS
@@ -76,9 +84,10 @@ DEPENDENCIES
   mysql2 (~> 0.5)
   pg (~> 1.2)
   rspec (~> 3.0)
+  rspec-retry (~> 0.6)
   rubocop (~> 1.0)
-  sqlite3 (~> 1.4.1)
+  sqlite3 (~> 1.5.0)
   webrick (~> 1.7.0)
 
 BUNDLED WITH
-   2.2.3
+   2.3.22

data/README.md

@@ -1,8 +1,8 @@
 # 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)
+[![CI](https://github.com/madogiwa0124/makanai/actions/workflows/ci.yml/badge.svg)](https://github.com/madogiwa0124/makanai/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/Madogiwa0124/makanai/branch/main/graph/badge.svg)](https://codecov.io/gh/Madogiwa0124/makanai)
 
 simple web application framework for learning.
 
@@ -25,6 +25,7 @@ Or install it yourself as:
     $ gem install makanai
 
 ## Start sample project
+
 Getting started with Makanai is easy.
 
 ```
@@ -41,7 +42,7 @@ $ ruby app.rb
 
 create a ruby ​​file(ex. app.rb).
 
-``` ruby
+```ruby
 require 'makanai/main'
 
 router.get '/' do
@@ -49,7 +50,7 @@ router.get '/' do
 end
 ```
 
-start server(WEBrick) at  execute `$ ruby app.rb`.
+start server(WEBrick) at execute `$ ruby app.rb`.
 
 ```
 $ ruby app.rb
@@ -61,6 +62,7 @@ $ ruby app.rb
 When accessing root, `Hello Makanai!` is displayed.
 
 ## constitution
+
 Makanai application has the following constitution.
 
 ```
@@ -79,7 +81,7 @@ You can overwrite the settings (`Makanai :: Settings`) with the created ruby ​
 
 ex) When overriding rack app settings.
 
-``` ruby
+```ruby
 Makanai::Settings.rack_app_config = { handler: :webrick, host: '0.0.0.0', port: '8081' }
 ```
 
@@ -87,13 +89,13 @@ Makanai::Settings.rack_app_config = { handler: :webrick, host: '0.0.0.0', port:
 
 Add rack web server(ex. puma) gem in your Gemfile.
 
-``` ruby
+```ruby
 gem 'puma'
 ```
 
 Overwrite the `handler` in `rack_app_config` with the created ruby ​​file(ex. app.rb).
 
-``` ruby
+```ruby
 Makanai::Settings.rack_app_config = { handler: :puma, host: '0.0.0.0', port: '8080' }
 ```
 
@@ -103,13 +105,13 @@ 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
+```ruby
 gem 'pg'
 ```
 
 Overwrite the `databse_client` and `databse_config` with the created ruby ​​file(ex. app.rb) and Rakefile.
 
-``` ruby
+```ruby
 Makanai::Settings.databse_client = :postgres
 Makanai::Settings.databse_config = {
   host: 'localhost',
@@ -120,9 +122,10 @@ Makanai::Settings.databse_config = {
 ```
 
 ## routing
+
 Routing is searched in the order defined and call block args.
 
-``` ruby
+```ruby
 require 'makanai/main'
 
 # root path
@@ -171,7 +174,7 @@ end
 
 Define instance variables used in the routing view. And specify template engine(`ERB` or `Haml`).
 
-``` ruby
+```ruby
 require 'makanai/main'
 
 # setting template engine(default: :erb).
@@ -194,22 +197,22 @@ Create an erb file in `src/views` with the name specified in render.
 
 erb
 
-``` html
+```html
 <!-- src/views/index.erb -->
 <html>
-<head>
-  <meta charset="UTF-8">
-  <title><%= @title %></title>
-</head>
-<body>
-  <%= @body %>
-</body>
+  <head>
+    <meta charset="UTF-8" />
+    <title><%= @title %></title>
+  </head>
+  <body>
+    <%= @body %>
+  </body>
 </html>
 ```
 
 haml
 
-``` haml
+```haml
 !!!
 %html
   %head
@@ -248,10 +251,11 @@ INFO: finished migration all
 ```
 
 ## model
+
 `Makanai::Model` is simple ORM.
 It can be used by creating a class that inherits `Makanai::Model`.
 
-``` ruby
+```ruby
 require 'makanai/model'
 
 class Resource < Makanai::Model
@@ -293,7 +297,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/Madogi
 
 Use docker-compose to build `mysql` and` postgres` containers for development.
 
-``` sh
+```sh
 $ docker-compose up -d
 Creating makanai_mysql_1    ... done
 Creating makanai_postgres_1 ... done
@@ -311,4 +315,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 # Code of Conduct
 
-Everyone interacting in the makanai project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/Madogiwa0124/makanai/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the makanai project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/Madogiwa0124/makanai/blob/main/CODE_OF_CONDUCT.md).

data/lib/makanai/dsl.rb

@@ -8,7 +8,7 @@ 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
+  locals = instance_variables.to_h { |name| [name, instance_variable_get(name)] }
   Makanai::Template.new(path: full_path, engine: engine, locals: locals).render
 end
 

data/lib/makanai/generator.rb

@@ -6,7 +6,7 @@ require_relative '../makanai'
 
 module Makanai
   class Generator
-    ROOT_PATH = "#{Makanai.root}/lib/makanai/generator"
+    ROOT_PATH = "#{Makanai.root}/lib/makanai/generator".freeze
     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")

data/lib/makanai/model.rb

@@ -70,7 +70,7 @@ module Makanai
     end
 
     def attributes
-      origin_attributes.map { |key, _val| [key, send(key)] }.to_h
+      origin_attributes.to_h { |key, _val| [key, send(key)] }
     end
 
     def create(db = Makanai::Database.new)

data/lib/makanai/rake_tasks.rb

@@ -23,8 +23,8 @@ namespace :makanai do
     task :migration do
       include Makanai::Migration
 
-      puts "INFO: start migration #{ENV['target']}"
-      target = ENV['target']
+      puts "INFO: start migration #{ENV.fetch('target', nil)}"
+      target = ENV.fetch('target', nil)
       pp migration_root_path
       if target == 'all'
         sql_paths = Dir.glob("#{migration_root_path}*")
@@ -32,7 +32,7 @@ namespace :makanai do
       else
         execute_sql(sql_path: File.join(migration_root_path, target))
       end
-      puts "INFO: finished migration #{ENV['target']}"
+      puts "INFO: finished migration #{ENV.fetch('target', nil)}"
     end
   end
 end

data/lib/makanai/request.rb

@@ -34,7 +34,7 @@ module Makanai
     def parsed_body
       @parsed_body ||= JSON.parse(origin_body)
     rescue JSON::ParserError
-      @parsed_body ||= origin_body.split('&').map { |param| param.split('=') }.to_h
+      @parsed_body ||= origin_body.split('&').to_h { |param| param.split('=') }
     end
 
     def parsed_url
@@ -49,7 +49,7 @@ module Makanai
     def build_params
       case env['REQUEST_METHOD']
       when 'GET'
-        return Hash[URI.decode_www_form(query)] if query
+        return URI.decode_www_form(query).to_h if query
       when 'POST'
         return parsed_body if origin_body
       end

data/lib/makanai/version.rb

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

data/makanai.gemspec

@@ -26,11 +26,13 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rake", ">= 10", "< 14"
-  spec.add_dependency "rack", ">= 2.0.7", "< 2.3.0"
-  spec.add_development_dependency "sqlite3", "~> 1.4.1"
+  spec.add_dependency "rack", ">= 2.0.7", "< 3.1.0"
+  spec.add_dependency "rackup", "~> 0.2"
+  spec.add_development_dependency "sqlite3", "~> 1.5.0"
   spec.add_development_dependency "rubocop", "~> 1.0"
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-retry", "~> 0.6"
   spec.add_development_dependency "pg", "~> 1.2"
   spec.add_development_dependency "mysql2", "~> 0.5"
   spec.add_development_dependency "webrick", "~> 1.7.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makanai
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Madogiwa
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -39,7 +39,7 @@ dependencies:
         version: 2.0.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,21 +49,35 @@ dependencies:
         version: 2.0.7
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -170,11 +198,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -241,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: simple web application framework for learning.

data/.travis.yml

@@ -1,25 +0,0 @@
----
-language: ruby
-cache: bundler
-services:
-  - postgresql
-  - mysql
-rvm:
-  - 2.6.6
-  - 2.7.2
-  - 3.0.0
-  - ruby-head
-os:
-  - linux
-before_install:
-  - gem install bundler -v 2.2.3
-  - 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