From acaf997b6e2cb0276a26734ef449ddfeb6cd2b7b Mon Sep 17 00:00:00 2001
From: dinedine <didier.lafforgue@gmail.com>
Date: Fri, 15 Oct 2010 02:05:21 +0200
Subject: [PATCH] build locomotive engine as a gem

---
 Gemfile                       |  2 +-
 Gemfile.lock                  |  4 ++--
 lib/locomotive.rb             |  2 +-
 lib/locomotive/delayed_job.rb |  1 +
 lib/locomotive/engine.rb      |  5 ++---
 lib/locomotive/version.rb     |  2 +-
 locomotive_cms.gemspec        | 15 +++++++++------
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1b552916..9ce9d261 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ gem 'warden'
 gem 'devise', '= 1.1.3'
 
 gem 'mongoid', '2.0.0.beta.19'
-gem 'bson_ext', '1.1'
+gem 'bson_ext', '1.1.1'
 gem 'locomotive_mongoid_acts_as_tree', '0.1.5.1', :require => 'mongoid_acts_as_tree'
 
 gem 'haml', '= 3.0.18'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8dce1607..63e3aebe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
       xml-simple
     bcrypt-ruby (2.1.2)
     bson (1.1)
-    bson_ext (1.1)
+    bson_ext (1.1.1)
     builder (2.1.2)
     capybara (0.3.9)
       culerity (>= 0.2.4)
@@ -227,7 +227,7 @@ DEPENDENCIES
   actionmailer-with-request
   autotest
   aws
-  bson_ext (= 1.1)
+  bson_ext (= 1.1.1)
   capybara
   cgi_multipart_eof_fix
   cucumber (= 0.8.5)
diff --git a/lib/locomotive.rb b/lib/locomotive.rb
index caeb8585..a036a497 100644
--- a/lib/locomotive.rb
+++ b/lib/locomotive.rb
@@ -1,4 +1,5 @@
 require 'mimetype_fu'
+
 require 'locomotive/version'
 require 'locomotive/core_ext'
 require 'locomotive/configuration'
@@ -17,7 +18,6 @@ require 'locomotive/render'
 require 'locomotive/import'
 require 'locomotive/delayed_job'
 require 'locomotive/middlewares'
-
 require 'locomotive/session_store'
 
 module Locomotive
diff --git a/lib/locomotive/delayed_job.rb b/lib/locomotive/delayed_job.rb
index 08d87494..f6626294 100644
--- a/lib/locomotive/delayed_job.rb
+++ b/lib/locomotive/delayed_job.rb
@@ -1,4 +1,5 @@
 require 'delayed_job'
+require 'delayed/backend/mongoid'
 
 module Delayed
   module Backend
diff --git a/lib/locomotive/engine.rb b/lib/locomotive/engine.rb
index 05f33d6e..2503454b 100644
--- a/lib/locomotive/engine.rb
+++ b/lib/locomotive/engine.rb
@@ -10,9 +10,8 @@ require 'mongoid_acts_as_tree'
 require 'httparty'
 require 'redcloth'
 require 'actionmailer_with_request'
-
-# FIXME: get rid of it once custom_fields is a gem
-require File.dirname(__FILE__) + '/../../vendor/plugins/custom_fields/init.rb'
+require 'zip/zipfilesystem'
+require 'custom_fields'
 
 module Locomotive
   class Engine < Rails::Engine
diff --git a/lib/locomotive/version.rb b/lib/locomotive/version.rb
index 91d452dd..ba1cb15b 100644
--- a/lib/locomotive/version.rb
+++ b/lib/locomotive/version.rb
@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = "0.0.3.3"
+  VERSION = "0.0.4"
 end
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 821a271b..78b69523 100644
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "nowarning"
 
   s.add_dependency "rails", ">= 3.0.0"
-  s.add_dependency "locomotive_liquid", ">= 2.1.3"
-  s.add_dependency "bson_ext", ">= 1.0.8"
-  s.add_dependency "mongoid", ">= 2.0.0.beta.18"
-  s.add_dependency "mongoid_acts_as_tree", "= 0.1.5"
+  s.add_dependency "locomotive_liquid", "2.2.2"
+  s.add_dependency "bson_ext", "1.1.1"
+  s.add_dependency "mongoid", "2.0.0.beta.19"
+  s.add_dependency "locomotive_mongoid_acts_as_tree", "0.1.5.1"
   s.add_dependency "warden"
-  s.add_dependency "devise", "= 1.1.2"
+  s.add_dependency "devise", "= 1.1.3"
   s.add_dependency "haml", "= 3.0.18"
   s.add_dependency "rmagick", "= 2.12.2"
   s.add_dependency "aws"
@@ -35,7 +35,10 @@ Gem::Specification.new do |s|
   s.add_dependency "httparty", ">= 0.6.1"
   s.add_dependency "RedCloth"
   s.add_dependency "inherited_resources", ">= 1.1.2"
-  s.add_dependency "custom_fields"
+  s.add_dependency "delayed_job", "2.1.0.pre2"
+  s.add_dependency "delayed_job_mongoid", "1.0.0.rc"
+  s.add_dependency "custom_fields", "1.0.0.beta"
+  s.add_dependency "rubyzip"
 
   s.files        = Dir[ "Gemfile",
                         "{app}/**/*",