Skip to content

Commit 9aca62a

Browse files
elijhelijh
committed
upgrade for ruby 2.7 compatibility (closes #13 #12)
1 parent ae46d36 commit 9aca62a

12 files changed

+68
-47
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
test/site/public
22
notes.txt
33
*.gem
4-
Gemfile.lock
4+
Gemfile.lock
5+
test/site/apache.log

‎README.md

+13
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,19 @@ Available properties:
170170

171171
To make a property none-inheritable, specify it like so: `@this.layout = 'home'`. For some properties, like `alias`, it does not make sense for the property to be inheritable.
172172

173+
Testing
174+
-----------------------------------
175+
176+
Run all the tests:
177+
178+
rake test
179+
180+
Run an individual test:
181+
182+
ruby -b test/unit/my_test.rb
183+
184+
Use `-b` to show the full stack trace.
185+
173186
Troubleshooting
174187
-----------------------------------
175188

‎Rakefile

+2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ require "rake/testtask"
66

77
Rake::TestTask.new do |t|
88
t.pattern = "test/unit/*_test.rb"
9+
t.verbose = false
10+
t.warning = false
911
end
1012
task :default => :test

‎amber.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
1515
s.required_ruby_version = '>= 1.9'
1616

1717
s.add_runtime_dependency 'i18n', '~> 0.7'
18-
s.add_runtime_dependency 'haml', '~> 5.0'
18+
s.add_runtime_dependency 'haml', '> 5.0.0', '< 6.0.0'
1919
s.add_runtime_dependency 'haml-contrib', '~> 1.0'
2020
s.add_runtime_dependency 'RedCloth', '~> 4.3'
2121
s.add_runtime_dependency 'rdiscount', '~> 2.1'

‎lib/amber.rb

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# encoding: utf-8
22

3-
# enforce UTF8 as the default, even if LANG environment
4-
# variable says otherwise.
5-
Encoding.default_internal = Encoding::UTF_8
6-
Encoding.default_external = Encoding::UTF_8
7-
83
require 'logger'
94

105
# ensure that we load sass from a gem, not the sass included in some

‎lib/amber/page_array.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def order_by(attr, options={})
4949
end
5050

5151
def to_numeric(anything)
52-
num = BigDecimal.new(anything.to_s)
52+
num = BigDecimal(anything.to_s)
5353
if num.frac == 0
5454
num.to_i
5555
else

‎lib/amber/render/layout.rb

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
require 'tilt'
77
require 'haml'
88

9-
#Haml::Options.defaults[:format] = :html5
10-
119
module Amber
1210
module Render
1311

@@ -35,10 +33,14 @@ def self.[](layout)
3533

3634
def initialize(file_path, &block)
3735
if file_path =~ /\.haml$/
38-
ugly = Amber.env != :test
39-
@template = Tilt::HamlTemplate.new(file_path, {:format => :html5, :ugly => ugly})
36+
# https://www.rubydoc.info/gems/haml/5.0.1/Haml/Options
37+
@template = Tilt::HamlTemplate.new(
38+
file_path, default_encoding: 'UTF-8', escape_html: false
39+
)
4040
else
41-
@template = Tilt.new(file_path, &block)
41+
@template = Tilt.new(
42+
file_path, default_encoding: 'UTF-8', &block
43+
)
4244
end
4345
end
4446

‎lib/amber/render/table_of_contents.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def to_html
142142

143143
def to_toc
144144
super
145-
ul = Nokogiri::XML::Node.new(@options[:tag], Nokogiri::HTML.fragment(""))
145+
ul = Nokogiri::XML::Node.new(@options[:tag], Nokogiri::XML::Document.new)
146146
@toc.populate_node(ul, @options)
147147
ul.to_pretty_html
148148
end

‎lib/amber/render/template.rb

+4-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ def render_title(view)
124124
end
125125

126126
def render_haml(file_path, view)
127-
template = Tilt::HamlTemplate.new(file_path, {:format => :html5, :default_encoding => 'UTF-8'})
127+
# https://www.rubydoc.info/gems/haml/5.0.1/Haml/Options
128+
template = Tilt::HamlTemplate.new(
129+
file_path, escape_html: false, encoding: 'UTF-8'
130+
)
128131
html = template.render(view, view.locals)
129132
html = add_variables(view, html)
130133
html = add_bracket_links(view, html)

‎test/site/apache.conf

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
Listen 8888
22
HostnameLookups Off
3-
PidFile /srv/amber-test/apache.pid
3+
PidFile DIR/apache.pid
44
ServerName 127.0.0.1
55

66
LogLevel debug rewrite:trace4
77
ErrorLogFormat "%m %M"
8-
ErrorLog /srv/amber-test/apache.log
9-
CustomLog /srv/amber-test/apache.log "%r"
8+
ErrorLog DIR/apache.log
9+
CustomLog DIR/apache.log "%r"
1010

11-
LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so
12-
LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
13-
LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
11+
LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so
12+
LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
13+
LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
1414
LoadModule negotiation_module /usr/lib/apache2/modules/mod_negotiation.so
15-
LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
16-
LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
17-
LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
15+
LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
16+
LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
17+
LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
1818

1919
TypesConfig /etc/mime.types
2020
DefaultLanguage en
@@ -25,8 +25,8 @@ AddLanguage de .de
2525
ServerAdmin webmaster@localhost
2626

2727
AccessFileName .htaccess
28-
DocumentRoot "/srv/amber-test/public"
29-
<Directory "/srv/amber-test/public">
28+
DocumentRoot "DIR/public"
29+
<Directory "DIR/public">
3030
AllowOverride FileInfo Indexes Options=All,MultiViews
3131
<IfModule !mod_authz_core.c>
3232
Order deny,allow

‎test/site/apache_with_prefix.conf

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
Listen 8888
22
HostnameLookups Off
3-
PidFile /srv/amber-test/apache.pid
3+
PidFile DIR/apache.pid
44
ServerName 127.0.0.1
55

66
LogLevel debug rewrite:trace4
77
ErrorLogFormat "%m %M"
8-
ErrorLog /srv/amber-test/apache.log
9-
CustomLog /srv/amber-test/apache.log "%r"
8+
ErrorLog DIR/apache.log
9+
CustomLog DIR/apache.log "%r"
1010

11-
LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so
12-
LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
13-
LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
11+
LoadModule mpm_event_module /usr/lib/apache2/modules/mod_mpm_event.so
12+
LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
13+
LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
1414
LoadModule negotiation_module /usr/lib/apache2/modules/mod_negotiation.so
15-
LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
16-
LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
17-
LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
15+
LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
16+
LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
17+
LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so
1818

1919
TypesConfig /etc/mime.types
2020
DefaultLanguage en
@@ -27,10 +27,10 @@ AddLanguage de .de
2727
DocumentRoot /srv
2828

2929
AccessFileName .htaccess
30-
AliasMatch ^/[a-z]{2}/test(/.+|/|)$ /srv/amber-test/public/$1
31-
Alias /test /srv/amber-test/public/
30+
AliasMatch ^/[a-z]{2}/test(/.+|/|)$ DIR/public/$1
31+
Alias /test DIR/public/
3232

33-
<Directory "/srv/amber-test/public/">
33+
<Directory "DIR/public/">
3434
AllowOverride FileInfo Indexes Options=All,MultiViews
3535
<IfModule !mod_authz_core.c>
3636
Order deny,allow

‎test/unit/apache_test.rb

+14-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
require File.expand_path('test_helper', File.dirname(__FILE__))
22

33
require 'net/http'
4+
require 'tempfile'
45

56
class ApacheTest < Minitest::Test
67

78
APACHE_URL = 'http://127.0.0.1:8888'
9+
SITE_ROOT = File.expand_path('../../site', __FILE__)
810

911
def self.test_order
1012
:alpha
1113
end
1214

1315
def test_001_start_apache
1416
$path_prefix = nil
15-
Amber::CLI.new(test_site).rebuild({})
17+
Amber::CLI.new(SITE_ROOT).rebuild({})
1618
start_apache(apache_config)
1719
end
1820

@@ -72,7 +74,7 @@ def test_099_stop_apache
7274

7375
def test_100_start_apache
7476
$path_prefix = '/test'
75-
Amber::CLI.new(test_site).rebuild({})
77+
Amber::CLI.new(SITE_ROOT).rebuild({})
7678
start_apache(apache_config_with_prefix)
7779
end
7880

@@ -142,7 +144,7 @@ def assert_get(path, response_text, status=nil)
142144
assert_equal $1, response['location'].sub(APACHE_URL, ''), "bad redirect from `#{path}`"
143145
status ||= 307
144146
else
145-
body = response.body.gsub(/<\/?p>\n?/, '')
147+
body = response.body.gsub(/<\/?p>\n?/, '').strip
146148
assert_equal response_text, body, "unexpected result for `#{path}`"
147149
status ||= 200
148150
end
@@ -158,16 +160,19 @@ def assert_get(path, response_text, status=nil)
158160
# end
159161
#end
160162

161-
def apache_config
162-
File.expand_path('../site/apache.conf', File.dirname(__FILE__))
163+
def tmp_config(path)
164+
file = Tempfile.new('amber-test-')
165+
file.write(File.read(path).gsub('DIR', SITE_ROOT))
166+
file.close
167+
return file.path
163168
end
164169

165-
def apache_config_with_prefix
166-
File.expand_path('../site/apache_with_prefix.conf', File.dirname(__FILE__))
170+
def apache_config
171+
@apache_config ||= tmp_config(File.join(SITE_ROOT, 'apache.conf'))
167172
end
168173

169-
def test_site
170-
File.expand_path('../site/', File.dirname(__FILE__))
174+
def apache_config_with_prefix
175+
@apache_config_prefix ||= tmp_config(File.join(SITE_ROOT, 'apache_with_prefix.conf'))
171176
end
172177

173178
def start_apache(config)

0 commit comments

Comments
 (0)