rest_my_case 1.9.4 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2724bb942b9966ddca16a313cd92a21159752885
-  data.tar.gz: 2700a310ca133fadaca6673e2be21cdacea3a938
+  metadata.gz: 2c8fcfcdfef03f7d258b3ccd34e73c919adfb285
+  data.tar.gz: b647c1d6d9a57071f36480a0cc410df2ad0a8b80
 SHA512:
-  metadata.gz: d80ea3c0c01816e07a9a7f0bb7ca3d54796a14cc07e42635945fee101435a873f9c44356c271392ee0d9fb374a65f566fe68c14cecd6809caf4868074d0060f1
-  data.tar.gz: bcdabecbadd83fe88bc1b7082852fcf678d9b990e07cd2f8f0f62d75e4ab04b0ecbe2b4bd57f1dd0a308c5416231ad6467fe84259ea1d0591d7af208d27c8058
+  metadata.gz: bff3902db329514d14c1957a5d0d0140e139a0e9b92cb2c0a32aed4cc962a3a6acca3b067813427855b7d564b65d83e3b9e7b13c168554ca6f3acad28d220117
+  data.tar.gz: 8dd1ffb6a3f9d7a2744667502260c0eac64ac951e63c12b62b983cc333348c8fdbe6b8a2556f45bd15d9b3ff1f65a2125fd70ea6a3107b8f0aed62a7f7dc2302

data/lib/rest_my_case/base.rb

@@ -9,6 +9,10 @@ module RestMyCase
         Judge::Base, DefenseAttorney::Base, RestMyCase::Base, Context::Base
     end
 
+    def self.trial_court=(new_trial_court)
+      @trial_court = new_trial_court
+    end
+
     def self.depends(*use_case_classes)
       dependencies.push(*use_case_classes)
     end
@@ -78,12 +82,16 @@ module RestMyCase
       abort && fail(Errors::Abort)
     end
 
-    def error(message = '')
-      abort && context.errors.add(self.class.name, message)
+    def error(error_data = '')
+      error_data = { message: error_data } unless error_data.is_a?(Hash)
+
+      error_data[:class_name] = self.class.name
+
+      abort && context.errors.add(error_data)
     end
 
-    def error!(message = '')
-      error(message) && fail(Errors::Abort)
+    def error!(error_data = '')
+      error(error_data) && fail(Errors::Abort)
     end
 
     def skip

data/lib/rest_my_case/context/errors/base.rb

@@ -2,7 +2,7 @@ module RestMyCase
   module Context
     module Errors
 
-      class Base < Hash
+      class Base < Array
 
         def initialize(context)
           super()
@@ -10,20 +10,8 @@ module RestMyCase
           @context = context
         end
 
-        def add(class_name, message)
-          self[class_name] ||= []
-
-          self[class_name].push(message.to_s)
-        end
-
-        def messages
-          self.values.flatten
-        end
-
-        def full_messages
-          self.map do |class_name, messages|
-            "#{class_name}: #{messages.join(', ')}"
-          end
+        def add(error)
+          self.push(error)
         end
 
       end

data/lib/rest_my_case/context/errors/status.rb

@@ -4,12 +4,14 @@ module RestMyCase
 
       class Status < Base
 
-        def add(error, message)
+        attr_reader :last_known_error
+
+        def add(error)
           super
 
-          status = message.to_s.split(' - ')[0]
+          @context.status.send("#{error[:status]}!")
 
-          @context.status.send("#{status}!")
+          @last_known_error = error
         end
 
       end

data/lib/rest_my_case/context/http_status.rb

@@ -59,10 +59,17 @@ module RestMyCase
         RAILS_HTTP_STATUS[status.to_sym]
       end
 
-      def error_message
-        {
-          message: errors.empty? ? 'unknown error' : errors.messages.join(', ')
-        }
+      def error_response
+
+        if errors.last_known_error
+          response = errors.last_known_error.dup
+          response.delete :class_name
+          response[:http_status] = http_status
+
+          response
+        else
+          { message: 'unkown error' }
+        end
       end
 
     end

data/lib/rest_my_case/http_status.rb

@@ -1,10 +1,11 @@
 module RestMyCase
 
-  class HttpStatus < Status
+  module HttpStatus
 
-    def self.trial_court
-      @trial_court ||= Trial::Court.new \
-        Judge::Base, DefenseAttorney::Base, Base, Context::HttpStatus
+    def self.included(parent_class)
+      parent_class.include Status
+
+      parent_class.trial_court.context_class = Context::HttpStatus
     end
 
   end

data/lib/rest_my_case/status.rb

@@ -1,20 +1,25 @@
 module RestMyCase
 
