makanai 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c7b32701bd75c6ea7cae7f893310a50e5e70a9fea7c14e9a99ba9559b2e7a39
-  data.tar.gz: 8890f0956507a1d0bfa92197718f40b4ed7da313737fe4501032565154f68e08
+  metadata.gz: e74d48c4c10a817b2dfad39c4aafb057a660152d27f9edd66cbfbb9293688749
+  data.tar.gz: 67ea0e86c3b9ad4228e623628f81b70bb2c6ff40de415790a1a8812180d6c002
 SHA512:
-  metadata.gz: 268af34e32c0cfd48753227a04bf604f6b1fe3fae0a2ef4bb709965c8d6ac73ec3b78a6c6813a2576c33e69e9c00506d60ef1edecd8fd4046bdb013f96081574
-  data.tar.gz: d112687c6207e860f5c0513f2530c26c0d388472d3058aae069dc98771c7e637636ef61dfb2300727fa7952c8d03d018d3649b7d086a3b395d98a4c33bb2e8eb
+  metadata.gz: 99c175dffd8df4f05d1d371ac6eb2e2ba58bc4a90937606dc3c174c910642519da29fc8dcaa0a14e29a1b8b737e1fedfbacc8c6eff0d7bf8fad773ba5e891cb1
+  data.tar.gz: 44e7b1185134b873bda34309925422a46838e616641575dc03700cf8a8194d8cb393adf7fe22d33d823bc76df9be4bcbba22b4d6a8b1c3fe281848c956fbc706

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.7.0
+  TargetRubyVersion: 3.0.0
   NewCops: enable
   Exclude:
     - './makanai.gemspec'

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.0.0

data/.travis.yml

@@ -6,12 +6,13 @@ services:
   - mysql
 rvm:
   - 2.6.6
-  - 2.7.1
+  - 2.7.2
+  - 3.0.0
   - ruby-head
 os:
   - linux
 before_install:
-  - gem install bundler -v 2.1.4
+  - 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

data/CHANGELOG.md

@@ -46,3 +46,8 @@
 
 * :zap: remove sqlite3 from runtime_dependency.  
   https://github.com/Madogiwa0124/makanai/commit/d63c3b12cf6fc412a8d88806dca9710e210e5fe0
+
+## :gift: 2021/01/05 `v.1.7` released.
+* :package: dependency update.
+* :gem: supported ruby `3.0.0`.
+  https://github.com/Madogiwa0124/makanai/pull/82

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    makanai (0.1.6)
+    makanai (0.1.7)
       rack (>= 2.0.7, < 2.3.0)
       rake (>= 10, < 14)
 
@@ -9,60 +9,61 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
-    codecov (0.2.3)
-      colorize
+    codecov (0.2.12)
       json
       simplecov
-    colorize (0.8.1)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    haml (5.1.2)
+    diff-lcs (1.4.4)
+    docile (1.3.4)
+    haml (5.2.1)
       temple (>= 0.8.0)
       tilt
-    json (2.3.1)
+    json (2.5.1)
     mysql2 (0.5.3)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       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)
+    rake (13.0.3)
+    regexp_parser (2.0.2)
     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)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.89.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (1.7.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.1.0, < 1.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
+    rubocop-ast (1.3.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
-    simplecov (0.18.5)
+    simplecov (0.21.1)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
     sqlite3 (1.4.2)
     temple (0.8.2)
     tilt (2.0.10)
     unicode-display_width (1.7.0)
+    webrick (1.7.0)
 
 PLATFORMS
   ruby
@@ -75,8 +76,9 @@ DEPENDENCIES
   mysql2 (~> 0.5)
   pg (~> 1.2)
   rspec (~> 3.0)
-  rubocop (~> 0.74)
+  rubocop (~> 1.0)
   sqlite3 (~> 1.4.1)
+  webrick (~> 1.7.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

data/README.md

@@ -32,9 +32,9 @@ $ 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
+[2021-01-05 09:37:09] INFO  WEBrick 1.7.0
+[2021-01-05 09:37:09] INFO  ruby 3.0.0 (2020-12-25) [x86_64-darwin18]
+[2021-01-05 09:37:09] INFO  WEBrick::HTTPServer#start: pid=10675 port=8080
 ```
 
 # Usage
@@ -68,6 +68,8 @@ root ┬ app.rb    # main application file
      ├ views     # views files(ex. index.erb)
      ├ models    # models files(ex. post.rb)
      ├ migration # migration files(ex. 00_create_resources.sql)
+     ├ Rakefile  # rake tasks
+     ├ Gemfile   # dependencies
      └ db        # use Sqlite3 dabase file
 ```
 

data/lib/makanai/application.rb

@@ -20,7 +20,7 @@ module Makanai
     def run!
       app_config = config.rack_app_config
       handler = Rack::Handler.get(app_config[:handler])
-      handler.run(self, { Host: app_config[:host], Port: app_config[:port] })
+      handler.run(self, **{ Host: app_config[:host], Port: app_config[:port] })
     rescue Interrupt
       handler.shutdown
       puts '==== Goodbye! :) ===='
@@ -30,7 +30,7 @@ module Makanai
       @request = Makanai::Request.new(env)
       @response = Makanai::Response.new
       route_result = execute_route
-      return route_result.result if route_result.class == Response
+      return route_result.result if route_result.instance_of?(Response)
       @response.body << execute_route
       @response.result
     end

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

@@ -1,4 +1,9 @@
 # frozen_string_literal: true
 
+source 'https://rubygems.org'
+
 gem 'makanai'
-gem 'sqlite3'
+
+# If you want to use DB, please uncomment it.
+# or add any gem(`mysql2` or `pg`).
+# gem 'sqlite3'

data/lib/makanai/model.rb

@@ -55,11 +55,13 @@ module Makanai
     end
 
     def self.buid_sql_text(value)
+      # rubocop:disable Lint/DuplicateBranch
       case value
       when String then "'#{value.gsub(/'/, "''")}'"
       when Numeric, Integer then value
       else value
       end
+      # rubocop:enable Lint/DuplicateBranch
     end
 
     def assign_attributes(attributes)

data/lib/makanai/template_engine/erb.rb

@@ -21,6 +21,7 @@ module Makanai
         # 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) }

data/lib/makanai/version.rb

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

data/makanai.gemspec

@@ -28,10 +28,11 @@ Gem::Specification.new do |spec|
   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_development_dependency "rubocop", "~> 0.74"
+  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 "pg", "~> 1.2"
   spec.add_development_dependency "mysql2", "~> 0.5"
+  spec.add_development_dependency "webrick", "~> 1.7.0"
   spec.add_development_dependency "haml", "~> 5.0"
 end

data/sample/Gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'makanai'
+
+# If you want to use DB, please uncomment it.
+# or add any gem(`mysql2` or `pg`).
+# gem 'sqlite3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makanai
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Madogiwa
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,14 +70,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.74'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +213,7 @@ files:
 - lib/makanai/template_engine/haml.rb
 - lib/makanai/version.rb
 - makanai.gemspec
+- sample/Gemfile
 - sample/Rakefile
 - sample/app.rb
 - sample/db/.keep
@@ -211,7 +226,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/Madogiwa0124/makanai
   source_code_uri: https://github.com/Madogiwa0124/makanai
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -226,8 +241,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: simple web application framework for learning.
 test_files: []