octopress-ink 1.0.0.rc.62 → 1.0.0.rc.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f20493df6c84e50ab1eeadbc9db1df5bf8ad021e
-  data.tar.gz: ae01d676ab2c7f0e319c516bbf0dc84d2fe356f8
+  metadata.gz: 38cbab3ab928fb591f938e1c98cb078ab6ae8c51
+  data.tar.gz: 88673f92bd520ed0959ebc513a8ba2f191690b6a
 SHA512:
-  metadata.gz: 822b9533c74bf2443cb36890cf9a35bc398a129084dca0eebf91226e68a1fb862750b947cc5c3a5aabb885552230406b86b619da542287c759c78337fee5781c
-  data.tar.gz: d955e19dd99e0f59ed8529b41515e70f2a810f28d33b1b8b7a9f1b5790d2c30dc3554785912bef193d825b1c871e8e1dfb25cbd2651c9d3e64eebc858e510bb0
+  metadata.gz: e0d6ccfd49f34053b397b9f8941d5082ba23b52d60dea30038776c0fff98276450487473c71e7c7fe020936ff61b896f0ae2f0cf09ce8334b532f9342c254ca1
+  data.tar.gz: ec2662de4ea0f38adfbde2ef333203a73f81ed0096b9e1484064cc7ebd44486f7f6f5df255e0bab143be79c5b3b1e30999b43568558c3a677ed4fa71a1ec53be

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.0.0 RC63 - 2015-04-26
+- New: Pages and Sass assets can read plugin config at {{ plugin.config_label }} instead of {{ plugins.plugin-name.config_label }}.
+
 ### 1.0.0 RC62 - 2015-04-25
 - Fix: octopress-autoprefixer is a runtime dependencies, not a development dependency.
 

data/lib/octopress-ink.rb

@@ -36,6 +36,10 @@ module Octopress
       require 'octopress-ink/commands'
     end
 
+    if ENV['OCTODEV']
+      require 'octopress-debugger'
+    end
+
     @load_plugin_assets = true
 
     Plugins.reset

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

@@ -39,8 +39,8 @@ module Octopress
         def content
           @render ||= begin
             contents = super
-            if asset_payload = payload
-              Liquid::Template.parse(contents).render!(payload)
+            if payload
+              Liquid::Template.parse(contents).render!({ 'plugin' => @plugin.config }.merge(payload))
             else
               contents
             end

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

@@ -2,22 +2,6 @@ module Octopress
   module Ink
     class Layout < Jekyll::Layout
       include Ink::Convertible
-
-      # Initialize a new Layout.
-      #
-      # site - The Site.
-      # base - The String path to the source.
-      # name - The String filename of the post file.
-      def initialize(site, base, name)
-        @site = site
-        @base = base
-        @name = name
-
-        self.data = {}
-
-        process(name)
-        read_yaml(base, name)
-      end
     end
   end
 end

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

@@ -10,6 +10,15 @@ module Octopress
         page_source.relative_path_from(site_source).to_s
       end
 
+      def render(layouts, site_payload)
+        site_payload = {
+          'plugin' => plugin.config(data['lang'])
+        }.merge(site_payload)
+
+        super(layouts, site_payload)
+      end
+      
+
       # Allow pages to read url from plugin configuration
       #
       def url

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.62
+  version: 1.0.0.rc.63
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll