sibilant 0.0.3 → 0.0.4

data/lib/sibilant.rb

@@ -1,7 +1,10 @@
 require "sibilant/version"
 require 'json'
+require 'open3'
 
 module Sibilant
+  class CompilationError < RuntimeError; end
+
   class << self
     def [](sibilant_code)
       Sibilant::Compiler.new.translate sibilant_code
@@ -30,11 +33,16 @@ module Sibilant
     end
 
     def translate(sibilant_code)
-      IO.popen("#{sibilant_cli} -i", 'r+') do |sibilant|
-        sibilant.puts sibilant_code
-        sibilant.close_write
-        sibilant.read
-      end.strip
+      Open3.popen3 sibilant_cli, '-i' do |i,o,e,t|
+        i.puts sibilant_code
+        i.close_write
+
+        if t.value.success?
+          o.read.strip
+        else
+          raise Sibilant::CompilationError.new(e.read.strip)
+        end
+      end
     end
   end
 end

data/lib/sibilant/sinatra.rb

@@ -5,6 +5,30 @@ module Sinatra
     def sibilant(*args)
       content_type 'application/javascript'
       render :sibilant, *args
+    rescue ::Sibilant::CompilationError => error
+      if settings.development?
+        display_sibilant_compilation_error error
+      else
+        500
+      end
+    end
+
+    def display_sibilant_compilation_error(error)
+      <<-END_JS
+        ;(function() {
+          var pre = document.createElement('PRE');
+          pre.innerHTML = '<h1>Sibilant Compilation Error</h1><code>' + 
+            '#{Rack::Utils.escape_html(error.message).gsub("'", "\\'").gsub("\n", "\\n")}' +
+            '</code>';
+          pre.style.background = 'rgba(255,0,0,0.5)';
+          pre.style.position = 'absolute';
+          pre.style.padding = '25px';
+          pre.style.top = '10px';
+          pre.style.left = '10px';
+          pre.style.margin = '0';
+          document.body.appendChild(pre);
+        })();
+      END_JS
     end
   end
 end

data/lib/sibilant/version.rb

@@ -1,3 +1,3 @@
 module Sibilant
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/sibilant_spec.rb

@@ -34,5 +34,19 @@ describe Sibilant do
       @compiler.should_receive(:package_json).once.and_return version: test_version
       @compiler.version.should eq(test_version)
     end
+
+    describe 'on compilation failure' do
+      it 'should raise a Sibilant::CompilationError' do
+        expect { @compiler.translate('(foo') }.to raise_error(Sibilant::CompilationError)
+      end
+
+      it 'should pass through the error message' do
+        begin
+          @compiler.translate('(foo')
+        rescue => error
+          error.message.should match(/Error: unexpected EOF, probably missing a \)/)
+        end
+      end
+    end
   end
 end

data/spec/sinatra_helper_spec.rb

@@ -8,6 +8,7 @@ class SibilantApp < Sinatra::Base
   set :views, ->{ root }
   get('/fixture.js') { sibilant :fixture }
   get('/inline.js') { sibilant '(alert "hello world")' }
+  get('/compilation-error.js') { sibilant '(defun' }
 end
 
 describe SibilantApp do
@@ -45,4 +46,40 @@ describe SibilantApp do
       last_response.body.should == 'thisIsSibilantCode((1 + 2 + 3));'
     end
   end
+
+  describe 'error handling' do
+    describe 'in development mode' do
+      before :each do
+        app.set :environment, :development
+        get '/compilation-error.js'
+      end        
+
+      it 'should succeed' do
+        last_response.should be_ok
+      end
+
+      it 'should display the error' do
+        last_response.body.should match(/unexpected EOF/)
+      end
+
+      it 'should still render javascript' do
+        last_response.content_type.should match('application/javascript')
+      end
+
+      it 'should display a nice header message' do
+        last_response.body.should match('Sibilant Compilation Error')
+      end
+    end
+
+    describe 'in production mode' do
+      before :each do
+        app.set :environment, :production
+        get '/compilation-error.js'
+      end
+
+      it 'should error' do
+        last_response.should_not be_ok
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibilant
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler