octopress-ink 1.0.0.rc.14 → 1.0.0.rc.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2897bcee91248ea1e129e5cf04a4f0c1ede2844
-  data.tar.gz: ffbebcfa8a92445270a5241ca67e7b2a2feac89c
+  metadata.gz: 7c418b320600ccde0e84cc5250117b3d8c5aadba
+  data.tar.gz: e3b8474832d3515c04a3deb208f190eed65c8421
 SHA512:
-  metadata.gz: 29f661c90f771c2aae273523978bb1ec1f6dad7fc75efe1080e206c33afa9e93b7fea49cbc8879d895f815454f7274caeef6cf74ffd7ed6c3ecc9bd13078a6d7
-  data.tar.gz: 9316a8d4c8e18b6536d80b5f0c7e82c16ff7c302e111a0f15cd30e76cd93b2f5aca1d7a66bb14573dd468b5ff62a94e75593e99e2353b1354951a72b345093e2
+  metadata.gz: b032d79261a2a9a5edef35dfe846c915d0ade487d099307f72992adfc67d6238b85c80b4a0c291e3a7b5c946f9b459ac434246b4d6fd8a271d58a05d0ea84e18
+  data.tar.gz: e12bb1b356643d00c6c80e22c2e7fe72fbd040742aeac083537661ee3a5fa0390d233ed1ecf09bec489c9c853180a24f9ca63594b33656477fd9a93174901d13

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC15 - 2014-08-17
+
+- Fixed an issue where Octopress would trigger site_payload too early. 
+
 ### 1.0.0 RC14 - 2014-08-11
 
 - Reworked asset methods

data/lib/octopress-ink.rb

@@ -57,6 +57,23 @@ module Octopress
       version << "Octopress Ink v#{Octopress::Ink::VERSION}"
     end
 
+    def self.payload
+      config = Plugins.config
+      ink_payload = {
+        'plugins'   => config['plugins'],
+        'theme'     => config['theme'],
+        'octopress' => {
+          'version' => version
+        }
+      }
+
+      if Octopress.config['docs_mode']
+        ink_payload['doc_pages'] = Ink::Plugins.doc_pages
+      end
+
+      ink_payload
+    end
+
     # Register a new plugin
     # 
     # plugin - A subclass of Plugin

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

@@ -129,7 +129,13 @@ module Octopress
 
         def payload
           unless @payload
-            @payload = Octopress.site.site_payload
+            @payload = Ink.payload
+            @payload['jekyll'] = {
+              'version' => Jekyll::VERSION,
+              'environment' => Jekyll.env
+            }
+            @payload['site'] = Octopress.site.config
+            @payload['site']['data'] = Octopress.site.site_data
             @payload['page'] = data
           end
 

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

@@ -9,21 +9,7 @@ module Octopress
       end
 
       def merge_payload(payload, site)
-        config = Ink::Plugins.config
-
-        new_payload = {
-          'plugins'   => config['plugins'],
-          'theme'     => config['theme'],
-          'octopress' => {
-            'version' => Ink.version
-          }
-        }
-
-        if Octopress.config['docs_mode']
-          new_payload['doc_pages'] = Ink::Plugins.doc_pages
-        end
-
-        new_payload
+        Ink.payload
       end
 
       def post_write(site)

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.14"
+    VERSION = "1.0.0.rc.15"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.14
+  version: 1.0.0.rc.15
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll