octopress-ink 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68a4980b51d2557f63a373d60ff0da59981d3dda
-  data.tar.gz: 9127e9a61add546f886a4e15763e80d8b7418614
+  metadata.gz: 6a3b15b45d91c027ba553ed2389bd8f2eda786f5
+  data.tar.gz: e5ad4861c19163e4887bedee72e26936a3601623
 SHA512:
-  metadata.gz: ca4edb8b3902338c45764f0a8947512577839e9388b48d8fd5bee095902135b9ac3e47336d1a54cc6d87c6225b1273dd3068048914b82e9eb26f2fbcf14bd32d
-  data.tar.gz: 135205a60c04750005a264f4771562435eb42d0cfaf9c0524d4783a098bc5bfe715466346d190f3541d2bf7d7a143775354d141b6477751cc784218cac3e9e64
+  metadata.gz: 5ec39b805dbe73ebd301ae499e1e63e7a4f16b8a221779237263c363f0799d441569e8621f09af3297155702eb3d68d762cf42129d797c43e18b67c2716d9037
+  data.tar.gz: 43285a10de3685141b7fd2c5401d7f877716a538c47a126c31dd11bf9f40d4fe902ed4b43f5b9991fbe6ffb7e288daa98e5e0771f445de16506db117c25ba866

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.1.2 (2015-05-12)
+- Use Jekyll Hooks if you got 'em.
+- Now supporting Jekyll 2 & 3
+- In Jekyll 3 Coffeescript is optional - Added a request to install the gem if a plugin uses it but it is not present.
+
 ### 1.1.1 (2015-05-11)
 - Minor: Gemspec dependency updates.
 

data/lib/octopress-ink/assets/coffeescript.rb

@@ -13,6 +13,11 @@ module Octopress
         end
 
         def content
+          begin
+            require 'jekyll-coffeescript'
+          rescue LoadError
+            raise "Add gem jekyll-coffeescript to Gemfile (or gemspec)."
+          end
           ::CoffeeScript.compile(super)
         end
 

data/lib/octopress-ink/jekyll/hooks.rb

@@ -1,31 +1,60 @@
 module Octopress
   module Ink
-    class SiteHook < Hooks::Site
+    if defined?(Jekyll::Hooks)
 
-      def reset(site)
+      Jekyll::Hooks.register :site, :after_reset do |site|
         Ink.watch_assets(site)
         if Plugins.registered
           Plugins.reset
         end
       end
 
-      def post_read(site)
+      Jekyll::Hooks.register :site, :post_read do |site|
         Octopress.site = site
         Ink::Plugins.register
         Ink::Plugins.add_files
       end
 
-      def merge_payload(payload, site)
-        Ink.payload
+      Jekyll::Hooks.register :site, :pre_render do |site, payload|
+        Ink.payload.each do |key, val|
+          payload[key] = val
+        end
       end
 
-      def post_write(site)
+      Jekyll::Hooks.register :site, :post_write do |site|
         Octopress::Ink::Plugins.static_files.each do |f| 
           f.write(site.dest)
         end
 
         Octopress::Ink::Cache.clean
       end
+    else
+      class SiteHook < Hooks::Site
+        def reset(site)
+          Ink.watch_assets(site)
+          if Plugins.registered
+            Plugins.reset
+          end
+        end
+
+        def post_read(site)
+          Octopress.site = site
+          Ink::Plugins.register
+          Ink::Plugins.add_files
+        end
+
+        def merge_payload(payload, site)
+          Ink.payload
+        end
+
+        def post_write(site)
+          Octopress::Ink::Plugins.static_files.each do |f| 
+            f.write(site.dest)
+          end
+
+          Octopress::Ink::Cache.clean
+        end
+      end
     end
   end
 end

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -84,30 +84,30 @@ dependencies:
   name: octopress-date-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: octopress-autoprefixer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: octopress
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jekyll-coffeescript
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement