puffer_pages 0.0.5 → 0.0.6

data/README.md

@@ -26,7 +26,7 @@ namespace :admin do
   resources :layouts
   resources :snippets
 end
-<pre>
+</pre>
 
 ## Introduction.
 
@@ -50,7 +50,15 @@ In puffer pages you can use puffer pages layouts or applcation layouts.
 For puffer pages layouts page parts placeholder is liquid tag yield.
 <pre>{% yield [page_part_name] %}</pre>
 
-If no page_part_name specified, puffer layout will use page part with default name (`body`). You can change defaul page part name in puffer pages setup initializer.
+If no page_part_name specified, puffer layout will use page part with default name ('body'). You can change defaul page part name in puffer pages setup initializer.
+
+Ex.
+<pre>
+  {% yield %} # renders body
+  {% yield 'sidebar' %} # renders sidebar
+  {% assign sb = 'sidebar' %}
+  {% yield sb %} # renders sidebar too
+</pre>
 
 ### Application layouts.
 For application layout page part body will be inserted instead of SUDDENLY! <%= yield %>

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/app/models/page.rb

@@ -99,7 +99,7 @@ class Page < ActiveRecord::Base
   end
 
   def part name
-    inherited_page_parts.detect {|part| part.name = name}
+    inherited_page_parts.detect {|part| part.name == name}
   end
 
   def is_layout?

data/lib/puffer_pages/liquid/tags/yield.rb

@@ -3,20 +3,20 @@ module PufferPages
     module Tags
 
       class Yield < ::Liquid::Tag
-        Syntax = /(\w+)/
+        Syntax = /(#{::Liquid::QuotedFragment}+)/
 
         def initialize(tag_name, markup, tokens)
           if markup =~ Syntax
             @name = $1
           else
-            @name = PufferPages.primary_page_part_name
+            @name = "'#{PufferPages.primary_page_part_name}'"
           end
 
           super
         end
 
         def render(context)
-          swallow_nil{context.registers[:page].part(@name).render(context)}
+          context.registers[:page].part(context[@name]).render(context)
         end
       end
 

data/puffer_pages.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
@@ -126,6 +126,7 @@ Gem::Specification.new do |s|
     "spec/fabricators/pages_fabricator.rb",
     "spec/integration/navigation_spec.rb",
     "spec/models/page_spec.rb",
+    "spec/models/tags_spec.rb",
     "spec/puffer_pages_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -165,6 +166,7 @@ Gem::Specification.new do |s|
     "spec/fabricators/pages_fabricator.rb",
     "spec/integration/navigation_spec.rb",
     "spec/models/page_spec.rb",
+    "spec/models/tags_spec.rb",
     "spec/puffer_pages_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/models/page_spec.rb

@@ -122,9 +122,9 @@ describe Page do
     end
 
     it 'should render layout' do
-      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% yield %} {% yield sidebar %}"
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "|{% yield %}|{% yield 'sidebar' %}|{% assign sb = 'sidebar' %}|{% yield sb %}|"
       result = @root.render 'self' => PufferPages::Liquid::PageDrop.new(@root)
-      result.should == "#{@root.title} #{@root.name}"
+      result.should == "|#{@root.title}|#{@root.name}||#{@root.name}|"
     end
 
   end

data/spec/models/tags_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe 'Tags' do
+
+  #describe 'yield' do
+
+  #end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer_pages
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - pyromaniac
@@ -313,6 +313,7 @@ files:
 - spec/fabricators/pages_fabricator.rb
 - spec/integration/navigation_spec.rb
 - spec/models/page_spec.rb
+- spec/models/tags_spec.rb
 - spec/puffer_pages_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -381,5 +382,6 @@ test_files:
 - spec/fabricators/pages_fabricator.rb
 - spec/integration/navigation_spec.rb
 - spec/models/page_spec.rb
+- spec/models/tags_spec.rb
 - spec/puffer_pages_spec.rb
 - spec/spec_helper.rb