goat 0.3.42 → 0.3.45

data/goat.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'goat'
-  s.version = '0.3.42'
+  s.version = '0.3.45'
   s.summary = 'Pre-release beta version of Goat'
   s.author = 'Patrick Collison'
   s.email = 'patrick@collison.ie'

data/lib/goat.rb

@@ -351,31 +351,33 @@ module Goat
       hook = find_hook(meth, path)
       hdrs = {}
       resp = nil
+      req = Rack::Request.new(env)
 
-      begin
-        req = Rack::Request.new(env)
+      Dynamic.let(:current_request => req) do
+        begin
 
-        app = @app_class.new(req)
+          app = @app_class.new(req)
 
-        begin
-          run_before_handlers(app)
+          begin
+            run_before_handlers(app)
+          rescue Halt => halt
+            return halt.response.to_a
+          end
+
+          if hook
+            resp = hook.handle_request(app)
+          else
+            raise NotFoundError.new(path)
+          end
         rescue Halt => halt
-          return halt.response.to_a
+          resp = halt.response
+        rescue Exception => e
+          resp = resp_for_error(e, app)
         end
 
-        if hook
-          resp = hook.handle_request(app)
-        else
-          raise NotFoundError.new(path)
-        end
-      rescue Halt => halt
-        resp = halt.response
-      rescue Exception => e
-        resp = resp_for_error(e, app)
+        run_after_handlers(app)
       end
 
-      run_after_handlers(app)
-
       resp.to_a
     end
   end
@@ -590,12 +592,22 @@ module Goat
 
             args << IndifferentHash.from_hash(reqargs)
 
-            resp = app.respond_with_hook("rpc_#{rpc}", *args)
-            resp = opts[:is_get] ? resp.to_json : [200, {}, '']
+            had_error = false
+            begin
+              resp = app.respond_with_hook("rpc_#{rpc}", *args)
+              resp = opts[:is_get] ? resp.to_json : [200, {}, '']
+            rescue Exception => e
+              had_error = true
+              # even though the actual response returned here doesn't matter too much,
+              # we want to call the error handler to make sure any app logic for handling
+              # errors is called.
+              resp = req_handler.resp_for_error(e, app)
+            end
 
-            if opts[:live]
+            if opts[:live] && !had_error
               component.update
             end
+
           end
         end
       end
@@ -1268,7 +1280,7 @@ module Goat
     end
 
     def live_spec
-      @live_spec ? @live_spec : raise("No live_spec specified")
+      @live_spec
     end
 
     def erb(*args, &blk)

data/lib/goat/autoreload.rb

@@ -40,21 +40,24 @@ module Goat
     end
 
     def self.command
-      @command || "ruby #{$0} #{ARGV.join(' ')}"
+      @command || (['ruby', $0] + ARGV)
     end
 
-    def initialize(dir, interval)
-      @dir = dir
+    def initialize(interval, opts={})
+      @dirs = opts[:dirs] || []
+      @files = opts[:files] || []
       @interval = interval
       @cache = {}
     end
 
     def filter_loadpaths
-      self.class.full_loadpaths.select {|f| f.downcase.start_with?(@dir.downcase)}
+      self.class.full_loadpaths.select do |f|
+        @dirs.any? { |d| f.downcase.start_with?(d.downcase) }
+      end
     end
 
     def watchpaths
-      @paths ||= filter_loadpaths
+      @paths ||= (filter_loadpaths + @files)
     end
 
     def update_cache
@@ -66,7 +69,13 @@ module Goat
     def reload
       EM.stop
       IO.closefrom(3)
-      Kernel.exec(self.class.command)
+      case self.class.command
+      when String: cmd = [self.class.command]
+      when Array: cmd = self.class.command
+      else
+        raise "Reload command must be a string or an array"
+      end
+      Kernel.exec(*cmd)
     end
 
     def maybe_reload

data/lib/goat/goat.js

@@ -215,11 +215,12 @@ Goat.LoadingIndicator = {
   function show() {
     ld.indicatorActive = true;
     $(ld.where).prepend(ld.indicator);
+    $(ld.where).show();
   }
 
   function hide() {
     if(ld.indicatorActive)
-      ld.indicator.remove();
+      $(ld.where).hide();
   }
 
   $(document).ready(function() {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: goat
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 73
   prerelease: false
   segments: 
   - 0
   - 3
-  - 42
-  version: 0.3.42
+  - 45
+  version: 0.3.45
 platform: ruby
 authors: 
 - Patrick Collison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +00:00
+date: 2011-03-01 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency