munge 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94019c2c419a44b2c4be2aca94cbc587e7875439
-  data.tar.gz: b8113ced2804eb5b33093ba9a33da97324fbbb7a
+  metadata.gz: 6789b26f5adfbb4e63f7765b893eb1e76d9b2cb4
+  data.tar.gz: 2b3aa5cdebf2d78b0bb5af87c17cbe198438b04f
 SHA512:
-  metadata.gz: a75c4565e8cf70ca137a5516b5d320300dc51d181f28fa5c18b69c68aee7fe2e0d9f86a353c152b89552a1979a85059fb7025279e1aada0e2150597d1ed51d51
-  data.tar.gz: b1a255bde2c32b711c5751261a5eb2c5545a5f3aeb1e433c151059fb8549d9202eeb3a157b2cc0733caf54679de8a79f8d8c396d4f748248cfb7acfde75ba943
+  metadata.gz: fd0195d991650cc4d4fc0b149db88b5f844a15e77f19b948accf22fb8f4bd23d2f97cb8a145d776395d6df46595442f1cafb015c242ca872159addf165ccfd17
+  data.tar.gz: 78d5a5efdc0e9b2b97ad70daf23689855b8d04389e7c82bcbd0211a79e08e812d8e03a3fc12eef50b4cfcdb2beb2903868b7f3adb6a8611d588c6a4fa113f02b

data/lib/munge/application.rb

@@ -25,7 +25,7 @@ module Munge
     #
     # @return [Item]
     def build_virtual_item(relpath, content, **frontmatter)
-      @system.items.build(relpath: relpath, content: content, frontmatter: frontmatter)
+      @system.item_factory.build(relpath: relpath, content: content, frontmatter: frontmatter)
     end
 
     # Creates an Item and inserts it into the registry of Items.

data/lib/munge/cleaner.rb

@@ -0,0 +1,31 @@
+module Munge
+  class Cleaner
+    def initialize(path_to_clean:, paths_to_write:, io:)
+      @path_to_clean = path_to_clean
+      @paths_to_write = paths_to_write
+      @io = io
+    end
+
+    def orphans
+      existing_files - @paths_to_write
+    end
+
+    def delete
+      orphans.each { |orphan| @io.rm(orphan) }
+
+      Dir.glob(File.join(@path_to_clean, "**", "*")).reverse_each do |dir|
+        if !File.directory?(dir)
+          next
+        end
+
+        @io.rmdir(dir)
+      end
+    end
+
+    private
+
+    def existing_files
+      Dir.glob(File.join(@path_to_clean, "**", "*")).select { |path| File.file?(path) }
+    end
+  end
+end

data/lib/munge/cli/commands/build.rb

@@ -9,19 +9,21 @@ module Munge
         # @param build_root [String, nil]
         def initialize(bootloader, dry_run:, reporter:, verbosity:, build_root: nil)
           destination_root = bootloader.root_path
-          config           = bootloader.config
-          app              = application(bootloader)
-          destination      = File.expand_path(build_root || config[:output_path], destination_root)
+          config = bootloader.config
+          app = application(bootloader)
+          destination = File.expand_path(build_root || config[:output_path], destination_root)
+
+          io = new_io(dry_run)
 
           @runner =
             Munge::Runner.new(
               items: app.vomit(:items),
               router: app.vomit(:router),
               processor: app.vomit(:processor),
-              writer: writer(dry_run),
-              formatter: formatter(reporter),
-              verbosity: verbosity.to_sym,
-              destination: destination
+              io: io,
+              reporter: Munge::Reporter.new(formatter: new_formatter(reporter), verbosity: verbosity.to_sym),
+              destination: destination,
+              manager: Munge::WriteManager::OnlyNeeded.new(io)
             )
         end
 
@@ -38,15 +40,15 @@ module Munge
           bootstrap.app
         end
 
-        def writer(dry_run)
+        def new_io(dry_run)
           if dry_run
-            Munge::Writers::Noop.new
+            Munge::Io::DryRun.new(Munge::Io::Filesystem.new)
           else
-            Munge::Writers::Filesystem.new
+            Munge::Io::Filesystem.new
           end
         end
 
-        def formatter(class_name)
+        def new_formatter(class_name)
           Munge::Formatters.const_get(class_name).new
         end
       end

data/lib/munge/cli/commands/clean.rb

