yescode 1.0.0 → 22.05.24
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitattributes +2 -0
- data/CHANGELOG.md +132 -0
- data/README.md +3 -3
- data/exe/yescode +27 -3
- data/lib/yes_app.rb +8 -5
- data/lib/yes_controller.rb +19 -10
- data/lib/yes_mail.rb +34 -25
- data/lib/yes_record.rb +2 -2
- data/lib/yes_routes.rb +50 -10
- data/lib/yes_view.rb +2 -2
- data/lib/yescode/database.rb +8 -2
- data/lib/yescode/emote.rb +0 -2
- data/lib/yescode/generator.rb +225 -15
- data/lib/yescode/request_cache/middleware.rb +23 -0
- data/lib/yescode/request_cache.rb +20 -0
- data/lib/yescode/router.rb +8 -18
- data/lib/yescode/strings.rb +19 -12
- data/lib/yescode/version.rb +5 -0
- data/lib/yescode.rb +22 -22
- data/yescode.gemspec +2 -2
- metadata +4 -3
- data/lib/yescode/refinements.rb +0 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a496bc38d094a8023eb8a35144bbb28b34a83757aa72bbd0c43e74ce14ec687d
|
4
|
+
data.tar.gz: 84eeeb4d8a2f6e31a7b78af40eaad27709adb278917000f5a372e3acc89a3430
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7bf4aced8cef7c324db274362313d0293d958673a4e48f9afdf4a784d9cbd9d10443874223f7faef35e521d6956091711c44e3e4cde9080d6e640041675f2803
|
7
|
+
data.tar.gz: ff2c73bbb7d0e4066aa717c077019ec39afc553d6e8fcad678709574f5befcd2edc51ba3fb54f2ee96d94843eba0470184d23ebabfa3133b09d0dd52c49c6d58
|
data/.gitattributes
ADDED
data/CHANGELOG.md
CHANGED
@@ -4,6 +4,138 @@ All notable changes to this project will be documented in this file
|
|
4
4
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
|
6
6
|
|
7
|
+
# Unreleased
|
8
|
+
|
9
|
+
# [22.05.24]
|
10
|
+
|
11
|
+
Switched to calendar versioning, the new format is YY.MM.DD
|
12
|
+
|
13
|
+
### Fixes
|
14
|
+
|
15
|
+
No fixes :tada:
|
16
|
+
|
17
|
+
### Features
|
18
|
+
|
19
|
+
- Add a json response helper
|
20
|
+
- Add render method to controller which can disable layout at runtime
|
21
|
+
- Add action routing
|
22
|
+
- Add actions routing
|
23
|
+
- Add resources routing
|
24
|
+
|
25
|
+
The new `action` method:
|
26
|
+
|
27
|
+
```rb
|
28
|
+
class Routes < YesRoutes
|
29
|
+
action "/signup", :Signups
|
30
|
+
end
|
31
|
+
|
32
|
+
# elsewhere in the signups controller
|
33
|
+
class Signups < YesController
|
34
|
+
# GET /signup
|
35
|
+
def new
|
36
|
+
end
|
37
|
+
|
38
|
+
# POST /signup
|
39
|
+
def create
|
40
|
+
end
|
41
|
+
end
|
42
|
+
```
|
43
|
+
|
44
|
+
`actions` is very similar to `action`
|
45
|
+
|
46
|
+
```rb
|
47
|
+
class Routes < YesRoutes
|
48
|
+
actions "/profile", :Profile
|
49
|
+
end
|
50
|
+
|
51
|
+
# elsewhere in the signups controller
|
52
|
+
class Profile < YesController
|
53
|
+
# GET /profile
|
54
|
+
def show
|
55
|
+
end
|
56
|
+
|
57
|
+
# GET /profile/new
|
58
|
+
def new
|
59
|
+
end
|
60
|
+
|
61
|
+
# POST /profile/new
|
62
|
+
def create
|
63
|
+
end
|
64
|
+
|
65
|
+
# GET /profile/edit
|
66
|
+
def edit
|
67
|
+
end
|
68
|
+
|
69
|
+
# POST /profile/edit
|
70
|
+
def update
|
71
|
+
end
|
72
|
+
|
73
|
+
# POST /profile/delete
|
74
|
+
def delete
|
75
|
+
end
|
76
|
+
end
|
77
|
+
```
|
78
|
+
|
79
|
+
Finally, resources is a more flexible version of `resource`
|
80
|
+
|
81
|
+
```rb
|
82
|
+
class Routes < YesRoutes
|
83
|
+
resources "/todos/:todo_id", :Todos
|
84
|
+
end
|
85
|
+
|
86
|
+
# elsewhere
|
87
|
+
|
88
|
+
class Todos < YesController
|
89
|
+
# GET /todos
|
90
|
+
def index
|
91
|
+
end
|
92
|
+
|
93
|
+
# GET /todos/:todo_id
|
94
|
+
def show
|
95
|
+
end
|
96
|
+
|
97
|
+
# GET /todos/new
|
98
|
+
def new
|
99
|
+
end
|
100
|
+
|
101
|
+
# POST /todos/new
|
102
|
+
def create
|
103
|
+
end
|
104
|
+
|
105
|
+
# GET /todos/:todo_id/edit
|
106
|
+
def edit
|
107
|
+
end
|
108
|
+
|
109
|
+
# POST /todos/:todo_id/edit
|
110
|
+
def update
|
111
|
+
end
|
112
|
+
|
113
|
+
# POST /todos/:todo_id/delete
|
114
|
+
def delete
|
115
|
+
end
|
116
|
+
end
|
117
|
+
```
|
118
|
+
|
119
|
+
# [1.1.1]
|
120
|
+
|
121
|
+
### Fixes
|
122
|
+
|
123
|
+
- Migrations and rollbacks from the yescode cli are now working as intended
|
124
|
+
|
125
|
+
# [1.1.0]
|
126
|
+
|
127
|
+
### Fixes
|
128
|
+
|
129
|
+
- Make resource routing actually work
|
130
|
+
- Added some tests around snake/pascal/camel case
|
131
|
+
- Fixed a few rough edges around migrations/rollbacks
|
132
|
+
|
133
|
+
### Features
|
134
|
+
|
135
|
+
- Removed refinements
|
136
|
+
- Prep for RBS type checking with steep
|
137
|
+
- Help messages in the yescode cli command
|
138
|
+
|
7
139
|
# [1.0.0]
|
8
140
|
|
9
141
|
- MVC
|
data/README.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# yescode
|
2
2
|
|
3
|
-
A
|
3
|
+
A full stack ruby mvc web framework
|
4
4
|
|
5
5
|
# Learning
|
6
6
|
|
@@ -17,7 +17,7 @@ gem install yescode
|
|
17
17
|
Generate a new app and get in there
|
18
18
|
|
19
19
|
```sh
|
20
|
-
yescode
|
20
|
+
yescode new todos
|
21
21
|
cd todos
|
22
22
|
```
|
23
23
|
|
@@ -56,7 +56,7 @@ gem install yescode
|
|
56
56
|
Generate a new app and get in there
|
57
57
|
|
58
58
|
```sh
|
59
|
-
yescode
|
59
|
+
yescode new todos
|
60
60
|
cd todos
|
61
61
|
```
|
62
62
|
|
data/exe/yescode
CHANGED
@@ -1,16 +1,40 @@
|
|
1
1
|
#!/usr/bin/env ruby
|
2
2
|
|
3
|
+
# frozen_string_literal: true
|
4
|
+
|
3
5
|
require "yescode"
|
4
6
|
|
7
|
+
HELP_MESSAGE = <<~TXT
|
8
|
+
Usage: yescode <command> [options]
|
9
|
+
|
10
|
+
Supported yescode commands:
|
11
|
+
generate Generate new code (aliases: g, gen)
|
12
|
+
migrate Migrates the database with up sql in ./db/migrations/*.sql
|
13
|
+
rollback Rolls the database back with down sql in ./db/migrations/*.sql
|
14
|
+
|
15
|
+
new Create a new Yescode application
|
16
|
+
|
17
|
+
Example:
|
18
|
+
yescode new my_app
|
19
|
+
|
20
|
+
This will create a new application in ./my_app
|
21
|
+
TXT
|
22
|
+
|
5
23
|
command, *args = ARGV
|
6
24
|
|
7
25
|
case command
|
8
26
|
when "g", "gen", "generate"
|
9
27
|
Yescode::Generator.generate(*args)
|
28
|
+
when "new"
|
29
|
+
Yescode::Generator.generate_app(args[0])
|
10
30
|
when "migrate"
|
11
|
-
|
31
|
+
YesApp.migrate
|
12
32
|
when "rollback"
|
13
|
-
|
33
|
+
YesApp.rollback(args[0] || 1)
|
34
|
+
when "-v", "--version"
|
35
|
+
puts Yescode::VERSION
|
36
|
+
when "-h", "--help"
|
37
|
+
puts HELP_MESSAGE
|
14
38
|
else
|
15
|
-
puts
|
39
|
+
puts HELP_MESSAGE
|
16
40
|
end
|
data/lib/yes_app.rb
CHANGED
@@ -24,7 +24,8 @@ class YesApp
|
|
24
24
|
|
25
25
|
builder.use Yescode::RequestCache::Middleware
|
26
26
|
|
27
|
-
|
27
|
+
Yescode::Router.assets = @assets
|
28
|
+
builder.run Yescode::Router.new(@routes)
|
28
29
|
|
29
30
|
@app = builder.to_app
|
30
31
|
end
|
@@ -63,16 +64,18 @@ class YesApp
|
|
63
64
|
@assets.compile_assets
|
64
65
|
end
|
65
66
|
|
66
|
-
def migrations(dir
|
67
|
+
def migrations(dir)
|
67
68
|
@migrations ||= Dir[dir]
|
68
69
|
end
|
69
70
|
|
70
71
|
def migrate
|
71
|
-
Yescode::Database.
|
72
|
+
Yescode::Database.logger = YesLogger.new($stdout)
|
73
|
+
Yescode::Database.migrate(@migrations || Dir["./db/migrations/*.sql"])
|
72
74
|
end
|
73
75
|
|
74
|
-
def rollback(step
|
75
|
-
Yescode::Database.
|
76
|
+
def rollback(step)
|
77
|
+
Yescode::Database.logger = YesLogger.new($stdout)
|
78
|
+
Yescode::Database.rollback_schema(@migrations || Dir["./db/migrations/*.sql"], step:)
|
76
79
|
end
|
77
80
|
|
78
81
|
def development?
|
data/lib/yes_controller.rb
CHANGED
@@ -1,13 +1,6 @@
|
|
1
1
|
class YesController
|
2
2
|
class << self
|
3
|
-
attr_accessor :before_actions
|
4
|
-
attr_writer :layout
|
5
|
-
|
6
|
-
def layout
|
7
|
-
@layout || Object.const_get(:Layout).new
|
8
|
-
rescue NameError => _e
|
9
|
-
nil
|
10
|
-
end
|
3
|
+
attr_accessor :before_actions, :assets
|
11
4
|
|
12
5
|
def before_action(*symbols)
|
13
6
|
@before_actions = symbols
|
@@ -43,6 +36,10 @@ class YesController
|
|
43
36
|
ok body, { "content-type" => "text/xml; charset=utf-8" }
|
44
37
|
end
|
45
38
|
|
39
|
+
def json(body = nil)
|
40
|
+
ok body, { "content-type" => "application/json; charset=utf-8" }
|
41
|
+
end
|
42
|
+
|
46
43
|
def redirect(controller_or_url, method_name = nil, params = {})
|
47
44
|
if method_name
|
48
45
|
response 302, nil, { "Location" => path(controller_or_url, method_name, params) }
|
@@ -64,7 +61,7 @@ class YesController
|
|
64
61
|
end
|
65
62
|
|
66
63
|
def not_found
|
67
|
-
[404, {"content-type" => "text/plain"}, ["not found"]]
|
64
|
+
[404, { "content-type" => "text/plain" }, ["not found"]]
|
68
65
|
end
|
69
66
|
|
70
67
|
def not_found!
|
@@ -72,7 +69,7 @@ class YesController
|
|
72
69
|
end
|
73
70
|
|
74
71
|
def server_error
|
75
|
-
[500, {"content-type" => "text/plain"}, ["internal server error"]]
|
72
|
+
[500, { "content-type" => "text/plain" }, ["internal server error"]]
|
76
73
|
end
|
77
74
|
|
78
75
|
def server_error!
|
@@ -82,4 +79,16 @@ class YesController
|
|
82
79
|
def path(*args)
|
83
80
|
Object.const_get(:App).path(*args)
|
84
81
|
end
|
82
|
+
|
83
|
+
def render(view, layout: true)
|
84
|
+
view.csrf_name = csrf_name
|
85
|
+
view.csrf_value = csrf_value
|
86
|
+
view.assets = self.class.assets&.to_h || {}
|
87
|
+
view.session = session
|
88
|
+
view.ajax = @env.key?("HTTP_YES_AJAX")
|
89
|
+
content = view.render(view.template)
|
90
|
+
content = view.render(view.class.superclass.new.template, content:) if layout
|
91
|
+
|
92
|
+
ok content
|
93
|
+
end
|
85
94
|
end
|
data/lib/yes_mail.rb
CHANGED
@@ -1,9 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
Mail.defaults do
|
2
|
-
delivery_method :logger, logger: Logger.new($stdout) if Yescode.env.development?
|
4
|
+
delivery_method :logger, logger: Logger.new($stdout) if Yescode.env.development? || Yescode.env.test?
|
3
5
|
end
|
4
6
|
|
5
7
|
class YesMail
|
6
|
-
|
8
|
+
extend Yescode::Strings
|
7
9
|
include Emote::Helpers
|
8
10
|
|
9
11
|
class << self
|
@@ -44,29 +46,7 @@ class YesMail
|
|
44
46
|
end
|
45
47
|
|
46
48
|
def mail(from: nil, to: nil, subject: nil)
|
47
|
-
|
48
|
-
mail[:from] = from || self.class._from
|
49
|
-
mail[:to] = to
|
50
|
-
mail[:subject] = subject
|
51
|
-
|
52
|
-
default_name = self.class.to_s.snake_case
|
53
|
-
|
54
|
-
text = part(self.class._text_view || "#{default_name}.text.emote")
|
55
|
-
html = part(self.class._html_view || "#{default_name}.html.emote")
|
56
|
-
|
57
|
-
text_part = Mail::Part.new do
|
58
|
-
body text
|
59
|
-
end
|
60
|
-
|
61
|
-
html_part = Mail::Part.new do
|
62
|
-
content_type "text/html; charset=UTF-8"
|
63
|
-
body html
|
64
|
-
end
|
65
|
-
|
66
|
-
mail.text_part = text_part
|
67
|
-
mail.html_part = html_part
|
68
|
-
|
69
|
-
mail.deliver
|
49
|
+
new_mail(from:, to:, subject:).deliver
|
70
50
|
end
|
71
51
|
|
72
52
|
private
|
@@ -79,10 +59,39 @@ class YesMail
|
|
79
59
|
content = template(name)
|
80
60
|
layout = template(self.class._layout || "layout")
|
81
61
|
|
62
|
+
return unless File.exist?(layout) || File.exist?(content)
|
63
|
+
|
82
64
|
if File.exist?(layout)
|
83
65
|
emote(layout, { content: })
|
84
66
|
else
|
85
67
|
emote(content)
|
86
68
|
end
|
87
69
|
end
|
70
|
+
|
71
|
+
def new_mail(from:, to:, subject:)
|
72
|
+
mail = Mail.new
|
73
|
+
mail[:from] = from || self.class._from
|
74
|
+
mail[:to] = to
|
75
|
+
mail[:subject] = subject
|
76
|
+
|
77
|
+
filename = self.class.filename
|
78
|
+
|
79
|
+
text = part(self.class._text_view || "#{filename}.text.emote")
|
80
|
+
html = part(self.class._html_view || "#{filename}.html.emote")
|
81
|
+
|
82
|
+
if text
|
83
|
+
mail.text_part = Mail::Part.new do
|
84
|
+
body text
|
85
|
+
end
|
86
|
+
end
|
87
|
+
|
88
|
+
if html
|
89
|
+
mail.html_part = Mail::Part.new do
|
90
|
+
content_type "text/html; charset=UTF-8"
|
91
|
+
body html
|
92
|
+
end
|
93
|
+
end
|
94
|
+
|
95
|
+
mail
|
96
|
+
end
|
88
97
|
end
|
data/lib/yes_record.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class YesRecord
|
4
|
-
|
4
|
+
extend Yescode::Strings
|
5
5
|
|
6
6
|
class QueryNotFound < StandardError; end
|
7
7
|
class RecordNotFound < StandardError; end
|
@@ -12,7 +12,7 @@ class YesRecord
|
|
12
12
|
attr_writer :table_name
|
13
13
|
|
14
14
|
def table_name
|
15
|
-
@table_name ||
|
15
|
+
@table_name || filename
|
16
16
|
end
|
17
17
|
|
18
18
|
def table(name)
|
data/lib/yes_routes.rb
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class YesRoutes
|
4
|
-
using Refinements
|
5
4
|
class RouteDoesNotExistError < StandardError; end
|
6
5
|
class RouteParamsNilError < StandardError; end
|
7
6
|
|
@@ -36,18 +35,55 @@ class YesRoutes
|
|
36
35
|
match("POST", path_string, class_name, method_name)
|
37
36
|
end
|
38
37
|
|
38
|
+
def action(path_string, class_name)
|
39
|
+
match("GET", path_string, class_name, :new)
|
40
|
+
match("POST", path_string, class_name, :create)
|
41
|
+
end
|
42
|
+
|
43
|
+
def actions(path_string, class_name)
|
44
|
+
match("GET", path_string, class_name, :show)
|
45
|
+
match("GET", "#{path_string}/new", class_name, :new)
|
46
|
+
match("POST", "#{path_string}/new", class_name, :create)
|
47
|
+
match("GET", "#{path_string}/edit", class_name, :edit)
|
48
|
+
match("POST", "#{path_string}/edit", class_name, :update)
|
49
|
+
match("POST", "#{path_string}/delete", class_name, :delete)
|
50
|
+
end
|
51
|
+
|
39
52
|
def resource(path_string, class_name)
|
40
|
-
snake_case = class_name.snake_case
|
41
53
|
[
|
42
|
-
[
|
43
|
-
[
|
44
|
-
[
|
45
|
-
[
|
46
|
-
[
|
47
|
-
[
|
48
|
-
[
|
54
|
+
["GET", :index, ""],
|
55
|
+
["GET", :new, "/new"],
|
56
|
+
["POST", :create, "/new"],
|
57
|
+
["GET", :show, "/:id"],
|
58
|
+
["GET", :edit, "/:id/edit"],
|
59
|
+
["POST", :update, "/:id/edit"],
|
60
|
+
["POST", :delete, "/:id/delete"]
|
49
61
|
].each do |method, method_name, suffix|
|
50
|
-
|
62
|
+
match(method, full_path(path_string, suffix), class_name, method_name)
|
63
|
+
end
|
64
|
+
end
|
65
|
+
|
66
|
+
def resources(path_string, class_name)
|
67
|
+
raise StandardError, "Needs at least two url segments" if path_string.split("/").size < 2
|
68
|
+
raise StandardError, "The last url segment needs to be a param" unless path_string.split("/").last.include?(":")
|
69
|
+
|
70
|
+
*prefix, _ = path_string.split("/")
|
71
|
+
prefix = prefix.join("/")
|
72
|
+
|
73
|
+
[
|
74
|
+
["GET", :index, "", :plural],
|
75
|
+
["GET", :new, "/new", :plural],
|
76
|
+
["POST", :create, "/new", :plural],
|
77
|
+
["GET", :show, ""],
|
78
|
+
["GET", :edit, "/edit"],
|
79
|
+
["POST", :update, "/edit"],
|
80
|
+
["POST", :delete, "/delete"]
|
81
|
+
].each do |method, method_name, suffix, plural|
|
82
|
+
if plural
|
83
|
+
match(method, full_path(prefix, suffix), class_name, method_name)
|
84
|
+
else
|
85
|
+
match(method, full_path(path_string, suffix), class_name, method_name)
|
86
|
+
end
|
51
87
|
end
|
52
88
|
end
|
53
89
|
|
@@ -60,5 +96,9 @@ class YesRoutes
|
|
60
96
|
|
61
97
|
path.gsub(re, params)
|
62
98
|
end
|
99
|
+
|
100
|
+
def full_path(prefix, suffix)
|
101
|
+
"#{prefix}/#{suffix}".gsub(%r{/+}, "/").chomp("/")
|
102
|
+
end
|
63
103
|
end
|
64
104
|
end
|
data/lib/yes_view.rb
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
class YesView
|
4
|
-
|
4
|
+
extend Yescode::Strings
|
5
5
|
include Emote::Helpers
|
6
6
|
|
7
7
|
class << self
|
@@ -25,7 +25,7 @@ class YesView
|
|
25
25
|
end
|
26
26
|
|
27
27
|
def template_name
|
28
|
-
@template_name || "#{
|
28
|
+
@template_name || "#{filename}.emote"
|
29
29
|
end
|
30
30
|
end
|
31
31
|
|
data/lib/yescode/database.rb
CHANGED
@@ -19,6 +19,8 @@ module Yescode
|
|
19
19
|
end
|
20
20
|
|
21
21
|
def migrate(filenames)
|
22
|
+
return unless connection_string
|
23
|
+
|
22
24
|
execute "create table if not exists yescode_migrations ( version integer primary key )"
|
23
25
|
rows = execute("select version from yescode_migrations").map { |r| r["version"] }
|
24
26
|
file_versions = filenames.map { |f| version(f) }
|
@@ -37,9 +39,13 @@ module Yescode
|
|
37
39
|
end
|
38
40
|
end
|
39
41
|
|
40
|
-
def rollback_schema(filenames, step:
|
42
|
+
def rollback_schema(filenames, step:)
|
43
|
+
return unless connection_string
|
44
|
+
|
41
45
|
execute "create table if not exists yescode_migrations ( version integer primary key )"
|
42
|
-
rows = execute("select version from yescode_migrations order by version desc limit
|
46
|
+
rows = execute("select version from yescode_migrations order by version desc limit ?", step).map { |r| r["version"] }
|
47
|
+
|
48
|
+
return if rows.empty?
|
43
49
|
|
44
50
|
transaction do
|
45
51
|
rows.each do |row|
|
data/lib/yescode/emote.rb
CHANGED
data/lib/yescode/generator.rb
CHANGED
@@ -5,10 +5,169 @@ require "securerandom"
|
|
5
5
|
|
6
6
|
module Yescode
|
7
7
|
class Generator
|
8
|
-
|
8
|
+
extend Strings
|
9
|
+
|
9
10
|
VIEW_DIR = File.join(".", "app", "views")
|
10
11
|
|
11
|
-
|
12
|
+
APP_HELP_MESSAGE = <<~TXT
|
13
|
+
Usage: yescode new [name]
|
14
|
+
|
15
|
+
Create a new Yescode application
|
16
|
+
|
17
|
+
Example:
|
18
|
+
yescode new todos
|
19
|
+
|
20
|
+
This will generate a new Yescode application in ./todos
|
21
|
+
TXT
|
22
|
+
|
23
|
+
CONTROLLER_HELP_MESSAGE = <<~TXT
|
24
|
+
Usage: yescode generate controller [name]
|
25
|
+
|
26
|
+
Create a new controller with all available actions
|
27
|
+
|
28
|
+
Example:
|
29
|
+
yescode generate controller todos
|
30
|
+
|
31
|
+
This will generate a controller named Todos in ./app/controllers/todos.rb
|
32
|
+
TXT
|
33
|
+
|
34
|
+
MIGRATION_HELP_MESSAGE = <<~TXT
|
35
|
+
Usage: yescode generate migration [name]
|
36
|
+
|
37
|
+
Create a new migration with -- up and -- down placeholders in ./db/migrations/[timestamp]_[migration name].sql
|
38
|
+
|
39
|
+
Example:
|
40
|
+
yescode generate migration create_table_todo
|
41
|
+
|
42
|
+
This will generate a common create table sql statement below -- up and a drop table below -- down
|
43
|
+
|
44
|
+
|
45
|
+
Example:
|
46
|
+
yescode generate migration add_created_at_to_todo
|
47
|
+
|
48
|
+
This will generate an empty sql file with -- up and -- down placeholders
|
49
|
+
TXT
|
50
|
+
|
51
|
+
MODEL_HELP_MESSAGE = <<~TXT
|
52
|
+
Usage: yescode generate model [name]
|
53
|
+
|
54
|
+
Create a new model
|
55
|
+
|
56
|
+
Example:
|
57
|
+
yescode generate model todo
|
58
|
+
|
59
|
+
This will generate a model named Todo in ./app/models/todo.rb
|
60
|
+
TXT
|
61
|
+
|
62
|
+
MVC_HELP_MESSAGE = <<~TXT
|
63
|
+
Usage: yescode generate mvc [name]
|
64
|
+
|
65
|
+
Create a new model, common views and controller all at once
|
66
|
+
|
67
|
+
Example:
|
68
|
+
yescode generate mvc todo
|
69
|
+
|
70
|
+
This will generate a model, common sql queries, views and controller:
|
71
|
+
|
72
|
+
- ./app/models/todo.rb
|
73
|
+
- ./app/models/todo.sql
|
74
|
+
- ./app/controllers/todos.rb
|
75
|
+
- ./app/views/todos_edit.rb
|
76
|
+
- ./app/views/todos_edit.emote
|
77
|
+
- ./app/views/todos_index.rb
|
78
|
+
- ./app/views/todos_index.emote
|
79
|
+
- ./app/views/todos_new.rb
|
80
|
+
- ./app/views/todos_new.emote
|
81
|
+
- ./app/views/todos_show.rb
|
82
|
+
- ./app/views/todos_show.emote
|
83
|
+
TXT
|
84
|
+
|
85
|
+
QUERIES_HELP_MESSAGE = <<~TXT
|
86
|
+
Usage: yescode generate queries [name]
|
87
|
+
|
88
|
+
Create common sql queries for a given table
|
89
|
+
|
90
|
+
Example:
|
91
|
+
yescode generate queries todo
|
92
|
+
|
93
|
+
This will generate common sql queries in ./app/models/todo.sql
|
94
|
+
TXT
|
95
|
+
|
96
|
+
TEMPLATE_HELP_MESSAGE = <<~TXT
|
97
|
+
Usage: yescode generate template [name]
|
98
|
+
|
99
|
+
Create a template file
|
100
|
+
|
101
|
+
Example:
|
102
|
+
yescode generate template todos_index
|
103
|
+
|
104
|
+
This will generate ./app/views/todos_index.emote
|
105
|
+
TXT
|
106
|
+
|
107
|
+
TEMPLATES_HELP_MESSAGE = <<~TXT
|
108
|
+
Usage: yescode generate templates [name]
|
109
|
+
|
110
|
+
Create common templates for a given controller
|
111
|
+
|
112
|
+
Example:
|
113
|
+
yescode generate templates todos
|
114
|
+
|
115
|
+
This will generate the following templates
|
116
|
+
- ./app/views/todos_edit.emote
|
117
|
+
- ./app/views/todos_index.emote
|
118
|
+
- ./app/views/todos_new.emote
|
119
|
+
- ./app/views/todos_show.emote
|
120
|
+
- ./app/views/todos_form.emote
|
121
|
+
TXT
|
122
|
+
|
123
|
+
VIEW_HELP_MESSAGE = <<~TXT
|
124
|
+
Usage: yescode generate view [name]
|
125
|
+
|
126
|
+
Create the view and template
|
127
|
+
|
128
|
+
Example:
|
129
|
+
yescode generate view todos_index
|
130
|
+
|
131
|
+
This will generate the following view and template:
|
132
|
+
- ./app/views/todos_index.rb
|
133
|
+
- ./app/views/todos_index.emote
|
134
|
+
TXT
|
135
|
+
|
136
|
+
VIEWS_HELP_MESSAGE = <<~TXT
|
137
|
+
Usage: yescode generate views [name]
|
138
|
+
|
139
|
+
Create common views and templates for a given controller
|
140
|
+
|
141
|
+
Example:
|
142
|
+
yescode generate views todos
|
143
|
+
|
144
|
+
This will generate the following views and templates
|
145
|
+
- ./app/views/todos_edit.rb
|
146
|
+
- ./app/views/todos_edit.emote
|
147
|
+
- ./app/views/todos_index.rb
|
148
|
+
- ./app/views/todos_index.emote
|
149
|
+
- ./app/views/todos_new.rb
|
150
|
+
- ./app/views/todos_new.emote
|
151
|
+
- ./app/views/todos_show.rb
|
152
|
+
- ./app/views/todos_show.emote
|
153
|
+
- ./app/views/todos_form.rb
|
154
|
+
- ./app/views/todos_form.emote
|
155
|
+
TXT
|
156
|
+
|
157
|
+
HELP_MESSAGE = <<~TXT
|
158
|
+
Usage: yescode generate GENERATOR [options]
|
159
|
+
|
160
|
+
Supported yescode generators:
|
161
|
+
controller Create a new controller with all available actions
|
162
|
+
migration Create a new migration
|
163
|
+
model Create a new model
|
164
|
+
mvc Create a new model, views and controller all at once
|
165
|
+
queries Create common sql queries for a given table
|
166
|
+
template Create just a template file
|
167
|
+
templates Create just the templates for a given controller
|
168
|
+
view Create the view and template
|
169
|
+
views Create common views and templates for a given controller
|
170
|
+
TXT
|
12
171
|
|
13
172
|
class << self
|
14
173
|
def generate(*gen_args)
|
@@ -27,6 +186,8 @@ module Yescode
|
|
27
186
|
generate_views(*args)
|
28
187
|
when "template"
|
29
188
|
generate_template(*args)
|
189
|
+
when "templates"
|
190
|
+
generate_templates(*args)
|
30
191
|
when "migration"
|
31
192
|
generate_migration(*args)
|
32
193
|
when "mvc"
|
@@ -34,11 +195,16 @@ module Yescode
|
|
34
195
|
when "app"
|
35
196
|
generate_app(*args)
|
36
197
|
else
|
37
|
-
puts
|
198
|
+
puts HELP_MESSAGE
|
38
199
|
end
|
39
200
|
end
|
40
201
|
|
41
|
-
def generate_app(dir)
|
202
|
+
def generate_app(dir = nil)
|
203
|
+
if dir.nil?
|
204
|
+
puts APP_HELP_MESSAGE
|
205
|
+
return
|
206
|
+
end
|
207
|
+
|
42
208
|
FileUtils.mkdir_p(File.join(".", dir))
|
43
209
|
{
|
44
210
|
"public" => %w[css js],
|
@@ -281,13 +447,23 @@ module Yescode
|
|
281
447
|
# app.rb
|
282
448
|
end
|
283
449
|
|
284
|
-
def generate_mvc(filename)
|
450
|
+
def generate_mvc(filename = nil)
|
451
|
+
if filename.nil?
|
452
|
+
puts MVC_HELP_MESSAGE
|
453
|
+
return
|
454
|
+
end
|
455
|
+
|
285
456
|
generate_model(filename)
|
286
457
|
generate_controller(filename)
|
287
458
|
generate_views(filename)
|
288
459
|
end
|
289
460
|
|
290
|
-
def generate_queries(filename)
|
461
|
+
def generate_queries(filename = nil)
|
462
|
+
if filename.nil?
|
463
|
+
puts QUERIES_HELP_MESSAGE
|
464
|
+
return
|
465
|
+
end
|
466
|
+
|
291
467
|
filepath = File.join(".", "app", "models", "#{filename}.sql")
|
292
468
|
contents = <<~SQL
|
293
469
|
-- name: all
|
@@ -324,9 +500,14 @@ module Yescode
|
|
324
500
|
File.write(filepath, contents)
|
325
501
|
end
|
326
502
|
|
327
|
-
def generate_model(filename)
|
503
|
+
def generate_model(filename = nil)
|
504
|
+
if filename.nil?
|
505
|
+
puts MODEL_HELP_MESSAGE
|
506
|
+
return
|
507
|
+
end
|
508
|
+
|
328
509
|
filepath = File.join(".", "app", "models", "#{filename}.rb")
|
329
|
-
class_name = filename
|
510
|
+
class_name = pascal_case(filename)
|
330
511
|
contents = <<~RB
|
331
512
|
class #{class_name} < AppRecord
|
332
513
|
queries "#{filename}.sql"
|
@@ -338,8 +519,13 @@ module Yescode
|
|
338
519
|
generate_queries(filename)
|
339
520
|
end
|
340
521
|
|
341
|
-
def generate_controller(filename)
|
342
|
-
|
522
|
+
def generate_controller(filename = nil)
|
523
|
+
if filename.nil?
|
524
|
+
puts CONTROLLER_HELP_MESSAGE
|
525
|
+
return
|
526
|
+
end
|
527
|
+
|
528
|
+
class_name = pascal_case(filename)
|
343
529
|
var_name = filename
|
344
530
|
route = <<~RB
|
345
531
|
class #{class_name} < AppController
|
@@ -412,8 +598,13 @@ module Yescode
|
|
412
598
|
File.write routes_filename, routes_file
|
413
599
|
end
|
414
600
|
|
415
|
-
def generate_view(filename, accessors = [])
|
416
|
-
|
601
|
+
def generate_view(filename = nil, accessors = [])
|
602
|
+
if filename.nil?
|
603
|
+
puts VIEW_HELP_MESSAGE
|
604
|
+
return
|
605
|
+
end
|
606
|
+
|
607
|
+
class_name = pascal_case(filename)
|
417
608
|
filepath = File.join(VIEW_DIR, "#{filename}.rb")
|
418
609
|
|
419
610
|
return if File.exist?(filepath)
|
@@ -434,12 +625,22 @@ module Yescode
|
|
434
625
|
end
|
435
626
|
|
436
627
|
def generate_views(prefix)
|
628
|
+
if prefix.nil?
|
629
|
+
puts VIEWS_HELP_MESSAGE
|
630
|
+
return
|
631
|
+
end
|
632
|
+
|
437
633
|
%w[new show edit index].each do |suffix|
|
438
634
|
generate_view("#{prefix}_#{suffix}", [])
|
439
635
|
end
|
440
636
|
end
|
441
637
|
|
442
|
-
def generate_template(filename)
|
638
|
+
def generate_template(filename = nil)
|
639
|
+
if filename.nil?
|
640
|
+
puts TEMPLATE_HELP_MESSAGE
|
641
|
+
return
|
642
|
+
end
|
643
|
+
|
443
644
|
filename = File.join(VIEW_DIR, "#{filename}.emote")
|
444
645
|
|
445
646
|
return if File.exist?(filename)
|
@@ -447,13 +648,22 @@ module Yescode
|
|
447
648
|
File.write(filename, "<div></div>")
|
448
649
|
end
|
449
650
|
|
450
|
-
def generate_templates(prefix)
|
651
|
+
def generate_templates(prefix = nil)
|
652
|
+
if prefix.nil?
|
653
|
+
puts TEMPLATES_HELP_MESSAGE
|
654
|
+
return
|
655
|
+
end
|
656
|
+
|
451
657
|
%w[index new edit show form].each do |page|
|
452
658
|
generate_template("#{prefix}_#{page}")
|
453
659
|
end
|
454
660
|
end
|
455
661
|
|
456
|
-
def generate_migration(filename, columns = [])
|
662
|
+
def generate_migration(filename = nil, columns = [])
|
663
|
+
if filename.nil?
|
664
|
+
puts MIGRATION_HELP_MESSAGE
|
665
|
+
return
|
666
|
+
end
|
457
667
|
table_name = filename.split('_').last
|
458
668
|
column_string = columns.map do |c|
|
459
669
|
name, type = c.split(':')
|
@@ -1,3 +1,26 @@
|
|
1
|
+
# Copyright (c) 2012 Steve Klabnik
|
2
|
+
#
|
3
|
+
# MIT License
|
4
|
+
#
|
5
|
+
# Permission is hereby granted, free of charge, to any person obtaining
|
6
|
+
# a copy of this software and associated documentation files (the
|
7
|
+
# "Software"), to deal in the Software without restriction, including
|
8
|
+
# without limitation the rights to use, copy, modify, merge, publish,
|
9
|
+
# distribute, sublicense, and/or sell copies of the Software, and to
|
10
|
+
# permit persons to whom the Software is furnished to do so, subject to
|
11
|
+
# the following conditions:
|
12
|
+
#
|
13
|
+
# The above copyright notice and this permission notice shall be
|
14
|
+
# included in all copies or substantial portions of the Software.
|
15
|
+
#
|
16
|
+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
17
|
+
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
18
|
+
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
19
|
+
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
20
|
+
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
21
|
+
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
22
|
+
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
23
|
+
|
1
24
|
module Yescode
|
2
25
|
module RequestCache
|
3
26
|
class Middleware
|
@@ -1,3 +1,23 @@
|
|
1
|
+
# Copyright (c) 2012 Steve Klabnik
|
2
|
+
#
|
3
|
+
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
4
|
+
# of this software and associated documentation files (the "Software"), to deal
|
5
|
+
# in the Software without restriction, including without limitation the rights
|
6
|
+
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
7
|
+
# copies of the Software, and to permit persons to whom the Software is
|
8
|
+
# furnished to do so, subject to the following conditions:
|
9
|
+
#
|
10
|
+
# The above copyright notice and this permission notice shall be included in
|
11
|
+
# all copies or substantial portions of the Software.
|
12
|
+
#
|
13
|
+
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
14
|
+
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
15
|
+
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
16
|
+
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
17
|
+
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
18
|
+
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
19
|
+
# THE SOFTWARE.
|
20
|
+
|
1
21
|
module Yescode
|
2
22
|
module RequestCache
|
3
23
|
def self.store
|
data/lib/yescode/router.rb
CHANGED
@@ -8,14 +8,11 @@ module Yescode
|
|
8
8
|
class ServerError < StandardError; end
|
9
9
|
|
10
10
|
class Router
|
11
|
-
using Refinements
|
12
|
-
|
13
11
|
class << self
|
14
|
-
attr_accessor :logger
|
12
|
+
attr_accessor :logger, :assets
|
15
13
|
end
|
16
14
|
|
17
|
-
def initialize(
|
18
|
-
@app = app
|
15
|
+
def initialize(routes)
|
19
16
|
@routes = routes
|
20
17
|
@logger = self.class.logger
|
21
18
|
end
|
@@ -41,27 +38,20 @@ module Yescode
|
|
41
38
|
rescue NameError => e
|
42
39
|
raise RouteClassDoesNotExist, e.message
|
43
40
|
end
|
44
|
-
|
45
|
-
raise RouteMethodDoesNotExist, "#{class_name}##{method} does not exist" unless
|
41
|
+
controller = klass.new(env)
|
42
|
+
raise RouteMethodDoesNotExist, "#{class_name}##{method} does not exist" unless controller.respond_to?(method)
|
46
43
|
|
47
44
|
@logger&.info(msg: "Request dispatched", route: "#{class_name}##{method}", params: params.except(:_csrf))
|
45
|
+
klass.assets = self.class.assets
|
48
46
|
klass.before_actions&.each do |before_action|
|
49
|
-
|
47
|
+
controller.send(before_action)
|
50
48
|
end
|
51
|
-
response =
|
49
|
+
response = controller.public_send(method)
|
52
50
|
raise NotFoundError if response.nil?
|
53
51
|
|
54
52
|
case response
|
55
53
|
when YesView
|
56
|
-
|
57
|
-
response.csrf_value = obj.csrf_value
|
58
|
-
response.assets = @app.assets.to_h
|
59
|
-
response.session = obj.session
|
60
|
-
response.ajax = env.key?("HTTP_YES_AJAX")
|
61
|
-
layout = klass.layout
|
62
|
-
content = response.render(response.template)
|
63
|
-
content = response.render(layout.template, content:) if layout && response.class < layout.class
|
64
|
-
obj.ok content
|
54
|
+
controller.render response
|
65
55
|
else
|
66
56
|
response
|
67
57
|
end
|
data/lib/yescode/strings.rb
CHANGED
@@ -1,23 +1,30 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
module Yescode
|
4
|
-
|
4
|
+
module Strings
|
5
5
|
SNAKE_CASE_REGEX = /\B([A-Z])/
|
6
6
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
7
|
+
def snake_case(str)
|
8
|
+
str.gsub(SNAKE_CASE_REGEX, '_\1').downcase
|
9
|
+
end
|
10
|
+
|
11
|
+
def camel_case(str)
|
12
|
+
result = pascal_case(str)
|
13
|
+
result[0] = result[0].downcase
|
14
|
+
|
15
|
+
result
|
16
|
+
end
|
11
17
|
|
12
|
-
|
13
|
-
|
18
|
+
def pascal_case(str)
|
19
|
+
str.split("_").map(&:capitalize).join
|
20
|
+
end
|
14
21
|
|
15
|
-
|
16
|
-
|
22
|
+
def class_name
|
23
|
+
to_s.split("::").last
|
24
|
+
end
|
17
25
|
|
18
|
-
|
19
|
-
|
20
|
-
end
|
26
|
+
def filename
|
27
|
+
snake_case(class_name)
|
21
28
|
end
|
22
29
|
end
|
23
30
|
end
|
data/lib/yescode.rb
CHANGED
@@ -9,29 +9,29 @@ require "rack/csrf"
|
|
9
9
|
require "stringio"
|
10
10
|
require "sqlite3"
|
11
11
|
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
12
|
+
require_relative "./yescode/request_cache"
|
13
|
+
require_relative "./yescode/request_cache/middleware"
|
14
|
+
require_relative "./yescode/emote"
|
15
|
+
require_relative "./yescode/strings"
|
16
|
+
require_relative "./yescode/env"
|
17
|
+
require_relative "./yescode/logfmt_formatter"
|
18
|
+
require_relative "./yescode/router"
|
19
|
+
require_relative "./yescode/database"
|
20
|
+
require_relative "./yescode/queries"
|
21
|
+
require_relative "./yescode/assets"
|
22
|
+
require_relative "./yescode/asset_compiler"
|
23
|
+
require_relative "./yescode/generator"
|
24
|
+
require_relative "./yescode/version"
|
25
25
|
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
26
|
+
require_relative "./yes_static"
|
27
|
+
require_relative "./yes_logger"
|
28
|
+
require_relative "./yes_rack_logger"
|
29
|
+
require_relative "./yes_routes"
|
30
|
+
require_relative "./yes_controller"
|
31
|
+
require_relative "./yes_view"
|
32
|
+
require_relative "./yes_record"
|
33
|
+
require_relative "./yes_mail"
|
34
|
+
require_relative "./yes_app"
|
35
35
|
|
36
36
|
def require_all(paths)
|
37
37
|
paths.each do |path|
|
data/yescode.gemspec
CHANGED
@@ -1,9 +1,9 @@
|
|
1
|
-
|
1
|
+
require_relative "./lib/yescode/version"
|
2
2
|
|
3
3
|
Gem::Specification.new do |spec|
|
4
4
|
spec.platform = Gem::Platform::RUBY
|
5
5
|
spec.name = "yescode"
|
6
|
-
spec.version =
|
6
|
+
spec.version = Yescode::VERSION
|
7
7
|
spec.author = "Sean Walker"
|
8
8
|
spec.email = "sean@swlkr.com"
|
9
9
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: yescode
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 22.05.24
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Walker
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-05-
|
11
|
+
date: 2022-05-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: minitest
|
@@ -101,6 +101,7 @@ executables:
|
|
101
101
|
extensions: []
|
102
102
|
extra_rdoc_files: []
|
103
103
|
files:
|
104
|
+
- ".gitattributes"
|
104
105
|
- CHANGELOG.md
|
105
106
|
- Dockerfile
|
106
107
|
- Gemfile
|
@@ -126,11 +127,11 @@ files:
|
|
126
127
|
- lib/yescode/generator.rb
|
127
128
|
- lib/yescode/logfmt_formatter.rb
|
128
129
|
- lib/yescode/queries.rb
|
129
|
-
- lib/yescode/refinements.rb
|
130
130
|
- lib/yescode/request_cache.rb
|
131
131
|
- lib/yescode/request_cache/middleware.rb
|
132
132
|
- lib/yescode/router.rb
|
133
133
|
- lib/yescode/strings.rb
|
134
|
+
- lib/yescode/version.rb
|
134
135
|
- yescode.gemspec
|
135
136
|
homepage: https://github.com/swlkr/yescode
|
136
137
|
licenses:
|
data/lib/yescode/refinements.rb
DELETED
@@ -1,19 +0,0 @@
|
|
1
|
-
module Refinements
|
2
|
-
SNAKE_CASE_REGEX = /\B([A-Z])/
|
3
|
-
|
4
|
-
refine String do
|
5
|
-
def snake_case
|
6
|
-
gsub(SNAKE_CASE_REGEX, '_\1').downcase
|
7
|
-
end
|
8
|
-
|
9
|
-
def camel_case
|
10
|
-
first, *rest = split("_")
|
11
|
-
|
12
|
-
"#{first}#{rest.map(&:capitalize).join}"
|
13
|
-
end
|
14
|
-
|
15
|
-
def pascal_case
|
16
|
-
split("_").map(&:capitalize).join
|
17
|
-
end
|
18
|
-
end
|
19
|
-
end
|