nesta 0.12.0 → 0.14.0

data/test/unit/config_test.rb

@@ -3,11 +3,17 @@ require 'test_helper'
 describe Nesta::Config do
   include TestConfiguration
 
-  after do
-    ENV.keys.each { |variable| ENV.delete(variable) if variable =~ /NESTA_/ }
+  it 'cannot be instantiated directly' do
+    assert_raises(NoMethodError) { Nesta::Config.new }
   end
 
-  it 'returns default value for "Read more"' do
+  it 'exposes settings at the class level' do
+    Nesta::Config::SETTINGS.each do |setting|
+      assert Nesta::Config.respond_to?(setting), "should respond to '#{setting}'"
+    end
+  end
+
+  it 'defines default value for "Read more"' do
     assert_equal 'Continue reading', Nesta::Config.read_more
   end
 
@@ -15,100 +21,34 @@ describe Nesta::Config do
     assert_nil Nesta::Config.author
   end
 
-  describe 'when settings defined in ENV' do
-    before do
-      @title = 'Title from ENV'
-      ENV['NESTA_TITLE'] = @title
-    end
-
-    it 'falls back to config.yml' do
-      stub_config('subtitle' => 'Subtitle in YAML file') do
-        assert_equal 'Subtitle in YAML file', Nesta::Config.subtitle
-      end
-    end
-
-    it 'overrides config.yml' do
-      stub_config('title' => 'Title in YAML file') do
-        assert_equal @title, Nesta::Config.title
-      end
-    end
-
-    it 'knows how to cope with boolean values' do
-      Nesta::Config.settings << 'a_boolean'
-      begin
-        ENV['NESTA_A_BOOLEAN'] = 'true'
-        assert_equal true, Nesta::Config.a_boolean, 'should be true'
-        ENV['NESTA_A_BOOLEAN'] = 'false'
-        assert_equal false, Nesta::Config.a_boolean, 'should be false'
-      ensure
-        Nesta::Config.settings.pop
-        ENV.delete('NESTA_A_BOOLEAN')
-      end
-    end
-
-    it 'should return configured value for "Read more"' do
-      ENV['NESTA_READ_MORE'] = 'Read on'
-      begin
-        assert_equal 'Read on', Nesta::Config.read_more
-      ensure
-        ENV.delete('NESTA_READ_MORE')
-      end
+  it 'reads configuration from YAML' do
+    title = 'Site Title'
+    stub_config('subtitle' => title) do
+      assert_equal title, Nesta::Config.subtitle
     end
+  end
 
-    it 'sets author hash from ENV' do
-      name = 'Name from ENV'
-      uri = 'URI from ENV'
-      ENV['NESTA_AUTHOR__NAME'] = name
-      ENV['NESTA_AUTHOR__URI'] = uri
+  it 'sets author hash from YAML' do
+    name = 'Name from YAML'
+    uri = 'URI from YAML'
+    stub_config('author' => { 'name' => name, 'uri' => uri }) do
       assert_equal name, Nesta::Config.author['name']
       assert_equal uri, Nesta::Config.author['uri']
       assert Nesta::Config.author['email'].nil?, 'should be nil'
     end
   end
 
-  describe 'when settings only defined in config.yml' do
-    before do
-      @title = 'Title in YAML file'
-    end
-
-    it 'reads configuration from YAML' do
-      stub_config('subtitle' => @title) do
-        assert_equal @title, Nesta::Config.subtitle
-      end
-    end
-
-    it 'sets author hash from YAML' do
-      name = 'Name from YAML'
-      uri = 'URI from YAML'
-      stub_config('author' => { 'name' => name, 'uri' => uri }) do
-        assert_equal name, Nesta::Config.author['name']
-        assert_equal uri, Nesta::Config.author['uri']
-        assert Nesta::Config.author['email'].nil?, 'should be nil'
-      end
-    end
-
-    it 'overrides top level settings with environment specific settings' do
-      config = {
-        'content' => 'general/path',
-        'test' => { 'content' => 'rack_env_specific/path' }
-      }
-      stub_config(config) do
-        assert_equal 'rack_env_specific/path', Nesta::Config.content
-      end
+  it 'overrides top level settings with environment specific settings' do
+    config = {
+      'content' => 'general/path',
+      'test' => { 'content' => 'rack_env_specific/path' }
+    }
+    stub_config(config) do
+      assert_equal 'rack_env_specific/path', Nesta::Config.content
     end
   end
 
   describe 'Nesta::Config.fetch' do
