mint 0.8.1 → 0.10.0

data/spec/support/matchers.rb

@@ -7,7 +7,7 @@ RSpec::Matchers.define :be_path do |name|
 end
 
 RSpec::Matchers.define :be_in_template do |name|
-  match {|file| file =~ /#{Mint::ROOT}.*#{name}/ }
+  match {|file| file =~ /#{Mint::PROJECT_ROOT}.*#{name}/ }
 end
 
 RSpec::Matchers.define :be_a_template do |name|

data/spec/template_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe Mint::Template do
+  describe ".valid?" do
+    it "determines if a directory is a valid template directory" do
+      Dir.mktmpdir do |tmpdir|
+        template_dir = Pathname.new(tmpdir) + "test_template"
+        template_dir.mkdir
+        
+        # Empty directory should not be valid (returns empty array)
+        expect(Mint::Template.valid?(template_dir)).to be_empty
+        
+        # Directory with stylesheet should be valid
+        (template_dir + "style.css").write("body { color: black; }")
+        expect(Mint::Template.valid?(template_dir)).to be_truthy
+      end
+    end
+  end
+
+  describe ".find_directory_by_name" do
+    it "returns template directory path by name" do
+      # This will return nil if template doesn't exist, which is expected
+      result = Mint::Template.find_directory_by_name("default")
+      if result
+        expect(result).to be_a(Pathname)
+      else
+        expect(result).to be_nil
+      end
+    end
+  end
+end

data/spec/workspace_spec.rb

@@ -0,0 +1,177 @@
+require "spec_helper"
+
+module Mint
+  describe Workspace do
+    around(:each) do |example|
+      in_temp_dir do |dir|
+        File.write("test.md", "# Test")
+        @workspace = begin
+          config = Mint::Config.with_defaults(destination_directory: Pathname.new("output"))
+          Workspace.new([Pathname.new("test.md")], config)
+        end
+        example.run
+      end
+    end
+    
+    describe "#update_path_basename" do
+      it "formats basic filename with new extension" do
+        result = @workspace.update_path_basename(Pathname.new("document.md"), 
+          new_extension: "html", format_string: "%{name}.%{ext}")
+        expect(result).to eq(Pathname.new("document.html"))
+      end
+
+      it "uses custom format string" do
+        result = @workspace.update_path_basename(Pathname.new("document.md"), 
+          new_extension: "html", format_string: "%{name}_output.%{ext}")
+        expect(result).to eq(Pathname.new("document_output.html"))
+      end
+
+      it "provides access to original extension" do
+        result = @workspace.update_path_basename(Pathname.new("document.md"), 
+          new_extension: "html", format_string: "%{name}.%{original_ext}.%{ext}")
+        expect(result).to eq(Pathname.new("document.md.html"))
+      end
+
+      it "handles files without extension" do
+        result = @workspace.update_path_basename(Pathname.new("README"), 
+          new_extension: "html", format_string: "%{name}.%{ext}")
+        expect(result).to eq(Pathname.new("README.html"))
+      end
+    end
+
+    describe "autodrop functionality" do
+      around(:each) do |example|
+        in_temp_dir do |dir|
+          @test_dir = dir
+          create_template_directory("default")
+          example.run
+        end
+      end
+
+      describe "#calculate_autodrop_levels" do
+        it "returns 0 for single file" do
+          File.write("readme.md", "# README")
+          workspace = Workspace.new([Pathname.new("readme.md")], Config.defaults)
+          expect(workspace.send(:calculate_autodrop_levels_for, [Pathname.new("readme.md")])).to eq(0)
+        end
+
+        it "calculates common prefix for multiple files" do
+          FileUtils.mkdir_p(["common/docs", "common/src"])
+          files = [
+            Pathname.new("common/docs/api.md"),
+            Pathname.new("common/docs/guide.md"), 
+            Pathname.new("common/src/code.md")
+          ]
+          files.each {|file| File.write(file, "# Content") }
+          workspace = Workspace.new(files, Config.defaults)
+          expect(workspace.send(:calculate_autodrop_levels_for, files)).to eq(1)
+        end
+
+        it "handles deeply nested common paths" do
+          FileUtils.mkdir_p(["very/deeply/nested/dir1", "very/deeply/nested/dir2"])
+          files = [
+            Pathname.new("very/deeply/nested/dir1/file1.md"),
+            Pathname.new("very/deeply/nested/dir2/file2.md")
+          ]
+          files.each {|file| File.write(file, "# Content") }
+          workspace = Workspace.new(files, Config.defaults)
+          expect(workspace.send(:calculate_autodrop_levels_for, files)).to eq(3)
+        end
+
+        it "returns 0 when no common prefix exists" do
+          FileUtils.mkdir_p(["docs", "src"])
+          files = [
+            Pathname.new("docs/guide.md"),
+            Pathname.new("src/code.md")
+          ]
+          files.each {|file| File.write(file, "# Content") }
+          workspace = Workspace.new(files, Config.defaults)
+          expect(workspace.send(:calculate_autodrop_levels_for, files)).to eq(0)
+        end
+      end
+
+      describe "autodrop behavior in publishing" do
+        it "drops common levels from destination paths when autodrop is enabled" do
+          FileUtils.mkdir_p(["common/docs", "common/src", "output"])
+          create_markdown_path("common/docs/api.md", "# API Documentation")
+          create_markdown_path("common/docs/guide.md", "# User Guide")
+          create_markdown_path("common/src/code.md", "# Code Documentation")
+          
+          files = [
+            Pathname.new("common/docs/api.md"),
+            Pathname.new("common/docs/guide.md"),
+            Pathname.new("common/src/code.md")
+          ]
+          
+          config = Config.with_defaults(
+            destination_directory: Pathname.new("output"),
+            preserve_structure: true,
+            autodrop: true
+          )
+          
+          workspace = Workspace.new(files, config)
+          workspace.publish!
+          
+          # Files should be placed without the "common" prefix
+          expect(File.exist?("output/docs/api.html")).to be true
+          expect(File.exist?("output/docs/guide.html")).to be true
+          expect(File.exist?("output/src/code.html")).to be true
+          
+          # Files should NOT be placed with the full path
+          expect(File.exist?("output/common/docs/api.html")).to be false
+        end
+
+        it "preserves full paths when autodrop is disabled" do
+          FileUtils.mkdir_p(["common/docs", "common/src", "output"])
+          create_markdown_path("common/docs/api.md", "# API Documentation")
+          create_markdown_path("common/src/code.md", "# Code Documentation")
+          
+          files = [
+            Pathname.new("common/docs/api.md"),
+            Pathname.new("common/src/code.md")
+          ]
+          
+          config = Config.with_defaults(
+            destination_directory: Pathname.new("output"),
+            preserve_structure: true,
+            autodrop: false
+          )
+          
+          workspace = Workspace.new(files, config)
+          workspace.publish!
+          
+          # Files should be placed with full path preserved
+          expect(File.exist?("output/common/docs/api.html")).to be true
+          expect(File.exist?("output/common/src/code.html")).to be true
+          
+          # Files should NOT be placed without the common prefix
+          expect(File.exist?("output/docs/api.html")).to be false
+        end
+
+        it "doesn't affect paths when preserve_structure is false" do
+          FileUtils.mkdir_p(["common/docs", "output"])
+          create_markdown_path("common/docs/api.md", "# API Documentation")
+          create_markdown_path("common/docs/guide.md", "# User Guide")
+          
+          files = [
+            Pathname.new("common/docs/api.md"),
+            Pathname.new("common/docs/guide.md")
+          ]
+          
+          config = Config.with_defaults(
+            destination_directory: Pathname.new("output"),
+            preserve_structure: false,
+            autodrop: true
+          )
+          
+          workspace = Workspace.new(files, config)
+          workspace.publish!
+          
+          # Files should be placed directly in destination without structure
+          expect(File.exist?("output/api.html")).to be true
+          expect(File.exist?("output/guide.html")).to be true
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mint
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.10.0
 platform: ruby
 authors:
 - David Jacobs
@@ -9,26 +9,6 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -49,20 +29,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.1
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: sass-embedded
   requirement: !ruby/object:Gem::Requirement
@@ -84,19 +50,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.89.2
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: toml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -118,53 +84,73 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 8.0.2.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
-  type: :runtime
+        version: '11.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 11.1.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '11.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 11.1.3
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
+        version: '3.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.13.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.13.1
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :runtime
+        version: '1.3'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '1.1'
 description: Clean, simple library for maintaining and styling documents without a
   word processor. Mint aims to bring the best of the Web to desktop publishing, to
   be completely flexible, and to let the user decide what his workflow is like. A
@@ -172,7 +158,6 @@ description: Clean, simple library for maintaining and styling documents without
 email: david@wit.io
 executables:
 - mint
-- mint-epub
 extensions: []
 extra_rdoc_files: []
 files:
@@ -180,56 +165,53 @@ files:
 - LICENSE
 - README.md
 - bin/mint
-- bin/mint-epub
+- config/templates/base/navigation.css
+- config/templates/base/print.css
+- config/templates/base/reset.css
 - config/templates/base/style.css
+- config/templates/base/utilities.css
+- config/templates/base/variables.css
+- config/templates/basic/style.css
 - config/templates/default/layout.erb
 - config/templates/default/style.css
-- config/templates/garden/layout.erb
-- config/templates/garden/style.css
-- config/templates/nord-dark/layout.erb
+- config/templates/magazine/style.css
 - config/templates/nord-dark/style.css
-- config/templates/nord/layout.erb
 - config/templates/nord/style.css
-- config/templates/reset.css
-- config/templates/zen/layout.erb
-- config/templates/zen/style.css
 - lib/mint.rb
-- lib/mint/command_line.rb
-- lib/mint/css.rb
+- lib/mint/commandline/parse.rb
+- lib/mint/commandline/publish.rb
+- lib/mint/commandline/run.rb
+- lib/mint/config.rb
+- lib/mint/css_dsl.rb
 - lib/mint/css_parser.rb
-- lib/mint/css_template.rb
 - lib/mint/document.rb
+- lib/mint/document_tree.rb
 - lib/mint/exceptions.rb
 - lib/mint/helpers.rb
 - lib/mint/layout.rb
-- lib/mint/markdown_template.rb
-- lib/mint/mint.rb
-- lib/mint/plugin.rb
-- lib/mint/plugins/epub.rb
-- lib/mint/resource.rb
+- lib/mint/renderers/css_renderer.rb
+- lib/mint/renderers/erb_renderer.rb
+- lib/mint/renderers/markdown_renderer.rb
 - lib/mint/style.rb
+- lib/mint/template.rb
 - lib/mint/version.rb
+- lib/mint/workspace.rb
 - man/mint.1
-- plugins/templates/epub/layouts/container.haml
-- plugins/templates/epub/layouts/content.haml
-- plugins/templates/epub/layouts/layout.haml
-- plugins/templates/epub/layouts/title.haml
-- plugins/templates/epub/layouts/toc.haml
 - spec/cli/README.md
 - spec/cli/argument_parsing_spec.rb
 - spec/cli/bin_integration_spec.rb
-- spec/cli/configuration_management_spec.rb
 - spec/cli/full_workflow_integration_spec.rb
+- spec/cli/original_style_integration_spec.rb
 - spec/cli/publish_workflow_spec.rb
-- spec/cli/template_management_spec.rb
+- spec/commandline_path_integration_spec.rb
+- spec/config_file_integration_spec.rb
+- spec/css_dsl_spec.rb
 - spec/css_parser_spec.rb
-- spec/css_spec.rb
 - spec/document_spec.rb
-- spec/helpers_spec.rb
+- spec/flattened_path_spec.rb
 - spec/layout_spec.rb
 - spec/mint_spec.rb
-- spec/plugin_spec.rb
-- spec/resource_spec.rb
+- spec/path_handling_spec.rb
 - spec/run_cli_tests.rb
 - spec/spec_helper.rb
 - spec/style_spec.rb
@@ -240,6 +222,8 @@ files:
 - spec/support/fixtures/layout.haml
 - spec/support/fixtures/static.css
 - spec/support/matchers.rb
+- spec/template_spec.rb
+- spec/workspace_spec.rb
 homepage: https://github.com/davejacobs/mint
 licenses:
 - MIT
@@ -265,18 +249,18 @@ test_files:
 - spec/cli/README.md
 - spec/cli/argument_parsing_spec.rb
 - spec/cli/bin_integration_spec.rb
-- spec/cli/configuration_management_spec.rb
 - spec/cli/full_workflow_integration_spec.rb
+- spec/cli/original_style_integration_spec.rb
 - spec/cli/publish_workflow_spec.rb
-- spec/cli/template_management_spec.rb
+- spec/commandline_path_integration_spec.rb
+- spec/config_file_integration_spec.rb
+- spec/css_dsl_spec.rb
 - spec/css_parser_spec.rb
-- spec/css_spec.rb
 - spec/document_spec.rb
-- spec/helpers_spec.rb
+- spec/flattened_path_spec.rb
 - spec/layout_spec.rb
 - spec/mint_spec.rb
-- spec/plugin_spec.rb
-- spec/resource_spec.rb
+- spec/path_handling_spec.rb
 - spec/run_cli_tests.rb
 - spec/spec_helper.rb
 - spec/style_spec.rb
@@ -287,3 +271,5 @@ test_files:
 - spec/support/fixtures/layout.haml
 - spec/support/fixtures/static.css
 - spec/support/matchers.rb
+- spec/template_spec.rb
+- spec/workspace_spec.rb

data/bin/mint-epub

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-# A script for publishing Mint in the ePub format
-# Usage: mint epub [command] [options] [files]
-
-$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
-require "mint"
-require "mint/plugins/epub"
-
-def usage
-  abort "mint epub publish file"
-end
-
-case ARGV.shift.downcase.to_sym
-when :publish
-  destination = ARGV.first.gsub(/\.[^.]*$/, "")
-  opts = { destination: destination, style_destination: "OPS" }
-  document = Mint::Document.new(ARGV.first, opts) 
-  document.publish! :plugins => [Mint::EPub]
-end

data/config/templates/garden/layout.erb

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title><%= (metadata.is_a?(Hash) && metadata['title']) || File.basename(source_file, '.*').tr('_-', ' ').split.map(&:capitalize).join(' ') %></title>
-    <%= stylesheet_tag %>
-    <style type="text/css"><%= inline_styles %></style>
-  </head>
-  <body>
-    <div class="garden-container">
-      <nav class="garden-nav">
-        <div class="garden-nav-header">
-          <h3>Garden</h3>
-        </div>
-        <div class="garden-nav-content">
-          <% if files.any? %>
-            <ul class="garden-toc">
-              <% files.each do |file| %>
-                <li class="depth-<%= file[:depth] %>">
-                  <a href="<%= file[:html_path] %>" 
-                     class="<%= file[:source_path] == Pathname.new(source_file).relative_path_from(Pathname.new(root_directory)).to_s ? 'current' : '' %>">
-                    <%= file[:title] %>
-                  </a>
-                </li>
-              <% end %>
-            </ul>
-          <% end %>
-        </div>
-      </nav>
-      <main class="garden-main">
-        <div class="garden-content">
-          <%= content %>
-        </div>
-      </main>
-    </div>
-  </body>
-</html>