WIP

thunderboltlabs · Mar 5, 2012 · b56ab46 · b56ab46
1 parent ce1900e
commit b56ab46
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/Guardfile b/Guardfile
@@ -8,6 +8,7 @@ guard 'rspec', :version => 2, :cli => "--backtrace" do
   watch(%r{^.rspec$})           { "spec" }
   watch(%r{^config/.*$})        { "spec" }
   watch(%r{^lib/(.+)\.rb$})     { "spec" }
+  watch('Gemfile.lock')         { "spec" }
 end
 
 guard 'bundler' do

diff --git a/engine_of_war.gemspec b/engine_of_war.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'sinatra', ">= 1.3"
   gem.add_dependency "compass"
-  gem.add_dependency "padrino"
+  #gem.add_dependency "padrino"
   gem.add_dependency "active_support"
   gem.add_dependency "builder"
   gem.add_dependency 'haml'

diff --git a/lib/engine_of_war.rb b/lib/engine_of_war.rb
@@ -7,8 +7,8 @@
 require 'sass'
 require "RedCloth"
 require "coffee-script"
-require 'padrino-core/application/rendering'
-require 'padrino-helpers'
+# require 'padrino-core/application/rendering'
+# require 'padrino-helpers'
 require 'active_support/hash_with_indifferent_access'
 require 'active_support/core_ext/object/blank'
 require 'date'

diff --git a/lib/engine_of_war/app.rb b/lib/engine_of_war/app.rb
@@ -1,6 +1,6 @@
 class EngineOfWar::App < Sinatra::Base
-  register Padrino::Rendering
-  register Padrino::Helpers
+  # register Padrino::Rendering
+  # register Padrino::Helpers
 
   Compass.configuration do |config|
     config.project_path = File.dirname(__FILE__)

diff --git a/lib/engine_of_war/template_engines/filters.rb b/lib/engine_of_war/template_engines/filters.rb
@@ -1,7 +1,7 @@
 module EngineOfWar::TemplateEngines
   module Filters
     BASE_IMAGE_URL = "/images"
-    include Padrino::Helpers::TagHelpers
+    # include Padrino::Helpers::TagHelpers
 
     def code_filter(txt)
       txt.gsub(/@@@ *(\w*)\r?\n? *(.+?)\r?\n?@@@/m) do