-  class Status < Base
+  module Status
 
-    def self.trial_court
-      @trial_court ||= Trial::Court.new \
-        Judge::Base, DefenseAttorney::Base, Base, Context::Status
+    def self.included(parent_class)
+      parent_class.trial_court.context_class = Context::Status
     end
 
-    context_reader :status
+    def status
+      context.status
+    end
+
+    def failure(status, error = nil)
+      error = { message: error } unless error.is_a?(Hash)
+
+      error[:status] = status
 
-    def failure(status, message = nil)
-      error(Helpers.blank?(message) ? "#{status}" : "#{status} - #{message}")
+      error(error)
     end
 
-    def failure!(status, message = nil)
-      failure(status, message) && fail(Errors::Abort)
+    def failure!(status, error = nil)
+      failure(status, error) && fail(Errors::Abort)
     end
 
   end

data/lib/rest_my_case/version.rb

@@ -1,5 +1,5 @@
 module RestMyCase
 
-  VERSION = '1.9.4'
+  VERSION = '1.10.1'
 
 end

data/spec/rest_my_case/base_spec.rb

@@ -107,8 +107,7 @@ describe RestMyCase::Base do
       end
 
       it "context should contain only one error" do
-        expect(@context.errors).to match a_hash_including({"Perform::ValidateName"=>[""]})
-        expect(@context.errors.full_messages).to eq ["Perform::ValidateName: "]
+        expect(@context.errors).to match a_hash_including({ message: '', class_name: "Perform::ValidateName" })
       end
 
       it "context prove that only the correct method have ran" do
@@ -130,8 +129,7 @@ describe RestMyCase::Base do
       end
 
       it "context should contain only one error" do
-        expect(@context.errors).to match a_hash_including({"Perform::ValidateName"=>[""]})
-        expect(@context.errors.full_messages).to eq ["Perform::ValidateName: "]
+        expect(@context.errors).to match a_hash_including({ message: '', class_name: "Perform::ValidateName" })
       end
 
       it "context prove that only the correct method have ran" do
@@ -232,8 +230,7 @@ describe RestMyCase::Base do
         end
 
         it "context should contain only 2 errors" do
-          expect(@context.errors).to match a_hash_including({"Perform::ValidateName"=>[""], "Perform::ValidateBody"=>[""]})
-          expect(@context.errors.full_messages).to eq ["Perform::ValidateName: ", "Perform::ValidateBody: "]
+          expect(@context.errors).to match a_hash_including({ message: '', class_name: "Perform::ValidateName"}, { message: '', class_name: "Perform::ValidateBody" })
         end
 
         it "context prove that only the correct method have ran" do
@@ -257,8 +254,7 @@ describe RestMyCase::Base do
         end
 
         it "context should contain only 2 errors" do
-          expect(@context.errors).to match a_hash_including({"Perform::ValidateName"=>[""], "Perform::ValidateBody"=>[""]})
-          expect(@context.errors.full_messages).to eq ["Perform::ValidateName: ", "Perform::ValidateBody: "]
+          expect(@context.errors).to match a_hash_including({ message: '', class_name: "Perform::ValidateName" }, { message: '', class_name: "Perform::ValidateBody" })
         end
 
         it "context prove that only the correct method have ran" do
@@ -293,8 +289,7 @@ describe RestMyCase::Base do
         end
 
         it "context should contain only 4 errors" do
-          expect(@context.errors).to match a_hash_including({"Perform::BuildPost"=>[""], "Perform::ValidateName"=>[""], "Perform::ValidateBody"=>[""], "Perform::SavePost"=>[""]})
-          expect(@context.errors.full_messages).to eq ["Perform::BuildPost: ", "Perform::ValidateName: ", "Perform::ValidateBody: ", "Perform::SavePost: "]
+          expect(@context.errors).to match a_hash_including({ message: '', class_name: "Perform::BuildPost" }, { message: '', class_name: "Perform::ValidateName" }, { message: '', class_name: "Perform::ValidateBody" }, { message: '', class_name: "Perform::SavePost" })
         end
 
         it "context prove that only the correct method have ran" do

data/spec/rest_my_case/http_status_spec.rb

@@ -3,7 +3,10 @@ require 'spec_helper'
 describe RestMyCase::HttpStatus do
 
   context "when status.not_found! is used" do
-    NotFound = Class.new(RestMyCase::HttpStatus) { def perform; status.not_found!; end }
+    NotFound = Class.new(RestMyCase::Base) do
+      include RestMyCase::HttpStatus
+      def perform; status.not_found!; end
+    end
 
     before { @context = NotFound.perform }
 
@@ -11,13 +14,16 @@ describe RestMyCase::HttpStatus do
       expect(@context.http_status).to be 404
     end
 
-    it "@context.error_message should only list the class's dependencies" do
-      expect(@context.error_message).to match a_hash_including({:message=>"unknown error"})
+    it "@context.error_response should only list the class's dependencies" do
+      expect(@context.error_response).to match a_hash_including({ message: 'unkown error' })
     end
   end
 
   context "when failure(:unprocessable_entity) is used" do
-    UnprocessableEntity = Class.new(RestMyCase::HttpStatus) { def perform; failure(:unprocessable_entity); end }
+    UnprocessableEntity = Class.new(RestMyCase::Base) do
+      include RestMyCase::HttpStatus
+      def perform; failure(:unprocessable_entity); end
+    end
 
     before { @context = UnprocessableEntity.perform }
 
@@ -25,22 +31,25 @@ describe RestMyCase::HttpStatus do
       expect(@context.http_status).to be 422
     end
 
-    it "@context.error_message should only list the class's dependencies" do
-      expect(@context.error_message).to match a_hash_including({:message=>"unprocessable_entity"})
+    it "@context.error_response should only list the class's dependencies" do
+      expect(@context.error_response).to match a_hash_including({ status: :unprocessable_entity, http_status: 422, message: nil })
     end
   end
 
-  context "when failure!(:internal_server_error) is used" do
-    InternalServerError = Class.new(RestMyCase::HttpStatus) { def perform; failure!(:internal_server_error, 'failed to save'); end }
+  context "when failure!(:service_unavailable) is used" do
+    InternalServerError = Class.new(RestMyCase::Base) do
+      include RestMyCase::HttpStatus
+      def perform; failure!(:service_unavailable, { code: 404, message: 'github could not found repo' }); end
+    end
 
     before { @context = InternalServerError.perform }
 
     it "@context.http_status should only list the class's dependencies" do
-      expect(@context.http_status).to be 500
+      expect(@context.http_status).to be 503
     end
 
-    it "@context.error_message should only list the class's dependencies" do
-      expect(@context.error_message).to match a_hash_including({:message=>"internal_server_error - failed to save"})
+    it "@context.error_response should only list the class's dependencies" do
+      expect(@context.error_response).to match a_hash_including({ status: :service_unavailable, http_status: 503, code: 404, message: "github could not found repo" })
     end
   end
 

data/spec/rest_my_case/status_spec.rb

@@ -5,9 +5,14 @@ describe RestMyCase::Status do
   describe "context#status" do
 
     context "when status.not_found! is used" do
-      TestCase1 = Class.new(described_class) { def perform; status.accepted!; end }
+      StatusTestCase1 = Class.new(RestMyCase::Base) do
+        include RestMyCase::Status
+        def perform
+          status.accepted!
+        end
+      end
 
-      before { @context = TestCase1.perform }
+      before { @context = StatusTestCase1.perform }
 
       it "@context.status.accepted? should be true" do
         expect(@context.status.accepted?).to be true
@@ -19,50 +24,77 @@ describe RestMyCase::Status do
     end
 
     context "when error(:unprocessable_entity) is used" do
-      TestCase2 = Class.new(described_class) do
+      StatusTestCase2 = Class.new(RestMyCase::Base) do
+        include RestMyCase::Status
         def perform
           error(:unprocessable_entity)
           context.next_line = true
         end
       end
 
-      before { @context = TestCase2.perform }
+      before { @context = StatusTestCase2.perform }
 
-      it "@context.status.unprocessable_entity? should be true" do
-        expect(@context.status.unprocessable_entity?).to be true
+      it "@context.status.unprocessable_entity? should be false" do
+        expect(@context.status.unprocessable_entity?).to be false
       end
 
       it "@context.next_line should be true" do
         expect(@context.next_line).to be true
       end
 
-      it "@context.status.ok? should be false" do
-        expect(@context.status.ok?).to be false
+      it "@context.status.ok? should be true" do
+        expect(@context.status.ok?).to be true
       end
 
       it "context's errors should have a proper message" do
-        message = "unprocessable_entity"
-
-        expect(@context.errors["TestCase2"]).to eq [message]
-        expect(@context.errors.messages).to eq [message]
+        expect(@context.errors).to match [a_hash_including({ message: :unprocessable_entity, class_name: "StatusTestCase2" })]
       end
     end
 
     context "when error!(:internal_server_error) is used" do
-      TestCase3 = Class.new(described_class) do
+      StatusTestCase3 = Class.new(RestMyCase::Base) do
+        include RestMyCase::Status
         def perform
           error!(:internal_server_error)
           context.next_line = true
         end
       end
 
