umlaut 4.0.0 → 4.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODZiYTQzNWJjMzkwMDAyZjZhMTNiODlhYzhlMmFjOGIwNTc0ZTVjYw==
+    OGNlZDU2MTIxYjg1Y2ViYjZkNThjNDY4MjJhMDQ1ZDlkNTFjMjg5Mg==
   data.tar.gz: !binary |-
-    MDk2ODYwYTM1M2UwM2QzMDg4ZGNlNDQxNWIwNjQ0YjVjN2JhZDE3NA==
+    ZDYwM2IwZDE2MDVkMjY1ZDE2ZjRjZmVmYTg0MWMxNWM2ZjNlNDMxNw==
 SHA512:
   metadata.gz: !binary |-
-    NTlmOTFjNzA2ZDU2ZDYwZDQ3MTJjNTk4Y2YxM2U0MTk1NGI4OTE1ZDk2YzM3
-    MjcyYjlkNjA5NTViZWNlMGM4Njk5YTJkZGFkMDdkZmY2YzBiYzg5ZWE2YjVk
-    MzZhZDViMmRhZWQyZjQwOWM0YzMwYWFjMTRjYTQ3YWQ2ODZkMmI=
+    ZDJkODQ3OTZhY2VlMGE2OWNkMmZiZWJhM2RlZjY3ZDA0MzUwOWEzNGRiNGQy
+    MmFjY2ZjNzFiYjQxNzY2Mzc0MzZiMTUyY2UxMDRhZDZjODAxMDZmNWY0ODU2
+    ZGNhNTdjZDI0ZjgzMGM1NTdmNGUzNzUzYjlhYjViYTZkZDZjMjk=
   data.tar.gz: !binary |-
-    ODRjOTg4MWY2NWIyNDYwMmU3MmU3ZWY2ZmE2MDg1ZDU4YzU1ZDJiMWU1YWVj
-    YmUxMjYwZTllMWZmNTc0NWI2MzJiN2Q2Nzk2MzcxODQxYjg5M2U3NTgyMzMz
-    NTllZGUxYTU5ZDQyMzI5NzY4ZGY4ZjY4YmMxMWM5YTY4OWE4YTM=
+    MzlhZmI2YmE3ZjFiOWM3MDhhNmM0MTdhZmM5N2U5NmYzYWVjOGYwMDg2Y2Vk
+    NjVjNjQ2ZTc1MTlkYzViZmY4ZmE3MjE1Njc3ZTZlYTFmMjgwN2JhMWU1MDAz
+    Y2YwNGM5Zjg4MjUwNGFhYjhmMzQ2YmQ0YmEyYzJjNTVlZGQwZDU=

data/app/controllers/umlaut/error_handling.rb

@@ -42,9 +42,7 @@ module Umlaut::ErrorHandling
     message << "  User-Agent: #{request.user_agent}\n"
     message << "  Client IP: #{request.remote_addr}\n\n"
     message << exception.annoted_source_code.to_s if exception.respond_to?(:annoted_source_code)
-    # mysterious :noise param seems to match how default rails does it, so
-    # we actually get a backtrace.
-    message << "  " << Rails.backtrace_cleaner.clean(exception.backtrace, :noise).join("\n  ")
+    message << "  " << Rails.backtrace_cleaner.clean(exception.backtrace).join("\n  ")
     logger.send(severity, "#{message}\n\n")
   end
   protected :log_error_with_context

data/app/models/service_wave.rb

@@ -101,7 +101,7 @@ class ServiceWave
             
             # Log it too, although experience shows it may never make it to the 
             # log for mysterious reasons. 
-            log_msg = TermColor.color("Umlaut: Threaded service raised exception.", :red, true) + " Service: #{service.service_id}, #{e.class} #{e.message}. Backtrace:\n  #{e.backtrace.join("\n  ")}"
+            log_msg = TermColor.color("Umlaut: Threaded service raised exception.", :red, true) + " Service: #{service.service_id}, #{e.class} #{e.message}. Backtrace:\n  #{clean_backtrace(e).join("\n  ")}"
             Rails.logger.error(log_msg)
             
             # And stick it in a thread variable too
@@ -162,10 +162,14 @@ class ServiceWave
   end
   
   protected
-    def clean_backtrace(exception, *args)
-      defined?(Rails) && Rails.respond_to?(:backtrace_cleaner) ?
-        Rails.backtrace_cleaner.clean(exception.backtrace, *args) :
-        exception.backtrace
+    def clean_backtrace(exception)
+      if defined?(Rails) && Rails.respond_to?(:backtrace_cleaner)
+        trace = Rails.backtrace_cleaner.clean(exception.backtrace)
+        trace = Rails.backtrace_cleaner.clean(exception.backtrace, :all) if trace.empty?
+        return trace
+      else
+        return exception.backtrace
+      end
     end
 
   

data/app/service_adaptors/isbn_db.rb

@@ -1,3 +1,6 @@
+# NOT recommended anymore, jrochkind has found IsbnDb to be pretty flaky, and
+# hard to deal with. See book_finder.rb or all_books_dot_com.rb as alternatives. 
+#
 # Talks to the ISBNDb (isbndb.com) to get pricing info and links to pricing
 # info for online sellers. There are potentially other services we could
 # make use of there in the future too.

data/lib/umlaut/version.rb

@@ -1,5 +1,5 @@
 module Umlaut
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 
   # This is used in Umlaut's .gemspec for generating the gem,
   # and is also used in the umlaut app generator to make sure

data/lib/umlaut.rb

@@ -46,6 +46,9 @@ module Umlaut
         line.sub(/^#{engine_root_regex}/, "#{engine_name} ")
       end
 
+      # This actually seemed not to be neccesary, and wasn't behaving right? Let's
+      # try without it...
+      #
       # Keep Umlaut's own stacktrace in the backtrace -- we have to remove Rails
       # silencers and re-add them how we want. 
       Rails.backtrace_cleaner.remove_silencers!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Jonathan Rochkind, et al
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails