makanai 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90461a7d5e372f93f13f282e5f20b0410db84438b4eb9cbb587f0e739bd0c19
-  data.tar.gz: a3dbff0cd0661110d7503889d768e6e277d8b3bf1241fcb13c62589ca8133d9d
+  metadata.gz: c35e25ab94dce7eb78c2e81cd7d1086ba736c81d99ba81c17ae85cfaa88dcd25
+  data.tar.gz: fa52e627e552253a97ce59065ab456406e75901667c093fb7c160ac243bb5a35
 SHA512:
-  metadata.gz: 83066b43bf8207fdc6cc99763cd546504a324420e679c09c5aad6d98f65b7fb308cfd034af1b3e8508735de9693fb93919f55424b3ef04b53e45d5ae7ec8655f
-  data.tar.gz: 047dcbdf9ed4afe1c4991b0355ba58f469d63211f840c7f6f28c24f47be07b6a20f595e6eb19636e018152f636f44acffd9ede2cf7993e4a143b0663d7a8a9ec
+  metadata.gz: 8b2661b6a8e5df30a371e60ad9123b3814df7db48f02c91a2eae1e3e2acb3961b711aa5880aa70c103b0d78345ffbd9e4b097196e519e12821dd81951c554552
+  data.tar.gz: 0b91f2e2a8a3a03406506d8323ff05dccd22be62bf1d5ddb254b32771b8f99488094457bde8d5dd63367d73ac325d7d41a0e0d930ba4e5d7da75127e93118ab2

data/.rubocop.yml

@@ -2,12 +2,7 @@ AllCops:
   TargetRubyVersion: 2.7.0
   Exclude:
     - './makanai.gemspec'
-
-Style/Documentation:
-  Enabled: false
-
-Metrics/LineLength:
-  Max: 90
+    - 'vendor/**/*'
 
 Metrics/ClassLength:
   Max: 120
@@ -17,8 +12,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/CHANGELOG.md

@@ -13,3 +13,9 @@
 * :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

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    makanai (0.1.1)
-      rack (~> 2.0.7)
+    makanai (0.1.2)
+      rack (>= 2.0.7, < 2.3.0)
       rake (>= 10, < 14)
       sqlite3 (~> 1.4.1)
 
@@ -13,11 +13,12 @@ GEM
     diff-lcs (1.3)
     jaro_winkler (1.5.4)
     parallel (1.19.1)
-    parser (2.7.0.0)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
-    rack (2.0.8)
+    rack (2.2.2)
     rainbow (3.0.0)
     rake (13.0.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -31,16 +32,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubocop (0.78.0)
+    rubocop (0.80.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
     sqlite3 (1.4.2)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -76,10 +76,34 @@ 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' }
+```
+
 ## routing
 
 ``` ruby
-require_relative '../lib/main.rb'
+require 'makanai/main'
 
 # root path
 router.get '/' do
@@ -122,7 +146,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'
@@ -178,7 +202,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.

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/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/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)

data/lib/makanai/database.rb

@@ -5,9 +5,7 @@ require_relative './settings.rb'
 
 module Makanai
   class Database
-    DATABASE_PATH = "#{Settings::APP_ROOT_PATH}#{Settings::DATABASE_PATH}"
-
-    def initialize(path: DATABASE_PATH)
+    def initialize(path: Settings.database_full_path)
       @handler = SQLite3::Database
       @db = handler.new path
       db.tap { |db| db.results_as_hash = true }

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

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

@@ -1,10 +1,39 @@
 # 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
+
+    @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
+
+    class << self
+      attr_accessor :app_root_path,
+                    :database_path,
+                    :template_root_path,
+                    :migration_root_path,
+                    :rack_app_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.1"
+  VERSION = '0.1.2'
 end

data/lib/makanai.rb

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

data/makanai.gemspec

@@ -26,7 +26,7 @@ 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 "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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: makanai
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Madogiwa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-28 00:00:00.000000000 Z
+date: 2020-02-22 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