From ea050afd5e528210ebb741136bd4eb9514dea4d8 Mon Sep 17 00:00:00 2001
From: did <didier@nocoffee.fr>
Date: Fri, 29 Apr 2011 01:16:40 +0200
Subject: [PATCH] use absolute urls for the pagination links + allow developers
 to access the http params within a liquid template + the with_scope handles
 category fields

---
 app/models/content_type.rb                         |  9 ++++++++-
 lib/locomotive/liquid/filters/html.rb              | 10 +++++++---
 lib/locomotive/liquid/tags/with_scope.rb           |  6 +++---
 lib/locomotive/render.rb                           |  3 ++-
 spec/lib/locomotive/liquid/tags/with_scope_spec.rb | 10 ++++++++--
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/app/models/content_type.rb b/app/models/content_type.rb
index b41ce53a..00343fd2 100644
--- a/app/models/content_type.rb
+++ b/app/models/content_type.rb
@@ -82,7 +82,14 @@ class ContentType
         # convert alias (key) to name
         field = self.content_custom_fields.detect { |f| f._alias == key }
 
-        conditions_with_names[field._name.to_sym] = value
+        case field.kind.to_sym
+        when :category
+          if (category_item = field.category_items.where(:name => value).first).present?
+            conditions_with_names[field._name.to_sym] = category_item._id
+          end
+        else
+          conditions_with_names[field._name.to_sym] = value
+        end
       end
 
       self.contents.where(conditions_with_names)
diff --git a/lib/locomotive/liquid/filters/html.rb b/lib/locomotive/liquid/filters/html.rb
index a7672c4c..f7d4accc 100644
--- a/lib/locomotive/liquid/filters/html.rb
+++ b/lib/locomotive/liquid/filters/html.rb
@@ -82,13 +82,13 @@ module Locomotive
           previous_link = (if paginate['previous'].blank?
             "<span class=\"disabled prev_page\">#{previous_label}</span>"
           else
-            "<a href=\"/#{paginate['previous']['url']}\" class=\"prev_page\">#{previous_label}</a>"
+            "<a href=\"#{absolute_url(paginate['previous']['url'])}\" class=\"prev_page\">#{previous_label}</a>"
           end)
 
           links = ""
           paginate['parts'].each do |part|
             links << (if part['is_link']
-              "<a href=\"/#{part['url']}\">#{part['title']}</a>"
+              "<a href=\"#{absolute_url(part['url'])}\">#{part['title']}</a>"
             elsif part['hellip_break']
               "<span class=\"gap\">#{part['title']}</span>"
             else
@@ -99,7 +99,7 @@ module Locomotive
           next_link = (if paginate['next'].blank?
             "<span class=\"disabled next_page\">#{next_label}</span>"
           else
-            "<a href=\"/#{paginate['next']['url']}\" class=\"next_page\">#{next_label}</a>"
+            "<a href=\"#{absolute_url(paginate['next']['url'])}\" class=\"next_page\">#{next_label}</a>"
           end)
 
           %{<div class="pagination #{options[:css]}">
@@ -140,6 +140,10 @@ module Locomotive
           ThemeAssetUploader.url_for(@context.registers[:site], path)
         end
 
+        def absolute_url(url)
+          url.starts_with('/') ? url : "/#{url}"
+        end
+
       end
 
       ::Liquid::Template.register_filter(Html)
diff --git a/lib/locomotive/liquid/tags/with_scope.rb b/lib/locomotive/liquid/tags/with_scope.rb
index a173a0e3..ea23b339 100644
--- a/lib/locomotive/liquid/tags/with_scope.rb
+++ b/lib/locomotive/liquid/tags/with_scope.rb
@@ -13,21 +13,21 @@ module Locomotive
 
         def render(context)
           context.stack do
-            context['with_scope'] = decode(@attributes)
+            context['with_scope'] = decode(@attributes, context)
             render_all(@nodelist, context)
           end
         end
 
         private
 
-        def decode(attributes)
+        def decode(attributes, context)
           attributes.each_pair do |key, value|
             attributes[key] = (case value
             when /true|false/ then value == 'true'
             when /[0-9]+/ then value.to_i
             when /'(\S+)'/ then $1
             else
-              value
+              context[value]
             end)
           end
         end
diff --git a/lib/locomotive/render.rb b/lib/locomotive/render.rb
index d59b0a0a..75052207 100644
--- a/lib/locomotive/render.rb
+++ b/lib/locomotive/render.rb
@@ -61,7 +61,8 @@ module Locomotive
           'page'              => @page,
           'asset_collections' => Locomotive::Liquid::Drops::AssetCollections.new,
           'contents'          => Locomotive::Liquid::Drops::Contents.new,
-          'current_page'      => self.params[:page]
+          'current_page'      => self.params[:page],
+          'params'            => self.params
         }.merge(flash.stringify_keys) # data from api
 
         if @page.templatized? # add instance from content type
diff --git a/spec/lib/locomotive/liquid/tags/with_scope_spec.rb b/spec/lib/locomotive/liquid/tags/with_scope_spec.rb
index b1083d3f..68130175 100644
--- a/spec/lib/locomotive/liquid/tags/with_scope_spec.rb
+++ b/spec/lib/locomotive/liquid/tags/with_scope_spec.rb
@@ -2,15 +2,21 @@ require 'spec_helper'
 
 describe Locomotive::Liquid::Tags::WithScope do
 
-  it 'should decode options (boolean, interger, ...)' do
+  it 'should decode basic options (boolean, interger, ...)' do
     scope = Locomotive::Liquid::Tags::WithScope.new('with_scope', 'active:true price:42 title:\'foo\' hidden:false', ["{% endwith_scope %}"], {})
-    attributes = scope.send(:decode, scope.instance_variable_get(:@attributes))
+    attributes = scope.send(:decode, scope.instance_variable_get(:@attributes), {})
     attributes['active'].should == true
     attributes['price'].should == 42
     attributes['title'].should == 'foo'
     attributes['hidden'].should == false
   end
 
+  it 'should decode context variable' do
+    scope = Locomotive::Liquid::Tags::WithScope.new('with_scope', 'category: params.type', ["{% endwith_scope %}"], {})
+    attributes = scope.send(:decode, scope.instance_variable_get(:@attributes), { 'params.type' => 'posts' })
+    attributes['category'].should == 'posts'
+  end
+
   it 'should store attributes in the context' do
     template = ::Liquid::Template.parse("{% with_scope active:true title:'foo' %}{{ with_scope.active }}-{{ with_scope.title }}{% endwith_scope %}")
     text = template.render