Merge pull request #60 from Sija/develop

v1.5.5

shard.yml

@@ -1,5 +1,5 @@
 name: raven
-version: 1.5.4
+version: 1.5.5
 
 authors:
   - Sijawusz Pur Rahnama <sija@sija.pl>
@@ -15,7 +15,7 @@ development_dependencies:
     version: ~> 0.3.0
   ameba:
     github: crystal-ameba/ameba
-    version: ~> 0.10.0
+    version: ~> 0.11.0
 
 targets:
   crash_handler:

spec/raven/instance_spec.cr

@@ -73,6 +73,21 @@ describe Raven::Instance do
       end
     end
 
+    {% for key in %i(user extra tags) %}
+      context "with {{key.id}} context specified" do
+        it "merges context hierarchy" do
+          with_instance do |instance|
+            Raven::Context.clear!
+            Raven.{{key.id}}_context(foo: :foo, bar: :bar)
+
+            instance.capture("Test message", {{key.id}}: {bar: "baz"}) do |event|
+              event.{{key.id}}.should eq({:foo => :foo, :bar => "baz"})
+            end
+          end
+        end
+      end
+    {% end %}
+
     context "with String" do
       it "sends the result of Event.from" do
         with_instance do |instance|

src/crash_handler.cr

@@ -80,9 +80,8 @@ module Raven
     end
 
     private def capture_with_options(*args, **options)
-      capture(*args) do |event|
-        event.initialize_with **DEFAULT_OPTS
-        event.initialize_with **options
+      options = DEFAULT_OPTS.merge(options)
+      capture(*args, **options) do |event|
         yield event
       end
     end

src/raven/instance.cr

@@ -132,8 +132,12 @@ module Raven
         logger.debug "'#{obj}' excluded from capture: #{configuration.error_messages}"
         return false
       end
-      Event.from(obj, configuration: configuration, context: context).tap do |event|
-        event.initialize_with **options
+      default_options = {
+        configuration: configuration,
+        context:       context,
+      }
+      options = default_options.merge(options)
+      Event.from(obj, **options).tap do |event|
         hint =
           if obj.is_a?(String)
             Event::Hint.new(exception: nil, message: obj)

src/raven/version.cr

@@ -1,3 +1,3 @@
 module Raven
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end