Integration is a go!

lib/barista.rb

@@ -214,8 +214,8 @@ def setup_defaults!
     end
 
   end
-
-  if defined?(Rails::Engine)
-  end
+  
+  # Setup integration by default.
+  Integration.setup
 
 end

lib/barista/integration.rb

@@ -1,15 +1,24 @@
 module Barista
   module Integration
-
+    
     autoload :Rails3,  'barista/integration/rails3'
     autoload :Sinatra, 'barista/integration/sinatra'
-
+    
     def self.setup
-      if defined?(Rails)
-        setup_rails
+      setup_rails   if defined?(Rails)
+      setup_sinatra if defined?(::Sinatra)
+    end
+
+    def self.setup_rails
+      case Rails::VERSION::MAJOR
+      when 3
+        require 'barista/integration/rails3'
       end
-      ::Sinatra::Base.register(Sinatra) if defined?(::Sinatra)
     end
-
+
+    def self.setup_sinatra
+      ::Sinatra::Base.register(Sinatra)
+    end
+
   end
 end

lib/barista/integration/rails3.rb

@@ -4,7 +4,7 @@ module Rails3
       class Railtie < Rails::Railtie
 
         rake_tasks do
-          load Barista.library_root.join('tasks', 'barista.rake').to_s
+          load Barista.library_root.join('barista/tasks/barista.rake').to_s
         end
 
         initializer 'barista.wrap_filter' do