octopress-render-tag 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aa9842657c88e4874e5fb77e459eb2c3ec71ffe
-  data.tar.gz: 7836131fe925b864564e7e9608738f158fd0bd0e
+  metadata.gz: 23ec46e74b6b488da291b6527f9f5cafd0fb6414
+  data.tar.gz: 129eaae81207ec96343cf4465951784e1349a4aa
 SHA512:
-  metadata.gz: c4da2d15ef77ec5958f007a27a3769e37a2d4994c1c128c0b3e5632c7aa8a0c6e72827110e75609d1f4915c60abb64a7d607e6dd8c9caf282dd4c138421b1e66
-  data.tar.gz: 62582ceb255164560c9268395d40956e8b284351e70421bd94ab094e1b01b2453b25811ce6a2796c594312e7eb5e2e18cba1db24ff67e01b216b8f744defa34a
+  metadata.gz: 64d0030f1d7993775908f935b77d9deade5ea1e5ccafb1fa62ed855dbdf122b63b061d5cc3006e8ef5479965b677104dc33b5630cadc71fd0b14291573a4b53c
+  data.tar.gz: 2300fe9149a460a2ddb0eb34e4187f563afb991c777824012a9d9c58ece8953d10a4b7f9566033a3a10b4fa48b373676018b1d716de7e436f8b8dcbefd7d95d4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.0.3 - 2014-07-27
+
+- No longer requires Jekyll page hooks.
+- Triggers Octopress hooks if present.
+
 ### 1.0.2 - 2014-07-16
 
 - Added Octopress Ink plugin

data/lib/octopress-render-tag/hooks.rb

@@ -0,0 +1,47 @@
+# Add support for Octopress hooks
+#
+module Octopress
+
+  # Create a new page class to allow partials to trigger Octopress Hooks.
+  #
+  class Partial
+    include Jekyll::Convertible
+    
+    attr_accessor :name, :content, :site, :ext, :output, :data
+    
+    def initialize(site, name, content)
+      @site     = site
+      @name     = name
+      @ext      = File.extname(name)
+      @content  = content
+      @data     = { layout: nil } # hack
+      
+    end
+    
+    def render(payload)
+      pre_render
+      do_layout(payload, { no_layout: nil })
+      post_render
+    end
+
+    def hooks
+      if self.site.respond_to? :page_hooks
+        self.site.page_hooks
+      else
+        []
+      end
+    end
+
+    def pre_render
+      self.hooks.each do |hook|
+        hook.pre_render(self)
+      end
+    end
+
+    def post_render
+      self.hooks.each do |hook|
+        hook.post_render(self)
+      end
+    end
+  end
+end

data/lib/octopress-render-tag/version.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Tags
     module RenderTag
-      VERSION = "1.0.2"
+      VERSION = "1.0.3"
     end
   end
 end

data/lib/octopress-render-tag.rb

@@ -1,7 +1,7 @@
 require "octopress-render-tag/version"
 require "octopress-tag-helpers"
 require "octopress-render-tag/ink-plugin"
-require "jekyll-page-hooks"
+require "octopress-render-tag/hooks"
 require "jekyll"
 
 module Octopress
@@ -51,9 +51,7 @@ module Octopress
 
           content = replace_raw(content)
 
-          if defined?(Jekyll::ConvertiblePartial)
-            content = parse_convertible(content, context).strip
-          end
+          content = parse_convertible(content, context).strip
 
           unless content.nil? || filters.nil?
             content = TagHelpers::Var.render_filters(content, filters, context)
@@ -88,7 +86,7 @@ module Octopress
         end
         
         def parse_convertible(content, context)
-          page = Jekyll::ConvertiblePartial.new(context.registers[:site], @path, content)
+          page = Octopress::Partial.new(context.registers[:site], @path, content)
           page.render({})
           page.output.strip
         end

data/octopress-render-tag.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "octopress-tag-helpers", "~> 1.0"
-  spec.add_runtime_dependency "jekyll-page-hooks", "~> 1.0"
   spec.add_runtime_dependency "jekyll", "~> 2.0"
 
   spec.add_development_dependency "clash"

data/test/.clash.yml

@@ -1,2 +1,2 @@
 build: true 
-compare: "_site, _expected"
+compare: "_expected, _site"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-render-tag
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-tag-helpers
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: jekyll-page-hooks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +111,7 @@ files:
 - assets/docs/changelog.markdown
 - assets/docs/index.markdown
 - lib/octopress-render-tag.rb
+- lib/octopress-render-tag/hooks.rb
 - lib/octopress-render-tag/ink-plugin.rb
 - lib/octopress-render-tag/version.rb
 - octopress-render-tag.gemspec