replace data if passed

xneelo · May 8, 2018 · 601c7b4 · 601c7b4
1 parent 004f9f2
commit 601c7b4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/lib/jsender/json.rb b/lib/jsender/json.rb
@@ -11,12 +11,10 @@ def error(message: "An error has occurred")
       }.to_json
     end
 
-    def failure(message: "A failure has occurred", data: {})
+    def failure(message: "A failure has occurred", data: nil)
       {
         'status' => 'fail',
-        'data' => {
-         'message' => message
-        }.merge(data)
+        'data' => data || { 'message' => message }
       }.to_json
     end
 

diff --git a/lib/jsender/rack.rb b/lib/jsender/rack.rb
@@ -10,7 +10,7 @@ def error(code: 500, flow_id: nil, message: "An error has occurred", body_as_arr
       ]
     end
 
-    def failure(code: 400, flow_id: nil, message: "A failure has occurred", data: {}, body_as_array: false)
+    def failure(code: 400, flow_id: nil, message: "A failure has occurred", data: nil, body_as_array: false)
       [
         code,
         headers(flow_id: flow_id),

diff --git a/lib/jsender/version.rb b/lib/jsender/version.rb
@@ -1,3 +1,3 @@
 module Jsender
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end
diff --git a/spec/jsender_json_spec.rb b/spec/jsender_json_spec.rb
@@ -66,9 +66,7 @@
       it 'should return a json encoded hash with provided data' do
         expected_result = {
           'status' => 'fail',
-          'data'   => {
-            'message' => message
-          }.merge(data)
+          'data'   => data
         }.to_json
         expect(subject.failure(message: message, data: data)).to eq(expected_result)
       end

diff --git a/spec/jsender_rack_spec.rb b/spec/jsender_rack_spec.rb
@@ -169,9 +169,7 @@
           },
           {
             'status' => 'fail',
-            'data' => {
-              'message' => message,
-            }.merge(data)
+            'data' => data
           }.to_json
         ]
         expect(subject.failure(message: message, data: data)).to eq(expected_result)