barista 1.0.0 → 1.1.0.pre1

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem 'coffee-script', '~> 2.1.1'
+gem 'coffee-script', '~> 2.1'
 
 group :development, :test do
   gem 'jeweler', '~> 1.0'

data/Gemfile.lock

@@ -1,38 +1,31 @@
-PATH
-  remote: .
-  specs:
-    barista (0.7.0.pre)
-      coffee-script (~> 2.1.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
     coffee-script (2.1.1)
       coffee-script-source
-    coffee-script-source (0.9.5)
+    coffee-script-source (1.0.1)
     diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.5.1)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     rake (0.8.7)
     rr (1.0.2)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.0)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.5.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  barista!
-  coffee-script (~> 2.1.1)
+  coffee-script (~> 2.1)
   jeweler (~> 1.0)
   rr (~> 1.0)
   rspec (~> 2.1)

data/README.md

@@ -1,34 +1,95 @@
-# Barista #
+# Barista
 
 Barista is a set of tools to make using [CoffeeScript](http://jashkenas.github.com/coffee-script/) in Rails 3, Rails 2 and Rack applications
-easier. You can think of it as similar to [Compass]() but instead of for Sass, it's for CoffeeScript.
+easier. You can think of it as similar to [Compass](http://compass-style.org/), but for CoffeeScript instead of [Sass](http://sass-lang.com/).
 
-Getting started is fairly simple - The short version for Rails 3 is simply:
+As an added bonus, Barista also gives:
 
-1. Add `gem 'barista', '~> 1.0'` to your Gemfile
-2. Run `bundle install`
-3. Run `rails generate barista:install`
+* Automatic support for a `:coffeescript` filter in [Haml](http://haml-lang.com/) (when Haml is loaded before Barista) — automatically converting inline CoffeeScript to JavaScript for you.
+* Where possible, support for `coffeescript_include_tag` and `coffeescript_tag`.
+* When possible, instead of pre-compiling in development and test modes, Barista will embed CoffeeScript in the page for you.
+* Support for Heroku via [therubyracer-heroku](https://github.com/aler/therubyracer-heroku) and either pre-compiled JS or, optionally, a lightweight Rack app that generates on request.
 
-Place your CoffeeScript's in `app/coffeescripts` and Barista will automatically compile them on change into `public/javascripts`.
+## Getting Started
 
+Out of the box, Barista has semi-automatic support for Rails 3.0, Rails 2 (currently untested) and Sinatra. With a minimal amount of effort, you can also make it work in any Rack-based framework.
 
-As an added bonus, Barista also gives:
+### Rails 3
 
-* Automatic support for a `:coffeescript` filter in Haml (when Haml is loaded before barista) - Automatically converting inline CoffeeScript
-  to JavaScript for you.
-* Where possible, support for `coffeescript_include_tag` and `coffeescript_tag`.
-* When possible, instead of pre-compiling in development and test modes, Barista will embed CoffeeScript in the page for you.
-* Support for Heroku via `therubyracer` and either pre-compiled JS or, optionally, a lightweight Rack app that generates on request.
+Adding Barista to your Rails 3 application should as simple as adding two gems to your `Gemfile`, and running  two commands. To get started, open up your `Gemfile` and add the following:
+
+    gem "json" # Only needed if on Ruby 1.8 / a platform that ships without JSON
+    gem "barista"
+
+Next, you'll need to run the the following:
+
+    bundle install
+    rails g barista:install
+
+This will install the gem into your application and will generate a file in `config/initializers/barista_config.rb` that contains a set of options to configure Barista options.
+
+Place your CoffeeScripts in `app/coffeescripts` and Barista will automatically compile them on change into `public/javascripts`.
+
+### Rails 2
+
+Much like on Rails 3, Barista supports deep integration into Rails 2. The only thing missing (that is currently supported in the Rails 3 version) is built in support for generating a config file. If you're using bundler in your application, all you need to do is add:
+
+    gem "json" # Only needed if on Ruby 1.8 / a platform that ships without JSON
+    gem "barista"
+    
+To your `Gemfile`. If you're not using bundler, doing `gem install json barista` and requiring barista both in your application should be enough to get you started.
+
+If you wish to change the barista configuration, take a look at the  [Rails 3 initializer](https://github.com/Sutto/barista/blob/master/lib/generators/barista/install/templates/initializer.rb) and modify it to suite your application as needed.
+
+### Sinatra
+
+Adding Barista to a Sinatra application is a relatively straight forward affair. Like in Rails 2 and Rails 3, you first need to add and require the barista gem and (optionally, the json gem). Unlike Rails 2 and 3 (which set it up automatically), you must also register the extension in your application. So, in the scope of your app (either the top level scope or the `Sinatra::Application` subclass you're using), you then need to simple add:
+
+    register Barista::Integration::Sinatra
+
+Which will automatically set up the Barista environment and other similar details (e.g. the automatic compilation filter). Since you don't have initializers like you do in Rails, you
+can then simply run your `Barista.configure` call and block anywhere before your application starts serving requests.
+
+### Other Rack-based Frameworks
+
+Lastly, even though it is built out of the box to support Rails and Sinatra, Barista can also be used with any Rack-based framework. For proper integration, several things must be done. Namely, wherever you declare your middleware (e.g. in a `config.ru` file), you should register the two pieces of middleware barista uses. `Barista::Filter` should only be registered when
+Barista performs compilation (e.g. in development mode) and `Barista::Server::Proxy` should be registered if you want it to support automatic serving of a `coffeescript.js` file and / or
+on the fly (versus pre-request compilation) of CoffeeScripts.
 
+For example, your `config.ru` may look like:
+
+    # Setup goes here...
+    use Barista::Filter if Barista.add_filter?
+    use Barista::Server::Proxy
+    run MyRackApplication
+    
+Next, you need to configure barista anywhere before your the above code is run. e.g by adding the following immediatly preceeding it:
+
+    # Barista (for CoffeeScript Support)
+    Barista.app_root = root
+    Barista.root     = File.join(root, 'coffeescripts')
+    Barista.setup_defaults
+    barista_config = root + '/barista_config.rb'
+    require barista_config if File.exist?(barista_config)
+    
+Hence, if you'e using, for example, [serve](https://github.com/jlong/serve) users should have a `config.ru` that looks similar to [this example](https://github.com/YouthTree/site-design/blob/master/config.ru).
+
+### A Quick Note on the JSON Gem
+
+Barista indirectly requires the json gem via the coffee-script gem, but it isn't listed as a dependency for very
+good reasons. If you encounter errors relating to `require 'json'`, Then you'll need to add either `gem 'json'`
+or `gem 'json_pure'` to your Gemfile.
+
+If you're already running Ruby 1.9, this will be unnecessary as JSON is shipped as part of the standard library.
 
 ## General Information
 
-Barista transparently compiles CoffeeScript to JavaScript - When a `.coffee` file is changed and the page is refreshed, it first regenerates all `.js` files whose `.coffee` sources have been recently changed. This way, you can refresh immediately after saving the `.coffee` file, and not worry about an old `.js` file being sent to the browser (as often happens when using `coffee --watch`).
+Barista transparently compiles CoffeeScript to JavaScript. When a `.coffee` file is changed and the page is refreshed, Barista first regenerates all `.js` files whose `.coffee` sources have been recently changed. This way, you can refresh immediately after saving the `.coffee` file and not worry about an old `.js` file being sent to the browser (as often happens when using `coffee --watch`).
 
-Barista supports using `therubyracer` when installed or, by default, using either the `node` executable or `jsc` (on OSX) to compile your scripts. There is
-no need for you to install the coffee script executable in node - having Node itself or any of the alternatives available is enough for you to get support.
+Barista supports using `therubyracer` when installed or, by default, using either the `node` executable or `jsc` (on OS X) to compile your scripts. There is
+no need for you to install the coffee-script executable in Node as having Node itself, or any of the alternatives available, is enough.
 
-When you want to deploy, you can simple run `rake barista:brew` to force the compilation of all JavaScripts fro the current application.
+When you want to deploy, you can simple run `rake barista:brew` to force the compilation of all JavaScripts for the current application.
 
 ## In Practice
 
@@ -36,75 +97,82 @@ Barista not only supports compiling all JavaScripts on demand (via `rake barista
 also ships with a simple Rack server app that will compile on demand for platforms such as Heroku, meaning you don't need write access
 (although it is helpful).
 
-If you're using Jammit, the precompilation phase (e.g. `rake barista:brew` before running jammit) will make it possible for your application
+If you're using [Jammit](http://documentcloud.github.com/jammit/), the precompilation phase (e.g. `rake barista:brew` before running Jammit) will make it possible for your application
 to automatically bundle not only normal JavaScripts but also your CoffeeScripts.
 
-To add to your project, simply add:
+To add Barista to your project, simply add `gem 'barista', '~> 1.0'` to your Gemfile and run `bundle install`.
 
-    gem 'barista', '~> 1.0'
-    
-To your Gemfile and run bundle install.
-
-Please note that for Jammit compatibility, in test and dev mode (by default) it will
+Please note that for Jammit compatibility, in test and development mode (by default) it will
 automatically compile all CoffeeScripts that have changed before rendering the page.
 
-Barista works out of the box with Rails 3 (and theoretically, Rails 2) - with support for Rack if
+Barista works out of the box with Rails 3 (and theoretically, Rails 2) — with support for Rack if
 you're willing to set it up manually. More docs on how to set it up for other platforms
 will be posted in the near future.
 
-## Configuration ##
+## Sinatra
+
+To use Barista with [Sinatra](http://www.sinatrarb.com/), you'll need to first require the Barista gem in your application
+and then add the following to your application scope (e.g. if you're using a custom class, there):
+
+    register Barista::Integration::Sinatra
+
+This will automatically setup the filter as needed, setup a server proxy for the `coffee-script.js`
+file and setup the defaults based on your applications environment
 
-Please note that barista lets you configure several options. To do this,
+## Configuration
+
+Please note that Barista lets you configure several options. To do this,
 it's as simple as setting up an initializer with:
 
     rails generate barista:install
-    
+
 Then editing `config/initializers/barista_config.rb`. The options available are:
 
 ### Boolean Options
 
-All of these come in the form of `#option?` (to check it's status), `#option=(value)` (to set it)
+All of these come in the form of `#option?` (to check its status), `#option=(value)` (to set it)
 and `#option!` (to set the value to true):
 
-* `verbose` - Output debugging error messages. (Defaults to true in test / dev)
-* `bare` - Don't wrap the compiled JS in a Closure
-* `add_filter` - Automatically add an around filter for processing changes. (Defaults to true in test / dev)
-* `add_preamble` - Add a time + path preamble to compiled JS. (Defaults to true in test / dev)
-* `exception_on_error` - Raise an exception on compilation errors (defaults to true)
-* `embedded_interpreter` - Embeds coffeescript + link to coffee file instead of compiling for include tags and haml filters. (Defaults to true in test / dev)
+* `verbose` – Output debugging error messages. (Defaults to true in test / dev)
+* `bare` – Don't wrap the compiled JS in a Closure.
+* `add_filter` – Automatically add an around filter for processing changes. (Defaults to true in test / dev)
+* `add_preamble` – Add a time + path preamble to compiled JS. (Defaults to true in test / dev)
+* `exception_on_error` – Raise an exception on compilation errors (defaults to true)
+* `embedded_interpreter` – Embeds coffeescript + link to coffee file instead of compiling for include tags and haml filters. (Defaults to true in test / dev)
+* `auto_compile` – Automatically compile CoffeeScript to JS when CoffeeScript is newer than the generated JS file. After you turn it off, your server will use the generated JS file directly and won't depend on any CoffeeScript compilers. (Defaults is true)
 
 ### Path options
 
-* `root` - the folder path to read coffeescripts from, defaults to app/coffeescripts
-* `output_root` - the folder to write them into, defaults to public/javascripts.
-* `change_output_prefix!` - method to change the output prefix for a framework.
-* `verbose` - whether or not barista will add a preamble to files.
-* `js_path` - Path to the pure-javascript compiler.
-* `env` - The application environment. (defaults to Rails.env)
-* `app_root` - The root of the application.
-* `bin_path` - The path to the `node` executable if non-standard and not using therubyracer.
+* `root` – The folder path to read CoffeeScripts from. (Defaults to `app/coffeescripts`.)
+* `output_root` – The folder to write compiled JS files to. (Defaults to `public/javascripts`.)
+* `change_output_prefix!` – Method to change the output prefix for a framework.
+* `verbose` – Whether or not Barista will add a preamble to files.
+* `js_path` – Path to the pure-JavaScript compiler.
+* `env` – The application environment. (Defaults to `Rails.env`.)
+* `app_root` – The application's root path.
+* `bin_path` – The path to the `node` executable if non-standard and not using `therubyracer`.
 * All of the hook methods mentioned below.
 
-## Frameworks ##
+## Frameworks
 
 One of the other main features Barista adds (over other tools) is frameworks similar
-to Compass. The idea being, you add coffee scripts at runtime from gems etc. To do this,
-in your gem just have a `coffeescript` directory and then in you gem add the following code:
+to Compass. The idea being, you add CoffeeScripts at runtime from gems etc. To do this,
+in your gem just have a `coffeescript` directory and then in your gem add the following code:
 
     Barista::Framework.register 'name', 'full-path-to-directory' if defined?(Barista::Framework)
-    
+
 For an example of this in practice, check out [bhm-google-maps](http://github.com/YouthTree/bhm-google-maps)
 or, the currently-in-development, [shuriken](http://github.com/Sutto/shuriken). The biggest advantage of this
-is you can then manage js dependencies using existing tools like bundler.
+is you can then manage JS dependencies using existing tools like Bundler.
 
 In your `Barista.configure` block, you can also configure on a per-application basis the output directory
-for individual frameworks (e.g. put shuriken into vendor/shuriken, bhm-google-maps into vendor/bhm-google-maps):
+for individual frameworks (e.g. put shuriken into `vendor/shuriken`, bhm-google-maps into `vendor/bhm-google-maps`):
 
     Barista.configure do |c|
       c.change_output_prefix! 'shuriken',        'vendor/shuriken'
       c.change_output_prefix! 'bhm-google-maps', 'vendor/bhm-google-maps'
     end
-    
+
 Alternatively, to prefix all, you can use `Barista.each_framework` (if you pass true, it includes the 'default' framework
 which is your application root).
 
@@ -113,17 +181,17 @@ which is your application root).
         c.change_output_prefix! framework.name, "vendor/#{framework.name}"
       end
     end
-    
-## Hooks ##
 
-Barista lets you hook into the compilation at several stages. Namely:
+## Hooks
+
+Barista lets you hook into the compilation at several stages, namely:
 
 * before compilation
 * after compilation
 * after compilation fails
 * after compilation complete
 
-To hook into these hooks, you can use like so:
+To hook into these hooks, you can do the following:
 
 * `Barista.before_compilation { |path| puts "Barista: Compiling #{path}" }`
 * `Barista.on_compilation { |path| puts "Barista: Successfully compiled #{path}" }`
@@ -135,20 +203,21 @@ These allow you to do things such as notify on compilation, automatically
 perform compression post compilation and a variety of other cool things.
 
 An excellent example of these hooks in use is [barista\_growl](http://github.com/TrevorBurnham/barista_growl),
-by Trevor Burnham - a gem perfect for development purposes that automatically shows growl messages
+by Trevor Burnham — a gem perfect for development purposes that automatically shows Growl messages
 on compilation.
 
 # Contributors / Credits
 
 The following people have all contributed to Barista:
 
-* [Xavier Shay](https://github.com/xaviershay) - Added preamble text to generated text in verbose mode.
-* [einarmagnus](https://github.com/einarmagnus) - Fixed jruby support.
-* [Matt Dean](https://github.com/trabian) - Added `before_full_compilation` and `on_compilation_complete` hooks.
-* [Trevor Burnham](https://github.com/TrevorBurnham) - Misc. documentation tweaks and hooks idea.
-* [Sean McCullough](https://github.com/mcculloughsean) - Initial switch to support bare (vs. no\_wrap)
-* [Ben Atkin](https://github.com/benatkin) - Docs work.
-* [Ben Hoskings](https://github.com/benhoskings) Misc fixes, added preamble support.
+* [Xavier Shay](https://github.com/xaviershay) – Added preamble text to generated text in verbose mode.
+* [einarmagnus](https://github.com/einarmagnus) – Fixed jruby support.
+* [Matt Dean](https://github.com/trabian) – Added `before_full_compilation` and `on_compilation_complete` hooks.
+* [Trevor Burnham](https://github.com/TrevorBurnham) – Misc. documentation tweaks and hooks idea.
+* [Sean McCullough](https://github.com/mcculloughsean) – Initial switch to support bare (vs. no\_wrap)
+* [Ben Atkin](https://github.com/benatkin) – Docs work.
+* [Ben Hoskings](https://github.com/benhoskings) – Misc. fixes, added preamble support.
+* [Kim Joar Bekkelund](https://github.com/kjbekkelund) – Docs work.
 
 Barista was originally heavily inspired by [Bistro Car](https://github.com/jnicklas/bistro_car), but has taken a few fundamentally
 different approach in a few areas.
@@ -158,7 +227,7 @@ Barista builds upon the awesome [coffee-script](https://github.com/josh/ruby-cof
 It's all possible thanks to [CoffeeScript](https://github.com/jashkenas/coffee-script) by Jeremy Ashkenas.
 
 ## Note on Patches/Pull Requests ##
- 
+
 1. Fork the project.
 2. Make your feature addition or bug fix.
 3. Add tests for it. This is important so I don't break it in a future version unintentionally.

data/barista.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barista}
-  s.version = "1.0.0"
+  s.version = "1.1.0.pre1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2011-01-01}
+  s.date = %q{2011-04-18}
   s.description = %q{Barista provides simple, integrated support for CoffeeScript in Rack and Rails applications.
 
 Much like Compass does for Sass, It also provides Frameworks (bundleable code which can be shared via Gems).
@@ -45,6 +45,7 @@ For more details, please see the the README file bundled with it.}
     "lib/barista/integration/rails2.rb",
     "lib/barista/integration/rails3.rb",
     "lib/barista/integration/sinatra.rb",
+    "lib/barista/rake_task.rb",
     "lib/barista/server.rb",
     "lib/barista/tasks/barista.rake",
     "lib/barista/version.rb",
@@ -57,7 +58,7 @@ For more details, please see the the README file bundled with it.}
   ]
   s.homepage = %q{http://github.com/Sutto/barista}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Simple, transparent coffeescript integration for Rails and Rack applications.}
   s.test_files = [
     "spec/barista_spec.rb",
@@ -65,22 +66,21 @@ For more details, please see the the README file bundled with it.}
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<coffee-script>, ["~> 2.1.1"])
+      s.add_runtime_dependency(%q<coffee-script>, ["~> 2.1"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.1"])
       s.add_development_dependency(%q<rr>, ["~> 1.0"])
     else
-      s.add_dependency(%q<coffee-script>, ["~> 2.1.1"])
+      s.add_dependency(%q<coffee-script>, ["~> 2.1"])
       s.add_dependency(%q<jeweler>, ["~> 1.0"])
       s.add_dependency(%q<rspec>, ["~> 2.1"])
       s.add_dependency(%q<rr>, ["~> 1.0"])
     end
   else
-    s.add_dependency(%q<coffee-script>, ["~> 2.1.1"])
+    s.add_dependency(%q<coffee-script>, ["~> 2.1"])
     s.add_dependency(%q<jeweler>, ["~> 1.0"])
     s.add_dependency(%q<rspec>, ["~> 2.1"])
     s.add_dependency(%q<rr>, ["~> 1.0"])

data/lib/barista.rb

@@ -33,15 +33,15 @@ module Barista
     def hooks
       @hooks ||= Hooks.new
     end
-    
+
     def on_hook(name, *args, &blk)
       hooks.on(name, *args, &blk)
     end
-    
+
     def invoke_hook(name, *args)
       hooks.invoke(name, *args)
     end
-    
+
     has_hook_method :on_compilation_error        => :compilation_failed,
                     :on_compilation              => :compiled,
                     :on_compilation_complete     => :all_compiled,
@@ -51,15 +51,15 @@ module Barista
 
 
     # Configuration - Tweak how you use Barista.
-    
-    has_boolean_options    :verbose, :bare, :add_filter, :add_preamble, :exception_on_error, :embedded_interpreter
+
+    has_boolean_options    :verbose, :bare, :add_filter, :add_preamble, :exception_on_error, :embedded_interpreter, :auto_compile
     has_delegate_methods   Compiler, :bin_path, :bin_path=, :js_path, :js_path=
     has_deprecated_methods :compiler, :compiler=, :compiler_klass, :compiler_klass=
-    
+
     def configure
       yield self if block_given?
     end
-    
+
     def env
       @env ||= default_for_env
     end
@@ -68,7 +68,7 @@ module Barista
       @env = value.to_s.strip
       @env = nil if @env == ''
     end
-    
+
     def logger
       @logger ||= default_for_logger
     end
@@ -160,11 +160,16 @@ module Barista
     def default_for_exception_on_error
       true
     end
-    
+
     def default_for_embedded_interpreter
-      local_env?
+      false
+    end
+
+    def default_for_auto_compile
+      true
     end
 
+
     # Actual tasks on the barista module.
 
     def compile_file!(file, force = false, silence_error = false)
@@ -183,7 +188,7 @@ module Barista
 
     def change_output_prefix!(framework, prefix = nil)
       framework = Barista::Framework[framework] unless framework.is_a?(Barista::Framework)
-      framework.output_prefix = prefix if framework.present?
+      framework.output_prefix = prefix if framework
     end
 
     def each_framework(include_default = false, &blk)
@@ -195,16 +200,16 @@ module Barista
     end
 
     def debug(message)
-      logger.debug "[Barista] #{message}"
+      logger.debug "[Barista] #{message}" if logger
     end
-    
+
     def setup_defaults
       Barista::HamlFilter.setup
       Barista::Compiler.setup_default_error_logger
     end
 
   end
-  
+
   # Setup integration by default.
   Integration.setup
 

data/lib/barista/compiler.rb

@@ -23,7 +23,7 @@ module Barista
       end
       
       def available?
-        CoffeeScript.engine.present? && CoffeeScript.engine.supported?
+        CoffeeScript.engine && CoffeeScript.engine.supported?
       end
 
       def check_availability!(silence = false)
@@ -39,16 +39,26 @@ module Barista
       end
 
       def autocompile_file(file, force = false, silence_error = false)
-        # Ensure we have a coffeescript compiler available.
-        if !check_availability!(silence_error)
-          Barista.debug "The coffeescript compiler at '#{Compiler.bin_path}' is currently unavailable."
-          return nil
-        end
         # Expand the path from the framework.
         origin_path, framework = Framework.full_path_for(file)
         return if origin_path.nil?
         destination_path = framework.output_path_for(file)
+      
+        # read file directly if auto_compile is disabled
+        if !Barista.auto_compile? 
+          if File.exist?(destination_path) 
+            return File.read(destination_path)
+          else 
+            return nil
+          end
+        end
+
         return File.read(destination_path) unless dirty?(origin_path, destination_path) || force
+        # Ensure we have a coffeescript compiler available.
+        if !check_availability!(silence_error)
+          Barista.debug "The coffeescript compiler at '#{Compiler.bin_path}' is currently unavailable."
+          return nil
+        end
         Barista.debug "Compiling #{file} from framework '#{framework.name}'"
         compiler = new(origin_path, :silence_error => silence_error, :output_path => destination_path)
         content = compiler.to_js

data/lib/barista/framework.rb

@@ -20,7 +20,7 @@ module Barista
         collection + fw.exposed_coffeescripts
       end.uniq.sort_by { |f| f.length }
     end
-    
+
     def self.coffeescript_glob_paths
       all(true).map { |fw| fw.coffeescript_glob_path }
     end
@@ -65,7 +65,7 @@ module Barista
     def coffeescripts
       Dir[coffeescript_glob_path]
     end
-    
+
     def coffeescript_glob_path
       @coffeescript_glob_path ||= File.join(@framework_root, "**", "*.coffee")
     end

data/lib/barista/integration.rb

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

data/lib/barista/integration/sinatra.rb

@@ -1,7 +1,7 @@
 module Barista
   module Integration
     module Sinatra
-      
+
       def self.registered(app)
         app.configure do |inner_app|
           setup_defaults inner_app
@@ -9,15 +9,15 @@ module Barista
           inner_app.use Barista::Server::Proxy
           Barista.setup_defaults
         end
-        
+
       end
-      
+
       def self.setup_defaults(app)
         Barista.configure do |c|
           c.env = app.environment.to_s
         end
       end
-      
+
     end
   end
 end

data/lib/barista/rake_task.rb

@@ -0,0 +1,69 @@
+require 'barista' unless defined?(Barista)
+require 'rake'
+require 'rake/tasklib'
+
+module Barista
+  class RakeTask < ::Rake::TaskLib
+
+    attr_writer :namespace, :task_name
+    attr_writer :environment, :input_directory, :output_directory, :rails
+
+    def initialize
+      yield self if block_given?
+      @namespace ||= :barista
+      @task_name ||= :brew
+      @task_name = @task_name.to_sym
+      @rails     = defined?(Rails) if @rails.nil?
+
+      task_declaration = (@rails ? {@task_name => :environment} : @task_name)
+
+      namespace @namespace do
+        desc "Compiles all CoffeeScript sources to JavaScript"
+        task task_declaration do
+          setup_barista
+          check_availability
+          puts "Compiling all CoffeeScripts to their JavaScript equivalent."
+          Barista.compile_all! true, false
+        end
+      end
+    end
+
+    # Proxy methods for rake tasks
+
+    def respond_to?(method, include_private = false)
+      super || Barista.respond_to?(method, include_private)
+    end
+
+    def method_missing(method, *args, &blk)
+      if Barista.respond_to?(method)
+        Barista.send method, *args, &blk
+      else
+        super
+      end
+    end
+
+    private
+
+    def setup_barista
+      Barista.env = @environment if @environment
+      if @input_directory
+        Barista.root = File.expand_path(@input_directory, Dir.pwd)
+      end
+      if @output_directory
+        Barista.output_root = File.expand_path(@output_directory, Dir.pwd)
+      end
+    end
+
+    def check_availability
+      if !Barista::Compiler.available?
+        if Barista::Compiler.bin_path.nil?
+          $stderr.puts "CoffeeScript doesn't appear to be installed on this system and you're not using an embedded compiler."
+        else
+          $stderr.puts "'#{Barista::Compiler.bin_path}' was unavailable."
+        end
+        exit 1
+      end
+    end
+
+  end
+end

data/lib/barista/tasks/barista.rake

@@ -1,12 +1,7 @@
-namespace :barista do
-
-  desc "Compiles coffeescripts from app/coffeescripts into public/javascripts"
-  task :brew => :environment do
-    if !Barista::Compiler.available?
-      $stderr.puts "'#{Barista::Compiler.bin_path}' was unavailable."
-      exit 1
-    end
-    Barista.compile_all! true, false
-  end
+require 'barista/rake_task'
 
+Barista::RakeTask.new do |t|
+  t.namespace = :barista
+  t.task_name = :brew
+  t.rails     = true
 end

data/lib/barista/version.rb

@@ -1,8 +1,8 @@
 module Barista
   module Version
     MAJOR  = 1
-    MINOR  = 0
+    MINOR  = 1
     PATCH  = 0
-    STRING = [MAJOR, MINOR, PATCH].join(".")
+    STRING = [MAJOR, MINOR, PATCH, "pre1"].join(".")
   end
 end

data/lib/generators/barista/install/templates/initializer.rb

@@ -1,49 +1,56 @@
 # Configure barista.
 Barista.configure do |c|
-  
+
   # Change the root to use app/scripts
   # c.root = Rails.root.join("app", "scripts")
-  
+
   # Change the output root, causing Barista to compile into public/coffeescripts
   # c.output_root = Rails.root.join("public", "coffeescripts")
-  
+  #
+  # Disable auto compile, use generated file directly:
+  # c.auto_compile = false
+
   # Set the compiler
-  
+
   # Disable wrapping in a closure:
   # c.no_wrap = true
   # ... or ...
   # c.no_wrap!
-  
+
   # Change the output root for a framework:
-  
+
   # c.change_output_prefix! 'framework-name', 'output-prefix'
-  
+
   # or for all frameworks...
-  
+
   # c.each_framework do |framework|
   #   c.change_output_prefix! framework.name, "vendor/#{framework.name}"
   # end
-  
+
   # or, prefix the path for the app files:
-  
-  # c.change_output_prefix! :default, 'my-app-name'  
-  
+
+  # c.change_output_prefix! :default, 'my-app-name'
+
   # or, hook into the compilation:
-  
+
   # c.before_compilation   { |path|         puts "Barista: Compiling #{path}" }
   # c.on_compilation       { |path|         puts "Barista: Successfully compiled #{path}" }
   # c.on_compilation_error { |path, output| puts "Barista: Compilation of #{path} failed with:\n#{output}" }
   # c.on_compilation_with_warning { |path, output| puts "Barista: Compilation of #{path} had a warning:\n#{output}" }
-  
-  # Turn off preambles and exceptions on failure
-  
+
+  # Turn off preambles and exceptions on failure:
+
   # c.verbose = false
-  
+
   # Or, make sure it is always on
   # c.verbose!
-  
+
   # If you want to use a custom JS file, you can as well
   # e.g. vendoring CoffeeScript in your application:
   # c.js_path = Rails.root.join('public', 'javascripts', 'coffee-script.js')
-  
+
+  # Make helpers and the HAML filter output coffee-script instead of the compiled JS.
+  # Used in combination with the coffeescript_interpreter_js helper in Rails.
+  # c.embedded_interpreter = true
+
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: barista
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 1923831963
+  prerelease: 6
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  - pre
+  - 1
+  version: 1.1.0.pre1
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -15,30 +17,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 +08:00
+date: 2011-04-18 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  name: coffee-script
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 1
         segments: 
         - 2
         - 1
-        - 1
-        version: 2.1.1
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+        version: "2.1"
+  version_requirements: *id001
+  name: coffee-script
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: jeweler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +47,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id002
+  name: jeweler
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rspec
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +62,12 @@ dependencies:
         - 2
         - 1
         version: "2.1"
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *id003
+  name: rspec
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
-  name: rr
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,7 +77,9 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  requirement: *id004
+  version_requirements: *id004
+  name: rr
+  prerelease: false
 description: |-
   Barista provides simple, integrated support for CoffeeScript in Rack and Rails applications.
   
@@ -118,6 +119,7 @@ files:
 - lib/barista/integration/rails2.rb
 - lib/barista/integration/rails3.rb
 - lib/barista/integration/sinatra.rb
+- lib/barista/rake_task.rb
 - lib/barista/server.rb
 - lib/barista/tasks/barista.rake
 - lib/barista/version.rb
@@ -148,16 +150,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple, transparent coffeescript integration for Rails and Rack applications.