@@ -0,0 +1,61 @@
+module Munge
+  module Cli
+    module Commands
+      # This class is used by the CLI to build and calculate output
+      class Clean
+        def initialize(bootloader, dry_run:, reporter:, verbosity:, build_root: nil)
+          destination_root = bootloader.root_path
+          config = bootloader.config
+          app = application(bootloader)
+          destination = File.expand_path(build_root || config[:output_path], destination_root)
+          @dry_run = dry_run
+
+          io = Munge::Io::DryRun.new(Munge::Io::Filesystem.new)
+
+          @runner =
+            Munge::Runner.new(
+              items: app.vomit(:items),
+              router: app.vomit(:router),
+              processor: app.vomit(:processor),
+              io: io,
+              reporter: Munge::Reporter.new(formatter: formatter("Silent"), verbosity: :silent),
+              destination: destination,
+              manager: Munge::WriteManager::All.new(io)
+            )
+
+          @output_path = File.expand_path(build_root || config[:output_path], destination_root)
+        end
+
+        def call
+          io =
+            if @dry_run
+              Munge::Io::DryRun.new(Munge::Io::Filesystem.new)
+            else
+              Munge::Io::Filesystem.new
+            end
+
+          cleaner =
+            Munge::Cleaner.new(
+              path_to_clean: @output_path,
+              paths_to_write: @runner.write,
+              io: io
+            )
+
+          cleaner.delete
+        end
+
+        private
+
+        def application(bootloader)
+          bootstrap = bootloader.init
+
+          bootstrap.app
+        end
+
+        def formatter(class_name)
+          Munge::Formatters.const_get(class_name).new
+        end
+      end
+    end
+  end
+end

data/lib/munge/cli/commands/server.rb

@@ -2,9 +2,11 @@ module Munge
   module Cli
     module Commands
       class Server
-        def initialize(bootloader, livereload:)
+        def initialize(bootloader, livereload:, host:, port:)
           @bootloader = bootloader
           @listener = listener
+          @view_host = host
+          @view_port = port
           @livereload =
             if livereload
               if Gem.loaded_specs.key?("reel")
@@ -23,7 +25,7 @@ module Munge
 
           munge_build
 
-          system("munge view")
+          munge_view
         rescue Interrupt
           @listener.stop
         end
@@ -34,9 +36,14 @@ module Munge
           require "listen"
 
           listen = Listen.to(@bootloader.root_path) do
-            built_files = munge_build
+            begin
+              built_files = munge_build
 
-            @livereload.notify_changes(files: built_files)
+              @livereload.notify_changes(files: built_files)
+            rescue => e
+              puts "ERROR: #{e.message}"
+              puts e.backtrace.map { |line| "\t" + line }.join("\n")
+            end
 
             GC.start
           end
@@ -55,12 +62,9 @@ module Munge
         end
 
         def munge_build
-          bootloader =
-            Munge::Bootloader.new(root_path: @bootloader.root_path)
-
           build_command =
             Munge::Cli::Commands::Build.new(
-              bootloader,
+              new_bootloader,
               dry_run: false,
               reporter: "Default",
               verbosity: "written",
@@ -69,6 +73,22 @@ module Munge
 
           build_command.call
         end
+
+        def munge_view
+          view_command =
+            Munge::Cli::Commands::View.new(
+              new_bootloader,
+              host: @view_host,
+              port: @view_port,
+              build_root: ENV["BUILD_ROOT"]
+            )
+
+          view_command.call
+        end
+
+        def new_bootloader
+          Munge::Bootloader.new(root_path: @bootloader.root_path)
+        end
       end
     end
   end

data/lib/munge/cli/commands/view.rb

@@ -35,9 +35,9 @@ module Munge
         # @param build_root [String, nil]
         def initialize(bootloader, host:, port:, build_root: nil)
           config = bootloader.config
-          @host  = host
-          @port  = port
-          root   = File.expand_path(build_root || config[:output_path], bootloader.root_path)
+          @host = host
+          @port = port
+          root = File.expand_path(build_root || config[:output_path], bootloader.root_path)
 
           @app =
             Rack::Builder.new do

data/lib/munge/cli/dispatch.rb

@@ -12,7 +12,7 @@ module Munge
       method_option :dry_run, desc: "Run without writing files", default: false, type: :boolean
       method_option :verbosity, aliases: "-v", desc: "Preferred amount of output", enum: %w(all written silent), default: "written", type: :string
       def build
-        ENV["MUNGE_ENV"] ||= "production"
+        production!
 
         Commands::Build.new(bootloader, **symbolized_options, build_root: ENV["BUILD_ROOT"]).call
       end
@@ -21,23 +21,34 @@ module Munge
       method_option :port, aliases: "-p", desc: "Set port", default: 7000, type: :numeric
       method_option :host, aliases: "-h", desc: "Set host", default: "0.0.0.0", type: :string
       def view
-        ENV["MUNGE_ENV"] ||= "production"
+        production!
 
         Commands::View.new(bootloader, **symbolized_options, build_root: ENV["BUILD_ROOT"]).call
       end
 
       desc "server", "Run the development server"
       method_option :livereload, desc: "Reload browser on update", default: Gem.loaded_specs.key?("reel"), type: :boolean
+      method_option :port, aliases: "-p", desc: "Set port", default: 7000, type: :numeric
+      method_option :host, aliases: "-h", desc: "Set host", default: "0.0.0.0", type: :string
       def server
-        ENV["MUNGE_ENV"]  ||= "development"
-        ENV["BUILD_ROOT"] ||= "tmp/development-build"
+        development!
 
         Commands::Server.new(bootloader, **symbolized_options).call
       end
 
+      desc "clean", "Remove old built files (generally unnecessary)"
+      method_option :reporter, desc: "Set reporting formatter", default: "Default", type: :string
+      method_option :dry_run, desc: "Run without writing files", default: false, type: :boolean
+      method_option :verbosity, aliases: "-v", desc: "Preferred amount of output", enum: %w(all written silent), default: "written", type: :string
+      def clean
+        production!
+
+        Commands::Clean.new(bootloader, **symbolized_options, build_root: ENV["BUILD_ROOT"]).call
+      end
+
       desc "update", "Use with caution: override local configs with pristine version (useful after bumping version in Gemfile)"
       def update
-        ENV["MUNGE_ENV"] ||= "development"
+        development!
 
         Commands::Update.new(bootloader, current_working_directory).call
       end
@@ -64,6 +75,15 @@ module Munge
       def symbolized_options
         Munge::Util::SymbolHash.deep_convert(options)
       end
+
+      def production!
+        ENV["MUNGE_ENV"] ||= "production"
+      end
+
+      def development!
+        ENV["MUNGE_ENV"] ||= "development"
+        ENV["BUILD_ROOT"] ||= "tmp/development-build"
+      end
     end
   end
 end

data/lib/munge/cli.rb

@@ -5,8 +5,10 @@ require "munge/cli/commands/init"
 require "munge/cli/commands/build"
 require "munge/cli/commands/view"
 require "munge/cli/commands/server"
+require "munge/cli/commands/clean"
 require "munge/cli/commands/update"
 require "munge/cli/dispatch"
 
 require "munge/formatters/default"
 require "munge/formatters/dots"
+require "munge/formatters/silent"

data/lib/munge/config.rb

@@ -10,7 +10,7 @@ module Munge
       if @configs.key?(sym_key)
         @configs[sym_key]
       else
-        raise Munge::Errors::ConfigKeyNotFound, sym_key
+        raise Errors::ConfigKeyNotFound, sym_key
       end
     end
 
@@ -28,7 +28,7 @@ module Munge
       elsif key?(method_name)
         self[method_name]
       else
-        super
+        raise Errors::ConfigKeyNotFound, method_name
       end
     end
 

data/lib/munge/extras/livereload/server.rb

@@ -10,13 +10,15 @@ module Munge
         end
 
         def notify_reload(changed_files)
-          @sockets.each do |socket|
+          @sockets.select! do |socket|
             begin
               changed_files.each do |file|
                 socket << @messaging.reload(file)
               end
+
+              true
             rescue Reel::SocketError
-              print_error("error pushing livereload notification to browser")
+              false
             end
           end
         end

data/lib/munge/formatters/default.rb

@@ -2,10 +2,10 @@ module Munge
   module Formatters
     class Default
       def initialize
-        @new_count       = 0
-        @changed_count   = 0
+        @new_count = 0
+        @changed_count = 0
         @identical_count = 0
-        @reported_count  = 0
+        @reported_count = 0
       end
 
       def call(_item, relpath, write_status, should_print)

data/lib/munge/formatters/silent.rb

@@ -0,0 +1,14 @@
+module Munge
+  module Formatters
+    class Silent
+      def call(_item, _relpath, _write_status, _should_print)
+      end
+
+      def start
+      end
+
+      def done
+      end
+    end
+  end
+end

data/lib/munge/go/sass/asset_urls.rb

@@ -1,25 +1,4 @@
 module Sass::Script::Functions
-  def stringify_string(stringish)
-    if stringish.instance_of?(::String)
-      stringish
-    else
-      stringish.value
-    end
-  end
-
-  def asset_route_helper(root, basename)
-    basename_string = stringify_string(basename)
-
-    item = system.items["#{root}/#{basename_string}"]
-    r = system.router.route(item)
-
-    quoted_string(r)
-  end
-
-  def font_route(basename)
-    asset_route_helper(fonts_root, basename)
-  end
-
   def font_url(basename)
     basename_string = stringify_string(basename)
 
@@ -27,7 +6,7 @@ module Sass::Script::Functions
       basename_parts = basename_string.split("?")
 
       base = "#{basename_parts[0]}"
-      qs   = "?#{basename_parts[1]}"
+      qs = "?#{basename_parts[1]}"
 
       path_to_font = quoted_string(font_route(base).value + qs)
 
@@ -41,4 +20,27 @@ module Sass::Script::Functions
     img_route = asset_route_helper(images_root, basename)
     unquoted_string("url(#{img_route})")
   end
+
+  private
+
+  def stringify_string(stringish)
+    if stringish.instance_of?(::String)
+      stringish
+    else
+      stringish.value
+    end
+  end
+
+  def asset_route_helper(root, basename)
+    basename_string = stringify_string(basename)
+
+    item = system.items["#{root}/#{basename_string}"]
+    r = system.router.route(item)
+
+    quoted_string(r)
+  end
+
+  def font_route(basename)
+    asset_route_helper(fonts_root, basename)
+  end
 end

data/lib/munge/helpers/asset_tags.rb

@@ -2,7 +2,7 @@ module Munge
   module Helpers
     module AssetTags
       def stylesheet_tag(basename, options = {})
-        options[:rel]  ||= "stylesheet"
+        options[:rel] ||= "stylesheet"
         options[:href] ||= stylesheet_path(basename)
 
         empty_tag(:link, options)
@@ -10,7 +10,7 @@ module Munge
 
       def javascript_tag(basename, options = {})
         options[:type] ||= "text/javascript"
-        options[:src]  ||= javascript_path(basename)
+        options[:src] ||= javascript_path(basename)
 
         content_tag(:script, options)
       end

data/lib/munge/helpers/rendering.rb

@@ -2,9 +2,9 @@ module Munge
   module Helpers
     module Rendering
       def render(item, engines: nil, data: {}, content_override: nil)
-        content   = content_override || item.content
+        content = content_override || item.content
         renderers = tilt_renderer_list(item, engines)
-        mdata     = merged_data(item.frontmatter, data, self_item: item)
+        mdata = merged_data(item.frontmatter, data, self_item: item)
         item_path = item.relpath
 
         render_string(content, data: mdata, engines: renderers, template_name: item_path)
@@ -12,8 +12,8 @@ module Munge
 
       def layout(item_or_string, data: {}, &block)
         layout_item = resolve_layout(item_or_string)
-        renderers   = tilt_renderer_list(layout_item, nil)
-        mdata       = merged_data(layout_item.frontmatter, data, self_layout: layout_item)
+        renderers = tilt_renderer_list(layout_item, nil)
+        mdata = merged_data(layout_item.frontmatter, data, self_layout: layout_item)
         layout_path = "(layout) #{layout_item.relpath}"
 
         render_string(layout_item.content, data: mdata, engines: renderers, template_name: layout_path, &block)
@@ -28,7 +28,7 @@ module Munge
         output =
           engines
             .reduce(content) do |memoized_content, engine|
-              options  = tilt_options[engine]
+              options = tilt_options[engine]
               template = engine.new(template_name, options) { memoized_content }
 
               template.render(self, data) { inner }

data/lib/munge/init.rb

@@ -9,10 +9,10 @@ module Munge
                    config:,
                    setup_path:,
                    rules_path:)
-      @root_path  = root_path
+      @root_path = root_path
       @setup_path = setup_path
       @rules_path = rules_path
-      @binding    = binding
+      @binding = binding
 
       system = Munge::System.new(root_path, config)
 

data/lib/munge/io/dry_run.rb

@@ -0,0 +1,31 @@
+module Munge
+  module Io
+    # NoOp driver for writing files. This is used to compute dry-runs.
+    class DryRun
+      def initialize(driver)
+        @driver = driver
+      end
+
+      # Pretends to write, but actually does nothing
+      #
+      # @param _abspath [String]
+      # @param _content [String]
+      def write(_abspath, _content)
+      end
+
+      def exist?(path)
+        @driver.exist?(path)
+      end
+
+      def read(path)
+        @driver.read(path)
+      end
+
+      def rm(_path)
+      end
+
+      def rmdir(_path)
+      end
+    end
+  end
+end

data/lib/munge/{writers → io}/filesystem.rb

@@ -1,5 +1,5 @@
 module Munge
-  module Writers
+  module Io
     # Filesystem driver for writing files. These drivers can be defined however
     # you wish, as long as the `#write` method accepts an abspath and content.
     class Filesystem
@@ -13,6 +13,26 @@ module Munge
 
         File.write(abspath, content)
       end