-    it 'retrieves settings from environment' do
-      ENV['NESTA_MY_SETTING'] = 'value in ENV'
-      begin
-        assert_equal 'value in ENV', Nesta::Config.fetch('my_setting')
-        assert_equal 'value in ENV', Nesta::Config.fetch(:my_setting)
-      ensure
-        ENV.delete('NESTA_MY_SETTING')
-      end
-    end
-
     it 'retrieves settings from YAML' do
       stub_config('my_setting' => 'value in YAML') do
         assert_equal 'value in YAML', Nesta::Config.fetch('my_setting')
@@ -125,14 +65,5 @@ describe Nesta::Config do
     it 'allows default values to be set' do
       assert_equal 'default', Nesta::Config.fetch('no such setting', 'default')
     end
-
-    it 'copes with non-truthy boolean values' do
-      ENV['NESTA_SETTING'] = 'false'
-      begin
-        assert_equal false, Nesta::Config.fetch('setting')
-      ensure
-        ENV.delete('NESTA_SETTING')
-      end
-    end
   end
 end

data/test/unit/static/assets_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+require_relative '../../../lib/nesta/static/assets'
+
+describe 'Assets' do
+  include TestConfiguration
+
+  after do
+    remove_temp_directory
+  end
+
+  it 'is happy if attachments directory not present' do
+    in_temporary_project do |project_root|
+      stub_config('content' => File.join(project_root, 'content')) do
+        Nesta::Static::Assets.new('dist').copy_attachments
+      end
+    end
+  end
+
+  it 'copies attachments into build directory' do
+    build_dir = 'dist'
+    attachment = 'image.jpeg'
+
+    in_temporary_project do |project_root|
+      stub_config('content' => File.join(project_root, 'content')) do
+        FileUtils.mkdir_p(Nesta::Config.attachment_path)
+        open(File.join(Nesta::Config.attachment_path, attachment), 'w')
+
+        Nesta::Static::Assets.new(build_dir).copy_attachments
+
+        assert_exists_in_project File.join(build_dir, 'attachments', attachment)
+      end
+    end
+  end
+
+  it 'is happy if public directory not present' do
+    in_temporary_project do |project_root|
+      Nesta::Static::Assets.new('dist').copy_public_folder
+    end
+  end
+
+  it 'copies contents of public directory into build directory' do
+    build_dir = 'dist'
+    asset_path = File.join('css', 'third-party.css')
+
+    in_temporary_project do |project_root|
+      public_path = File.join(project_root, 'public')
+      FileUtils.mkdir_p(File.dirname(File.join(public_path, asset_path)))
+      open(File.join(public_path, asset_path), 'w')
+
+      Nesta::Static::Assets.new(build_dir).copy_public_folder
+
+      assert_exists_in_project File.join(build_dir, asset_path)
+    end
+  end
+end

data/test/unit/static/html_file_test.rb

