barista 1.1.0 → 1.2.0

data/Gemfile

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

data/Gemfile.lock

@@ -1,31 +1,35 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    coffee-script (2.1.1)
+    coffee-script (2.2.0)
       coffee-script-source
-    coffee-script-source (1.0.1)
+      execjs
+    coffee-script-source (1.1.1)
     diff-lcs (1.1.2)
+    execjs (1.1.0)
+      multi_json (~> 1.0)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.6.2)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
+    multi_json (1.0.3)
+    rake (0.9.1)
     rr (1.0.2)
-    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)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.3)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec-mocks (2.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  coffee-script (~> 2.1)
+  coffee-script (~> 2.2)
   jeweler (~> 1.0)
   rr (~> 1.0)
   rspec (~> 2.1)

data/barista.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barista}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2011-06-01}
+  s.date = %q{2011-06-02}
   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).
@@ -60,27 +60,23 @@ For more details, please see the the README file bundled with it.}
   s.require_paths = ["lib"]
   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",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     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"])
+      s.add_runtime_dependency(%q<coffee-script>, ["~> 2.2"])
       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"])
+      s.add_dependency(%q<coffee-script>, ["~> 2.2"])
       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"])
+    s.add_dependency(%q<coffee-script>, ["~> 2.2"])
     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

@@ -183,7 +183,7 @@ module Barista
     end
 
     def compile_all!(force = false, silence_error = true)
-      debug "Compiling all coffeescripts"
+      debug "Compiling all coffeescripts" if Barista.auto_compile?
       Barista.invoke_hook :before_full_compilation
       Framework.exposed_coffeescripts.each do |coffeescript|
         Compiler.autocompile_file coffeescript, force, silence_error

data/lib/barista/compiler.rb

@@ -3,6 +3,8 @@ require 'digest/sha2'
 module Barista
   class Compiler
 
+    UNAVAILABLE_MESSAGE = "No method of compiling coffee-script is currently available. Please see the ExecJS page (https://github.com/sstephenson/execjs) for details on how to set one up."
+
     # TODO: Deprecate.
     class << self
 
@@ -15,19 +17,11 @@ module Barista
       end
 
       def bin_path
-        if defined?(CoffeeScript::Engines::Node)
-          CoffeeScript::Engines::Node.binary
-        else
-          execjs_runtime_call :binary
-        end
+        execjs_runtime_call :binary
       end
 
       def bin_path=(path)
-        if defined?(CoffeeScript::Engines::Node)
-          CoffeeScript::Engines::Node.binary = path
-        else
-          execjs_runtime_call :binary=, path
-        end
+        execjs_runtime_call :binary=, path
       end
 
       def execjs_runtime_call(method, *args)
@@ -40,13 +34,13 @@ module Barista
       end
 
       def available?
-        CoffeeScript.engine && CoffeeScript.engine.supported?
+        ExecJS.runtime and ExecJS.runtime.available?
       end
 
       def check_availability!(silence = false)
         available = available?
         if !available && Barista.exception_on_error? && !silence
-          raise CompilerUnavailableError, "No method of compiling cofffescript is currently available. Please install therubyracer or node."
+          raise CompilerUnavailableError, UNAVAILABLE_MESSAGE
         end
         available
       end
@@ -73,7 +67,7 @@ module Barista
         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."
+          Barista.debug UNAVAILABLE_MESSAGE
           return nil
         end
         Barista.debug "Compiling #{file} from framework '#{framework.name}'"

data/lib/barista/filter.rb

@@ -10,11 +10,11 @@ module Barista
     end
 
     def _call(env)
-      Barista.debug 'Compiling all scripts for barista'
+      Barista.debug 'Compiling all scripts for barista' if Barista.auto_compile?
       Barista.compile_all!
       # Now, actually call the app.
       @app.call env
     end
 
   end
-end
+end

data/lib/barista/rake_task.rb

@@ -55,12 +55,8 @@ module Barista
     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
+      unless Barista::Compiler.available?
+        warn Barista::Compiler::UNAVAILABLE_MESSAGE
         exit 1
       end
     end

data/lib/barista/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: barista
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-01 00:00:00 +08:00
+date: 2011-06-02 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +25,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 2
-        - 1
-        version: "2.1"
+        - 2
+        version: "2.2"
   version_requirements: *id001
   name: coffee-script
   prerelease: false
@@ -161,6 +161,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple, transparent coffeescript integration for Rails and Rack applications.
-test_files: 
-- spec/barista_spec.rb
-- spec/spec_helper.rb
+test_files: []
+