Skip to content

Commit

Permalink
Merge branch 'main' into update-minitesting-config
Browse files Browse the repository at this point in the history
  • Loading branch information
jaredcwhite authored Jan 3, 2025
2 parents ab2295b + 8b54e1c commit d5ec3cf
Show file tree
Hide file tree
Showing 34 changed files with 563 additions and 332 deletions.
8 changes: 7 additions & 1 deletion .yardopts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,10 @@ bridgetown-foundation/lib/**/*.rb
bridgetown-paginate/lib/**/*.rb
bridgetown-routes/lib/**/*.rb
-m markdown
-p yard/templates
-p yard/templates
--exclude bridgetown-core/lib/bridgetown-core/configurations/ruby2js/hello_world.js.rb
--exclude bridgetown-core/lib/bridgetown-core/configurations/vercel/vercel_url.rb
--exclude bridgetown-core/lib/site_template/server/roda_app.rb
--exclude bridgetown-core/lib/site_template/plugins/site_builder.rb
--exclude bridgetown-core/lib/site_template/TEMPLATES/erb/_components/shared/navbar.rb
--exclude bridgetown-core/lib/site_template/TEMPLATES/serbea/_components/shared/navbar.rb
15 changes: 12 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

- Add Enumerable to Paginator (#967) @jaredcwhite
- nsure symbol values for relations config still work @jaredcwhite
- docs: Add some file excludes for YARDoc generation (#964) @jaredcwhite
- Show generic index file instead of crashing (#963) @jarecwhite
- Support minimalist installations with no `config.ru` or `Rakefile` (or anything other than `Gemfile` really) (#942) @jaredcwhite
- Switch to `.bridgetown-cache/live_reload.txt` for live reload (#949) @jaredcwhite
- Cache instantiated template objects for ERB and Serbea (#958) @jaredcwhite
- Preserve the `_bridgetown` default value in `keep_files` config (#945) @jaredcwhite
- Add back in "Now serving", fix absolute URL bug in dev, fix missing 404 @jaredcwhite
- Ensure front matter defaults are dot access hashes (#944) @jaredcwhite
- Avoid duplication in r.bridgetown implementation (#939) @jeremyevans
- Update `gh_pages` bundled configuration (#943)[#943](https://github.com/bridgetownrb/bridgetown/pull/943) ([@konnorrogers](https://github.com/konnorrogers))
- Update `gh_pages` bundled configuration [#943](https://github.com/bridgetownrb/bridgetown/pull/943) ([@konnorrogers](https://github.com/konnorrogers))

## [2.0.0.beta3] - 2024-11-16

Expand Down Expand Up @@ -51,6 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Refactor start command to use Rackup instead of Puma [#875](https://github.com/bridgetownrb/bridgetown/pull/875) ([@ayushn21](https://github.com/ayushn21))
- Use rack 3 proc responses for SSE live reload [#858](https://github.com/bridgetownrb/bridgetown/pull/858) ([@ayushn21](https://github.com/ayushn21))
- Refactor front matter handling and extract behavior into loaders [#778](https://github.com/bridgetownrb/bridgetown/pull/778) ([@michaelherold](https://github.com/michaelherold))
- Thanks to @soulcutter for docs improvements!

### Removed

Expand All @@ -59,8 +70,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Remove webpack integration from Bridgetown [#868](https://github.com/bridgetownrb/bridgetown/pull/868) ([@jaredcwhite](https://github.com/jaredcwhite))
- Remove Cucumber and consolidate around Minitest for integrated feature testing

- Thanks to @soulcutter for docs improvements!

## [1.3.4] - 2024-03-28

- Fix: Lock Liquid to version < 5.5 (unresolved data leakage and generation errors otherwise)
Expand Down
54 changes: 34 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ PATH
faraday (~> 2.0)
faraday-follow_redirects (~> 0.3)
i18n (~> 1.0)
irb (>= 1.14)
kramdown (~> 2.1)
kramdown-parser-gfm (~> 1.0)
liquid (>= 5.0, < 5.5)
Expand Down Expand Up @@ -60,7 +61,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activesupport (7.2.2)
activesupport (7.2.2.1)
base64
benchmark (>= 0.3)
bigdecimal
Expand All @@ -85,14 +86,15 @@ GEM
builder (3.3.0)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
csv (3.3.0)
csv (3.3.1)
date (3.4.1)
diff-lcs (1.5.1)
docile (1.4.1)
drb (2.2.1)
dry-inflector (1.1.0)
e2mmap (0.1.0)
erubi (1.13.0)
faraday (2.12.1)
erubi (1.13.1)
faraday (2.12.2)
faraday-net_http (>= 2.0, < 3.5)
json
logger
Expand All @@ -108,8 +110,12 @@ GEM
i18n (1.14.6)
concurrent-ruby (~> 1.0)
inclusive (1.0.0)
io-console (0.8.0)
irb (1.14.3)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jaro_winkler (1.6.0)
json (2.8.2)
json (2.9.1)
kramdown (2.5.1)
rexml (>= 3.3.9)
kramdown-parser-gfm (1.1.0)
Expand All @@ -119,7 +125,7 @@ GEM
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.1)
logger (1.6.4)
memory_profiler (1.1.0)
mini_portile2 (2.8.8)
minitest (5.25.4)
Expand All @@ -130,16 +136,16 @@ GEM
minitest (>= 5.0)
ruby-progressbar
minitest-stub_any_instance (1.0.3)
net-http (0.5.0)
net-http (0.6.0)
uri
nokogiri (1.16.7)
nokogiri (1.17.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.16.7-arm64-darwin)
nokogiri (1.17.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-darwin)
nokogiri (1.17.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
nokogiri (1.17.2-x86_64-linux)
racc (~> 1.4)
nokolexbor (0.5.4)
nokolexbor (0.5.4-arm64-darwin)
Expand All @@ -149,6 +155,9 @@ GEM
parser (3.3.6.0)
ast (~> 2.4.1)
racc
psych (5.2.2)
date
stringio
public_suffix (6.0.1)
racc (1.8.1)
rack (3.1.8)
Expand All @@ -162,24 +171,28 @@ GEM
rb-inotify (0.11.1)
ffi (~> 1.0)
rbs (2.8.4)
regexp_parser (2.9.2)
rdoc (6.10.0)
psych (>= 4.0.0)
regexp_parser (2.9.3)
reline (0.6.0)
io-console (~> 0.5)
reverse_markdown (2.1.1)
nokogiri
rexml (3.3.9)
roda (3.86.0)
rexml (3.4.0)
roda (3.87.0)
rack
rouge (4.5.1)
rubocop (1.68.0)
rubocop (1.69.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rubocop-ast (>= 1.32.2, < 2.0)
regexp_parser (>= 2.9.3, < 3.0)
rubocop-ast (>= 1.36.2, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.36.1)
unicode-display_width (>= 2.4.0, < 4.0)
rubocop-ast (1.37.0)
parser (>= 3.3.1.0)
rubocop-bridgetown (0.6.1)
rubocop (~> 1.23)
Expand All @@ -188,7 +201,7 @@ GEM
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (1.13.0)
securerandom (0.3.2)
securerandom (0.4.1)
serbea (2.2.0)
erubi (>= 1.10)
tilt (~> 2.0)
Expand Down Expand Up @@ -225,6 +238,7 @@ GEM
streamlined (0.6.0)
serbea (>= 2.1)
zeitwerk (~> 2.5)
stringio (3.1.2)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thor (1.3.2)
Expand Down
85 changes: 43 additions & 42 deletions bridgetown-core/bridgetown-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,59 @@

require_relative "../bridgetown-foundation/lib/bridgetown/version"

Gem::Specification.new do |s|
s.name = "bridgetown-core"
s.version = Bridgetown::VERSION
s.license = "MIT"
s.author = "Bridgetown Team"
s.email = "[email protected]"
s.homepage = "https://www.bridgetownrb.com"
s.summary = "A next-generation, progressive site generator & fullstack framework, powered by Ruby"
s.description = "Bridgetown is a next-generation, progressive site generator & fullstack framework, powered by Ruby"
Gem::Specification.new do |spec|
spec.name = "bridgetown-core"
spec.version = Bridgetown::VERSION
spec.license = "MIT"
spec.author = "Bridgetown Team"
spec.email = "[email protected]"
spec.homepage = "https://www.bridgetownrb.com"
spec.summary = "A next-generation, progressive site generator & fullstack framework, powered by Ruby"
spec.description = "Bridgetown is a next-generation, progressive site generator & fullstack framework, powered by Ruby"

s.files = `git ls-files -z`.split("\x0").reject do |f|
spec.files = `git ls-files -z`.split("\x0").reject do |f|
f.match(%r!^(benchmark|features|script|test)/!)
end
s.executables = ["bridgetown", "bt"] # `bt` is a shortcut to `bridgetown` command
s.bindir = "bin"
s.require_paths = ["lib"]
spec.executables = ["bridgetown", "bt"] # `bt` is a shortcut to `bridgetown` command
spec.bindir = "bin"
spec.require_paths = ["lib"]

s.metadata = {
spec.metadata = {
"source_code_uri" => "https://github.com/bridgetownrb/bridgetown",
"bug_tracker_uri" => "https://github.com/bridgetownrb/bridgetown/issues",
"changelog_uri" => "https://github.com/bridgetownrb/bridgetown/releases",
"homepage_uri" => s.homepage,
"homepage_uri" => spec.homepage,
"rubygems_mfa_required" => "true",
}

s.rdoc_options = ["--charset=UTF-8"]
spec.rdoc_options = ["--charset=UTF-8"]

s.required_ruby_version = ">= 3.1.0"
spec.required_ruby_version = ">= 3.1.0"

s.add_runtime_dependency("activesupport", [">= 6.0", "< 8.0"])
s.add_runtime_dependency("addressable", "~> 2.4")
s.add_runtime_dependency("amazing_print", "~> 1.2")
s.add_runtime_dependency("bridgetown-foundation", Bridgetown::VERSION)
s.add_runtime_dependency("csv", "~> 3.2")
s.add_runtime_dependency("dry-inflector", ">= 1.0")
s.add_runtime_dependency("erubi", "~> 1.9")
s.add_runtime_dependency("faraday", "~> 2.0")
s.add_runtime_dependency("faraday-follow_redirects", "~> 0.3")
s.add_runtime_dependency("i18n", "~> 1.0")
s.add_runtime_dependency("kramdown", "~> 2.1")
s.add_runtime_dependency("kramdown-parser-gfm", "~> 1.0")
s.add_runtime_dependency("liquid", [">= 5.0", "< 5.5"])
s.add_runtime_dependency("listen", "~> 3.0")
s.add_runtime_dependency("rack", ">= 3.0")
s.add_runtime_dependency("rackup", "~> 2.0")
s.add_runtime_dependency("rake", ">= 13.0")
s.add_runtime_dependency("roda", "~> 3.46")
s.add_runtime_dependency("rouge", [">= 3.0", "< 5.0"])
s.add_runtime_dependency("serbea", "~> 2.1")
s.add_runtime_dependency("signalize", "~> 1.3")
s.add_runtime_dependency("streamlined", ">= 0.6.0")
s.add_runtime_dependency("thor", "~> 1.1")
s.add_runtime_dependency("tilt", "~> 2.0")
s.add_runtime_dependency("zeitwerk", "~> 2.5")
spec.add_dependency("activesupport", [">= 6.0", "< 8.0"])
spec.add_dependency("addressable", "~> 2.4")
spec.add_dependency("amazing_print", "~> 1.2")
spec.add_dependency("bridgetown-foundation", Bridgetown::VERSION)
spec.add_dependency("csv", "~> 3.2")
spec.add_dependency("dry-inflector", ">= 1.0")
spec.add_dependency("erubi", "~> 1.9")
spec.add_dependency("faraday", "~> 2.0")
spec.add_dependency("faraday-follow_redirects", "~> 0.3")
spec.add_dependency("i18n", "~> 1.0")
spec.add_dependency("irb", ">= 1.14")
spec.add_dependency("kramdown", "~> 2.1")
spec.add_dependency("kramdown-parser-gfm", "~> 1.0")
spec.add_dependency("liquid", [">= 5.0", "< 5.5"])
spec.add_dependency("listen", "~> 3.0")
spec.add_dependency("rack", ">= 3.0")
spec.add_dependency("rackup", "~> 2.0")
spec.add_dependency("rake", ">= 13.0")
spec.add_dependency("roda", "~> 3.46")
spec.add_dependency("rouge", [">= 3.0", "< 5.0"])
spec.add_dependency("serbea", "~> 2.1")
spec.add_dependency("signalize", "~> 1.3")
spec.add_dependency("streamlined", ">= 0.6.0")
spec.add_dependency("thor", "~> 1.1")
spec.add_dependency("tilt", "~> 2.0")
spec.add_dependency("zeitwerk", "~> 2.5")
end
4 changes: 3 additions & 1 deletion bridgetown-core/lib/bridgetown-core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ def require_all(path)

# Monkey patches:

# @!visibility private
module HashWithDotAccess
class Hash # :nodoc:
class Hash
def to_liquid
to_h.to_liquid
end
Expand Down Expand Up @@ -99,6 +100,7 @@ module Bridgetown
autoload :Slot, "bridgetown-core/slot"
autoload :StaticFile, "bridgetown-core/static_file"
autoload :Transformable, "bridgetown-core/concerns/transformable"
autoload :Viewable, "bridgetown-core/concerns/viewable"
autoload :Utils, "bridgetown-core/utils"
autoload :VERSION, "bridgetown-core/version"
autoload :Watcher, "bridgetown-core/watcher"
Expand Down
9 changes: 5 additions & 4 deletions bridgetown-core/lib/bridgetown-core/collection.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ def resources_by_relative_url
# Iterate over Resources by delegating to `resources.each` (supports Enumerable)
def each(...) = resources.each(...)

# Delgates to `resources.last`
# Delegates to `resources.last`
def last(...) = resources.last(...)

# Delgates to `resources.deconstruct`
# Delegates to `resources.deconstruct`
def deconstruct = resources.deconstruct

# Delgates to `resources[]`
# Delegates to `resources[]`
def [](...) = resources.[](...)

# Fetch the static files in this collection.
Expand Down Expand Up @@ -184,7 +184,8 @@ def entry_filter
#
# @return [String]
def inspect
"#<#{self.class} @label=#{label} resources=#{resources}>"
"#<#{self.class} #{label}: #{resources.count} metadata=#{metadata.inspect} " \
"static_files: #{static_files.count}>"
end

# Produce a sanitized label name
Expand Down
2 changes: 1 addition & 1 deletion bridgetown-core/lib/bridgetown-core/commands/build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def build_site(config_options)
#
# @param options [Bridgetown::Configuration] options loaded from config and/or CLI
def watch_site(config_options)
if config_options["url"].include?("://localhost")
if config_options["url"]&.include?("://localhost")
require "socket"
external_ip = Socket.ip_address_list.find do |ai|
ai.ipv4? && !ai.ipv4_loopback?
Expand Down
Loading

0 comments on commit d5ec3cf

Please sign in to comment.