+
+      def exist?(path)
+        File.exist?(path)
+      end
+
+      def read(path)
+        File.read(path)
+      end
+
+      def rm(path)
+        File.delete(path)
+      end
+
+      def rmdir(path)
+        contents = Dir.entries(path) - %w(. ..)
+
+        if contents.empty?
+          Dir.rmdir(path)
+        end
+      end
     end
   end
 end

data/lib/munge/{writers → io}/noop.rb

@@ -1,5 +1,5 @@
 module Munge
-  module Writers
+  module Io
     # NoOp driver for writing files. This is used to compute dry-runs.
     class Noop
       # Pretends to write, but actually does nothing
@@ -8,6 +8,20 @@ module Munge
       # @param _content [String]
       def write(_abspath, _content)
       end
+
+      def exist?(_path)
+        false
+      end
+
+      def read(_path)
+        ""
+      end
+
+      def rm(_path)
+      end
+
+      def rmdir(_path)
+      end
     end
   end
 end

data/lib/munge/item.rb

@@ -7,19 +7,18 @@ module Munge
                    content: nil,
                    frontmatter: {},
                    stat: nil)
-      @type        = type
-      @relpath     = relpath
-      @id          = id
-      @content     = content
+      @type = type
+      @relpath = relpath
+      @id = id
+      @content = content
       @frontmatter = frontmatter
-      @stat        = stat
+      @stat = stat
 
-      @route      = nil
-      @layout     = nil
+      @route = nil
+      @layout = nil
       @transforms = []
     end
 
-    attr_reader :type
     attr_reader :relpath, :id
     attr_reader :content, :frontmatter
     attr_reader :stat
@@ -77,6 +76,18 @@ module Munge
       end
     end
 
+    # @return [true, false] whether or not this item is a text type
+    #   (determined by extension)
+    def text?
+      @type == :text
+    end
+
+    # @return [true, false] whether or not this item is a binary type
+    #   (determined by extension)
+    def binary?
+      @type == :binary
+    end
+
     # Runs a regex match to see if item was found in the specified directory.
     # Do not query with any slashes. Each argument will automatically be joined
     # by slashes. Note though that the string will be converted into a regex.

data/lib/munge/routers/auto_add_extension.rb

@@ -21,7 +21,7 @@ module Munge
 
       def add_extension(initial_route, item)
         intersection = item.extensions & @keep_extensions
-        extension    = intersection[0]
+        extension = intersection[0]
 
         "#{initial_route}.#{extension}"
       end

data/lib/munge/routers/fingerprint.rb

@@ -4,7 +4,7 @@ module Munge
       def initialize(extensions:,
                      separator:)
         @extensions = extensions
-        @separator  = separator
+        @separator = separator
       end
 
       def type
@@ -29,7 +29,7 @@ module Munge
 
       def generate_link(initial_route, content)
         pre, extension = disassemble(initial_route)
-        asset_hash     = hash(content)
+        asset_hash = hash(content)
 
         if extension == ""
           "#{pre}#{@separator}#{asset_hash}"
@@ -43,7 +43,7 @@ module Munge
       end
 
       def disassemble(path)
