moonrope 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef945cc15907ff80fe15bc8d5e8cd01c439183e7
-  data.tar.gz: 29682cb87255200fb7c52dbec08c0e7b18ce6292
+  metadata.gz: 029f11de28ff6aad99782e6afa1cd9b63fd5a728
+  data.tar.gz: 7534e31e1f74e53908750560a9939a1c1052d43a
 SHA512:
-  metadata.gz: 16c45bb324804dc8180a2e71940a952d50cb1c68464df6d619d1bef1b3beb63aa1557647f70a4c5b0294f0f7ba733ac7cf1ec9648e6e37ee1fabe517967c5a57
-  data.tar.gz: c7b40e7fe75f15ca75894c2df47a3db6d6a6dcc3c672c0d084e9a95711a5ea09c7ee9165d14e5946cad1093a7514448ce1920b536f5d15cd17cc0f507819f0f1
+  metadata.gz: e52ac061f8085db1f3ca79dba71a0b33f7e8d5228a3d612b637ea7c8683abdd40ac808f1532469938f17cd6c50745d9161a81968563c6224e122b7434244acc8
+  data.tar.gz: 63674f861d4a4d5777df6f94079863c6f5ea4b7a62a39d3dde9a03d7bb6c08698cc4803bf1dc7d082491ffc4682b715918bba3d91ac50d22a61a0128217fe8a2

data/lib/moonrope/action.rb

@@ -49,6 +49,32 @@ module Moonrope
       end
     end
     
+    #
+    # Execute a block of code and catch approprite Moonrope errors and return
+    # a result.
+    #
+    def convert_errors_to_action_result(&block)
+      begin
+        yield block
+      rescue => exception
+        case exception
+        when Moonrope::Errors::RequestError
+          result = ActionResult.new(self)
+          result.status = exception.status
+          result.data = exception.data
+          result
+        else
+          if error_block = @controller.base.external_errors[exception.class]
+            result = ActionResult.new(self)
+            error_block.call(exception, result)
+            result
+          else
+            raise
+          end
+        end
+      end
+    end
+    
     #
     # Executes the action and returns a ActionResult object with the result
     # of the action.
@@ -75,7 +101,7 @@ module Moonrope
       #
       eval_environment.action = self
       
-      begin
+      convert_errors_to_action_result do
         #
         # Validate the parameters
         #
@@ -104,12 +130,6 @@ module Moonrope
         
         # Return the result object
         result
-        
-      rescue Moonrope::Errors::RequestError => e
-        result = ActionResult.new(self)
-        result.status = e.status
-        result.data = e.data
-        result
       end
     end
     
@@ -158,6 +178,6 @@ module Moonrope
       end
       true
     end
-          
+         
   end
 end

data/lib/moonrope/base.rb

@@ -126,5 +126,23 @@ module Moonrope
       matched_helpers.first
     end
     
+    #
+    # Return all the external errors which are registered for this base
+    #
+    # @return [Hash] a hash of external errors
+    #
+    def external_errors
+      @external_errors ||= {}
+    end
+    
+    #
+    # Register a new external error
+    #
+    # @param error_class [Class] a class which should be caught 
+    #
+    def register_external_error(error_class, &block)
+      self.external_errors[error_class] = block
+    end
+    
   end
 end

data/lib/moonrope/railtie.rb

@@ -21,6 +21,14 @@ module Moonrope
         Moonrope::Request.path_regex = app.config.moonrope_request_path_regex
       end
       
+      # Catch ActiveRecord::RecordNotFound exception as a standard not-found error
+      if defined?(ActiveRecord)
+        app.config.moonrope.register_external_error ActiveRecord::RecordNotFound do |exception, result|
+          result.status = 'not-found'
+          result.data = {:message => exception.message}
+        end
+      end
+      
       # Insert the Moonrope middleware into the application's middleware
       # stack (at the bottom).
       app.middleware.use(

data/lib/moonrope/request.rb

@@ -82,7 +82,7 @@ module Moonrope
     def execute
       eval_env = EvalEnvironment.new(@base, self)
       if @base.authenticator
-        begin
+        result = action.convert_errors_to_action_result do
           @authenticated_user = eval_env.instance_eval(&@base.authenticator)
           # If we are authenticated, check whether the action permits access to 
           # this user, if not raise an error.
@@ -91,11 +91,11 @@ module Moonrope
               raise Moonrope::Errors::AccessDenied, "Access to #{controller.name}/#{action.name} is not permitted."
             end
           end
-        rescue Moonrope::Errors::RequestError => e
-          @authenticated_user ||= false # set authenticated user to false if they don't exist
-          result = Moonrope::ActionResult.new(self)
-          result.status = e.status
-          result.data = e.data
+        end
+        
+        if result.is_a?(Moonrope::ActionResult)
+          # If we already have a result, we should return it and no longer execute
+          # this request.
           return result
         end
       end

data/lib/moonrope/version.rb

@@ -1,3 +1,3 @@
 module Moonrope
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moonrope
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Adam Cooke