octopress-ink 1.0.0.alpha.28 → 1.0.0.alpha.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc46c805b9c9408a12e59be45bce38d1e60a9b98
-  data.tar.gz: f3235034540210c39d801bfc0afb6cd2d7b7d3a2
+  metadata.gz: 1b32b9130d0f7aa2c02fd31e843550e1f3fe76fe
+  data.tar.gz: 46be5b6827a83af4a481ab318f425a2cf406f477
 SHA512:
-  metadata.gz: 5448ac1ba45a66b2a692f1ffb1acc3e7955ac1639bb6df01d5f8c92c128edc7dedb8b7e00a47fefd0f6bc790bad94a57bf0c749b3af4ee62eb47ae44fdc991d0
-  data.tar.gz: 060ba433677737ad6fddc84b15b41016784c0c6a5c6138d10e987900b6590391729929c03eaae5d3dccd935b10b201067b45639d4de90fbab07a6ef6c5b0ca40
+  metadata.gz: 2a6ac361f9f02a354888431144e604cf36c6c1067066a2dd3526722ce0f228a3a77b96e894c6254c8ca32f99cd7d224e29fd60b863dc416a286fef466527ef4e
+  data.tar.gz: cd09c65826a81d14f74f9549511869ccfb23057211cc860e2c929e30538d2800729e5cf0706271f0c5522f9e1318f6e7e8fec9e4caf6784f607e0a5e3fcadc1b

data/lib/octopress-ink.rb

@@ -35,10 +35,7 @@ Liquid::Template.register_tag('return', Octopress::Tags::ReturnTag)
 Liquid::Template.register_tag('render', Octopress::Tags::RenderTag)
 Liquid::Template.register_tag('octopress_js', Octopress::Tags::JavascriptTag)
 Liquid::Template.register_tag('octopress_css', Octopress::Tags::StylesheetTag)
-Liquid::Template.register_tag('content_for', Octopress::Tags::ContentForBlock)
-Liquid::Template.register_tag('head', Octopress::Tags::HeadBlock)
-Liquid::Template.register_tag('footer', Octopress::Tags::FooterBlock)
-Liquid::Template.register_tag('scripts', Octopress::Tags::ScriptsBlock)
+Liquid::Template.register_tag('content_for', Octopress::Tags::ContentForTag)
 Liquid::Template.register_tag('yield', Octopress::Tags::YieldTag)
 Liquid::Template.register_tag('wrap', Octopress::Tags::WrapTag)
 Liquid::Template.register_tag('_', Octopress::Tags::LineCommentTag)

data/lib/octopress-ink/tags.rb

@@ -7,11 +7,8 @@ module Octopress
     autoload :CaptureTag,           'octopress-ink/tags/capture'
     autoload :JavascriptTag,        'octopress-ink/tags/javascript'
     autoload :StylesheetTag,        'octopress-ink/tags/stylesheet'
-    autoload :ContentForBlock,      'octopress-ink/tags/content_for'
-    autoload :HeadBlock,            'octopress-ink/tags/head'
-    autoload :FooterBlock,          'octopress-ink/tags/footer'
+    autoload :ContentForTag,        'octopress-ink/tags/content_for'
     autoload :YieldTag,             'octopress-ink/tags/yield'
-    autoload :ScriptsBlock,         'octopress-ink/tags/scripts'
     autoload :WrapTag,              'octopress-ink/tags/wrap'
     autoload :LineCommentTag,       'octopress-ink/tags/line_comment'
   end

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

@@ -1,7 +1,7 @@
 # Inspired by jekyll-contentblocks https://github.com/rustygeldmacher/jekyll-contentblocks
 module Octopress
   module Tags
-    class ContentForBlock < Liquid::Block
+    class ContentForTag < Liquid::Block
 
       def initialize(tag_name, markup, tokens)
         super

data/lib/octopress-ink/version.rb

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

data/test/expected/test_tags/content_for.html

@@ -1,7 +1 @@
-Testing content for → Testing content for
-
-Testing scripts → Testing scripts
-
-Testing head tag → Testing head tag
-
-Testing footer → Testing footer
+Testing content_for → Testing content_for

data/test/site/test_tags/content_for.html

@@ -1,7 +1 @@
-Testing content for → Testing content for
-
-Testing scripts → Testing scripts
-
-Testing head tag → Testing head tag
-
-Testing footer → Testing footer
+Testing content_for → Testing content_for

data/test/source/test_tags/content_for.html

@@ -1,21 +1,7 @@
 ---
 ---
-Testing content for → {% content_for foo %}Testing content for{% endcontent_for %}{% yield foo %}
-
-Testing scripts → {% scripts %}
+Testing content_for → {% content_for test %}
 Testing
-{% endscripts %}{% scripts %}
-scripts
-{% endscripts %}{% yield scripts | join_space %}
-
-Testing head tag → {% head %}
-Testing
-{% endhead %}{% head %}
-head tag
-{% endhead %}{% yield head | join_space %}
-
-Testing footer → {% footer %}
-Testing
-{% endfooter %}{% footer %}
-footer
-{% endfooter %}{% yield footer | join_space %}
+{% endcontent_for %}{% content_for test %}
+content_for
+{% endcontent_for %}{% yield test | join_space %}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.28
+  version: 1.0.0.alpha.29
 platform: ruby
 authors:
 - Brandon Mathis
@@ -122,14 +122,11 @@ files:
 - lib/octopress-ink/tags/assign.rb
 - lib/octopress-ink/tags/capture.rb
 - lib/octopress-ink/tags/content_for.rb
-- lib/octopress-ink/tags/footer.rb
-- lib/octopress-ink/tags/head.rb
 - lib/octopress-ink/tags/include.rb
 - lib/octopress-ink/tags/javascript.rb
 - lib/octopress-ink/tags/line_comment.rb
 - lib/octopress-ink/tags/render.rb
 - lib/octopress-ink/tags/return.rb
-- lib/octopress-ink/tags/scripts.rb
 - lib/octopress-ink/tags/stylesheet.rb
 - lib/octopress-ink/tags/wrap.rb
 - lib/octopress-ink/tags/yield.rb

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

@@ -1,11 +0,0 @@
-module Octopress
-  module Tags
-    class FooterBlock < ContentForBlock
-      def initialize(tag_name, markup, tokens)
-        @block_name = 'footer'
-        @markup = markup
-        super
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Octopress
-  module Tags
-    class HeadBlock < ContentForBlock
-      def initialize(tag_name, markup, tokens)
-        @block_name = 'head'
-        @markup = markup
-        super
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Octopress
-  module Tags
-    class ScriptsBlock < ContentForBlock
-      def initialize(tag_name, markup, tokens)
-        @block_name = 'scripts'
-        @markup = markup
-        super
-      end
-    end
-  end
-end