squash_rails 1.1.4 → 1.2.0

data/lib/squash/rails/capistrano.rb

@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2013 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/squash/rails/configure.rb

@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2013 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/squash/rails/rack.rb

@@ -1,3 +1,17 @@
+# Copyright 2013 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
 module Squash
   module Rails
 

data/lib/squash/rails/sidekiq.rb

@@ -0,0 +1,40 @@
+# Copyright 2013 Square Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+module Squash
+
+  # Sidekiq adapter for Squash. Reports all exceptions in Sidekiq to Squash,
+  # then re-raises them for Sidekiq to manage.
+
+  class Sidekiq
+    # @private
+    def call(worker, msg, queue)
+      begin
+        yield
+      rescue => err
+        Squash::Ruby.notify err,
+                            :jid             => worker.jid,
+                            :sidekiq_message => msg,
+                            :queue           => queue
+        raise
+      end
+    end
+  end
+end
+
+::Sidekiq.configure_server do |config|
+  config.server_middleware do |chain|
+    chain.add ::Squash::Sidekiq
+  end
+end

data/lib/squash/rails/tasks.rake

@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2013 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/squash/rails.rb

@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2013 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -60,3 +60,5 @@ module Squash::Ruby
     alias_method_chain :exception_info_hash, :rails
   end
 end
+
+require 'squash/rails/sidekiq' if defined?(Sidekiq)

data/lib/squash/ruby/controller_methods.rb

@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2013 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/lib/squash/ruby/railtie.rb

@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2013 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

data/rails/init.rb

@@ -1,4 +1,4 @@
-# Copyright 2012 Square Inc.
+# Copyright 2013 Square Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: squash_rails
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 4
-  version: 1.1.4
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Tim Morgan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-09 00:00:00 Z
+date: 2013-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: squash_ruby
@@ -117,6 +117,7 @@ files:
 - lib/squash/rails/capistrano.rb
 - lib/squash/rails/configure.rb
 - lib/squash/rails/rack.rb
+- lib/squash/rails/sidekiq.rb
 - lib/squash/rails/tasks.rake
 - lib/squash/ruby/controller_methods.rb
 - lib/squash/ruby/railtie.rb