puffer_pages 0.0.9 → 0.0.10

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem 'rails', '~> 3.0.3'
-gem 'liquid'
+gem 'liquid', :git => 'git://github.com/tobi/liquid.git'
 gem 'nested_set'
 gem 'puffer', '>= 0.0.17'
 

data/Gemfile.lock

@@ -1,3 +1,9 @@
+GIT
+  remote: git://github.com/tobi/liquid.git
+  revision: 7bbb4ff84f192a6a2292e8bf16e1049cad34d763
+  specs:
+    liquid (2.2.2)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -65,7 +71,6 @@ GEM
       git (>= 1.2.5)
       rake
     json_pure (1.5.1)
-    liquid (2.2.2)
     mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -146,7 +151,7 @@ DEPENDENCIES
   fabrication (= 0.9.2)
   forgery
   jeweler
-  liquid
+  liquid!
   mongrel
   mysql
   nested_set

data/README.md

@@ -1,3 +1,6 @@
+# Warning! This puffer_pages version requires liquid from repo. So, add following line to your Gemfile until new liquid version will release.
+<pre>gem 'liquid', :git => 'git://github.com/tobi/liquid.git'</pre>
+
 # Puffer_pages is lightweight rails 3 CMS
 
 Interface of pages based on [puffer](https://github.com/puffer/puffer)
@@ -44,20 +47,19 @@ Puffer_pages use liquid as template language.
 ## Pages
 Pages - tree-based structure of site.
 Every page has one or more page parts.
-Every page part must have main page part, named by default `body`. You can configure main page part name in config/initializers/puffer_pages.rb
 
 ## PageParts
-Page_parts are the same as content_for block in rails. You can insert current page page_patrs at layout.
+Page_parts are the same as content_for block content in rails. You can insert current page page_patrs at layout.
 Also, page_parts are inheritable. It means, that if root has page_part named `sidebar`, all its children will have the same page_part until this page_part will be redefined.
+Every page part must have main page part, named by default `body`. You can configure main page part name in config/initializers/puffer_pages.rb
 
 ## Layouts
 Layout is page canvas, so you can draw page parts on it.
-You can use layouts from database or applcation for pages.
+You can use layouts from database or rails applcation layouts for pages.
 
-### Application layouts
+### Rails application layouts
 For application layout page_part body will be inserted instead of SUDDENLY! <%= yield %>
-Rules are the same. If no page part name specified puffer will use page part with default name.
-See `yield` liquid tag reference
+For yield with no parans specified puffer will use page part with default page_part name.
 
 So, main page part is action view and other are partials. So easy.
 
@@ -72,29 +74,22 @@ This variables accessible from every page:
 <pre>{{ root.name }}</pre>
 Both `self` and `root` are instances of page drop. View [this](https://github.com/puffer/puffer_pages/blob/master/lib/puffer_pages/liquid/page_drop.rb) to find list of possible page drop methods
 
-### yield
-<pre>{% yield [page_part_name] %}</pre>
-`yield` tag is page part or actionview `content_for` placeholder.
-
-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.
+### include
+`include` is standart liquid tag with pudder data model 'file_system'
 
-Usage example:
-<pre>
-  {% yield %} # renders body
-  {% yield 'sidebar' %} # renders sidebar
-  {% assign sb = 'sidebar' %}
-  {% yield sb %} # renders sidebar too
-</pre>
+#### for page_parts
+Use include tag for current page page_parts inclusion:
+<pre>{% include 'page_part_name' %}</pre>
 
-### render_snippet
-<pre>{% render_snippet snippet_name %}</pre>
-Renders specified snippet`s content.
+#### for snippets
+To include snippet use this path form:
+<pre>{% include 'snippets/snippet_name' %}</pre>
 
 Usage example:
 <pre>
-  {% render_snippet 'navigation' %}
-  {% assign nav = 'navigation' %}
-  {% render_snippet nav %}
+  {% include 'sidebar' %} # this will render 'sidebar' page_part
+  {% assign navigation = 'snippets/navigation' %}
+  {% include navigation %} # this will render 'navigation' snippet
 </pre>
 
 ### stylesheets, javascripts

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/app/models/page.rb

@@ -68,9 +68,9 @@ class Page < ActiveRecord::Base
   def render(drops_or_context)
     if inherited_layout
       @template = Liquid::Template.parse(inherited_layout.body)
-      tracker.cleanup @template.render(drops_or_context, :registers => {:tracker => tracker, :page => self})
+      tracker.cleanup @template.render(drops_or_context, :registers => {:tracker => tracker, :page => self, :file_system => PufferPages::Liquid::FileSystem.new})
     else
-      inherited_page_parts.map{|part| part.render(drops_or_context, true)}.join
+      inherited_page_parts.map{|part| part.render(drops_or_context, self)}.join
     end
   end
 

data/app/models/page_part.rb

@@ -4,10 +4,10 @@ class PagePart < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => :page_id
 
-  def render(drops_or_context, wrap = false)
+  def render(drops_or_context, page = nil)
     template = Liquid::Template.parse(body)
-    result = tracker.cleanup template.render(drops_or_context, :registers => {:tracker => tracker})
-    main? ? result : (wrap ? "<% content_for :#{name} do %>#{result}<% end %>" : result)
+    result = tracker.cleanup template.render(drops_or_context,  :registers => {:tracker => tracker, :page => page, :file_system => PufferPages::Liquid::FileSystem.new})
+    main? ? result : "<% content_for :#{name} do %>#{result}<% end %>"
   end
 
   def tracker

data/app/models/snippet.rb

@@ -1,14 +1,4 @@
 class Snippet < ActiveRecord::Base
   validates_presence_of :name
   validates_uniqueness_of :name
-
-  def render(drops_or_context)
-    template = Liquid::Template.parse(body)
-    tracker.cleanup template.render(drops_or_context, :registers => {:tracker => tracker})
-  end
-
-  def tracker
-    @tracker ||= PufferPages::Liquid::Tracker.new
-  end
-
 end

data/lib/puffer_pages.rb

@@ -19,8 +19,7 @@ require 'nested_set'
 require 'puffer_pages/engine'
 require 'puffer_pages/extensions/core'
 require 'puffer_pages/extensions/mapper'
-require 'puffer_pages/liquid/tags/yield'
-require 'puffer_pages/liquid/tags/render_snippet'
+#require 'puffer_pages/liquid/tags/yield'
 require 'puffer_pages/liquid/tags/stylesheets'
 require 'puffer_pages/liquid/tags/javascripts'
 

data/lib/puffer_pages/liquid/file_system.rb

@@ -0,0 +1,28 @@
+module PufferPages
+  module Liquid
+    class FileSystem < ::Liquid::BlankFileSystem
+
+      def read_template_file(context, template_name)
+        template_path = context[template_name]
+
+        case template_type template_path
+        when :snippet then
+          template_path = template_path.gsub(/^snippets\//, '')
+          snippet = Snippet.find_by_name(template_path)
+          raise FileSystemError, "No such snippet '#{template_path}' found" unless snippet
+          snippet.body
+        when :page_part then
+          page_part = context.registers[:page].part(template_path)
+          raise FileSystemError, "No such page_part '#{template_path}' found for current page" unless page_part
+          page_part.body
+        end
+      end
+
+      def template_type template_path
+        return :snippet if template_path.start_with? 'snippets/'
+        return :page_part
+      end
+
+    end
+  end
+end

data/lib/puffer_pages/liquid/page_drop.rb

@@ -2,40 +2,61 @@ module PufferPages
   module Liquid
     class PageDrop < ::Liquid::Drop
 
+      include ActionController::UrlFor
+      include Rails.application.routes.url_helpers
+
       def initialize page, request = nil
         @page, @request = page, request
       end
 
       (%w(name title description keywords created_at updated_at) + Page.statuses.map{|s| "#{s}?"}).each do |attribute|
         define_method attribute do
-          @page.send(attribute)
+          page.send(attribute)
         end
       end
 
       def parent
-        @parent ||= self.class.new(@page.parent, @request)
+        @parent ||= self.class.new(page.parent, @request)
       end
 
-      %w(children ancestors).each do |attribute|
+      %w(ancestors children).each do |attribute|
         define_method attribute do
-          instance_variable_get("@#{attribute}") || instance_variable_set("@#{attribute}", @page.send(attribute).map{ |page| self.class.new(page, @request)})
+          instance_variable_get("@#{attribute}") || instance_variable_set("@#{attribute}", page.send(attribute).map{ |ac| self.class.new(ac, request)})
         end
       end
 
       def ancestors?
-        !@page.root?
+        !page.root?
       end
 
       def children?
-        @page.children.present?
+        page.children.present?
       end
 
       def path
-        
+        puffer_page_path page.location
       end
 
       def url
-        
+        puffer_page_url page.location
+      end
+
+      def current?
+        path == request.path_info
+      end
+
+      def ancestor?
+        request.path_info.start_with? path
+      end
+
+    private
+
+      def request
+        @request
+      end
+
+      def page
+        @page
       end
 
     end

data/puffer_pages.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
@@ -62,9 +62,9 @@ Gem::Specification.new do |s|
     "lib/puffer_pages/engine.rb",
     "lib/puffer_pages/extensions/core.rb",
     "lib/puffer_pages/extensions/mapper.rb",
+    "lib/puffer_pages/liquid/file_system.rb",
     "lib/puffer_pages/liquid/page_drop.rb",
     "lib/puffer_pages/liquid/tags/javascripts.rb",
-    "lib/puffer_pages/liquid/tags/render_snippet.rb",
     "lib/puffer_pages/liquid/tags/stylesheets.rb",
     "lib/puffer_pages/liquid/tags/yield.rb",
     "lib/puffer_pages/liquid/tracker.rb",
@@ -130,6 +130,7 @@ Gem::Specification.new do |s|
     "spec/fabricators/pages_fabricator.rb",
     "spec/fabricators/snippets_fabricator.rb",
     "spec/integration/navigation_spec.rb",
+    "spec/lib/drops_spec.rb",
     "spec/lib/tags_spec.rb",
     "spec/models/page_spec.rb",
     "spec/puffer_pages_spec.rb",
@@ -172,6 +173,7 @@ Gem::Specification.new do |s|
     "spec/fabricators/pages_fabricator.rb",
     "spec/fabricators/snippets_fabricator.rb",
     "spec/integration/navigation_spec.rb",
+    "spec/lib/drops_spec.rb",
     "spec/lib/tags_spec.rb",
     "spec/models/page_spec.rb",
     "spec/puffer_pages_spec.rb",

data/spec/lib/drops_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe 'Drops' do
+
+  include 
+
+  def render_page(page, one_more = nil)
+    request = ActionController::TestRequest.new
+    request.env["rack.url_scheme"] = "http"
+    request.host = 'test.com'
+    request.port = 80
+    request.path = "/#{page.location}"
+    page.render 'self' => PufferPages::Liquid::PageDrop.new(page, request),
+      'page' => (PufferPages::Liquid::PageDrop.new(one_more, request) if one_more)
+  end
+
+  describe 'page drop' do
+
+    before :each do
+      @root = Fabricate :page, :layout_name => 'foo_layout'
+      @foo = Fabricate :page, :slug => 'hello', :parent => @root
+      @bar = Fabricate :page, :slug => 'world', :parent => @foo
+    end
+
+    it 'should render proper url and path' do
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{{ self.path }} {{ self.url }}"
+
+      render_page(@bar).should == '/hello/world http://test.com/hello/world'
+    end
+
+    it 'should render proper current?' do
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{{ page.current? }}"
+
+      render_page(@foo, @foo).should == 'true'
+      render_page(@foo, @root).should == 'false'
+      render_page(@foo, @bar).should ==  'false'
+    end
+
+    it 'should render proper ancestor?' do
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{{ page.ancestor? }}"
+
+      render_page(@foo, @foo).should == 'true'
+      render_page(@foo, @root).should == 'true'
+      render_page(@foo, @bar).should ==  'false'
+    end
+
+  end
+
+end

data/spec/lib/tags_spec.rb

@@ -6,7 +6,7 @@ describe 'Tags' do
     page.render 'self' => PufferPages::Liquid::PageDrop.new(page)
   end
 
-  describe 'yield' do
+  describe 'include page part' do
 
     before :each do
       @page = Fabricate :page, :layout_name => 'foo_layout'
@@ -15,37 +15,32 @@ describe 'Tags' do
       @page.page_parts = [@main, @sidebar]
     end
 
-    it 'should render yield without params' do
-      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% yield %}"
+    it 'should include page_part with string param' do
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% include 'body' %}"
       render_page(@page).should == @main.body
     end
 
-    it 'should render yield with string param' do
-      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% yield 'sidebar' %}"
-      render_page(@page).should == @sidebar.body
-    end
-
-    it 'should render yield with variable param' do
-      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% assign sb = 'sidebar' %}{% yield sb %}"
+    it 'should include page_part with variable param' do
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% assign sb = 'sidebar' %}{% include sb %}"
       render_page(@page).should == @sidebar.body
     end
 
   end
 
-  describe 'render_snippet' do
+  describe 'include snippet' do
 
     before :each do
       @page = Fabricate :page, :layout_name => 'foo_layout'
       @snippet = Fabricate :snippet, :name => 'snip', :body => 'snippet body'
     end
 
-    it 'should render render_snippet with string param' do
-      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% render_snippet 'snip' %}"
+    it 'should include snippet with string param' do
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% include 'snippets/snip' %}"
       render_page(@page).should == @snippet.body
     end
 
-    it 'should render render_snippet with variable param' do
-      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% assign sn = 'snip' %}{% render_snippet sn %}"
+    it 'should include snippet with variable param' do
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% assign sn = 'snippets/snip' %}{% include sn %}"
       render_page(@page).should == @snippet.body
     end
 

data/spec/models/page_spec.rb

@@ -122,7 +122,7 @@ 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 => "{% include 'body' %} {% include 'sidebar' %}"
       result = @root.render 'self' => PufferPages::Liquid::PageDrop.new(@root)
       result.should == "#{@root.title} #{@root.name}"
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer_pages
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - pyromaniac
@@ -277,9 +277,9 @@ files:
 - lib/puffer_pages/engine.rb
 - lib/puffer_pages/extensions/core.rb
 - lib/puffer_pages/extensions/mapper.rb
+- lib/puffer_pages/liquid/file_system.rb
 - lib/puffer_pages/liquid/page_drop.rb
 - lib/puffer_pages/liquid/tags/javascripts.rb
-- lib/puffer_pages/liquid/tags/render_snippet.rb
 - lib/puffer_pages/liquid/tags/stylesheets.rb
 - lib/puffer_pages/liquid/tags/yield.rb
 - lib/puffer_pages/liquid/tracker.rb
@@ -345,6 +345,7 @@ files:
 - spec/fabricators/pages_fabricator.rb
 - spec/fabricators/snippets_fabricator.rb
 - spec/integration/navigation_spec.rb
+- spec/lib/drops_spec.rb
 - spec/lib/tags_spec.rb
 - spec/models/page_spec.rb
 - spec/puffer_pages_spec.rb
@@ -416,6 +417,7 @@ test_files:
 - spec/fabricators/pages_fabricator.rb
 - spec/fabricators/snippets_fabricator.rb
 - spec/integration/navigation_spec.rb
+- spec/lib/drops_spec.rb
 - spec/lib/tags_spec.rb
 - spec/models/page_spec.rb
 - spec/puffer_pages_spec.rb

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

@@ -1,33 +0,0 @@
-module PufferPages
-  module Liquid
-    module Tags
-
-      class RenderSnippet < ::Liquid::Tag
-        Syntax = /^(#{::Liquid::QuotedFragment})/
-
-        def initialize(tag_name, markup, tokens)
-          if markup =~ Syntax
-            @name = $1
-          else
-            raise SyntaxError.new("Syntax Error in 'render_snippet' - Valid syntax: render_snippet snipper_name")
-          end
-
-          super
-        end
-
-        def render(context)
-          name = context[@name]
-          snippet = Snippet.find_by_name(name)
-          if snippet
-            snippet.render(context)
-          else
-            raise ArgumentError.new("Argument error in 'render_snippet' - Can not find snippet named '#{name}'")
-          end
-        end
-      end
-
-    end
-  end
-end
-
-Liquid::Template.register_tag('render_snippet', PufferPages::Liquid::Tags::RenderSnippet)