makanai 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 045d01dcb6633aa95bb5e62f1714b477e80d9df4b29bb225f70ee22ce0b62677
-  data.tar.gz: 66dd196776a842b881097bf686e658054e0a32377dc1fea5564f540275030763
+  metadata.gz: e90461a7d5e372f93f13f282e5f20b0410db84438b4eb9cbb587f0e739bd0c19
+  data.tar.gz: a3dbff0cd0661110d7503889d768e6e277d8b3bf1241fcb13c62589ca8133d9d
 SHA512:
-  metadata.gz: 7fbceba802f6ae1b6edd0477afa1e13dc0ca73f182527f616a013e23d32b72577eba0e42e65798b0ba3c9452c75638b47da153cd6f40aa42ff6644ca1803413d
-  data.tar.gz: 86fd67e171f26715f21e6725e18c5d564267387334e519d6ea2f7bffa7c002ba786300b79edf61b0f96f38f6745a81748909fe5aedc13b086bf3cd6b13ae9a12
+  metadata.gz: 83066b43bf8207fdc6cc99763cd546504a324420e679c09c5aad6d98f65b7fb308cfd034af1b3e8508735de9693fb93919f55424b3ef04b53e45d5ae7ec8655f
+  data.tar.gz: 047dcbdf9ed4afe1c4991b0355ba58f469d63211f840c7f6f28c24f47be07b6a20f595e6eb19636e018152f636f44acffd9ede2cf7993e4a143b0663d7a8a9ec

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6.3
+  TargetRubyVersion: 2.7.0
   Exclude:
     - './makanai.gemspec'
 
@@ -15,6 +15,7 @@ Metrics/ClassLength:
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
+    - 'lib/makanai/rake_tasks.rb'
 
 Style/ParallelAssignment:
   Enabled: false

data/.travis.yml

@@ -3,5 +3,5 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.3
+  - 2.7.0
 before_install: gem install bundler -v 2.0.2

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# 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

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    makanai (0.1.0)
+    makanai (0.1.1)
       rack (~> 2.0.7)
-      rake (~> 10.0)
+      rake (>= 10, < 14)
       sqlite3 (~> 1.4.1)
 
 GEM
@@ -11,27 +11,27 @@ GEM
   specs:
     ast (2.4.0)
     diff-lcs (1.3)
-    jaro_winkler (1.5.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    jaro_winkler (1.5.4)
+    parallel (1.19.1)
+    parser (2.7.0.0)
       ast (~> 2.4.0)
-    rack (2.0.7)
+    rack (2.0.8)
     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)
+    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)
       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.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    rubocop (0.78.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
@@ -39,7 +39,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    sqlite3 (1.4.1)
+    sqlite3 (1.4.2)
     unicode-display_width (1.6.0)
 
 PLATFORMS
@@ -52,4 +52,4 @@ DEPENDENCIES
   rubocop (~> 0.74)
 
 BUNDLED WITH
-   2.0.2
+   2.1.2

data/README.md

@@ -1,4 +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)
+
 simple web application framework for learning.
 
 # Getting Start
@@ -29,20 +33,15 @@ 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).
@@ -59,9 +58,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.

data/exe/makanai

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

data/lib/makanai/database.rb

@@ -7,9 +7,9 @@ module Makanai
   class Database
     DATABASE_PATH = "#{Settings::APP_ROOT_PATH}#{Settings::DATABASE_PATH}"
 
-    def initialize
+    def initialize(path: DATABASE_PATH)
       @handler = SQLite3::Database
-      @db = handler.new DATABASE_PATH
+      @db = handler.new path
       db.tap { |db| db.results_as_hash = true }
     end
 
@@ -20,6 +20,8 @@ module Makanai
       db.execute(sql).tap { close_db }
     end
 
+    private
+
     def close_db
       db.close
     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/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/migration.rb

@@ -5,10 +5,10 @@ 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

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

data/lib/makanai/version.rb

@@ -1,3 +1,3 @@
 module Makanai
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/makanai.rb

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

data/makanai.gemspec

@@ -25,7 +25,7 @@ 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 "rake", ">= 10", "< 14"
   spec.add_dependency "rack", "~> 2.0.7"
   spec.add_dependency "sqlite3", "~> 1.4.1"
   spec.add_development_dependency "rubocop", "~> 0.74"

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: makanai
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Madogiwa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-12-28 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
@@ -97,7 +103,8 @@ dependencies:
 description: simple web application framework for learning.
 email:
 - madogiwa0124@gmail.com
-executables: []
+executables:
+- makanai
 extensions: []
 extra_rdoc_files: []
 files:
@@ -105,6 +112,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -113,10 +121,15 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- exe/makanai
 - lib/makanai.rb
 - lib/makanai/application.rb
 - lib/makanai/database.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 +168,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.