puffer_pages 0.0.7 → 0.0.8

data/README.md

@@ -8,12 +8,15 @@ Interface of pages based on [puffer](https://github.com/puffer/puffer)
 * Flexibility. Puffer designed to be as flexible as possible, so you can create your own functionality easily.
 * Layouts. You can use rails layouts for pages and you can use pages as action layouts!
 
-## Installation.
+## Installation
 
 You can instal puffer as a gem:
 <pre>gem install puffer_pages</pre>
 Or in Gemfile:
 <pre>gem "puffer_pages"</pre>
+
+Did you install [puffer](https://github.com/puffer/puffer) properly?
+
 Next step is:
 <pre>rails g puffer_pages:install</pre>
 This will install puffer_pages config file in your initializers, some css/js, controllers and migrations
@@ -28,7 +31,7 @@ namespace :admin do
 end
 </pre>
 
-## Introduction.
+## Introduction
 
 The first thing, you should do - setup routes if you want pages path different from /(*path).
 Just put in your routes.rb:
@@ -38,26 +41,27 @@ Default pages route you can see with rake routes.
 Puffer_pages is radiant-like cms, so it has layouts, snippets and pages.
 Puffer_pages use liquid as template language.
 
-## Pages.
+## 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
 
-## Layouts.
+## Layouts
 Layout is page canvas, so you can draw page parts on it.
 You can use layouts from database or applcation for pages.
 
-### Application layouts.
+### 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
 
 So, main page part is action view and other are partials. So easy.
 
-## [Liquid](http://github.com/tobi/liquid/).
+## [Liquid](http://github.com/tobi/liquid/)
 
-### Variables.
+### Variables
 This variables accessible from every page:
+
 * self - current page reference.
 <pre>{{ self.name }}</pre>
 * root - root page reference.
@@ -70,7 +74,7 @@ Both `self` and `root` are instances of page drop. View [this](https://github.co
 
 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.
+Usage example:
 <pre>
   {% yield %} # renders body
   {% yield 'sidebar' %} # renders sidebar
@@ -82,10 +86,21 @@ Ex.
 <pre>{% render_snippet snippet_name %}</pre>
 Renders specified snippet`s content.
 
-Ex.
+Usage example:
 <pre>
   {% render_snippet 'navigation' %}
   {% assign nav = 'navigation' %}
   {% render_snippet nav %}
 </pre>
 
+### stylesheets, javascripts
+<pre>{% stylesheets path [, path, path ...] %}</pre>
+Both tags syntax is equal
+Tags renders rail`s stylesheet_link_tag or javascript_include_tag.
+
+Usage example:
+<pre>
+  {% assign ctrl = 'controls' %}
+  {% javascripts 'prototype', ctrl %}
+</pre>
+

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/puffer_pages/liquid/page_drop.rb

@@ -31,11 +31,11 @@ module PufferPages
       end
 
       def path
-        @page.location
+        
       end
 
       def url
-        @url ||= @request.protocol + @request.host_with_port + path
+        
       end
 
     end

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

@@ -0,0 +1,38 @@
+module PufferPages
+  module Liquid
+    module Tags
+
+      class Javascripts < ::Liquid::Tag
+        Syntax = /^(#{::Liquid::QuotedFragment}+)/
+
+        def initialize(tag_name, markup, tokens)
+          if markup =~ Syntax
+            @paths = variables_from_string(markup)
+          else
+            raise SyntaxError.new("Syntax Error in 'javascripts' - Valid syntax: javascripts path [, path, path ...]")
+          end
+
+          super
+        end
+
+        def render(context)
+          paths = @paths.map {|path| "'#{context[path]}'" }.join(', ')
+          context.registers[:tracker].register "<%= javascript_include_tag #{paths} %>"
+        end
+
+      private
+
+        def variables_from_string(markup)
+          markup.split(',').map do |var|
+          var.strip =~ /\s*(#{::Liquid::QuotedFragment})\s*/
+          $1 ? $1 : nil
+          end.compact
+        end
+
+      end
+
+    end
+  end
+end
+
+Liquid::Template.register_tag('javascripts', PufferPages::Liquid::Tags::Javascripts)

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

@@ -3,7 +3,7 @@ module PufferPages
     module Tags
 
       class RenderSnippet < ::Liquid::Tag
-        Syntax = /(#{::Liquid::QuotedFragment}+)/
+        Syntax = /^(#{::Liquid::QuotedFragment})/
 
         def initialize(tag_name, markup, tokens)
           if markup =~ Syntax

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

@@ -0,0 +1,38 @@
+module PufferPages
+  module Liquid
+    module Tags
+
+      class Stylesheets < ::Liquid::Tag
+        Syntax = /^(#{::Liquid::QuotedFragment}+)/
+
+        def initialize(tag_name, markup, tokens)
+          if markup =~ Syntax
+            @paths = variables_from_string(markup)
+          else
+            raise SyntaxError.new("Syntax Error in 'stylesheets' - Valid syntax: stylesheets path [, path, path ...]")
+          end
+
+          super
+        end
+
+        def render(context)
+          paths = @paths.map {|path| "'#{context[path]}'" }.join(', ')
+          context.registers[:tracker].register "<%= stylesheet_link_tag #{paths} %>"
+        end
+
+      private
+
+        def variables_from_string(markup)
+          markup.split(',').map do |var|
+          var.strip =~ /\s*(#{::Liquid::QuotedFragment})\s*/
+          $1 ? $1 : nil
+          end.compact
+        end
+
+      end
+
+    end
+  end
+end
+
+Liquid::Template.register_tag('stylesheets', PufferPages::Liquid::Tags::Stylesheets)

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

@@ -3,7 +3,7 @@ module PufferPages
     module Tags
 
       class Yield < ::Liquid::Tag
-        Syntax = /(#{::Liquid::QuotedFragment}+)/
+        Syntax = /^(#{::Liquid::QuotedFragment})/
 
         def initialize(tag_name, markup, tokens)
           if markup =~ Syntax

data/lib/puffer_pages.rb

@@ -12,6 +12,7 @@ module PufferPages
 
 end
 
+require 'puffer'
 require 'liquid'
 require 'nested_set'
 
@@ -20,6 +21,8 @@ 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/stylesheets'
+require 'puffer_pages/liquid/tags/javascripts'
 
 Puffer.setup do |config|
   config.javascripts += %w(right-dialog right-tabs puffer_pages)

data/puffer_pages.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer_pages}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
@@ -63,7 +63,9 @@ Gem::Specification.new do |s|
     "lib/puffer_pages/extensions/core.rb",
     "lib/puffer_pages/extensions/mapper.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",
     "puffer_pages.gemspec",

data/spec/models/tags_spec.rb

@@ -39,17 +39,37 @@ describe 'Tags' do
       @snippet = Fabricate :snippet, :name => 'snip', :body => 'snippet body'
     end
 
-    it 'should render yield with string param' do
+    it 'should render render_snippet with string param' do
       @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% render_snippet 'snip' %}"
       render_page(@page).should == @snippet.body
     end
 
-    it 'should render yield with variable param' do
+    it 'should render render_snippet with variable param' do
       @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% assign sn = 'snip' %}{% render_snippet sn %}"
       render_page(@page).should == @snippet.body
     end
 
   end
 
+  describe 'stylesheets' do
+
+    it 'should render stylesheets with proper params' do
+      @page = Fabricate :page, :layout_name => 'foo_layout'
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% assign st = 'styles' %}{% stylesheets 'reset', st %}"
+      render_page(@page).should == "<%= stylesheet_link_tag 'reset', 'styles' %>"
+    end
+
+  end
+
+  describe 'javascripts' do
+
+    it 'should render javascripts with proper params' do
+      @page = Fabricate :page, :layout_name => 'foo_layout'
+      @layout = Fabricate :layout, :name => 'foo_layout', :body => "{% assign ctrl = 'controls' %}{% javascripts 'prototype', ctrl %}"
+      render_page(@page).should == "<%= javascript_include_tag 'prototype', 'controls' %>"
+    end
+
+  end
+
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer_pages
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - pyromaniac
@@ -250,7 +250,9 @@ files:
 - lib/puffer_pages/extensions/core.rb
 - lib/puffer_pages/extensions/mapper.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
 - puffer_pages.gemspec