@@ -0,0 +1,41 @@
+require 'test_helper'
+
+require_relative '../../../lib/nesta/static/html_file'
+
+describe 'HtmlFile' do
+  include ModelFactory
+  include TestConfiguration
+
+  after do
+    remove_temp_directory
+  end
+
+  it 'determines HTML filename from build dir and page filename' do
+    build_dir = "dist"
+
+    with_temp_content_directory do
+      page = create(:page)
+
+      html_file = Nesta::Static::HtmlFile.new(build_dir, page)
+
+      expected = File.join(build_dir, "page-1.html")
+      assert_equal expected, html_file.filename
+    end
+  end
+
+  it 'creates index.html in directory if page shares path with directory' do
+    build_dir = "dist"
+
+    with_temp_content_directory do
+      page = create(:page)
+      ext = File.extname(page.filename)
+      directory_path = page.filename.sub(/#{ext}$/, '')
+      FileUtils.mkdir(directory_path)
+
+      html_file = Nesta::Static::HtmlFile.new(build_dir, page)
+
+      expected = File.join(build_dir, "page-1", "index.html")
+      assert_equal expected, html_file.filename
+    end
+  end
+end

data/test/unit/static/site_test.rb

@@ -0,0 +1,104 @@
+require 'test_helper'
+
+require_relative '../../../lib/nesta/static/site'
+
+describe 'Site' do
+  include ModelFactory
+  include TestConfiguration
+
+  after do
+    remove_temp_directory
+  end
+
+  it 'converts Markdown to HTML' do
+    build_dir = 'dist'
+    domain = 'localhost'
+
+    in_temporary_project do
+      with_temp_content_directory do
+        page = create(:page)
+
+        Nesta::Static::Site.new(build_dir, domain).render_pages
+
+        html_file = File.join(build_dir, page.abspath + '.html')
+        markup = open(html_file).read
+
+        assert markup.include?("<title>#{page.title}</title>")
+      end
+    end
+  end
+
+  it 'renders a 404 not found page' do
+    build_dir = 'dist'
+    domain = 'localhost'
+
+    in_temporary_project do
+      with_temp_content_directory do
+        Nesta::Static::Site.new(build_dir, domain).render_not_found
+
+        html_file = File.join(build_dir, '404.html')
+        markup = open(html_file).read
+
+        assert markup.include?("<h1>Page not found</h1>")
+      end
+    end
+  end
+
+  it 'renders Atom feed' do
+    build_dir = 'dist'
+    domain = 'mysite.com'
+
+    in_temporary_project do
+      with_temp_content_directory do
+        article = create(:article)
+        Nesta::Static::Site.new(build_dir, domain).render_atom_feed
+
+        xml_file = File.join(build_dir, 'articles.xml')
+        xml = open(xml_file).read
+
+        assert xml.include?("<link href='https://#{domain + article.abspath}'")
+      end
+    end
+  end
+
+  it 'includes domain name in sitemap' do
+    build_dir = 'dist'
+    domain = 'mysite.com'
+
+    in_temporary_project do
+      with_temp_content_directory do
+        page = create(:page)
+        Nesta::Static::Site.new(build_dir, domain).render_sitemap
+
+        xml_file = File.join(build_dir, 'sitemap.xml')
+        xml = open(xml_file).read
+
+        assert xml.include?(domain + page.abspath)
+      end
+    end
+  end
+
+  it "renders the user's list of templated assets" do
+    build_dir = 'dist'
+    css_path = '/css/styles.css'
+    build_config = {}
+
+    in_temporary_project do
+      stub_config('build' => { 'templated_assets' => [css_path] }) do
+        views = File.join(project_root, 'views')
+        FileUtils.mkdir_p(views)
+        open(File.join(views, 'styles.sass'), 'w') do |sass|
+          sass.write("p\n  font-size: 1em\n")
+        end
+
+        site = Nesta::Static::Site.new(build_dir, 'mysite.com')
+        site.render_templated_assets
+
+        css_file = File.join(build_dir, css_path)
+        assert_exists_in_project(css_file)
+
+        assert_equal open(css_file).read, "p {\n  font-size: 1em;\n}"
+      end
+    end
+  end
+end

data/test/unit/system_command_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+require_relative '../../lib/nesta/system_command'
+
+describe 'Nesta::SystemCommand' do
+  describe '#run' do
+    it 'catches errors when running external processes' do
+      command = Nesta::SystemCommand.new
+      command.run('ls / >/dev/null')
+      begin
+        stderr, $stderr = $stderr, StringIO.new
+        assert_raises(SystemExit) do
+          command.run('ls no-such-file 2>/dev/null')
+        end
+      ensure
+        $stderr.close
+        $stderr = stderr
+      end
+    end
+  end
+end

data/views/atom.haml

@@ -1,7 +1,7 @@
 !!! XML
-%feed(xmlns='http://www.w3.org/2005/Atom')
+%feed(xmlns='https://www.w3.org/2005/Atom')
   %title(type='text')= @title
-  %generator(uri='http://nestacms.com') Nesta
+  %generator(uri='https://nestacms.com') Nesta
   %id= atom_id
   %link(href="#{path_to('/articles.xml', :uri => true)}" rel='self')
   %link(href="#{path_to('/', :uri => true)}" rel='alternate')

data/views/comments.haml

@@ -3,7 +3,7 @@
     - if Sinatra::Application.environment == :development
       :javascript
         var disqus_developer = true;
-    %script{:type => 'text/javascript', :src => "http://#{short_name}.disqus.com/embed.js", :async => true}
+    %script{:type => 'text/javascript', :src => "https://#{short_name}.disqus.com/embed.js", :async => true}
 
     %noscript
-      %a(href="http://#{short_name}.disqus.com/embed.js?url=ref") View comments.
+      %a(href="https://#{short_name}.disqus.com/embed.js?url=ref") View comments.

data/views/footer.haml

@@ -2,4 +2,4 @@
   %p
     Powered by Nesta, a
     = succeed "." do
-      %a(href="http://nestacms.com") Ruby CMS
+      %a(href="https://nestacms.com") Ruby CMS

data/views/header.haml

@@ -1,4 +1,3 @@
 %header(role="banner")
-  %hgroup
-    %h1= @heading
-    %h2= @subtitle
+  %h1= @heading
+  %h2= @subtitle

data/views/layout.haml

@@ -8,13 +8,13 @@
     - if @keywords
       %meta(name="keywords" content=@keywords)
     %title= @title
-    %link(href='http://fonts.googleapis.com/css?family=Roboto+Slab:400,700' rel='stylesheet' type='text/css')
+    %link(href='//fonts.googleapis.com/css?family=Roboto+Slab:400,700' rel='stylesheet' type='text/css')
     <!--[if ! lte IE 6]><!-->
     %link(href="#{path_to('/css/master.css')}" media="screen" rel="stylesheet")
     - local_stylesheet_link_tag('local')
     <!--<![endif]-->
     /[if lte IE 6]
-      %link(rel="stylesheet" href="http://universal-ie6-css.googlecode.com/files/ie6.1.1.css" media="screen, projection")
+      %link(rel="stylesheet" href="//universal-ie6-css.googlecode.com/files/ie6.1.1.css" media="screen, projection")
     /[if lt IE 9]
       %script(src="//html5shim.googlecode.com/svn/trunk/html5.js")
     %script(src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.1.0/respond.min.js")

data/views/master.sass

@@ -70,7 +70,7 @@ li
 
 blockquote
   margin: $vertical-margin 0
-  padding: 0 $vertical-margin / 2
+  padding: 0 calc($vertical-margin / 2)
   border-left: 5px solid $tint
   
   font-style: italic

data/views/mixins.sass

@@ -1,5 +1,5 @@
 // Default ratios between font sizes; used to maintain the type hierarchy.
-// http://www.markboulton.co.uk/journal/comments/five-simple-steps-to-better-typography-part-4
+// https://www.markboulton.co.uk/journal/comments/five-simple-steps-to-better-typography-part-4
 
 $size5: 2.18em
 $size4: 1.64em
@@ -23,7 +23,7 @@ $nav-link-color: desaturate(lighten($link-color, 10%), 25%)
 $meta-color: #87877D
 
 @function empx($em, $base: 16px)
-  @return ($em / 1em) * $base
+  @return calc($em / 1em) * $base
 
 // Layout settings
 

data/views/normalize.scss

@@ -15,7 +15,6 @@ figcaption,
 figure,
 footer,
 header,
-hgroup,
 main,
 nav,
 section,

data/views/sitemap.haml

@@ -1,5 +1,5 @@
 !!! XML
-%urlset(xmlns="http://www.sitemaps.org/schemas/sitemap/0.9")
+%urlset(xmlns="https://www.sitemaps.org/schemas/sitemap/0.9")
   %url
     %loc= path_to('/', :uri => true)
     %changefreq daily

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nesta
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Graham Ashton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-30 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: haml-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +50,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +101,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: sass-embedded
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.58'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.58'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +212,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |
   Nesta is a lightweight Content Management System, written in Ruby using
   the Sinatra web framework. Nesta has the simplicity of a static site
@@ -225,11 +231,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/tests.yml"
 - ".gitignore"
 - ".gitmodules"
-- ".hound.yml"
-- ".rspec"
-- ".travis.yml"
 - CHANGES
 - Gemfile
 - Gemfile.lock
@@ -244,18 +248,20 @@ files:
 - lib/nesta.rb
 - lib/nesta/app.rb
 - lib/nesta/commands.rb
-- lib/nesta/commands/command.rb
+- lib/nesta/commands/build.rb
 - lib/nesta/commands/demo.rb
 - lib/nesta/commands/demo/content.rb
 - lib/nesta/commands/edit.rb
 - lib/nesta/commands/new.rb
 - lib/nesta/commands/plugin.rb
 - lib/nesta/commands/plugin/create.rb
+- lib/nesta/commands/template.rb
 - lib/nesta/commands/theme.rb
 - lib/nesta/commands/theme/create.rb
 - lib/nesta/commands/theme/enable.rb
 - lib/nesta/commands/theme/install.rb
 - lib/nesta/config.rb
+- lib/nesta/config_file.rb
 - lib/nesta/env.rb
 - lib/nesta/helpers.rb
 - lib/nesta/models.rb
@@ -263,6 +269,10 @@ files:
 - lib/nesta/overrides.rb
 - lib/nesta/path.rb
 - lib/nesta/plugin.rb
+- lib/nesta/static/assets.rb
+- lib/nesta/static/html_file.rb
+- lib/nesta/static/site.rb
+- lib/nesta/system_command.rb
 - lib/nesta/version.rb
 - nesta.gemspec
 - scripts/import-from-mephisto
@@ -292,6 +302,7 @@ files:
 - test/fixtures/nesta-plugin-test/lib/nesta-plugin-test/version.rb
 - test/fixtures/nesta-plugin-test/nesta-plugin-test.gemspec
 - test/integration/atom_feed_test.rb
+- test/integration/commands/build_test.rb
 - test/integration/commands/demo/content_test.rb
 - test/integration/commands/edit_test.rb
 - test/integration/commands/new_test.rb
@@ -305,17 +316,19 @@ files:
 - test/integration/sitemap_test.rb
 - test/integration_test_helper.rb
 - test/support/model_factory.rb
-- test/support/silence_commands_during_tests.rb
 - test/support/temporary_files.rb
 - test/support/test_configuration.rb
 - test/test_helper.rb
-- test/unit/commands_test.rb
 - test/unit/config_test.rb
 - test/unit/file_model_test.rb
 - test/unit/menu_test.rb
 - test/unit/page_test.rb
 - test/unit/path_test.rb
 - test/unit/plugin_test.rb
+- test/unit/static/assets_test.rb
+- test/unit/static/html_file_test.rb
+- test/unit/static/site_test.rb
+- test/unit/system_command_test.rb
 - views/analytics.haml
 - views/atom.haml
 - views/categories.haml
@@ -335,7 +348,7 @@ files:
 - views/sidebar.haml
 - views/sitemap.haml
 - views/summaries.haml
-homepage: http://nestacms.com
+homepage: https://nestacms.com
 licenses: []
 metadata: {}
 post_install_message: 
@@ -353,7 +366,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby CMS, written in Sinatra

data/.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  enabled: true