Server spec

lib/jbundle.rb

@@ -13,6 +13,7 @@ module JBundle
   JFILE = 'Jfile'
 
   class NoJFileError < StandardError;end
+  class NoBundleError < StandardError;end
 
   class << self
 
@@ -50,7 +51,7 @@ def write!
 
     def build(name)
       found = config.bundles_and_files.detect {|f| f.name == name}
-      raise "No bundle or file found with name #{name}" unless found
+      raise NoBundleError, "No bundle or file found with name #{name}" unless found
       Builder.new(config).build_one found
     end
 

lib/jbundle/server.rb

@@ -2,19 +2,24 @@ module JBundle
 
   class Server
 
+
     def initialize(jfile = JBundle::JFILE)
       @jfile = jfile
     end
 
     # Configure JBundle on every request. 
     # Expensive but allows for reloading changes to JFile
     def call(env)
-      JBundle.config_from_file(@jfile)
-      bundle_name = env['PATH_INFO'].sub('/', '')
-      if !bundle_name == ''
-        raise 'You need to define a bundle name ie. /my_bundle.js'
+      begin
+        JBundle.config_from_file(@jfile)
+        bundle_name = env['PATH_INFO'].sub('/', '')
+        [200, {'Content-Type' => 'application/x-javascript'}, [JBundle.build(bundle_name).src]]
+      rescue NoBundleError => boom
+        [404, {'Content-Type' => 'text/plain'}, ["No bundle defined. Try /[bundle_name].js as per your JFile"]]
+      rescue NoJFileError => boom
+        [404, {'Content-Type' => 'text/plain'}, [boom.message]]
       end
-      [200, {'Content-Type' => 'application/x-javascript'}, [JBundle.build(bundle_name).src]]
+
     end
 
   end

spec/server_spec.rb

@@ -13,6 +13,12 @@
       @response = @server.call({'PATH_INFO' => '/foo.js'})
     end
 
+    it 'should be 404 if no JFile found' do
+      s = JBundle::Server.new("doesn-not-exist")
+      r = s.call({'PATH_INFO' => '/foo.js'})
+      r[0].should == 404
+    end
+
     it 'should be 200 OK' do
       @response[0].should == 200
     end
@@ -25,6 +31,11 @@
       @response[2].should == [JBundle.build('foo.js').src]
     end
 
+    it 'should be 404 when no bundle found' do
+      r = @server.call({'PATH_INFO' => '/nonexisting.js'})
+      r[0].should == 404
+    end
+
   end
 
 end