From 4e2e6411f36514a0f447d602144ec621515a3037 Mon Sep 17 00:00:00 2001
From: dinedine <didier.lafforgue@gmail.com>
Date: Tue, 6 Jul 2010 23:44:24 +0200
Subject: [PATCH] fix liquid gem version + require httparty + bump to 0.0.2.8

---
 Gemfile                               | 2 +-
 Rakefile                              | 2 +-
 VERSION                               | 2 +-
 lib/locomotive/engine.rb              | 1 +
 lib/locomotive/httparty/webservice.rb | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8444eea9..fa093d12 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ source 'http://gems.github.com'
 
 gem 'rails', '3.0.0.beta3'
 
-gem 'liquid'
+gem 'liquid', '2.0.0'
 gem 'bson_ext', '>= 1.0.1'
 gem 'mongo_ext'
 gem 'mongoid', '2.0.0.beta6' 
diff --git a/Rakefile b/Rakefile
index 2c517441..527c5142 100644
--- a/Rakefile
+++ b/Rakefile
@@ -24,7 +24,7 @@ begin
       "{app}/**/*", 
       "{config}/**/*",
       "{lib}/**/*",
-      "{public}/stylesheets/**/*", "{public}/javascripts/**/*", "{public}/images/**/*", 
+      "{public}/stylesheets/admin/**/*", "{public}/javascripts/admin/**/*", "{public}/images/admin/**/*", 
       "{vendor}/**/*"]
     # other fields that would normally go in your gemspec
     # like authors, email and has_rdoc can also be included here
diff --git a/VERSION b/VERSION
index 6d0ee473..c0d06295 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.2.7
\ No newline at end of file
+0.0.2.8
\ No newline at end of file
diff --git a/lib/locomotive/engine.rb b/lib/locomotive/engine.rb
index 18469880..4d864a9c 100644
--- a/lib/locomotive/engine.rb
+++ b/lib/locomotive/engine.rb
@@ -7,6 +7,7 @@ require 'carrierwave'
 require 'formtastic'
 require 'mongoid'
 require 'mongoid_acts_as_tree'
+require 'httparty'
 
 # FIXME: get rid of it once custom_fields is a gem
 require File.dirname(__FILE__) + '/../../vendor/plugins/custom_fields/init.rb'
diff --git a/lib/locomotive/httparty/webservice.rb b/lib/locomotive/httparty/webservice.rb
index 9a9e8af4..c05b9760 100644
--- a/lib/locomotive/httparty/webservice.rb
+++ b/lib/locomotive/httparty/webservice.rb
@@ -2,7 +2,7 @@ module Locomotive
   module Httparty
     class Webservice
       
-      include HTTParty
+      include ::HTTParty
 
       def self.consume(url, options = {})
         url = HTTParty.normalize_base_uri(url)