octopress-ink 1.0.0.alpha.17 → 1.0.0.alpha.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa21d7ff884dfda2459b338edfe7d06fd6f18a7f
-  data.tar.gz: 6bc328cd1284b07ca85f7c5e002396ab3bdf5f55
+  metadata.gz: c888518337b350c4592c3808f128f21393f30e12
+  data.tar.gz: 8733d8937ac4bdc95426e0112aeb3a242bc63f05
 SHA512:
-  metadata.gz: b1ab05f90a48f9f18161cdaf3bfc4b61e5b4669e85fe78d2b3ee30738d25ce591b59cae7e05e3c773075089e1c781a1fd2cd27cb83d80675cee29973d83ad098
-  data.tar.gz: 1d39ca6d799a822141411cfd64cb5a2b962c4c8cb21d4e2d386a60dae804605908b5166948863b5b67fa54dcb069cce266f64534035a80c5588f0d8cac12c795
+  metadata.gz: 560806fb9ef8998368bc7511bc77d8c6ffed88ea4c141a1e11b8136ae9d391acd329d9c01f008b7ce50d94c787b097f30eae8cbf1cffc25a4058ba1ac2405a92
+  data.tar.gz: d3563681fbf6e66639eb31d6c98b8b5760d2f2ac9aba7ceba84bb99f53be6b67a5eb8f1be5c848a6f0bda4ce476f7ba0c691ed618648e0255a982e585d099dfa

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

@@ -16,7 +16,9 @@ module Octopress
       end
 
       def path(site)
-        unless @found_file
+        if @found_file and !@no_cache
+          @found_file
+        else
           files = []
           files << user_path(site)
           files << plugin_path unless @plugin.type == 'local_plugin'
@@ -27,7 +29,6 @@ module Octopress
           end
           @found_file = Pathname.new files[0]
         end
-        @found_file
       end
 
       def file(file, site)
@@ -52,7 +53,7 @@ module Octopress
       end
 
       def user_dir(site)
-        File.join site.source, Plugins.custom_dir(site), @dir
+        File.join site.source, Plugins.custom_dir(site.config), @dir
       end
 
       def local_plugin_path(site)

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

@@ -0,0 +1,39 @@
+module Octopress
+  module Assets
+    class Config < Asset
+
+      def initialize(plugin, path)
+        @root = plugin.assets_path
+        @plugin = plugin
+        @dir = plugin.namespace
+        @type = ''
+        @exists = {}
+        @file = path
+      end
+
+      def user_dir(site)
+        File.join site['source'], Plugins.custom_dir(site), @dir
+      end
+
+      def local_plugin_path(site)
+        File.join site['source'], @dir, @file
+      end
+
+      def read(site)
+        config = {}
+        if @plugin.type != 'local_plugin'
+          default = plugin_path
+          if exists? default
+            config = YAML::load(File.open(default))
+          end
+        end
+        override = user_path(site)
+        if exists? override
+          config = config.deep_merge YAML::load(File.open(override))
+        end
+        config
+      end
+    end
+  end
+end
+

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

@@ -7,13 +7,9 @@ module Octopress
         @type = type
         @plugin = plugin
         @dir = File.join(plugin.namespace, type)
+        @no_cache = true
         @exists = {}
       end
-
-      def file(file, site)
-        @file = file
-        path(site)
-      end
     end
   end
 end

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

@@ -2,10 +2,6 @@ module Octopress
   module Assets
     class Layout < Asset
 
-      def file(file, site)
-        @file = file
-      end
-
       def register(site)
         name = "#{@plugin.namespace}:#{@file}"
         name = name.split(".")[0..-2].join(".")

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

@@ -17,7 +17,7 @@ module Octopress
 
       # TODO: choose user path before local path.
       def user_load_path(site)
-        File.join(site.source, Plugins.custom_dir(site), @dir, File.dirname(@file)).sub /\/\.$/, ''
+        File.join(site.source, Plugins.custom_dir(site.config), @dir, File.dirname(@file)).sub /\/\.$/, ''
       end
 
       def theme_load_path

data/lib/octopress-ink/assets.rb

@@ -1,6 +1,7 @@
 module Octopress
   module Assets
     autoload :Asset,                'octopress-ink/assets/asset'
+    autoload :Config,               'octopress-ink/assets/config'
     autoload :Javascript,           'octopress-ink/assets/javascript'
     autoload :Stylesheet,           'octopress-ink/assets/stylesheet'
     autoload :Sass,                 'octopress-ink/assets/sass'

data/lib/octopress-ink/helpers/content_for.rb

@@ -16,12 +16,12 @@ module Octopress
       end
 
       def self.render(context, block)
-        content = get_block(context, block).map { |b| b.strip }.join
+        content = get_block(context, block).map { |b| b }.join
       end
 
       def self.append_to_block(context, block, content)
         converter = context.environments.first['converter']
-        content = converter.convert(content.strip).strip
+        content = converter.convert(content).lstrip
         get_block(context, block) << content
       end
     end

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

@@ -1,10 +1,12 @@
-
 module Jekyll
   module Convertible
     alias_method :do_layout_orig, :do_layout
 
     def do_layout(payload, layouts)
       # The contentblock tags needs access to the converter to process it while rendering.
+      config = Octopress::Plugins.config(payload['site'])
+      payload['plugins']   = config['plugins']
+      payload['theme']     = config['theme']
       payload['converter'] = self.converter
       do_layout_orig(payload, layouts)
     end

data/lib/octopress-ink/plugin.rb

@@ -1,6 +1,6 @@
 module Octopress
   class Plugin
-    attr_accessor :name, :type, :asset_override, :assets_path,
+    attr_accessor :name, :type, :asset_override, :assets_path, :config,
                   :layouts_dir, :stylesheets_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir,
                   :layouts, :includes, :stylesheets, :javascripts, :images, :sass, :fonts, :files
 
@@ -12,6 +12,7 @@ module Octopress
       @includes_dir      = 'includes'
       @javascripts_dir   = 'javascripts'
       @stylesheets_dir   = 'stylesheets'
+      @config_file       = 'config.yml'
       @name              = name
       @type              = type
       @layouts           = []
@@ -25,12 +26,17 @@ module Octopress
       add_assets
       add_layouts
       add_includes
+      add_config
     end
 
     def add_assets
       
     end
 
+    def add_config
+      @config = Assets::Config.new(self, @config_file)
+    end
+
     def namespace
       if @type == 'local_plugin'
         ''
@@ -139,5 +145,9 @@ module Octopress
     def include(file, site)
       @includes.file(file, site)
     end
+
+    def configs(site)
+      @config.read(site)
+    end
   end
 end

data/lib/octopress-ink/plugins.rb

@@ -23,6 +23,25 @@ module Octopress
       [@theme].concat(@plugins).concat(@local_plugins).compact
     end
 
+    def self.config(site)
+      if @config
+        @config
+      else
+        @config            = {}
+        @config['plugins'] = {}
+        @config['theme']   = @theme.configs(site)
+
+
+        plugins.each do |p| 
+          unless p == @theme
+            @config['plugins'][p.name] = p.configs(site)
+          end
+        end
+
+        @config
+      end
+    end
+
     def self.include(name, file, site)
       p = plugin(name)
       p.include(file, site)
@@ -47,8 +66,12 @@ module Octopress
       end
     end
 
-    def self.custom_dir(site)
-      site.config['custom'] || CUSTOM_DIR
+    def self.custom_dir(config)
+      if config['octopress'] and config['octopress']['custom']
+        config['octopress']['custom']
+      else
+        CUSTOM_DIR
+      end
     end
 
     def self.fingerprint(paths)

data/lib/octopress-ink/tags/content_for.rb

@@ -9,7 +9,7 @@ module Octopress
       end
 
       def render(context)
-        Helpers::ContentFor.append_to_block(context, @block_name, super.strip)
+        Helpers::ContentFor.append_to_block(context, @block_name, super)
         ''
       end
     end

data/lib/octopress-ink/tags/include.rb

@@ -13,9 +13,9 @@ module Octopress
 
         # If markup references a plugin e.g. plugin-name:include-file.html
         if @markup.strip =~ PLUGIN_SYNTAX
-          @plugin = $1
-          @path = $2
-          content = Plugins.include(@plugin, @path, context.registers[:site]).read
+          plugin = $1
+          path = $2
+          content = Plugins.include(plugin, path, context.registers[:site]).read
           partial = Liquid::Template.parse(content)
           context.stack {
             context['include'] = include_tag.parse_params(context)

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.alpha.17"
+    VERSION = "1.0.0.alpha.18"
   end
 end

data/test/expected/tag_tests/content_for.html

@@ -1,13 +1,4 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name='generator' content='Octopress 1.0.0.alpha.15'>
+Testing content for
+
+
 
-  </head>
-  <body>
-    Testing content for
-    
-    
-  </body>
-</html>

data/test/expected/tag_tests/footer.html

@@ -1,13 +1,3 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name='generator' content='Octopress 1.0.0.alpha.15'>
 
-  </head>
-  <body>
-    
-    <footer>This should go in the footer</footer>
-    
-  </body>
-</html>
+<footer>This should go in the footer</footer>
+

data/test/expected/tag_tests/head.html

@@ -1,13 +1,4 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name='generator' content='Octopress 1.0.0.alpha.15'>
-Testing head tagTesting that content_for is additive
-  </head>
-  <body>
-    
-    
-    
-  </body>
-</html>
+<meta name='generator' content='Octopress 1.0.0.alpha.17'>
+Testing head tag
+Testing that content_for is additive
+

data/test/expected/tag_tests/include_theme_override.html

@@ -1 +1 @@
-, I heard you like includes.
+include from theme override

data/test/expected/tag_tests/scripts.html

@@ -1,13 +1,4 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name='generator' content='Octopress 1.0.0.alpha.15'>
 
-  </head>
-  <body>
-    
-    
-    Testing scripts
-  </body>
-</html>
+
+Testing scripts
+

data/test/expected/test_config/plugin_config.html

@@ -0,0 +1,2 @@
+config from plugin
+config from plugin override

data/test/expected/test_config/theme_config.html

@@ -0,0 +1,2 @@
+config from theme
+config from theme override

data/test/site/tag_tests/content_for.html

@@ -1,13 +1,4 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name='generator' content='Octopress 1.0.0.alpha.15'>
+Testing content for
+
+
 
-  </head>
-  <body>
-    Testing content for
-    
-    
-  </body>
-</html>

data/test/site/tag_tests/footer.html

@@ -1,13 +1,3 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name='generator' content='Octopress 1.0.0.alpha.15'>
 
-  </head>
-  <body>
-    
-    <footer>This should go in the footer</footer>
-    
-  </body>
-</html>
+<footer>This should go in the footer</footer>
+

data/test/site/tag_tests/head.html

@@ -1,13 +1,4 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name='generator' content='Octopress 1.0.0.alpha.15'>
-Testing head tagTesting that content_for is additive
-  </head>
-  <body>
-    
-    
-    
-  </body>
-</html>
+<meta name='generator' content='Octopress 1.0.0.alpha.17'>
+Testing head tag
+Testing that content_for is additive
+

data/test/site/tag_tests/include_theme_override.html

@@ -1 +1 @@
-, I heard you like includes.
+include from theme override

data/test/site/tag_tests/scripts.html

@@ -1,13 +1,4 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name='generator' content='Octopress 1.0.0.alpha.15'>
 
-  </head>
-  <body>
-    
-    
-    Testing scripts
-  </body>
-</html>
+
+Testing scripts
+

data/test/site/test_config/plugin_config.html

@@ -0,0 +1,2 @@
+config from plugin
+config from plugin override

data/test/site/test_config/theme_config.html

@@ -0,0 +1,2 @@
+config from theme
+config from theme override

data/test/source/_custom/awesome-sauce/config.yml

@@ -0,0 +1 @@
+test_override: config from plugin override

data/test/source/_custom/theme/config.yml

@@ -0,0 +1 @@
+test_override: config from theme override

data/test/source/_layouts/content_for.html

@@ -0,0 +1,3 @@
+{% yield foo %}
+{% wrap_yield footer %}<footer>{= yield }</footer>{% endwrap_yield %}
+{% yield scripts %}

data/test/source/_layouts/head.html

@@ -0,0 +1 @@
+{% yield head %}

data/test/source/_plugins/awesome-sauce/config.yml

@@ -0,0 +1,2 @@
+test: config from plugin
+test_override: also config from plugin

data/test/source/_plugins/test-theme/config.yml

@@ -0,0 +1,2 @@
+test: config from theme
+test_override: also config from theme

data/test/source/tag_tests/content_for.html

@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: content_for
 ---
 {% content_for foo %}
 Testing content for

data/test/source/tag_tests/footer.html

@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: content_for
 ---
 {% footer %}
 This should go in the footer

data/test/source/tag_tests/head.html

@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: head
 ---
 {% head %}
 Testing head tag

data/test/source/tag_tests/include_theme.html

@@ -1,4 +1,4 @@
 ---
 ---
 Testing theme include
-{% include theme:foo.html greeting="Yo Dawg" %}
+{% include theme:greet.html greeting="Yo Dawg" %}

data/test/source/tag_tests/scripts.html

@@ -1,5 +1,5 @@
 ---
-layout: default
+layout: content_for
 ---
 {% scripts %}
 Testing scripts

data/test/source/test_config/plugin_config.html

@@ -0,0 +1,4 @@
+---
+---
+{{ plugins.awesome-sauce.test }}
+{{ plugins.awesome-sauce.test_override }}

data/test/source/test_config/theme_config.html

@@ -0,0 +1,4 @@
+---
+---
+{{ theme.test }}
+{{ theme.test_override }}

data/test/test.rb

@@ -42,6 +42,11 @@ def test_layouts(dir)
   layouts.each { |file| test("layout_tests/#{file}.html", dir) }
 end
 
+def test_configs(dir)
+  configs = %w{plugin_config theme_config}
+  configs.each { |file| test("test_config/#{file}.html", dir) }
+end
+
 def test_stylesheets(dir, concat_css=true)
   if concat_css
     stylesheets = %w{all-* print-*}
@@ -61,6 +66,7 @@ end
 test_tags('expected')
 test_layouts('expected')
 test_stylesheets('concat_css')
+test_configs('expected')
 
 build '_concat_css_false.yml'
 test_stylesheets('concat_css_false', false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.17
+  version: 1.0.0.alpha.18
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -97,6 +97,7 @@ files:
 - lib/octopress-ink.rb
 - lib/octopress-ink/assets.rb
 - lib/octopress-ink/assets/asset.rb
+- lib/octopress-ink/assets/config.rb
 - lib/octopress-ink/assets/include.rb
 - lib/octopress-ink/assets/javascript.rb
 - lib/octopress-ink/assets/layout.rb
@@ -149,6 +150,8 @@ files:
 - test/expected/tag_tests/include_theme.html
 - test/expected/tag_tests/include_theme_override.html
 - test/expected/tag_tests/scripts.html
+- test/expected/test_config/plugin_config.html
+- test/expected/test_config/theme_config.html
 - test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
 - test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
@@ -168,22 +171,29 @@ files:
 - test/site/tag_tests/include_theme.html
 - test/site/tag_tests/include_theme_override.html
 - test/site/tag_tests/scripts.html
+- test/site/test_config/plugin_config.html
+- test/site/test_config/theme_config.html
 - test/source/.gitignore
+- test/source/_custom/awesome-sauce/config.yml
+- test/source/_custom/theme/config.yml
 - test/source/_custom/theme/includes/bar.html
 - test/source/_custom/theme/layouts/test.html
 - test/source/_custom/theme/stylesheets/_colors.sass
 - test/source/_custom/theme/stylesheets/theme-test.css
 - test/source/_includes/foo.html
-- test/source/_layouts/default.html
+- test/source/_layouts/content_for.html
+- test/source/_layouts/head.html
 - test/source/_layouts/local.html
+- test/source/_plugins/awesome-sauce/config.yml
 - test/source/_plugins/awesome-sauce/includes/some-include.html
 - test/source/_plugins/awesome-sauce/layouts/test-layout.html
 - test/source/_plugins/awesome-sauce/stylesheets/plugin-media-test.css
 - test/source/_plugins/awesome-sauce/stylesheets/plugin-test.css
 - test/source/_plugins/bundler.rb
+- test/source/_plugins/test-theme/config.yml
 - test/source/_plugins/test-theme/files/test.html
 - test/source/_plugins/test-theme/includes/bar.html
-- test/source/_plugins/test-theme/includes/foo.html
+- test/source/_plugins/test-theme/includes/greet.html
 - test/source/_plugins/test-theme/javascripts/bar.js
 - test/source/_plugins/test-theme/javascripts/foo.js
 - test/source/_plugins/test-theme/layouts/default.html
@@ -209,6 +219,8 @@ files:
 - test/source/tag_tests/include_theme.html
 - test/source/tag_tests/include_theme_override.html
 - test/source/tag_tests/scripts.html
+- test/source/test_config/plugin_config.html
+- test/source/test_config/theme_config.html
 - test/test.rb
 homepage: https://github.com/octopress/ink
 licenses:
@@ -262,6 +274,8 @@ test_files:
 - test/expected/tag_tests/include_theme.html
 - test/expected/tag_tests/include_theme_override.html
 - test/expected/tag_tests/scripts.html
+- test/expected/test_config/plugin_config.html
+- test/expected/test_config/theme_config.html
 - test/sass_compact/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
 - test/sass_compact/stylesheets/print-0dc274efb4e3fba0ae71bd22eef6fb38.css
 - test/sass_expanded/stylesheets/all-e10f647557c9d610df6df40a458bc823.css
@@ -281,22 +295,29 @@ test_files:
 - test/site/tag_tests/include_theme.html
 - test/site/tag_tests/include_theme_override.html
 - test/site/tag_tests/scripts.html
+- test/site/test_config/plugin_config.html
+- test/site/test_config/theme_config.html
 - test/source/.gitignore
+- test/source/_custom/awesome-sauce/config.yml
+- test/source/_custom/theme/config.yml
 - test/source/_custom/theme/includes/bar.html
 - test/source/_custom/theme/layouts/test.html
 - test/source/_custom/theme/stylesheets/_colors.sass
 - test/source/_custom/theme/stylesheets/theme-test.css
 - test/source/_includes/foo.html
-- test/source/_layouts/default.html
+- test/source/_layouts/content_for.html
+- test/source/_layouts/head.html
 - test/source/_layouts/local.html
+- test/source/_plugins/awesome-sauce/config.yml
 - test/source/_plugins/awesome-sauce/includes/some-include.html
 - test/source/_plugins/awesome-sauce/layouts/test-layout.html
 - test/source/_plugins/awesome-sauce/stylesheets/plugin-media-test.css
 - test/source/_plugins/awesome-sauce/stylesheets/plugin-test.css
 - test/source/_plugins/bundler.rb
+- test/source/_plugins/test-theme/config.yml
 - test/source/_plugins/test-theme/files/test.html
 - test/source/_plugins/test-theme/includes/bar.html
-- test/source/_plugins/test-theme/includes/foo.html
+- test/source/_plugins/test-theme/includes/greet.html
 - test/source/_plugins/test-theme/javascripts/bar.js
 - test/source/_plugins/test-theme/javascripts/foo.js
 - test/source/_plugins/test-theme/layouts/default.html
@@ -322,4 +343,6 @@ test_files:
 - test/source/tag_tests/include_theme.html
 - test/source/tag_tests/include_theme_override.html
 - test/source/tag_tests/scripts.html
+- test/source/test_config/plugin_config.html
+- test/source/test_config/theme_config.html
 - test/test.rb

data/test/source/_layouts/default.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    {% yield head %}
-  </head>
-  <body>
-    {% yield foo %}
-    {% wrap_yield footer %}<footer>{= yield }</footer>{% endwrap_yield %}
-    {% yield scripts %}
-  </body>
-</html>