-        extension              = Util::Path.extname(path)
+        extension = Util::Path.extname(path)
         path_without_extension = Util::Path.path_no_extension(path)
 
         [

data/lib/munge/runner.rb

@@ -1,14 +1,14 @@
 module Munge
   class Runner
-    def initialize(items:, router:, processor:, writer:, formatter:, verbosity:, destination:)
-      @items         = items
-      @router        = router
-      @processor     = processor
-      @writer        = writer
-      @reporter      = Munge::Reporter.new(formatter: formatter, verbosity: verbosity)
-      @write_manager = Munge::WriteManager.new(driver: File)
-      @destination   = destination
-      @written_items = []
+    def initialize(items:, router:, processor:, io:, reporter:, destination:, manager:)
+      @items = items
+      @router = router
+      @processor = processor
+      @io = io
+      @reporter = reporter
+      @destination = destination
+      @manager = manager
+      @written_paths = []
     end
 
     def write
@@ -16,11 +16,11 @@ module Munge
 
       @items
         .reject { |item| item.route.nil? }
-        .each   { |item| render_and_write(item) }
+        .each { |item| render_and_write(item) }
 
       @reporter.done
 
-      @written_items
+      @manager.written_routes
     end
 
     private
@@ -31,17 +31,38 @@ module Munge
       route = @router.route(item)
       content = @processor.transform(item)
 
-      write_status = @write_manager.status(abspath, content)
+      write_status = status(abspath, content)
 
       case write_status
-      when :new, :changed
-        @writer.write(abspath, content)
-        @written_items.push(route)
+      when :new
+        @manager.on_new(route, abspath, content)
+      when :changed
+        @manager.on_changed(route, abspath, content)
+      when :identical
+        @manager.on_identical(route, abspath, content)
       when :double_write_error
         raise Errors::DoubleWriteError, item.route
       end
 
       @reporter.call(item, relpath, write_status)
     end
+
+    def status(path, content)
+      if @written_paths.include?(path)
+        return :double_write_error
+      end
+
+      @written_paths.push(path)
+
+      if !@io.exist?(path)
+        return :new
+      end
+
+      if @io.read(path) == content
+        return :identical
+      end
+
+      :changed
+    end
   end
 end

data/lib/munge/system/collection.rb

@@ -23,7 +23,7 @@ module Munge
       # @param frontmatter [Hash]
       # @param stat [File::Stat]
       def build(**args)
-        @item_factory.build(**prune_args(args))
+        @item_factory.build(**args)
       end
 
       # @see System::ItemFactory#parse
@@ -31,7 +31,7 @@ module Munge
       # @param content [String]
       # @param stat [File::Stat]
       def parse(**args)
-        @item_factory.parse(**prune_args(args))
+        @item_factory.parse(**args)
       end
 
       # @yield [Item]
@@ -69,12 +69,6 @@ module Munge
 
         super
       end
-
-      private
-
-      def prune_args(args)
-        args.select { |k, _| %i(relpath content frontmatter stat).include?(k) }
-      end
     end
   end
 end

data/lib/munge/system/item_factory/item_identifier.rb

@@ -7,13 +7,13 @@ module Munge
         end
 
         def call(relpath)
-          dirname    = Munge::Util::Path.ensure_relpath(Munge::Util::Path.dirname(relpath))
-          basename   = Munge::Util::Path.basename_no_extension(relpath)
+          dirname = Munge::Util::Path.ensure_relpath(Munge::Util::Path.dirname(relpath))
+          basename = Munge::Util::Path.basename_no_extension(relpath)
           extensions = Munge::Util::Path.extnames(relpath)
 
           filtered_extensions =
             extensions
-              .map    { |ext| @remove_extension_regex.match(ext) || ext }
+              .map { |ext| @remove_extension_regex.match(ext) || ext }
               .select { |ext| ext.is_a?(String) }
 
           new_basename =

data/lib/munge/system/readers/filesystem.rb

@@ -38,7 +38,7 @@ module Munge
 
         def compute_relpath(abspath)
           folder = Pathname.new(@source_path)
-          file   = Pathname.new(abspath)
+          file = Pathname.new(abspath)
 
           file.relative_path_from(folder).to_s
         end

data/lib/munge/system/router/itemish.rb

@@ -5,7 +5,7 @@ module Munge
         extend Forwardable
 
         def initialize(item, processor)
-          @item      = item
+          @item = item
           @processor = processor
         end
 

data/lib/munge/system.rb

@@ -5,20 +5,22 @@ module Munge
       @config = config
     end
 
-    def items
-      return @items if @items
-
-      source_path = File.expand_path(@config[:source_path], @root_path)
-
-      source_item_factory =
+    def item_factory
+      @item_factory ||=
         ItemFactory.new(
           text_extensions: @config[:items_text_extensions],
           ignore_extensions: @config[:items_ignore_extensions]
         )
+    end
+
+    def items
+      return @items if @items
+
+      source_path = File.expand_path(@config[:source_path], @root_path)
 
       @items =
         Collection.new(
-          item_factory: source_item_factory,
+          item_factory: item_factory,
           items: Readers::Filesystem.new(source_path)
         )
     end
@@ -28,15 +30,9 @@ module Munge
 
       layouts_path = File.expand_path(@config[:layouts_path], @root_path)
 
-      layouts_item_factory =
-        ItemFactory.new(
-          text_extensions: @config[:layouts_text_extensions],
-          ignore_extensions: %w(.+)
-        )
-
       @layouts ||=
         Collection.new(
-          item_factory: layouts_item_factory,
+          item_factory: item_factory,
           items: Readers::Filesystem.new(layouts_path)
         )
     end

data/lib/munge/version.rb

@@ -1,3 +1,3 @@
 module Munge
-  VERSION = "0.17.0".freeze
+  VERSION = "0.18.0".freeze
 end

data/lib/munge/write_manager/all.rb

@@ -0,0 +1,27 @@
+module Munge
+  module WriteManager
+    class All
+      def initialize(io)
+        @io = io
+        @written_routes = []
+      end
+
+      attr_reader :written_routes
+
+      def on_new(route, abspath, content)
+        @io.write(abspath, content)
+        @written_routes.push(abspath)
+      end
+
+      def on_changed(route, abspath, content)
+        @io.write(abspath, content)
+        @written_routes.push(abspath)
+      end
+
+      def on_identical(route, abspath, content)
+        @io.write(abspath, content)
+        @written_routes.push(abspath)
+      end
+    end
+  end
+end

data/lib/munge/write_manager/only_needed.rb

@@ -0,0 +1,25 @@
+module Munge
+  module WriteManager
+    class OnlyNeeded
+      def initialize(io)
+        @io = io
+        @written_routes = []
+      end
+
+      attr_reader :written_routes
+
+      def on_new(route, abspath, content)
+        @io.write(abspath, content)
+        @written_routes.push(abspath)
+      end
+
+      def on_changed(route, abspath, content)
+        @io.write(abspath, content)
+        @written_routes.push(abspath)
+      end
+
+      def on_identical(_route, _abspath, _content)
+      end
+    end
+  end
+end

data/lib/munge.rb

@@ -29,13 +29,16 @@ require "munge/system/collection"
 require "munge/system/readers/filesystem"
 require "munge/system/processor"
 require "munge/system"
-require "munge/writers/filesystem"
-require "munge/writers/noop"
-require "munge/write_manager"
+require "munge/io/dry_run"
+require "munge/io/filesystem"
+require "munge/io/noop"
+require "munge/write_manager/all"
+require "munge/write_manager/only_needed"
 require "munge/application"
 require "munge/config"
 require "munge/runner"
 require "munge/reporter"
+require "munge/cleaner"
 require "munge/pre_init"
 require "munge/init"
 require "munge/bootloader"

data/seeds/config.rb

@@ -9,10 +9,9 @@ config.output_path = "dest"
 # Path to global data file
 config.data_path = "data.yml"
 
-# Determines `item.type` for items and layouts
+# Determines `item.text?` and `item.binary?` for items and layouts
 # This can be useful avoid applying a transformation to an image
 config.items_text_extensions = yml["text_extensions"] + yml["bintext_extensions"]
-config.layouts_text_extensions = yml["text_extensions"] + yml["bintext_extensions"]
 
 # Specify which extensions shouldn't be included as a part of `item.id`
 config.items_ignore_extensions = yml["dynamic_extensions"]

data/seeds/layouts/blog.html.erb

@@ -1,4 +1,4 @@
-<% layout("default") do %>
+<% layout("default.html") do %>
   <h1>Blog</h1>
 
   <%= yield %>

data/seeds/layouts/blog_archives.html.erb

@@ -1,4 +1,4 @@
-<% layout("blog") do %>
+<% layout("blog.html") do %>
   <ul>
     <% posts.each do |post| %>
       <li><a href="<%= path_to(post) %>"><%= post.basename %></a></li>

data/seeds/layouts/blog_index.html.erb

@@ -1,4 +1,4 @@
-<% layout("blog") do %>
+<% layout("blog.html") do %>
   <% posts.each do |post| %>
     <%= render(post) %>
     <%= link_to(post, "Permalink") %>

data/seeds/layouts/blog_show.html.erb

@@ -1,3 +1,3 @@
-<% layout("blog") do %>
+<% layout("blog.html") do %>
   <%= yield %>
 <% end %>

data/seeds/rules.rb

@@ -4,37 +4,36 @@ transform = -> (item) { item.transform }
 # Blog rules
 blog_items =
   app.nonrouted
-    .select  { |item| item.relpath?("blog") }
-    .sort_by { |item| item.basename }
-    .each    { |item| item[:hide] = item.extensions.include?("draft") }
-    .each    { |item| item[:text] = item.content.valid_encoding? }
-    .each    { |item| item.route = "blog/#{item.basename}" }
+    .select { |item| item.relpath?("blog") }
+    .each { |item| item[:hide] = item.extensions.include?("draft") }
+    .each { |item| item.route = "blog/#{item.basename}" }
+    .sort_by(&:basename)
     .reverse
 
-blog_public_items = blog_items.select { |i| !i[:hide] && i[:text] }
+blog_public_items = blog_items.select { |item| !item[:hide] && item.text? }
 blog_index_items = blog_public_items[0..7]
 
 blog_items
-  .select { |item| item[:text] }
-  .each   { |item| item.layout = "blog_show" }
+  .select(&:text?)
+  .each { |item| item.layout = "blog_show.html" }
   .each(&transform)
 
 app.create("blog-index.html.erb", "", posts: blog_index_items)
-  .each { |item| item.route  = "blog" }
-  .each { |item| item.layout = "blog_index" }
+  .each { |item| item.route = "blog" }
+  .each { |item| item.layout = "blog_index.html" }
   .each(&transform)
 
 app.create("blog-archive.html.erb", "", posts: blog_public_items)
-  .each { |item| item.route  = "blog/archives" }
-  .each { |item| item.layout = "blog_archives" }
+  .each { |item| item.route = "blog/archives" }
+  .each { |item| item.layout = "blog_archives.html" }
   .each(&transform)
 
 # Home page rules
 app.nonrouted
   .select { |item| item.relpath?("home") }
-  .select { |item| item.type == :text }
-  .each   { |item| item.route = "#{item.basepath.sub(%r{^home/}, "")}" }
-  .each   { |item| item.layout = "default" }
+  .select(&:text?)
+  .each { |item| item.route = "#{item.basepath.sub(%r{^home/}, "")}" }
+  .each { |item| item.layout = "default.html" }
   .each(&transform)
 
 # Asset route helpers
@@ -65,8 +64,8 @@ app_asset("stylesheets")
 # Sitemap
 html_pages =
   app.routed
-    .reject  { |item| item.route.nil? }
-    .select  { |item| item.extensions.include?("html") }
-    .sort_by { |item| item.route }
+    .reject { |item| item.route.nil? }
+    .select { |item| item.extensions.include?("html") }
+    .sort_by(&:route)
 
 system.global_data[:sitemap_pages] = html_pages

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: munge
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Zach Ahn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -302,7 +302,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.17.0/README.md
+description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.18.0/README.md
 email:
 - zach.ahn@gmail.com
 executables:
@@ -317,8 +317,10 @@ files:
 - lib/munge.rb
 - lib/munge/application.rb
 - lib/munge/bootloader.rb
+- lib/munge/cleaner.rb
 - lib/munge/cli.rb
 - lib/munge/cli/commands/build.rb
+- lib/munge/cli/commands/clean.rb
 - lib/munge/cli/commands/init.rb
 - lib/munge/cli/commands/server.rb
 - lib/munge/cli/commands/update.rb
@@ -334,6 +336,7 @@ files:
 - lib/munge/extras/livereload/vendor/livereload.js
 - lib/munge/formatters/default.rb
 - lib/munge/formatters/dots.rb
+- lib/munge/formatters/silent.rb
 - lib/munge/go/sass.rb
 - lib/munge/go/sass/asset_urls.rb
 - lib/munge/helpers/asset_paths.rb
@@ -345,6 +348,9 @@ files:
 - lib/munge/helpers/rendering.rb
 - lib/munge/helpers/tag.rb
 - lib/munge/init.rb
+- lib/munge/io/dry_run.rb
+- lib/munge/io/filesystem.rb
+- lib/munge/io/noop.rb
 - lib/munge/item.rb
 - lib/munge/pre_init.rb
 - lib/munge/reporter.rb
@@ -368,9 +374,8 @@ files:
 - lib/munge/util/path.rb
 - lib/munge/util/symbol_hash.rb
 - lib/munge/version.rb
-- lib/munge/write_manager.rb
-- lib/munge/writers/filesystem.rb
-- lib/munge/writers/noop.rb
+- lib/munge/write_manager/all.rb
+- lib/munge/write_manager/only_needed.rb
 - munge.gemspec
 - seeds/.gitignore
 - seeds/Gemfile.tt
@@ -418,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Static site generator aiming to simplify complex build rules

data/lib/munge/write_manager.rb

@@ -1,31 +0,0 @@
-module Munge
-  # This class decides whether an item needs to be written.
-  class WriteManager
-    # @param driver [#exist?, #read]
-    def initialize(driver:)
-      @driver      = driver
-      @write_paths = []
-    end
-
-    # @param path [String] absolute path to file
-    # @param content [String] new content of file
-    # @return [Symbol] `:double_write_error`, `:identical`, `:different`
-    def status(path, content)
-      if @write_paths.include?(path)
-        return :double_write_error
-      end
-
-      @write_paths.push(path)
-
-      if !@driver.exist?(path)
-        return :new
-      end
-
-      if @driver.read(path) == content
-        return :identical
-      end
-
-      :changed
-    end
-  end
-end