assette 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/assette.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{assette}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Tal Atlas}]
-  s.date = %q{2011-12-29}
+  s.date = %q{2012-01-02}
   s.description = %q{Renders all asset types (coffeescript/sass/scss) as equals}
   s.email = %q{me@tal.by}
   s.executables = [%q{assette}]

data/lib/assette.rb

@@ -28,6 +28,8 @@ module Assette
   def logger=(l)
     @logger = l
   end
+
+  class CompilationError < StandardError; end;
 end
 
 %w{config reader readers post_processor post_processors

data/lib/assette/file.rb

@@ -141,7 +141,7 @@ class Assette::File < ::File
         if ::File.exist?(p2)
           p = p2
         else
-          raise "Cannot find dependancy #{p} or #{p2} as required in #{path}"
+          raise UnknownDependency, "Cannot find dependancy #{p} or #{p2} as required in #{path}"
         end
       end
       
@@ -229,40 +229,46 @@ class Assette::File < ::File
       return unless File.exist?(path)
       start = Time.now
       f = open(path)
-      
-      if opts[:deparr]
-        code = f.path_array
-        
-        resp = {:dependencies => code, :target_type => f.target_class.mime_type, :target_extension => f.extension}
-        
-        resp[:generation_time] = Time.now-start
+      begin    
+        if opts[:deparr]
+          code = f.path_array
+          
+          resp = {:dependencies => code, :target_type => f.target_class.mime_type, :target_extension => f.extension}
+          
+          resp[:generation_time] = Time.now-start
+          
+          return [200,{"Content-Type" => 'application/json'}, [resp.to_json]]
+        end
         
-        return [200,{"Content-Type" => 'application/json'}, [resp.to_json]]
-      end
-      
-      if opts[:nodep]
-        code = [f.code]
-        type = f.target_class.mime_type
-      elsif opts[:dev]
+        if opts[:nodep]
+          code = [f.code]
+          type = f.target_class.mime_type
+        elsif opts[:dev]
 
-        code = f.path_array.collect do |path|
-          path = "http://#{opts[:env]['HTTP_HOST']}#{path}"
-          f.target_class.include(path)
-        end
+          code = f.path_array.collect do |path|
+            path = "http://#{opts[:env]['HTTP_HOST']}#{path}"
+            f.target_class.include(path)
+          end
 
-        type = f.target_class.mime_type
+          type = f.target_class.mime_type
 
-      else
-        code = f.all_code_array
-        type = f.target_class.mime_type
+        else
+          code = f.all_code_array
+          type = f.target_class.mime_type
+        end
+        
+        code << "\n"
+        code << f.comment_str % "Time taken to generate: #{Time.now-start}s"
+        
+        [200,{"Content-Type" => type.content_type},code]
+      rescue Assette::CompilationError => e
+        target = f.target_class
+        [200,{"Content-Type" => target.mime_type.content_type},target.error(e.to_s,path)]
       end
-      
-      code << "\n"
-      code << f.comment_str % "Time taken to generate: #{Time.now-start}s"
-      
-      [200,{"Content-Type" => type.content_type},code]
     end
     
   end
+
+  class UnknownDependency < Assette::CompilationError; end
   
 end

data/lib/assette/reader.rb

@@ -91,7 +91,7 @@ module Assette
     
     end
     
-    class UnknownReader < StandardError; end
+    class UnknownReader < CompilationError; end
   end
   
   def self.Reader(type)

data/lib/assette/readers/js.rb

@@ -16,6 +16,8 @@ class Assette::Reader::Js < Assette::Reader(:js)
       else
         "console.error(#{str.to_json});"
       end
+
+      "console.error(#{str.to_json});alert(#{str.inspect.to_json});"
     end
     
     def comment_str

data/lib/assette/server.rb

@@ -84,16 +84,18 @@ module Assette
         return [200,{"Content-Type" => Reader::Js.mime_type.content_type},[set.compile]]
       end
       
-      if has_registered_reader? && (f = find_compiled_file)
-        f
-      elsif f = find_file
-        f
-      else
-        possible_paths = Assette.config.file_paths.collect do |p|
-          File.join(Dir.pwd,p,path)
-        end
-        
-        [404,{"Content-Type" => "text/plain"},["File Not Found\n#{possible_paths.join("\n")}"]]
+      begin
+        if has_registered_reader? && (f = find_compiled_file)
+          f
+        elsif f = find_file
+          f
+        else
+          possible_paths = Assette.config.file_paths.collect do |p|
+            File.join(Dir.pwd,p,path)
+          end
+          
+          [404,{"Content-Type" => "text/plain"},["File Not Found\n#{possible_paths.join("\n")}"]]
+        end  
       end
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assette
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 Z
+date: 2012-01-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement