octopress-content-for 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96c8d953843aef7083c7db9a31f17acd3910b549
-  data.tar.gz: 2c50614d35eee47c8d4602e4efb004e426cfd79d
+  metadata.gz: 30eb3fa2dda34869a8f7f55a0091c690230d55df
+  data.tar.gz: d971ad2695c8633681a3b29efa8aeb7eaec1e6b5
 SHA512:
-  metadata.gz: 2be1b43740367b84a9945e9c415c0abc12cd9a8ac82846531c70f30c394dab98ac589f9ab90160fdc2d94d3799bfebaed8d7f2febb9ac2e359eb8e0a37df2f08
-  data.tar.gz: 4ecad08bc747142b648237ffe49466a222ad687a31d838eeed116f09a58adb7f1ec8fb78514e50a3a219893a9b4b76b4dd7391d4a1e680f2c8ed74dd56fc4ba5
+  metadata.gz: 0f001dacb982a5d94418d5ce991ea9937fa59f9930c2cea3fefe90660caa9854d8d5afe7f257da83940002fc5f9735d938e4e25b4e037b939fa05f34d5239a42
+  data.tar.gz: cb3b8d567b6518a9a562eee73231139e8b5897c610afae63170871a3b241aea57790c43e14ebe9c1fb9f8f33dfae4452202857554e0fb83b8e326b465212dd87

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
-script: cd test && bundle exec clash
+script: bundle exec clash test

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.0.1 - 2015-01-11
+
+- Added support for Octopress docs
+- Updated readme
+
 ### 1.0.1 - 2014-07-16
 
 - Fixed Octopress Ink docs plugin.

data/README.md

@@ -8,44 +8,52 @@ Add content_for and yield tags to Jekyll with conditional rendering and in-line
 
 ## Installation
 
-Add this line to your application's Gemfile:
+If you're using bundler add this gem to your site's Gemfile in the `:jekyll_plugins` group:
 
-    gem 'octopress-content-for'
+    group :jekyll_plugins do
+      gem 'octopress-content-for'
+    end
 
-And then execute:
+Then install the gem with Bundler
 
     $ bundle
 
-Or install it yourself as:
+To install manually without bundler:
 
     $ gem install octopress-content-for
 
-Next add it to your gems list in Jekyll's `_config.yml`
+Then add the gem to your Jekyll configuration.
 
     gems:
-      - octopress-content-for
+      -octopress-content-for
 
 ## Usage
 
 Use it like a typical `content_for` tag.
 
-    {% content_for awesome_content %}
-    some content
-    {% endcontent_for %}
+```
+{% content_for awesome_content %}
+some content
+{% endcontent_for %}
 
-    {% yield awesome_content %}  //=> some content
+{% yield awesome_content %}  //=> some content
+```
 
 Use in-line filters.
 
-    {% yield awesome_content | upcase %}  //=> SOME CONTENT
+```
+{% yield awesome_content | upcase %}  //=> SOME CONTENT
+```
 
 Use conditional rendering in both `content_for` and `yield` tags.
 
-    {% content_for footer unless page.footer == false %}
-    Footer!
-    {% endcontent_for %}
+```
+{% content_for footer unless page.footer == false %}
+Footer!
+{% endcontent_for %}
 
-    {% yield footer if page.footer %}
+{% yield footer if page.footer %}
+```
 
 ## Contributing
 

data/assets/docs/changelog.markdown

@@ -3,6 +3,10 @@ title: "Changelog"
 permalink: /changelog/
 ---
 
+### 1.0.1 - 2014-07-16
+
+- Fixed Octopress Ink docs plugin.
+
 ### 1.0.0 - 2014-07-15
 
 - Initial release

data/assets/docs/index.markdown

@@ -22,6 +22,11 @@ Or install it yourself as:
 
     $ gem install octopress-content-for
 
+Next add it to your gems list in Jekyll's `_config.yml`
+
+    gems:
+      - octopress-content-for
+
 ## Usage
 
 Use it like a typical `content_for` tag.

data/lib/octopress-content-for.rb

@@ -1,5 +1,4 @@
 require "octopress-content-for/version"
-require "octopress-content-for/ink-plugin"
 require "octopress-tag-helpers"
 
 module Octopress
@@ -57,3 +56,14 @@ end
 
 Liquid::Template.register_tag('content_for', Octopress::Tags::ContentFor::Tag)
 Liquid::Template.register_tag('yield', Octopress::Tags::Yield::Tag)
+
+if defined? Octopress::Docs
+  Octopress::Docs.add({
+    name:        "Octopress Content For",
+    gem:         "octopress-content-for",
+    version:     Octopress::Tags::ContentFor::VERSION,
+    description: "A framework for writing Jekyll sites ",
+    path:        File.expand_path(File.join(File.dirname(__FILE__), "../")),
+    source_url:  "https://github.com/octopress/content-for"
+  })
+end

data/lib/octopress-content-for/version.rb

@@ -1,7 +1,7 @@
 module Octopress
   module Tags
     module ContentFor
-      VERSION = "1.0.1"
+      VERSION = "1.0.2"
     end
   end
 end

data/test/_site/content_for.html

@@ -0,0 +1,20 @@
+HEAD
+Testing
+content_for
+→ 
+Testing
+content_for
+
+
+GOOOOOOOAL! → GOOOOOOOAL!
+
+
+'' → ''
+
+
+'' → ''
+
+
+
+
+FEET

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-content-for
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-tag-helpers
@@ -102,6 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".clash.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -112,17 +113,12 @@ files:
 - assets/docs/changelog.markdown
 - assets/docs/index.markdown
 - lib/octopress-content-for.rb
-- lib/octopress-content-for/content-for.rb
-- lib/octopress-content-for/ink-plugin.rb
 - lib/octopress-content-for/version.rb
-- lib/octopress-content-for/yield.rb
 - octopress-content-for.gemspec
-- test/.clash.yml
-- test/.gitignore
-- test/Gemfile
 - test/_config.yml
 - test/_expected/content_for.html
 - test/_layouts/default.html
+- test/_site/content_for.html
 - test/content_for.html
 homepage: https://github.com/octopress/content-for
 licenses:
@@ -150,10 +146,8 @@ specification_version: 4
 summary: Jekyll content_for and yield tags with conditional rendering and in-line
   filters
 test_files:
-- test/.clash.yml
-- test/.gitignore
-- test/Gemfile
 - test/_config.yml
 - test/_expected/content_for.html
 - test/_layouts/default.html
+- test/_site/content_for.html
 - test/content_for.html

data/lib/octopress-content-for/content-for.rb

@@ -1,25 +0,0 @@
-# Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
-#
-module Octopress
-  module Tags
-    module ContentFor
-      class Tag < Liquid::Block
-
-        def initialize(tag_name, markup, tokens)
-          super
-          @tag_name = tag_name
-          @markup   = markup
-        end
-
-        def render(context)
-          return unless markup = TagHelpers::Conditional.parse(@markup, context)
-
-          @block_name ||= TagHelpers::ContentFor.get_block_name(@tag_name, markup)
-          TagHelpers::ContentFor.append_to_block(context, @block_name, super)
-          ''
-        end
-      end
-    end
-  end
-end
-

data/lib/octopress-content-for/ink-plugin.rb

@@ -1,11 +0,0 @@
-begin
-  require 'octopress-ink'
-
-  Octopress::Ink.add_plugin({
-    name:        'Content For',
-    assets_path: File.join(File.expand_path(File.dirname(__FILE__)), '../../assets' ),
-    description: "Add content_for and yield tags to Jekyll with conditional rendering and in-line filters."
-  })
-rescue LoadError
-end
-

data/lib/octopress-content-for/yield.rb

@@ -1,36 +0,0 @@
-# Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
-#
-module Octopress
-  module Tags
-    module Yield
-      class Tag < Liquid::Tag
-
-        def initialize(tag_name, markup, tokens)
-          if markup.strip == ''
-            raise IOError.new "Yield failed: {% #{tag_name} #{markup}%}. Please provide a block name to yield. - Syntax: {% yield block_name %}"
-          end
-
-          super
-          @markup = markup
-          if markup =~ TagHelpers::Var::HAS_FILTERS
-            markup = $1
-            @filters = $2
-          end
-          @block_name = TagHelpers::ContentFor.get_block_name(tag_name, markup)
-        end
-
-        def render(context)
-          return unless markup = TagHelpers::Conditional.parse(@markup, context)
-          content = TagHelpers::ContentFor.render(context, @block_name)
-
-          unless content.nil? || @filters.nil?
-            content = TagHelpers::Var.render_filters(content, @filters, context)
-          end
-
-          content
-        end
-      end
-    end
-  end
-end
-

data/test/.gitignore

@@ -1 +0,0 @@
-_site

data/test/Gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'octopress-content-for', path: '../'
-gem 'pry-debugger'
-gem 'clash'