munge 0.15.1 → 0.16.0

data/lib/munge/extras/livereload.rb

@@ -0,0 +1,32 @@
+if Gem.loaded_specs.key?("reel")
+  require "celluloid/current"
+  require "reel"
+
+  require "munge/extras/livereload/update_server"
+  require "munge/extras/livereload/update_client"
+  require "munge/extras/livereload/messaging"
+  require "munge/extras/livereload/server"
+end
+
+module Munge
+  module Extras
+    module Livereload
+      class Main
+        def initialize(activated)
+          @activated = activated
+
+          if @activated
+            Server.supervise
+            @updater = UpdateServer.new
+          end
+        end
+
+        def notify_changes(files:)
+          if @activated
+            @updater.notify(files)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/munge/helpers/livereload.rb

@@ -0,0 +1,19 @@
+module Munge
+  module Helpers
+    module Livereload
+      def livereload_script(force: false)
+        should_show = ENV["MUNGE_ENV"] == "development" && Gem.loaded_specs.key?("reel")
+
+        loading_script =
+          %q{document.write('<script src="http://'} +
+          %q{ + (location.host || 'localhost').split(':')[0]} +
+          %q{ + ':35729/livereload.js?snipver=1"></'} +
+          %q{ + 'script>')}
+
+        if should_show || force
+          content_tag(:script, loading_script)
+        end
+      end
+    end
+  end
+end

data/lib/munge/helpers/tag.rb

@@ -17,7 +17,12 @@ module Munge
           content = nil
         end
 
-        options_str = options.map { |k, v| %(#{k}="#{h(v)}") }.join(" ")
+        options_str =
+          if options.any?
+            " " + options.map { |k, v| %(#{k}="#{h(v)}") }.join(" ")
+          else
+            ""
+          end
 
         content_str =
           if content
@@ -28,7 +33,7 @@ module Munge
             ""
           end
 
-        "<#{name} #{options_str}>#{content_str}</#{name}>"
+        "<#{name}#{options_str}>#{content_str}</#{name}>"
       end
 
       def h(string)

data/lib/munge/runner.rb

@@ -8,6 +8,7 @@ module Munge
       @reporter      = Munge::Reporter.new(formatter: formatter, verbosity: verbosity)
       @write_manager = Munge::WriteManager.new(driver: File)
       @destination   = destination
+      @written_items = []
     end
 
     def write
@@ -18,6 +19,8 @@ module Munge
         .each   { |item| render_and_write(item) }
 
       @reporter.done
+
+      @written_items
     end
 
     private
@@ -25,6 +28,7 @@ module Munge
     def render_and_write(item)
       relpath = @router.filepath(item)
       abspath = File.join(@destination, relpath)
+      route = @router.route(item)
       content = @processor.transform(item)
 
       write_status = @write_manager.status(abspath, content)
@@ -32,6 +36,7 @@ module Munge
       case write_status
       when :new, :changed
         @writer.write(abspath, content)
+        @written_items.push(route)
       when :double_write_error
         raise Errors::DoubleWriteError, item.route
       when :identical

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

@@ -27,7 +27,7 @@ module Munge
         def self.parse_frontmatter(matchdata)
           return {} if matchdata.nil?
 
-          parsed_frontmatter = YAML.load(matchdata[1])
+          parsed_frontmatter = YAML.safe_load(matchdata[1])
 
           frontmatter_hash =
             if parsed_frontmatter.is_a?(Hash)

data/lib/munge/version.rb

@@ -1,3 +1,3 @@
 module Munge
-  VERSION = "0.15.1".freeze
+  VERSION = "0.16.0".freeze
 end

data/lib/munge.rb

@@ -48,8 +48,11 @@ require "munge/helpers/find"
 require "munge/helpers/link"
 require "munge/helpers/rendering"
 require "munge/helpers/tag"
+require "munge/helpers/livereload"
 require "munge/routers/auto_add_extension"
 require "munge/routers/fingerprint"
 require "munge/routers/add_directory_index"
 require "munge/routers/remove_index_basename"
 require "munge/transformers/tilt_transformer"
+
+require "munge/extras/livereload"

data/munge.gemspec

@@ -45,6 +45,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "tilt", "~> 2.0"
   spec.add_runtime_dependency "sass", "~> 3.4"
 
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.2")
+    spec.add_runtime_dependency "reel", "~> 0.6"
+  end
+
   if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.3")
     spec.add_runtime_dependency "rack", ">= 1.0", "< 2.0"
   end

data/seeds/config.rb

@@ -1,4 +1,4 @@
-yml = YAML.load(__end__)
+yml = YAML.safe_load(__end__)
 
 # Path to content
 config.source_path = "src"

data/seeds/lib/view_helpers.rb

@@ -6,6 +6,7 @@ tilt_transformer.register(Munge::Helpers::Rendering)
 tilt_transformer.register(Munge::Helpers::Tag)
 tilt_transformer.register(Munge::Helpers::AssetPaths)
 tilt_transformer.register(Munge::Helpers::AssetTags)
+tilt_transformer.register(Munge::Helpers::Livereload)
 tilt_transformer.register(AssetRoots)
 
 system.processor.register(tilt_transformer)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: munge
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Zach Ahn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -288,7 +288,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.15.1/README.md
+- !ruby/object:Gem::Dependency
+  name: reel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.16.0/README.md
 email:
 - zach.ahn@gmail.com
 executables:
@@ -312,6 +326,12 @@ files:
 - lib/munge/cli/dispatch.rb
 - lib/munge/config.rb
 - lib/munge/errors.rb
+- lib/munge/extras/livereload.rb
+- lib/munge/extras/livereload/messaging.rb
+- lib/munge/extras/livereload/server.rb
+- lib/munge/extras/livereload/update_client.rb
+- lib/munge/extras/livereload/update_server.rb
+- lib/munge/extras/livereload/vendor/livereload.js
 - lib/munge/formatters/default.rb
 - lib/munge/formatters/dots.rb
 - lib/munge/go/sass.rb
@@ -321,6 +341,7 @@ files:
 - lib/munge/helpers/capture.rb
 - lib/munge/helpers/find.rb
 - lib/munge/helpers/link.rb
+- lib/munge/helpers/livereload.rb
 - lib/munge/helpers/rendering.rb
 - lib/munge/helpers/tag.rb
 - lib/munge/init.rb
@@ -401,4 +422,3 @@ signing_key:
 specification_version: 4
 summary: Static site generator aiming to simplify complex build rules
 test_files: []
-has_rdoc: