barista 0.7.0.pre2 → 0.7.0.pre3

data/barista.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{barista}
-  s.version = "0.7.0.pre2"
+  s.version = "0.7.0.pre3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Darcy Laycock"]
-  s.date = %q{2010-11-26}
+  s.date = %q{2010-12-10}
   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).

data/lib/barista/compiler.rb

@@ -90,7 +90,7 @@ module Barista
     def compile!
       location          = @options.fetch(:origin, 'inline')
       @compiled_content = compile(@context, location)
-      @compiled_content = preamble(location) + @compiled_content if Barista.add_preamble?
+      @compiled_content = preamble(location) + @compiled_content if location != 'inline' && Barista.add_preamble?
       @compiled         = true
     end
 
@@ -107,7 +107,12 @@ module Barista
     rescue CoffeeScript::Error => e
       Barista.invoke_hook :compilation_failed, where, e.message
       if Barista.exception_on_error? && !@options[:silence]
-        raise CompilationError, "CoffeeScript encountered an error compiling #{where}: #{e.message}"
+        if e.is_a?(CoffeeScript::CompilationError)
+          where_within_app = where.sub(/#{Regexp.escape(Barista.app_root.to_s)}\/?/, '')
+          raise CompilationError, "Error: In #{where_within_app}, #{e.message}"
+        else
+          raise CompilationError, "CoffeeScript encountered an error compiling #{where}: #{e.message}"
+        end
       end
       compilation_error_for where, e.message
     end

data/lib/barista/framework.rb

@@ -2,7 +2,7 @@ module Barista
   class Framework
 
     def self.default_framework
-      @default_framework ||= self.new("default", Barista.root)
+      @default_framework ||= self.new(:name => "default", :root => Barista.root)
     end
 
     def self.default_framework=(value)

data/lib/barista/version.rb

@@ -3,6 +3,6 @@ module Barista
     MAJOR  = 0
     MINOR  = 7
     PATCH  = 0
-    STRING = [MAJOR, MINOR, PATCH, 'pre2'].join(".")
+    STRING = [MAJOR, MINOR, PATCH, 'pre3'].join(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: barista
 version: !ruby/object:Gem::Version 
-  hash: -1876988199
+  hash: -1876988218
   prerelease: true
   segments: 
   - 0
   - 7
   - 0
-  - pre2
-  version: 0.7.0.pre2
+  - pre3
+  version: 0.7.0.pre3
 platform: ruby
 authors: 
 - Darcy Laycock
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +08:00
+date: 2010-12-10 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency