rest_my_case 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3806b834670a2c8eb80d7fd00ef3923afee77ed
-  data.tar.gz: 94a6d4365d873c9a48bf677f5531b9b7e973d4f9
+  metadata.gz: 4eaca5ca9d55737b8d3aadc7d215d3bb13f2aabe
+  data.tar.gz: e4a6d32211c6c2033b341a1c53e4894b642a9985
 SHA512:
-  metadata.gz: 068a0cfdca202c28835aaece3c99b8efd36a3ae38d4c01c04c9db9673a966f1de84743f6278b116fdcaa3a222afae945c0be3d56381936cfef25103bbf100b9c
-  data.tar.gz: c580aa1241f136e325f7ed3d2db9e878a93c17761b902841dcb54628db413128086071066109d71c3b90ebaf32159d8e221315194765ced3ae86e1298a4141b4
+  metadata.gz: f34ecef601ece173ee6960d489ca331c767a23e255977f46c0b2362d745555781f9540a2bbb9032e9e1cd44ad3bd9c96c8c20741d047fefbf5f1644e05cdc790
+  data.tar.gz: b2a4efbdf1e1975f9b037a7a6e6162e3a6548c02533dca21474a6f6a53798e7399b78266765478eb814382b9482d7bdcba71abd846f94bc245553ad5ca1a9fde

data/lib/rest_my_case.rb

@@ -6,10 +6,10 @@ require 'rest_my_case/errors/base'
 require 'rest_my_case/config/base'
 require 'rest_my_case/config/general'
 require 'rest_my_case/defense_attorney/base'
+require 'rest_my_case/context/errors/base'
+require 'rest_my_case/context/errors/status'
 require 'rest_my_case/context/base'
-require 'rest_my_case/context/status/matcher'
-require 'rest_my_case/context/status/status'
-require 'rest_my_case/context/status/base'
+require 'rest_my_case/context/status'
 require 'rest_my_case/context/http_status'
 require 'rest_my_case/judge/base'
 require 'rest_my_case/trial/case'

data/lib/rest_my_case/base.rb

@@ -79,7 +79,7 @@ module RestMyCase
     end
 
     def error(message = '')
-      abort && context.errors[self.class.name].push(message)
+      abort && context.errors.add(self.class.name, message)
     end
 
     def error!(message = '')

data/lib/rest_my_case/context/base.rb

@@ -7,12 +7,16 @@ module RestMyCase
 
       include ActiveModel::Serialization if defined?(ActiveModel)
 
+      def self.error_class
+        Errors::Base
+      end
+
       def to_hash
         Marshal.load Marshal.dump(attributes)
       end
 
       def errors
-        @errors ||= Hash.new { |hash, key| hash[key] = [] }
+        @errors ||= self.class.error_class.new(self)
       end
 
       def valid?

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

@@ -0,0 +1,23 @@
+module RestMyCase
+  module Context
+    module Errors
+
+      class Base < Hash
+
+        def initialize(context)
+          super()
+
+          @context = context
+        end
+
+        def add(error, message)
+          self[error] ||= []
+
+          self[error].push(message)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module RestMyCase
+  module Context
+    module Errors
+
+      class Status < Base
+
+        def add(error, message)
+          super
+
+          @context.status.send("#{message}!")
+        end
+
+      end
+
+    end
+  end
+end

data/lib/rest_my_case/context/http_status.rb

@@ -1,7 +1,7 @@
 module RestMyCase
   module Context
 
-    class HttpStatus < Status::Base
+    class HttpStatus < Status
 
       RAILS_HTTP_STATUS = {
         continue: 100,
@@ -56,7 +56,7 @@ module RestMyCase
       }
 
       def http_status
-        RAILS_HTTP_STATUS[status.current.to_sym]
+        RAILS_HTTP_STATUS[status.to_sym]
       end
 
     end

data/lib/rest_my_case/context/status.rb

@@ -0,0 +1,38 @@
+module RestMyCase
+  module Context
+
+    class Status < Base
+
+      class StatusString < String
+
+        def method_missing(method, *args, &block)
+          last_char = method[-1]
+          method_name = method[0...-1]
+
+          if last_char == '!'
+            self.replace(method_name)
+          elsif last_char == '?'
+            self == method_name
+          else
+            super
+          end
+        end
+
+      end
+
+      def self.error_class
+        Errors::Status
+      end
+
+      def status
+        @status ||= StatusString.new 'ok'
+      end
+
+      def status=(val)
+        raise 'status is a reserved keyword which cannot be set'
+      end
+
+    end
+
+  end
+end

data/lib/rest_my_case/status.rb

@@ -4,14 +4,12 @@ module RestMyCase
 
     def self.trial_court
       @trial_court ||= Trial::Court.new \
-        Judge::Base, DefenseAttorney::Base, Base, Context::Status::Base
+        Judge::Base, DefenseAttorney::Base, Base, Context::Status
     end
 
     context_reader :status
 
     def failure(status, message = nil)
-      context.status.send("#{status}!")
-
       error(Helpers.blank?(message) ? "#{status}" : "#{status} - #{message}")
     end
 

data/lib/rest_my_case/version.rb

@@ -1,5 +1,5 @@
 module RestMyCase
 
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 
 end

data/spec/rest_my_case/base_spec.rb

@@ -107,7 +107,7 @@ describe RestMyCase::Base do
       end
 
       it "context should contain only one error" do
-        expect(@context.errors.keys.length).to be 1
+        expect(@context.errors).to match a_hash_including({"Perform::ValidateName"=>[""]})
       end
 
       it "context prove that only the correct method have ran" do
@@ -129,7 +129,7 @@ describe RestMyCase::Base do
       end
 
       it "context should contain only one error" do
-        expect(@context.errors.keys.length).to be 1
+        expect(@context.errors).to match a_hash_including({"Perform::ValidateName"=>[""]})
       end
 
       it "context prove that only the correct method have ran" do
@@ -230,7 +230,7 @@ describe RestMyCase::Base do
         end
 
         it "context should contain only 2 errors" do
-          expect(@context.errors.keys.length).to be 2
+          expect(@context.errors).to match a_hash_including({"Perform::ValidateName"=>[""], "Perform::ValidateBody"=>[""]})
         end
 
         it "context prove that only the correct method have ran" do
@@ -254,7 +254,7 @@ describe RestMyCase::Base do
         end
 
         it "context should contain only 2 errors" do
-          expect(@context.errors.keys.length).to be 2
+          expect(@context.errors).to match a_hash_including({"Perform::ValidateName"=>[""], "Perform::ValidateBody"=>[""]})
         end
 
         it "context prove that only the correct method have ran" do
@@ -289,7 +289,7 @@ describe RestMyCase::Base do
         end
 
         it "context should contain only 4 errors" do
-          expect(@context.errors.keys.length).to be 4
+          expect(@context.errors).to match a_hash_including({"Perform::BuildPost"=>[""], "Perform::ValidateName"=>[""], "Perform::ValidateBody"=>[""], "Perform::SavePost"=>[""]})
         end
 
         it "context prove that only the correct method have ran" do

data/spec/rest_my_case/context/status_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe RestMyCase::Context::Status do
+
+  describe '#status=' do
+    let(:context) { described_class.new }
+
+    it 'raises error' do
+      expect do
+        context.status = 'not_found'
+      end.to raise_error
+    end
+  end
+
+  describe '#status' do
+    before { @status = described_class.new.status }
+
+    describe '#method_missing' do
+      context "given that no method was previously called" do
+        it 'calling an unknown_method should raise an error' do
+          expect { @status.unknown_method }.to raise_error
+        end
+
+        it '#ok? should be true' do
+          expect(@status.ok?).to be true
+        end
+      end
+    end
+
+    describe '#to_s' do
+      context "given that .not_found! was called" do
+        before { @status.not_found! }
+
+        it "should return 'not_found'" do
+          expect(@status.to_s).to eq "not_found"
+        end
+      end
+    end
+
+    describe '#==' do
+      context "given that .unauthorized! was called" do
+        before { @status.unauthorized! }
+
+        it "comparing to 'unauthorized' should return true" do
+          expect(@status == 'unauthorized').to be true
+        end
+      end
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_my_case
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - goncalvesjoao
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -125,10 +125,10 @@ files:
 - lib/rest_my_case/config/base.rb
 - lib/rest_my_case/config/general.rb
 - lib/rest_my_case/context/base.rb
+- lib/rest_my_case/context/errors/base.rb
+- lib/rest_my_case/context/errors/status.rb
 - lib/rest_my_case/context/http_status.rb
-- lib/rest_my_case/context/status/base.rb
-- lib/rest_my_case/context/status/matcher.rb
-- lib/rest_my_case/context/status/status.rb
+- lib/rest_my_case/context/status.rb
 - lib/rest_my_case/defense_attorney/base.rb
 - lib/rest_my_case/errors/abort.rb
 - lib/rest_my_case/errors/base.rb
@@ -145,8 +145,7 @@ files:
 - spec/rest_my_case/accusation_attorneys/base_spec.rb
 - spec/rest_my_case/accusation_attorneys/each_spec.rb
 - spec/rest_my_case/base_spec.rb
-- spec/rest_my_case/context/status/base_spec.rb
-- spec/rest_my_case/context/status/status_spec.rb
+- spec/rest_my_case/context/status_spec.rb
 - spec/rest_my_case/defense_attorney/base_spec.rb
 - spec/rest_my_case/http_status_spec.rb
 - spec/rest_my_case/status_spec.rb
@@ -187,8 +186,7 @@ test_files:
 - spec/rest_my_case/accusation_attorneys/base_spec.rb
 - spec/rest_my_case/accusation_attorneys/each_spec.rb
 - spec/rest_my_case/base_spec.rb
-- spec/rest_my_case/context/status/base_spec.rb
-- spec/rest_my_case/context/status/status_spec.rb
+- spec/rest_my_case/context/status_spec.rb
 - spec/rest_my_case/defense_attorney/base_spec.rb
 - spec/rest_my_case/http_status_spec.rb
 - spec/rest_my_case/status_spec.rb

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

@@ -1,27 +0,0 @@
-module RestMyCase
-  module Context
-    module Status
-
-      class Base < Context::Base
-
-        def initialize(*args)
-          super(*args)
-
-          @status = ::RestMyCase::Context::Status::Status.new
-        end
-
-        def status
-          @status
-        end
-
-        def status=(val)
-          raise 'status is a reserved keyword which cannot be set'
-        end
-
-        alias :success? :valid?
-
-      end
-
-    end
-  end
-end

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

@@ -1,30 +0,0 @@
-module RestMyCase
-  module Context
-    module Status
-
-      class Matcher
-
-        STATUS_SETTER_REGEX   = /\A[a-zA-Z](.*)!\z/
-        STATUS_QUESTION_REGEX = /\A[a-zA-Z](.*)\?\z/
-
-        def initialize(text)
-          @text = text
-        end
-
-        def match_as_setter?
-          !!(@text =~ STATUS_SETTER_REGEX)
-        end
-
-        def match_as_question?
-          !!(@text =~ STATUS_QUESTION_REGEX)
-        end
-
-        def status
-          @text[0...-1]
-        end
-
-      end
-
-    end
-  end
-end

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

@@ -1,37 +0,0 @@
-module RestMyCase
-  module Context
-    module Status
-
-      class Status
-
-        attr_reader :current
-
-        def initialize
-          @current = 'ok'
-        end
-
-        def method_missing(method, *args, &block)
-          matcher = ::RestMyCase::Context::Status::Matcher.new(method)
-
-          if matcher.match_as_setter?
-            @current = matcher.status
-          elsif matcher.match_as_question?
-            @current == matcher.status
-          else
-            super
-          end
-        end
-
-        def to_s
-          current.to_s
-        end
-
-        def ==(value)
-          to_s == value
-        end
-
-      end
-
-    end
-  end
-end

data/spec/rest_my_case/context/status/base_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe RestMyCase::Context::Status::Base do
-
-  describe '#status=' do
-
-    let(:context) { described_class.new }
-
-    it 'raises error' do
-      expect do
-        context.status = 'not_found'
-      end.to raise_error
-    end
-
-  end
-end

data/spec/rest_my_case/context/status/status_spec.rb

@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-describe RestMyCase::Context::Status::Status do
-
-  describe '#method_missing' do
-    context "given that no method was previously called" do
-      before { @status = described_class.new }
-
-      it 'calling an unknown_method should raise an error' do
-        expect { @status.unknown_method }.to raise_error
-      end
-
-      it '#ok? should be true' do
-        expect(@status.ok?).to be true
-      end
-    end
-  end
-
-  describe '#to_s' do
-    context "given that .not_found! was called" do
-      before do
-        @status = described_class.new
-        @status.not_found!
-      end
-
-      it "should return 'not_found'" do
-        expect(@status.to_s).to eq "not_found"
-      end
-    end
-  end
-
-  describe '#==' do
-    context "given that .unauthorized! was called" do
-      before do
-        @status = described_class.new
-        @status.unauthorized!
-      end
-
-      it "comparing to 'unauthorized' should return true" do
-        expect(@status == 'unauthorized').to be true
-      end
-    end
-  end
-
-end