-      before { @context = TestCase3.perform }
+      before { @context = StatusTestCase3.perform }
+
+      it "@context.status.internal_server_error? should be false" do
+        expect(@context.status.internal_server_error?).to be false
+      end
+
+      it "@context.next_line should raise an error" do
+        expect { context.next_line }.to raise_error
+      end
+
+      it "@context.status.ok? should be true" do
+        expect(@context.status.ok?).to be true
+      end
+
+      it "context's errors should have a proper message" do
+        expect(@context.errors).to match [a_hash_including({ message: :internal_server_error, class_name: "StatusTestCase3" })]
+      end
+    end
+
+    context "when error!(status: :internal_server_error, message: 'something bad') is used" do
+      StatusTestCase4 = Class.new(RestMyCase::Base) do
+        include RestMyCase::Status
+        def perform
+          error!(status: :internal_server_error, message: 'something bad', yada: true)
+          context.next_line = true
+        end
+      end
+
+      before { @context = StatusTestCase4.perform }
 
       it "@context.status.internal_server_error? should be true" do
         expect(@context.status.internal_server_error?).to be true
       end
 
-      it "@context.next_line should be true" do
+      it "@context.next_line should raise an error" do
         expect { context.next_line }.to raise_error
       end
 
@@ -71,22 +103,20 @@ describe RestMyCase::Status do
       end
 
       it "context's errors should have a proper message" do
-        message = "internal_server_error"
-
-        expect(@context.errors["TestCase3"]).to eq [message]
-        expect(@context.errors.messages).to eq [message]
+        expect(@context.errors).to match [a_hash_including({ status: :internal_server_error, message: 'something bad', class_name: "StatusTestCase4", yada: true })]
       end
     end
 
     context "when failure(:unprocessable_entity) is used" do
-      TestCase4 = Class.new(described_class) do
+      StatusTestCase5 = Class.new(RestMyCase::Base) do
+        include RestMyCase::Status
         def perform
           failure(:unprocessable_entity, 'invalid id')
           context.next_line = true
         end
       end
 
-      before { @context = TestCase4.perform }
+      before { @context = StatusTestCase5.perform }
 
       it "@context.status.unprocessable_entity? should be true" do
         expect(@context.status.unprocessable_entity?).to be true
@@ -101,22 +131,20 @@ describe RestMyCase::Status do
       end
 
       it "context's errors should have a proper message" do
-        message = "unprocessable_entity - invalid id"
-
-        expect(@context.errors["TestCase4"]).to eq [message]
-        expect(@context.errors.messages).to eq [message]
+        expect(@context.errors).to match [a_hash_including({ status: :unprocessable_entity, message: 'invalid id', class_name: "StatusTestCase5" })]
       end
     end
 
     context "when failure!(:internal_server_error) is used" do
-      TestCase5 = Class.new(described_class) do
+      StatusTestCase6 = Class.new(RestMyCase::Base) do
+        include RestMyCase::Status
         def perform
           failure!(:internal_server_error, 'while saving the resource')
           context.next_line = true
         end
       end
 
-      before { @context = TestCase5.perform }
+      before { @context = StatusTestCase6.perform }
 
       it "@context.status.internal_server_error? should be true" do
         expect(@context.status.internal_server_error?).to be true
@@ -131,10 +159,7 @@ describe RestMyCase::Status do
       end
 
       it "context's errors should have a proper message" do
-        message = "internal_server_error - while saving the resource"
-
-        expect(@context.errors["TestCase5"]).to eq [message]
-        expect(@context.errors.messages).to eq [message]
+        expect(@context.errors).to match [a_hash_including({ status: :internal_server_error, message: 'while saving the resource', class_name: "StatusTestCase6" })]
       end
     end
 

data/spec/rest_my_case/validator_spec.rb

@@ -12,7 +12,7 @@ describe RestMyCase::Validator do
     end
 
     it "@context.errors should reflect the fact that no target is defined" do
-      expect(@context.errors).to a_hash_including({"RestMyCase::Validator"=>["no target to validate!"]})
+      expect(@context.errors).to a_hash_including({ message: "no target to validate!", class_name: "RestMyCase::Validator" })
     end
   end
 
@@ -28,7 +28,7 @@ describe RestMyCase::Validator do
       end
 
       it "@context.errors should include the unprocessable_entity error" do
-        expect(@context.errors).to a_hash_including({"CustomValidator"=>["unprocessable_entity"]})
+        expect(@context.errors).to a_hash_including({ message: "unprocessable_entity" , class_name: "CustomValidator" })
       end
 
       it "@post.errors should mention the bad phone_number error" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_my_case
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.10.1
 platform: ruby
 authors:
 - goncalvesjoao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry