lucid_works 0.6.1 → 0.6.2

data/lib/lucid_works/base.rb

@@ -132,9 +132,15 @@ module LucidWorks
         end
 
         raw_response = ActiveSupport::Notifications.instrument("lucid_works.request") do |payload|
-          payload[:method]   = :get
-          payload[:uri]      = url
-          payload[:response] = RestClient.get(url)
+          begin
+            payload[:method]   = :get
+            payload[:uri]      = url
+            payload[:response] = RestClient.get(url)
+          rescue RestClient::Exception => exception
+            # Tack on what we were doing when we got the exception, then send it on up
+            exception.message = "#{exception.message} while performing #{payload[:method]} #{payload[:uri]}"
+            raise exception
+          end
         end
 
         data = JSON.parse(raw_response)
@@ -173,9 +179,15 @@ module LucidWorks
             if kind_of_find == :all && association_info[:supports_all]
               all_targets_path = "#{collection_url(parent)}/all/#{target_name}"
               raw_response = ActiveSupport::Notifications.instrument("lucid_works.request") do |payload|
-                payload[:method]   = :get
-                payload[:uri]      = all_targets_path
-                payload[:response] = RestClient.get(all_targets_path)
+                begin
+                  payload[:method]   = :get
+                  payload[:uri]      = all_targets_path
+                  payload[:response] = RestClient.get(all_targets_path)
+                rescue RestClient::Exception => exception
+                  # Tack on what we were doing when we got the exception, then send it on up
+                  exception.message = "#{exception.message} while performing #{payload[:method]} #{payload[:uri]}"
+                  raise exception
+                end
               end
               if association_info[:type] == :has_one
                 all_targets_attributes = JSON.parse raw_response
@@ -321,6 +333,10 @@ module LucidWorks
               payload[:exception] = e
               attach_errors_to_model(e.response)
               false
+            rescue RestClient::Exception => exception
+              # Tack on what we were doing when we got the exception, then send it on up
+              exception.message = "#{exception.message} while performing #{payload[:method]} #{payload[:uri]}"
+              raise exception
             end
           end
         end
@@ -336,10 +352,16 @@ module LucidWorks
 
     def destroy(options={})
       ActiveSupport::Notifications.instrument("lucid_works.request") do |payload|
-        payload[:method]   = :delete
-        payload[:uri]      = member_url
-        payload[:options]  = options
-        payload[:repsonse] = RestClient.delete(member_url, options)
+        begin
+          payload[:method]   = :delete
+          payload[:uri]      = member_url
+          payload[:options]  = options
+          payload[:repsonse] = RestClient.delete(member_url, options)
+        rescue RestClient::Exception => exception
+          # Tack on what we were doing when we got the exception, then send it on up
+          exception.message = "#{exception.message} while performing #{payload[:method]} #{payload[:uri]}"
+          raise exception
+        end
       end
     end
 

data/lib/lucid_works/patch_restclient.rb

@@ -1,4 +1,20 @@
 module RestClient #:nodoc:
+
+  STATUSES.each_pair do |code, message|
+
+    # Compatibility
+    superclass = ([304, 401, 404].include? code) ? ExceptionWithResponse : RequestFailed
+    klass = Class.new(superclass) do
+      # LucidWorks: RestClient is kinda obnoxious and replaces the exception getter :message
+      # with a method returning a static string.  Make it return @message if it is set.
+      send(:define_method, :message) {@message || "#{http_code ? "#{http_code} " : ''}#{message}"}
+      # send(:define_method, :message) {"#{http_code ? "#{http_code} " : ''}#{message}"}
+    end
+    remove_const message.delete(' \-\'') # LucidWorks
+    klass_constant = const_set message.delete(' \-\''), klass
+    Exceptions::EXCEPTIONS_MAP[code] = klass_constant
+  end
+
   class Request #:nodoc:
 
     # Extract the query parameters for get request and append them to the url

data/lib/lucid_works/version.rb

@@ -1,3 +1,3 @@
 module LucidWorks
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: lucid_works
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Sam Pierson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 -04:00
+date: 2011-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency