octopress-ink 1.0.0.rc.7 → 1.0.0.rc.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65b8ffe436f7d3a98b496df4a39c4a5889072e87
-  data.tar.gz: d580ceb6faed7b3aced9533e5422c535ad92b38c
+  metadata.gz: c997aba1d3233f14592d404a8b92d7f49d9db20e
+  data.tar.gz: 522dd2e071da30e701937f7ccf4491c068549527
 SHA512:
-  metadata.gz: aa75320842ce5f449688d831e2e6902783c86b98d30917c37ca04e7680744efebea102e2d5ee37a5160db096a73c8038f81498a4f38def2ae72ebe4dc2225a7f
-  data.tar.gz: 59292e1a588bdad1bf9e9cbb77576e21d4a0c045e2fadcda7ce92d34025376b3de86297f9a39994cc6e3a9d50800f5867b269c40eb4158e12a319aff47757df7
+  metadata.gz: 8a9f9c4239bc8b4ec17a68b03d4221c8c0aa5875b55494019cc76ead766b6b268641fa0780bb70077c7f64267fe71add6c415314305696694f96628e5d96924c
+  data.tar.gz: 9501d02bbbdffa98dfdd6d933cab9ecfc1becf209659b282c945c3794d70936b1856f1bdf5e2dfdff2f01d48b85866530e7e51e4a6e795383a0c03cac90af5f4

data/CHANGELOG.md

@@ -2,12 +2,17 @@
 
 ## Current released version
 
-### 1.0.0 RC7 - 2014-06-08
+### 1.0.0 RC8 - 2014-06-09
 
-- New: Added `excerpted` post var, true if post.excerpt is shorted than post.content.
+- Improved the way Ink manages the payload
+- Added `linkposts` and `articles` methods to Ink
 
 ## Past versions
 
+### 1.0.0 RC7 - 2014-06-08
+
+- New: Added `excerpted` post var, true if post.excerpt is shorted than post.content.
+
 ### 1.0.0 RC6 - 2014-06-07
 
 - Fixed: Gemspec scaffold does not include Ink's pre-release version numbers.

data/lib/octopress-ink/version.rb

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

data/lib/octopress-ink.rb

@@ -76,27 +76,42 @@ module Octopress
       @site = site
     end
 
-    def self.payload(payload={})
-      config = Octopress::Ink::Plugins.config
-      payload['plugins']   = config['plugins']
-      payload['theme']     = config['theme']
-      payload['octopress'] = {}
-      payload['octopress']['version'] = Octopress::Ink.version
-      if Octopress::Ink.config['docs_mode']
-        payload['doc_pages'] = Octopress::Ink::Plugins.doc_pages
-      end
-      
-      payload['site'] ||= {}
+    def self.payload(jekyll_payload={})
+      Jekyll::Utils.deep_merge_hashes(jekyll_payload, custom_payload)
+    end
 
-      payload['site']['linkposts'] = site.posts.select do |p|
-        p.data['linkpost']
-      end
+    def self.custom_payload
+      unless @custom_payload
+        config = Plugins.config
+
+        payload = {
+          'plugins'   => config['plugins'],
+          'theme'     => config['theme'],
+          'octopress' => {
+            'version' => Octopress::Ink.version
+          },
+          'site' => {
+            'linkposts' => self.linkposts,
+            'articles'  => self.articles,
+          }
+        }
+
+        if Octopress::Ink.config['docs_mode']
+          payload['doc_pages'] = Octopress::Ink::Plugins.doc_pages
+        end
 
-      payload['site']['articles'] = site.posts.reject do |p|
-        p.data['linkpost']
+        @custom_payload = payload
       end
 
-      payload
+      @custom_payload
+    end
+
+    def self.linkposts
+      @linkposts ||= site.posts.select {|p| p.data['linkpost']}
+    end
+
+    def self.articles
+      @articles ||= site.posts.reject {|p| p.data['linkpost']}
     end
 
     def self.init_site(options)

metadata

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