roqua-support 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f481217c2c1c02f664554bb9a968cc84a09e5f6c
-  data.tar.gz: 9e3ad99b7e548bcb6a3070cd3014debb051a4765
+  metadata.gz: 5b4f2e07189d3ee1b5b4c0e6472bd3c1b4ba2c6a
+  data.tar.gz: 3ae9698e6c4b77a16e7ff1226cb9269e3d3f428c
 SHA512:
-  metadata.gz: 3883e8e1cf321a2f2cd2ae9e542a57338a6de7d268643668fa8071fb3970eb258ebdf021181abb50cbb9aeb58d738d66a492c0da18cf03f76310b298e8c5433e
-  data.tar.gz: 562bc80b0e7d6f222160c507201f2cf22ec3380cf629e50327b141972d15ffb729559c7a7dfd486b3285d82397c8ab4e961df2ca30b12d74f7fc99e66d71d641
+  metadata.gz: 6ab8c7979cb7a686033f05b6a0a9e64e028a94a59a6a6186a5621826e91f044dcedb0075dfe337b38c32eb623a6f45d63ff64c0b38e52bfb65bbfded5b518281
+  data.tar.gz: 86c8129d450c4e37237488eeef12ffc1766813b8d3b0d78762b2ec4531aec0c83cbaeb9cd4db439edaddd47cc8bd2dab90f75758797d275c050b2fddc02284e0

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+* remove dubious return from ensure in activerecord extensions
+
 ## 0.1.5 / 2014-03-10
 
 * Make sure to raise when uniq_find_or_create cannot find a record

data/Gemfile.lock

@@ -1,19 +1,18 @@
 PATH
   remote: .
   specs:
-    roqua-support (0.1.6)
+    roqua-support (0.1.7)
       activesupport (>= 3.2, < 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.3)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    activesupport (4.1.0)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.15)
+      tzinfo (~> 1.1)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
@@ -36,6 +35,7 @@ GEM
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     i18n (0.6.9)
+    json (1.8.1)
     listen (2.5.0)
       celluloid (>= 0.15.2)
       celluloid-io (>= 0.15.0)
@@ -43,8 +43,7 @@ GEM
       rb-inotify (>= 0.9)
     lumberjack (1.0.4)
     method_source (0.8.2)
-    minitest (4.7.5)
-    multi_json (1.9.0)
+    minitest (5.3.3)
     nio4r (1.0.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
@@ -65,10 +64,10 @@ GEM
     ruby-progressbar (1.4.1)
     slop (3.4.7)
     thor (0.18.1)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
+    thread_safe (0.3.3)
     timers (1.1.0)
-    tzinfo (0.3.39)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/lib/roqua/core_ext/activerecord/uniq_find_or_create.rb

@@ -8,10 +8,9 @@ module ActiveRecord
     # raised. When no record can be found, because for instance validations fail on create, the created object
     # containing the validation errors is returned instead.
     def self.uniq_find_or_create_by(attributes, &block)
-      record = find_or_create_by(attributes, &block)
+      find_or_create_by(attributes, &block)
     rescue ActiveRecord::RecordNotUnique => exception
-    ensure
-      return find_by(attributes) || record || raise(exception)
+      find_by(attributes) || raise(exception)
     end
 
     # Use this method if you want an exception to be raised when creating a new record fails due to some validation
@@ -19,9 +18,9 @@ module ActiveRecord
     def self.uniq_find_or_create_by!(attributes, &block)
       find_or_create_by!(attributes, &block)
     rescue ActiveRecord::RecordNotUnique => exception
+      find_by(attributes) || raise(exception)
     rescue ActiveRecord::RecordInvalid => exception
-    ensure
-      return find_by(attributes) || raise(exception)
+      find_by(attributes) || raise(exception)
     end
   end
 end

data/lib/roqua/support/errors.rb

@@ -35,14 +35,20 @@ module Roqua
           # Appsignal.send_exception(exception, parameters: parameters)
 
           if Appsignal.active?
-            transaction = Appsignal::Transaction.create(SecureRandom.uuid, ENV.to_hash)
-            transaction.set_tags(parameters)
-            transaction.add_exception(exception)
-            transaction.complete!
-            Appsignal.agent.send_queue
+            # Hackety hack around stateful mess of Appsignal gem
+            if Appsignal::Transaction.current
+              Appsignal::Transaction.current.set_tags(parameters)
+              Appsignal::Transaction.current.add_exception(exception)
+            else
+              transaction = Appsignal::Transaction.create(SecureRandom.uuid, ENV.to_hash)
+              transaction.set_tags(parameters)
+              transaction.add_exception(exception)
+              transaction.complete!
+              Appsignal.agent.send_queue
+            end
           end
         end
       end
     end
   end
-end
+end

data/lib/roqua-support/version.rb

@@ -1,5 +1,5 @@
 module Roqua
   module Support
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/spec/roqua/core_ext/activerecord/uniq_find_or_create_spec.rb

@@ -25,7 +25,7 @@ describe ActiveRecord::Base do
     end
 
     it 'returns a preexisting or created record by querying it' do
-      allow(ActiveRecord::Base).to receive(:find_by).with(attributes).and_return record
+      allow(ActiveRecord::Base).to receive(:find_or_create_by).with(attributes).and_return record
       expect(ActiveRecord::Base.uniq_find_or_create_by attributes, &block).to eq(record)
     end
 
@@ -59,7 +59,7 @@ describe ActiveRecord::Base do
     end
 
     it 'returns a preexisting or created record by querying it' do
-      allow(ActiveRecord::Base).to receive(:find_by).with(attributes).and_return record
+      allow(ActiveRecord::Base).to receive(:find_or_create_by!).with(attributes).and_return record
       expect(ActiveRecord::Base.uniq_find_or_create_by! attributes, &block).to eq(record)
     end
 

data/spec/roqua/support/errors_spec.rb

@@ -34,11 +34,11 @@ describe 'Error reporting' do
     let(:agent)       { double("agent") }
     let(:transaction) { double("transaction") }
 
-    it 'sends notifications to appsignal' do
+    it 'sends notifications to appsignal when there is no current exception' do
       stub_const("Appsignal", Module.new)
       Appsignal.stub(active?: true)
       Appsignal.stub(is_ignored_exception?: false, agent: agent)
-      stub_const("Appsignal::Transaction", double("Transaction", create: transaction))
+      stub_const("Appsignal::Transaction", double("Transaction", create: transaction, current: nil))
 
       transaction.should_receive(:set_tags).with({})
       transaction.should_receive(:add_exception).with(exception)
@@ -46,6 +46,17 @@ describe 'Error reporting' do
       agent.should_receive(:send_queue)
       Roqua::Support::Errors.report exception
     end
+
+    it 'sends notifications to appsignal when there already is a current exception' do
+      stub_const("Appsignal", Module.new)
+      Appsignal.stub(active?: true)
+      Appsignal.stub(is_ignored_exception?: false, agent: agent)
+      stub_const("Appsignal::Transaction", double("Transaction", current: transaction))
+
+      transaction.should_receive(:set_tags).with({})
+      transaction.should_receive(:add_exception).with(exception)
+      Roqua::Support::Errors.report exception
+    end
   end
 
   it 'supports default extra params' do
@@ -57,4 +68,4 @@ describe 'Error reporting' do
                                              parameters: {organization: 'some_org'})
     Roqua::Support::Errors.report exception
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roqua-support
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Marten Veldthuis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Helper objects and proxies used by a lot of RoQua applications