jekyll-haml-markup 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9259c1159a8de7d6fca744c0315d319a05f373bd
-  data.tar.gz: 7fa0e7d351b574d01b63da17c876609afd0b1914
+  metadata.gz: 5cf75015d192c32fcec1b8ab38077f6715a09f92
+  data.tar.gz: 17d091e04f614323e8264cd0d6a789225d5f943b
 SHA512:
-  metadata.gz: cd80d195acde91bb5f3b7be39801c8fcc8f6cb4324ff72960aea27d1112da2850a2a4c4cc0fa82dd1da73f76b38f67813812e07711e22c35e9103754fdd06f62
-  data.tar.gz: 8348ab98a42d8fecade22d853fa20088be0e2f2578b94955d7ea749dc389aba81ac10a1e7a08b6a7660b6ea17c3ccf1e49674eb6a6a31e2e19747f5bfa6e6953
+  metadata.gz: fabf6019e334bd851fa39fe89a5be5f08d45462ba0fd0c7e2a734882d933f66dc15d78c9a94e06926ee270bd27b3cff1f2a5594bd1dd3c37532e42d21385c469
+  data.tar.gz: 5af463b263b8bdd007ab0b22ff83bfb6ccae3d0fa2e354ab914eb0172b8c52ac4490b3ea648c77a79f891e1f83881cba2beb8b41edcd5540452287ae72b3e876

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    jekyll-haml-markup (0.1.1)
+    jekyll-haml-markup (0.1.2)
       haml (~> 5.0)
       jekyll (~> 3.7)
+      liquid (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
@@ -16,13 +17,13 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.5)
-    ffi (1.9.18)
+    ffi (1.9.21)
     forwardable-extended (2.6.0)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
     http_parser.rb (0.6.0)
-    i18n (0.9.3)
+    i18n (0.9.4)
       concurrent-ruby (~> 1.0)
     jekyll (3.7.2)
       addressable (~> 2.4)
@@ -37,7 +38,7 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-sass-converter (1.5.1)
+    jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
@@ -48,15 +49,18 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
+    mini_portile2 (2.3.0)
     minitest (5.11.3)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.1)
+    public_suffix (3.0.2)
     rake (10.5.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rouge (3.1.0)
+    rouge (3.1.1)
     ruby_dep (1.5.0)
     safe_yaml (1.0.4)
     sass (3.5.5)
@@ -74,6 +78,7 @@ DEPENDENCIES
   bundler (~> 1.16)
   jekyll-haml-markup!
   minitest (~> 5.0)
+  nokogiri (~> 1.6, >= 1.6.8)
   rake (~> 10.0)
 
 BUNDLED WITH

data/README.md

@@ -2,7 +2,7 @@
 
 [Jekyll](https://jekyllrb.com) plugin that enables [Haml](http://haml.info) as a markup option for layouts and partials.
 
-**Note**: This gem overrides a few jekyll methods and it lacks of testing.
+**Note**: This gem overwrites the `include` jekyll tag.
 
 ## Installation
 
@@ -22,14 +22,17 @@ The layout haml markup is rendered with hooks before the [Liquid](http://shopify
 !!!
 %html
   %head
-    {% assets style.css  %}
+    %title Fake title
+    %link{href: "{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}", rel: "stylesheet", type: 'text/css'}
+    %link(href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}" rel="stylesheet" type='text/css')
   %body
-    %head
-      {% include head.haml  %}
+    %header
+      {% include header.haml  %}
     %main
       {{ content }}
     %footer
-      {% include footer.haml  %}
+      {% include footer.html  %}
+    %script{src: "{{ '/assets/javascript/script.css?v=' | append: site.github.build_revision | relative_url }}"}
 ```
 
 Front-matter headers are not working on partials.

data/jekyll-haml-markup.gemspec

@@ -1,7 +1,7 @@
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jekyll-haml-markup/version'
+require 'jekyll/haml/markup/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-haml-markup"
@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Jekyll plugin to use Haml on templates.}
   spec.description   = %q{Jekyll plugin that add the option to write layouts and partials in Haml.}
-  spec.homepage      = 'https://github.com/afaundez/jekyll-haml'
+  spec.homepage      = 'https://github.com/afaundez/jekyll-haml-markup'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -24,7 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'nokogiri', '~> 1.6', '>= 1.6.8'
 
   spec.add_runtime_dependency 'jekyll', '~> 3.7'
+  spec.add_runtime_dependency 'liquid', '~> 4.0'
   spec.add_runtime_dependency 'haml', '~> 5.0'
 end

data/lib/jekyll/haml/markup/converter.rb

@@ -0,0 +1,43 @@
+require 'jekyll'
+
+module Jekyll
+  module Converters
+    class Haml < Converter
+
+      def extname_list
+        @extname_list ||= haml_conf["haml_ext"].split(",").map do |e|
+          ".#{e.downcase}"
+        end
+      end
+
+      def matches(ext)
+        extname_list.include?(ext.downcase)
+      end
+
+      def output_ext(ext)
+        '.html'
+      end
+
+      def get_processor
+        case haml_conf['haml'].downcase
+        when 'lib-haml' then return Jekyll::Haml::Parser.new haml_conf
+        end
+      end
+
+      def convert(content)
+        get_processor.convert content
+      end
+
+      def haml_conf
+        {
+          'haml_ext' => 'haml',
+          'haml' => 'lib-haml',
+          'lib-haml' => {
+            attr_wrapper: '"',
+            escape_attrs: false
+          }
+        }
+      end
+    end
+  end
+end

data/lib/jekyll/haml/markup/hooks.rb

@@ -0,0 +1,11 @@
+require 'jekyll'
+
+Jekyll::Hooks.register :site, :post_read do |site|
+  haml_converter = Jekyll::Converters::Haml.new site.config
+  site.layouts.each do |name, layout|
+    if haml_converter.matches layout.ext
+      parsed_content = haml_converter.convert layout.content
+      layout.content = parsed_content
+    end
+  end
+end

data/lib/jekyll/haml/markup/include.rb

@@ -0,0 +1,22 @@
+require 'jekyll'
+require 'liquid'
+
+module Jekyll
+  module Tags
+    class HamlInclude < IncludeTag
+
+      def read_file(file, context)
+        content = File.read file, file_read_opts(context)
+
+        config = context.registers[:site].config
+        haml_converter = Jekyll::Converters::Haml.new config
+        content = haml_converter.convert(content) if haml_converter.matches File.extname(file)
+
+        content
+      end
+
+    end
+  end
+end
+
+Liquid::Template.register_tag 'include', Jekyll::Tags::HamlInclude

data/lib/{jekyll-haml-markup → jekyll/haml/markup}/version.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Haml
     module Markup
-      VERSION = '0.1.1'
+      VERSION = '0.1.2'
     end
   end
 end

data/lib/jekyll/haml/markup.rb

@@ -0,0 +1,15 @@
+require_relative 'markup/version'
+require_relative 'markup/parser'
+require_relative 'markup/converter'
+require_relative 'markup/include'
+require_relative 'markup/hooks'
+
+module Jekyll
+  module Haml
+    module Markup
+      def self.root
+        Pathname.new File.expand_path('../../../..', __FILE__)
+      end
+    end
+  end
+end

data/lib/jekyll-haml-markup.rb

@@ -1,28 +1 @@
-require 'jekyll-haml-markup/version'
-
-require 'jekyll'
-require 'haml'
-
-require_relative 'jekyll/converters/haml'
-require_relative 'jekyll/haml/parser'
-require_relative 'jekyll/configuration'
-require_relative 'jekyll/tags/include'
-
-
-Jekyll::Hooks.register :site, :post_read do |site|
-  site.layouts.each do |name, layout|
-    layout.content = ::Haml::Engine.new(layout.content).render if ['.haml'].include? layout.ext
-  end
-end
-
-Jekyll::Hooks.register :pages, :pre_render do |page|
-  page.content = ::Haml::Engine.new(page.content).render if ['.haml'].include? page.ext
-end
-
-Jekyll::Hooks.register :posts, :pre_render do |post|
-  post.content = ::Haml::Engine.new(post.content).render if ['.haml'].include? post.ext
-end
-
-Jekyll::Hooks.register :documents, :pre_render do |document|
-  document.content = ::Haml::Engine.new(document.content).render if ['.haml'].include? document.ext
-end
+require_relative 'jekyll/haml/markup'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-haml-markup
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Alvaro Faundez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-30 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: liquid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +133,13 @@ files:
 - bin/setup
 - jekyll-haml-markup.gemspec
 - lib/jekyll-haml-markup.rb
-- lib/jekyll-haml-markup/version.rb
-- lib/jekyll/configuration.rb
-- lib/jekyll/converters/haml.rb
-- lib/jekyll/haml.rb
-- lib/jekyll/haml/parser.rb
-- lib/jekyll/haml_renderer.rb
-- lib/jekyll/tags/include.rb
-homepage: https://github.com/afaundez/jekyll-haml
+- lib/jekyll/haml/markup.rb
+- lib/jekyll/haml/markup/converter.rb
+- lib/jekyll/haml/markup/hooks.rb
+- lib/jekyll/haml/markup/include.rb
+- lib/jekyll/haml/markup/parser.rb
+- lib/jekyll/haml/markup/version.rb
+homepage: https://github.com/afaundez/jekyll-haml-markup
 licenses:
 - MIT
 metadata: {}

data/lib/jekyll/configuration.rb

@@ -1,92 +0,0 @@
-require 'jekyll/configuration'
-# frozen_string_literal: true
-
-module Jekyll
-  class Configuration < Hash
-    # Default options. Overridden by values in _config.yml.
-    # Strings rather than symbols are used for compatibility with YAML.
-    DEFAULTS = Configuration[{
-      'haml_ext' => 'haml',
-      'haml' => 'lib-haml',
-      'lib-haml' => {},
-
-      # Where things are
-      "source"              => Dir.pwd,
-      "destination"         => File.join(Dir.pwd, "_site"),
-      "collections_dir"     => "",
-      "plugins_dir"         => "_plugins",
-      "layouts_dir"         => "_layouts",
-      "data_dir"            => "_data",
-      "includes_dir"        => "_includes",
-      "collections"         => {},
-
-      # Handling Reading
-      "safe"                => false,
-      "include"             => [".htaccess"],
-      "exclude"             => %w(
-        Gemfile Gemfile.lock node_modules vendor/bundle/ vendor/cache/ vendor/gems/
-        vendor/ruby/
-      ),
-      "keep_files"          => [".git", ".svn"],
-      "encoding"            => "utf-8",
-      "markdown_ext"        => "markdown,mkdown,mkdn,mkd,md",
-      "strict_front_matter" => false,
-
-      # Filtering Content
-      "show_drafts"         => nil,
-      "limit_posts"         => 0,
-      "future"              => false,
-      "unpublished"         => false,
-
-      # Plugins
-      "whitelist"           => [],
-      "plugins"             => [],
-
-      # Conversion
-      "markdown"            => "kramdown",
-      "highlighter"         => "rouge",
-      "lsi"                 => false,
-      "excerpt_separator"   => "\n\n",
-      "incremental"         => false,
-
-      # Serving
-      "detach"              => false, # default to not detaching the server
-      "port"                => "4000",
-      "host"                => "127.0.0.1",
-      "baseurl"             => nil, # this mounts at /, i.e. no subdirectory
-      "show_dir_listing"    => false,
-
-      # Output Configuration
-      "permalink"           => "date",
-      "paginate_path"       => "/page:num",
-      "timezone"            => nil, # use the local timezone
-
-      "quiet"               => false,
-      "verbose"             => false,
-      "defaults"            => [],
-
-      "liquid"              => {
-        "error_mode" => "warn",
-      },
-
-      "rdiscount"           => {
-        "extensions" => [],
-      },
-
-      "redcarpet"           => {
-        "extensions" => [],
-      },
-
-      "kramdown"            => {
-        "auto_ids"      => true,
-        "toc_levels"    => "1..6",
-        "entity_output" => "as_char",
-        "smart_quotes"  => "lsquo,rsquo,ldquo,rdquo",
-        "input"         => "GFM",
-        "hard_wrap"     => false,
-        "footnote_nr"   => 1,
-        "show_warnings" => false,
-      },
-    }.map { |k, v| [k, v.freeze] }].freeze
-  end
-end

data/lib/jekyll/converters/haml.rb

@@ -1,34 +0,0 @@
-require 'jekyll/converter'
-require 'jekyll/haml/parser'
-
-module Jekyll
-  module Converters
-    class Haml < Identity
-      safe true
-
-      def extname_list
-        @extname_list ||= @config["haml_ext"].split(",").map do |e|
-          ".#{e.downcase}"
-        end
-      end
-
-      def matches(ext)
-        extname_list.include?(ext.downcase)
-      end
-
-      def output_ext(ext)
-        '.html'
-      end
-
-      def get_processor
-        case @config["haml"].downcase
-        when "lib-haml" then return Jekyll::Haml::Parser.new(@config)
-        end
-      end
-      
-      def convert(content)
-        get_processor.convert content
-      end
-    end
-  end
-end

data/lib/jekyll/haml.rb

@@ -1,11 +0,0 @@
-require "jekyll/haml/version"
-
-require_relative 'converters/haml'
-require_relative 'haml/parser'
-require_relative 'tags/include'
-require_relative 'configuration'
-require_relative 'convertible'
-require_relative 'excerpt'
-require_relative 'haml_renderer'
-require_relative 'renderer'
-require_relative 'site'

data/lib/jekyll/haml_renderer.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-require 'jekyll/haml_renderer'
-require_relative 'haml_renderer/file'
-require_relative 'haml_renderer/table'
-
-module Jekyll
-  class HamlRenderer
-    def initialize(site)
-      @site = site
-      # Haml::Template.error_mode = @site.config["haml"]["error_mode"].to_sym
-      reset
-    end
-
-    def reset
-      @stats = {}
-    end
-
-    def file(filename)
-      filename = @site.in_source_dir(filename).sub(
-        %r!\A#{Regexp.escape(@site.source)}/!,
-        ""
-      )
-
-      HamlRenderer::File.new(self, filename).tap do
-        @stats[filename] ||= new_profile_hash
-        @stats[filename][:count] += 1
-      end
-    end
-
-    def increment_bytes(filename, bytes)
-      @stats[filename][:bytes] += bytes
-    end
-
-    def increment_time(filename, time)
-      @stats[filename][:time] += time
-    end
-
-    def stats_table(n = 50)
-      HamlRenderer::Table.new(@stats).to_s(n)
-    end
-
-    def self.format_error(e, path)
-      "#{e.message} in #{path}"
-    end
-
-    private
-    def new_profile_hash
-      Hash.new { |hash, key| hash[key] = 0 }
-    end
-  end
-end

data/lib/jekyll/tags/include.rb

@@ -1,13 +0,0 @@
-require 'jekyll/tags/include'
-
-module Jekyll
-  module Tags
-    class IncludeTag < Liquid::Tag
-
-      def read_file(file, context)
-        ::Haml::Engine.new(File.read(file, file_read_opts(context))).render
-      end
-
-    end
-  end
-end