diff --git a/Gemfile b/Gemfile index 06ed10c..301344a 100644 --- a/Gemfile +++ b/Gemfile @@ -13,4 +13,4 @@ gem "standard", "~> 1.3" gem "phlex", "~> 1.11" -gem "steep", "~> 1.7", :group => :development +gem "steep", "~> 1.7", group: :development diff --git a/Gemfile.lock b/Gemfile.lock index ba81738..ba33887 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,6 +26,7 @@ GEM drb (2.2.1) ffi (1.17.0) ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x64-mingw-ucrt) fileutils (1.7.2) i18n (1.14.5) concurrent-ruby (~> 1.0) @@ -107,6 +108,7 @@ GEM PLATFORMS arm64-darwin-23 ruby + x64-mingw-ucrt DEPENDENCIES minitest (~> 5.16) diff --git a/lib/phlexite/router.rb b/lib/phlexite/router.rb index 2363b53..1c2f5b9 100644 --- a/lib/phlexite/router.rb +++ b/lib/phlexite/router.rb @@ -1,4 +1,4 @@ -require 'fileutils' +require "fileutils" class Phlexite::Router def initialize(base, site) @@ -7,25 +7,25 @@ def initialize(base, site) end def group(new_base) - router = Phlexite::Router.new(File::join(@base, new_base), @site) + router = Phlexite::Router.new(File.join(@base, new_base), @site) yield router end def page(out_path, component) out = full_out_path(out_path) - FileUtils::mkdir_p File::dirname(out) - File::write(out, component.call) + FileUtils.mkdir_p File.dirname(out) + File.write(out, component.call) end def mount(local_directory, on:) out = full_out_path(on) - FileUtils::mkdir_p out - FileUtils::cp_r File::join(local_directory, "."), out + FileUtils.mkdir_p out + FileUtils.cp_r File.join(local_directory, "."), out end -private + private def full_out_path(out_path) - File::join(@site.build_dir, @site.base_url, @base, out_path) + File.join(@site.build_dir, @site.base_url, @base, out_path) end end diff --git a/lib/phlexite/site.rb b/lib/phlexite/site.rb index 5232f8c..21ef3a1 100644 --- a/lib/phlexite/site.rb +++ b/lib/phlexite/site.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative 'router.rb' +require_relative "router" class Phlexite::Site < Phlexite::Router attr_accessor :build_dir, :base_url diff --git a/test/test_phlexite.rb b/test/test_phlexite.rb index 16e3ebd..703d7ed 100644 --- a/test/test_phlexite.rb +++ b/test/test_phlexite.rb @@ -12,10 +12,10 @@ def test_it_does_something_useful end def test_that_site_is_defined - assert ::Phlexite::Site != nil + assert !::Phlexite::Site.nil? end def test_that_router_is_defined - assert ::Phlexite::Router != nil + assert !::Phlexite::Router.nil? end end