munge 0.5.0.beta1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0ea780f903de0afaf329d50a2e81a69e14b8e4e
-  data.tar.gz: 53d5d6025748b56dbc3394b5080afa7ec107a954
+  metadata.gz: 4cfe4d5e02bf3872299162b668845fbe856db41a
+  data.tar.gz: c1acc5e8fc9dd7c6a1c3ca2f1d7d12e360e080d7
 SHA512:
-  metadata.gz: ec154947682821e309c2d781bf7de1692e86c78bbb6f9236d3b46264ee49fcfbd94ea84ce214f6bb09754c81e9507a570265a22212f2e3f637c97433ffbb5914
-  data.tar.gz: 98d471dcfae5960316b92ac17cd4aa9e078d984a74091cfc687b3c4c435ee561f51e1f641efb1e8f6380d8374eb59cb65c84fb5806206580ba99cf830c1a4451
+  metadata.gz: 62174c45cdfb612a0351bfb37083a92f1109e25f618ddad861e086fa8e9274128f13aec4787e230d1707ffb1c723c74ce9008854d3edc4c523a7d79cab16bb6e
+  data.tar.gz: ec309d87bce9804227edbb8b0b86baeaadf4ac3e479edc451e795c78fb6dbc1f6fe686dc3f95818221be02b2b2fa54e52c584e9063053d94f7619c0e88156f1a

data/Makefile

@@ -1,21 +1,33 @@
-.PHONY: all test testc openc release
+.PHONY: all coverage-test coverage-open seeds-build seeds-open seeds-clean test release
 
 all:
 	@echo "usage:"
 	@echo
-	@echo "make test	runs tests"
-	@echo "make testc	runs tests and logs coverage"
-	@echo "make openc	starts webserver in coverage directory"
-	@echo "make release	releases gem (dangerous)"
+	@echo "make coverage-test  runs tests and logs coverage"
+	@echo "make coverage-open  starts webserver in coverage directory"
+	@echo "make seeds-build    runs munge-build on seeds"
+	@echo "make seeds-open     runs munge-view on seeds"
+	@echo "make seeds-clean    removes built seeds files"
+	@echo "make test           runs tests"
+	@echo "make release        releases gem (dangerous)"
 
-test:
-	script/test
-
-testc:
+coverage-test:
 	COVERAGE=1 script/test
 
-openc:
+coverage-open:
 	cd coverage && adsf
 
+seeds-build:
+	cd seeds && ../exe/munge build
+
+seeds-open:
+	cd seeds && ../exe/munge view
+
+seeds-clean:
+	rm -r seeds/dest seeds/.sass-cache
+
+test:
+	script/test
+
 release:
 	bundle exec rake release

data/lib/munge/application.rb

@@ -14,8 +14,8 @@ module Munge
         .each   { |item| render_and_write(item, &block) }
     end
 
-    def build_virtual_item(*args)
-      @system.source.build(*args)
+    def build_virtual_item(relpath, content, **frontmatter)
+      @system.source.build(relpath: relpath, content: content, frontmatter: frontmatter)
     end
 
     def create(*args)

data/lib/munge/bootstrap.rb

@@ -49,6 +49,9 @@ module Munge
                    rules_string:,
                    setup_path:,
                    rules_path:)
+      @setup_path = setup_path
+      @rules_path = rules_path
+
       system = Munge::System.new(root_path, config)
 
       binding.eval(setup_string, setup_path)
@@ -58,6 +61,14 @@ module Munge
       binding.eval(rules_string, rules_path)
     end
 
+    def root_path
+      File.dirname(@setup_path)
+    end
+
+    def config_path
+      File.join(root_path, "config")
+    end
+
     attr_reader :app
   end
 end

data/lib/munge/core/collection.rb

@@ -36,7 +36,13 @@ module Munge
       end
 
       def [](id)
-        @items[id]
+        found_item = @items[id]
+
+        if found_item.nil?
+          fail "item not found (#{id})"
+        end
+
+        found_item
       end
 
       private

data/lib/munge/core/item_factory.rb

@@ -4,9 +4,9 @@ module Munge
   module Core
     class ItemFactory
       def initialize(text_extensions:,
-                     ignored_basenames:)
-        @text_extensions = Set.new(text_extensions)
-        @ignored_basenames = ignored_basenames
+                     ignore_extensions:)
+        @text_extensions   = Set.new(text_extensions)
+        @ignore_extensions = ignore_extensions
       end
 
       def build(relpath:,
@@ -16,7 +16,7 @@ module Munge
         type = compute_file_type(relpath)
 
         id =
-          if type == :text
+          if @ignore_extensions || type == :text
             compute_id(relpath)
           else
             relpath
@@ -74,30 +74,24 @@ module Munge
       end
 
       def compute_id(relpath)
-        dirname  = compute_dirname(relpath)
-        basename = compute_basename(relpath)
+        dirname  = Munge::Util::Path.dirname(relpath)
+        basename =
+          if @ignore_extensions
+            Munge::Util::Path.basename_no_extension(relpath)
+          else
+            Munge::Util::Path.basename_one_extension(relpath)
+          end
 
         id = []
 
-        unless dirname == "."
+        unless dirname == ""
           id.push(dirname)
         end
 
-        unless @ignored_basenames.include?(basename)
-          id.push(basename)
-        end
+        id.push(basename)
 
         id.join("/")
       end
-
-      def compute_dirname(relpath)
-        File.dirname(relpath)
-      end
-
-      def compute_basename(relpath)
-        filename = File.basename(relpath)
-        filename.split(".").first
-      end
     end
   end
 end

data/lib/munge/helper/asset_tags.rb

@@ -0,0 +1,35 @@
+module Munge
+  module Helper
+    module AssetTags
+      def stylesheet_tag(basename, options = {})
+        options[:rel]  = "stylesheet"
+        options[:href] = stylesheet_url(basename)
+
+        empty_tag(:link, options)
+      end
+
+      def javascript_tag(basename, options = {})
+        options[:type] = "text/javascript"
+        options[:src]  = javascript_url(basename)
+
+        content_tag(:script, options)
+      end
+
+      def inline_stylesheet_tag(basename, options = {})
+        inline_asset_tag_helper(stylesheets_root, basename, :style, options)
+      end
+
+      def inline_javascript_tag(basename, options = {})
+        inline_asset_tag_helper(javascripts_root, basename, :script, options)
+      end
+
+      private
+
+      def inline_asset_tag_helper(root, basename, tag, options)
+        rendered_asset = render(items["#{root}/#{basename}"])
+
+        content_tag(tag, rendered_asset, options)
+      end
+    end
+  end
+end

data/lib/munge/helper/asset_urls.rb

@@ -0,0 +1,25 @@
+module Munge
+  module Helper
+    module AssetUrls
+      def image_url(basename)
+        item = items["#{images_root}/#{basename}"]
+        url_for(item)
+      end
+
+      def font_url(basename)
+        item = items["#{fonts_root}/#{basename}"]
+        url_for(item)
+      end
+
+      def stylesheet_url(basename)
+        item = items["#{stylesheets_root}/#{basename}"]
+        url_for(item)
+      end
+
+      def javascript_url(basename)
+        item = items["#{javascripts_root}/#{basename}"]
+        url_for(item)
+      end
+    end
+  end
+end

data/lib/munge/helper/capture.rb

@@ -2,22 +2,30 @@ module Munge
   module Helper
     module Capture
       def capture(&block)
-        original_erbout = block.binding.local_variable_get(:_erbout)
-        block.binding.local_variable_set(:_erbout, "")
+        if block.binding.local_variable_defined?(:_erbout)
+          original_erbout = block.binding.local_variable_get(:_erbout)
+          block.binding.local_variable_set(:_erbout, "")
 
-        captured_text = block.call
+          captured_text = block.call
 
-        block.binding.local_variable_set(:_erbout, original_erbout)
+          block.binding.local_variable_set(:_erbout, original_erbout)
 
-        captured_text
+          captured_text
+        else
+          block.call
+        end
       end
 
       def append_to_erbout(block_binding, text)
-        original_erbout = block_binding.local_variable_get(:_erbout)
+        if block_binding.local_variable_defined?(:_erbout)
+          original_erbout = block_binding.local_variable_get(:_erbout)
 
-        updated_erbout = original_erbout + text
+          updated_erbout = original_erbout + text
 
-        block_binding.local_variable_set(:_erbout, updated_erbout)
+          block_binding.local_variable_set(:_erbout, updated_erbout)
+        end
+
+        text
       end
     end
   end

data/lib/munge/helper/rendering.rb

@@ -4,7 +4,7 @@ module Munge
       def render(item, engines: nil, data: {}, content_override: nil)
         content   = content_override || item.content
         renderers = tilt_renderer_list(item, engines)
-        mdata     = merged_data(item.frontmatter, data)
+        mdata     = merged_data(item.frontmatter, data, { self_item: item })
 
         render_string(content, data: mdata, engines: renderers)
       end
@@ -12,32 +12,39 @@ 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)
+        mdata       = merged_data(layout_item.frontmatter, data, { self_layout: layout_item })
 
         render_string(layout_item.content, data: mdata, engines: renderers, &block)
       end
 
-      def render_string(content, data: {}, engines: [])
+      def render_string(content, data: {}, engines: [], &block)
         inner =
           if block_given?
-            yield
+            capture(&block)
           end
 
-        engines
-          .inject(content) do |output, engine|
-            template = engine.new { output }
+        output =
+          engines
+            .inject(content) do |output, engine|
+              template = engine.new { output }
 
-            if inner
-              template.render(self, data) { inner }
-            else
-              template.render(self, data)
+              if inner
+                template.render(self, data) { inner }
+              else
+                template.render(self, data)
+              end
             end
-          end
+
+        if block_given?
+          append_to_erbout(block.binding, output)
+        end
+
+        output
       end
 
       def render_with_layout(item, content_engines: nil, data: {}, content_override: nil)
         inner = render(item, engines: content_engines, data: data, content_override: content_override)
-        mdata = merged_data(item.frontmatter, data)
+        mdata = merged_data(item.frontmatter, data, { self_item: item })
 
         if item.layout
           layout(item.layout, data: mdata) do

data/lib/munge/helper/tag.rb

@@ -0,0 +1,35 @@
+module Munge
+  module Helper
+    module Tag
+      def empty_tag(name, options = {})
+        options_str = options.map { |k, v| %(#{k}="#{v}") }.join(" ")
+
+        if options_str == ""
+          "<#{name} />"
+        else
+          "<#{name} #{options_str} />"
+        end
+      end
+
+      def content_tag(name, content = nil, options = {}, &block)
+        if content.is_a?(Hash)
+          options = content
+          content = nil
+        end
+
+        options_str = options.map { |k, v| %(#{k}="#{v}") }.join(" ")
+
+        content_str =
+          if content
+            content
+          elsif block_given?
+            capture(&block)
+          else
+            ""
+          end
+
+        "<#{name} #{options_str}>#{content_str}</#{name}>"
+      end
+    end
+  end
+end

data/lib/munge/system.rb

@@ -11,21 +11,27 @@ module Munge
 
       @config = config
 
-      @item_factory =
+      source_item_factory =
         Core::ItemFactory.new(
-          text_extensions: config[:text_extensions],
-          ignored_basenames: config[:ignored_basenames]
+          text_extensions: config[:text_extensions] + config[:bintext_extensions],
+          ignore_extensions: false
+        )
+
+      layouts_item_factory =
+        Core::ItemFactory.new(
+          text_extensions: config[:text_extensions] + config[:bintext_extensions],
+          ignore_extensions: true
         )
 
       @source =
         Core::Collection.new(
-          item_factory: @item_factory,
+          item_factory: source_item_factory,
           items: Reader::Filesystem.new(source_path)
         )
 
       @layouts =
         Core::Collection.new(
-          item_factory: @item_factory,
+          item_factory: layouts_item_factory,
           items: Reader::Filesystem.new(layouts_path)
         )
 

data/lib/munge/util/path.rb

@@ -17,6 +17,13 @@ module Munge
         end
       end
 
+      def self.basename_one_extension(path)
+        basename       = File.basename(path)
+        basename_parts = basename.split(".")
+
+        basename_parts[0..1].join(".")
+      end
+
       def self.basename_no_extension(path)
         basename = File.basename(path)
         basename_parts = basename.split(".")

data/lib/munge/version.rb

@@ -1,3 +1,3 @@
 module Munge
-  VERSION = "0.5.0.beta1"
+  VERSION = "0.5.0"
 end

data/lib/munge.rb

@@ -11,10 +11,13 @@ require "munge/item"
 require "munge/util/path"
 require "munge/util/symbol_hash"
 require "munge/util/config"
+require "munge/helper/asset_tags"
+require "munge/helper/asset_urls"
 require "munge/helper/capture"
 require "munge/helper/find"
 require "munge/helper/link"
 require "munge/helper/rendering"
+require "munge/helper/tag"
 require "munge/transformer/tilt"
 require "munge/readers/filesystem"
 require "munge/routers/auto_add_extension"

data/seeds/config/_asset_roots.rb

@@ -0,0 +1,19 @@
+module AssetRoots
+  module_function
+
+  def images_root
+    "assets/images"
+  end
+
+  def stylesheets_root
+    "assets/stylesheets"
+  end
+
+  def javascripts_root
+    "assets/javascripts"
+  end
+
+  def fonts_root
+    "assets/fonts"
+  end
+end

data/seeds/config/routing.rb

@@ -0,0 +1,19 @@
+system.router.register(
+  Router::Fingerprint.new(
+    extensions: config[:bin_extensions] + config[:bintext_extensions],
+    separator: config[:fingeprint_separator]
+  ))
+system.router.register(
+  Router::RemoveIndexBasename.new(
+    html_extensions: config[:text_extensions],
+    index: config[:index]
+  ))
+system.router.register(
+  Router::AddIndexHtml.new(
+    html_extensions: config[:text_extensions],
+    index: config[:index]
+  ))
+system.router.register(
+  Router::AutoAddExtension.new(
+    keep_extensions: config[:bin_extensions] + config[:bintext_extensions],
+  ))

data/seeds/config/sass.rb

@@ -0,0 +1,3 @@
+require "sass"
+
+Sass.load_paths << File.join(root_path, config[:source], "assets/stylesheets")

data/seeds/config/sass_helpers.rb

@@ -0,0 +1,54 @@
+module Sass::Script::Functions
+  include AssetRoots
+end
+
+Sass::Script::Functions.send(:define_method, :stringify_string) do |stringish|
+  if stringish.instance_of?(::String)
+    stringish
+  else
+    stringish.value
+  end
+end
+
+Sass::Script::Functions.send(:define_method, :route) do |id_ruby_string|
+  item = system.source[id_ruby_string]
+  r = system.router.route(item)
+
+  quoted_string(r)
+end
+
+Sass::Script::Functions.send(:define_method, :asset_route_helper) do |root, basename|
+  basename_string = stringify_string(basename)
+
+  route("#{root}/#{basename_string}")
+end
+
+Sass::Script::Functions.send(:define_method, :font_route) do |basename|
+  asset_route_helper(fonts_root, basename)
+end
+
+Sass::Script::Functions.send(:define_method, :image_route) do |basename|
+  asset_route_helper(images_root, basename)
+end
+
+Sass::Script::Functions.send(:define_method, :font_url) do |basename|
+  basename_string = stringify_string(basename)
+
+  if basename_string.include?("?")
+    basename_parts = basename_string.split("?")
+
+    base = "#{basename_parts[0]}"
+    qs   = "?#{basename_parts[1]}"
+
+    path_to_font = quoted_string(font_route(base).value + qs)
+
+    unquoted_string("url(#{path_to_font})")
+  else
+    unquoted_string("url(#{font_route(basename)})")
+  end
+end
+
+Sass::Script::Functions.send(:define_method, :image_url) do |basename|
+  img_route = image_route(basename)
+  unquoted_string("url(#{img_route})")
+end

data/seeds/config/view_helpers.rb

@@ -0,0 +1,11 @@
+tilt_transformer = Transformer::Tilt.new(system)
+tilt_transformer.register(Munge::Helper::Capture)
+tilt_transformer.register(Munge::Helper::Find)
+tilt_transformer.register(Munge::Helper::Link)
+tilt_transformer.register(Munge::Helper::Rendering)
+tilt_transformer.register(Munge::Helper::Tag)
+tilt_transformer.register(Munge::Helper::AssetUrls)
+tilt_transformer.register(Munge::Helper::AssetTags)
+tilt_transformer.register(AssetRoots)
+
+system.alterant.register(tilt_transformer)

data/seeds/config.yml

@@ -9,13 +9,17 @@ text_extensions:
   - htm
   - txt
   - md
-ignored_basenames:
-  - index
-keep_extensions:
+bintext_extensions:
+  - js
+  - css
+  - scss
+bin_extensions:
   - gif
   - ico
   - jpg
   - jpeg
   - png
-  - css
-  - js
+  - otf
+  - ttf
+  - eot
+  - woff

data/seeds/layouts/default.html.erb

@@ -3,7 +3,7 @@
 <head>
   <meta charset="UTF-8">
   <title><%= site_name %></title>
-  <link rel="stylesheet" href="<%= url_for(items["basic.css.scss"]) %>" media="screen" charset="utf-8">
+  <link rel="stylesheet" href="<%= url_for(items["assets/stylesheets/basic.css"]) %>" media="screen" charset="utf-8">
 </head>
 <body>
   <div class="layout">

data/seeds/rules.rb

@@ -1,15 +1,34 @@
 # HTML rules
 app.source
   .select { |item| item.extensions.include?("html") }
-  .each   { |item| item.route = item.id }
+  .each   { |item| item.route = item.basename }
   .each   { |item| item.layout = "default" }
   .each   { |item| item.transform }
 
+# Font rules
+app.source
+  .select { |item| item.relpath?("assets/fonts") }
+  .reject { |item| item.basename[0] == "_" }
+  .each   { |item| item.route = item.relpath }
+
+# Image rules
+app.source
+  .select { |item| item.relpath?("assets/images") }
+  .reject { |item| item.basename[0] == "_" }
+  .each   { |item| item.route = item.relpath }
+
+# JS rules
+app.source
+  .select { |item| item.relpath?("assets/javascripts") }
+  .reject { |item| item.basename[0] == "_" }
+  .each   { |item| item.route = "/#{item.dirname}/#{item.basename}.js" }
+  .each   { |item| item.transform }
+
 # CSS rules
 app.source
-  .select { |item| item.extensions.include?("scss") }
+  .select { |item| item.relpath?("assets/stylesheets") }
   .reject { |item| item.basename[0] == "_" }
-  .each   { |item| item.route = "/styles/#{item.basename}.css" }
+  .each   { |item| item.route = "/#{item.dirname}/#{item.basename}.css" }
   .each   { |item| item.transform }
 
 # Sitemap

data/seeds/setup.rb

@@ -1,15 +1,3 @@
-require "sass"
-Sass.load_paths << File.expand_path(system.config[:source], File.dirname(__FILE__))
-
-tilt_transformer = Transformer::Tilt.new(system)
-tilt_transformer.register(Munge::Helper::Capture)
-tilt_transformer.register(Munge::Helper::Find)
-tilt_transformer.register(Munge::Helper::Link)
-tilt_transformer.register(Munge::Helper::Rendering)
-
-system.alterant.register(tilt_transformer)
-
-system.router.register(Router::Fingerprint.new(extensions: system.config[:keep_extensions], separator: system.config[:fingeprint_separator]))
-system.router.register(Router::RemoveIndexBasename.new(html_extensions: system.config[:text_extensions], index: system.config[:index]))
-system.router.register(Router::AddIndexHtml.new(html_extensions: system.config[:text_extensions], index: system.config[:index]))
-system.router.register(Router::AutoAddExtension.new(keep_extensions: system.config[:keep_extensions]))
+Dir.glob(File.join(config_path, "*.rb")).sort.each do |file_path|
+  binding.eval(File.read(file_path), file_path)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: munge
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta1
+  version: 0.5.0
 platform: ruby
 authors:
 - Zach Ahn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,7 +178,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.5.0.beta1/README.md
+description: Documentation for this release is located in https://github.com/zachahn/munge/blob/v0.5.0/README.md
 email:
 - zach.ahn@gmail.com
 executables:
@@ -208,10 +208,13 @@ files:
 - lib/munge/core/router.rb
 - lib/munge/core/router/itemish.rb
 - lib/munge/core/write.rb
+- lib/munge/helper/asset_tags.rb
+- lib/munge/helper/asset_urls.rb
 - lib/munge/helper/capture.rb
 - lib/munge/helper/find.rb
 - lib/munge/helper/link.rb
 - lib/munge/helper/rendering.rb
+- lib/munge/helper/tag.rb
 - lib/munge/item.rb
 - lib/munge/readers/filesystem.rb
 - lib/munge/routers/add_index_html.rb
@@ -228,14 +231,22 @@ files:
 - munge.gemspec
 - seeds/Gemfile.tt
 - seeds/config.yml
+- seeds/config/_asset_roots.rb
+- seeds/config/routing.rb
+- seeds/config/sass.rb
+- seeds/config/sass_helpers.rb
+- seeds/config/view_helpers.rb
 - seeds/data.yml
 - seeds/layouts/default.html.erb
 - seeds/layouts/sitemap.html.erb
 - seeds/rules.rb
 - seeds/setup.rb
-- seeds/src/_vars.scss
 - seeds/src/about.html.erb
-- seeds/src/basic.css.scss
+- seeds/src/assets/fonts/.empty_directory
+- seeds/src/assets/images/.empty_directory
+- seeds/src/assets/javascripts/.empty_directory
+- seeds/src/assets/stylesheets/_vars.scss
+- seeds/src/assets/stylesheets/basic.css.scss
 - seeds/src/index.html.erb
 homepage: https://github.com/zachahn/munge
 licenses:
@@ -252,9 +263,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5