hexx 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d06fcfb644ba49b3b3cda9a06e024900f6600427
-  data.tar.gz: 00189cce747fa87b1f014235f564e9f7a1bda312
+  metadata.gz: 1ff06793590de1cf0454ae00e819af7743846bb5
+  data.tar.gz: 451ec8528f33174f8e115a37e162f0b5a90686ca
 SHA512:
-  metadata.gz: 04c8b1ac98ba33404aa04c9590ce7f9e9ebd1b5db1dd72e8996790f4e674475e337ad640ba0fccaf3f73b1617d23d70fb17f9012f826c173945d9abc6e7a40c0
-  data.tar.gz: 9c0be5860b62202e64b0f7102097ad17ece7b06932eee4edd99718f028ec1774102c68c0a7abb20895b17a65ca986b0bac5cb02c0b81e9d91edfe272c80bc205
+  metadata.gz: 1e06adaa3721ecedef8e8c02375aef4ae9e88ad71aed0b51c89153bd211084460170f4ed9f33d31a1de60954b8f6e3bdf2323b83ffdcb2a41eb6db4097066be0
+  data.tar.gz: d2d5ebbe8cda6dcdae090d3214dad875dfd55b32011cd967344bd4fecac0760e322b8bde1deed6945a947978ffad9f24bb506966274a5a24ee19ae8efd0923ef

data/lib/hexx/service.rb

@@ -121,6 +121,25 @@ module Hexx
       WithCallbacks.new(self, prefix: prefix)
     end
 
+    # @!attribute [r] messages
+    # The array of service messages (instances of {Hexx::Service::Message})
+    # with +text+ and +type+ attributes.
+    #
+    # @example
+    #   class Test < Hexx::Service
+    #     def run
+    #       add_message "info", :ok
+    #     end
+    #   end
+    #
+    #   service = Test.new
+    #   service.run # adds message
+    #   service.messages
+    #   # => [#<Hexx::Service::Message @text="ok" @type="info" >]
+    #
+    # @return [Array<Hexx::Service::Message>] The array of messages.
+    attr_reader :messages
+
     private
 
     # The helper runs another service object and subscribes +self+ for the
@@ -167,32 +186,32 @@ module Hexx
 
     # @!method escape
     #
-    # The method rescues block runtime errors and publishes the :error
-    # notification.
+    # The method:
+    # * rescues +StandardError+ exceptions
+    # * adds error message to the service
+    # * re-raises the <tt>Service::Invalid</tt> exception
     #
     # @example
     #   class GetItem < Hexx::Service
     #     def run
-    #       escape do
-    #         errors.add :base, :error
-    #         fail Invalid.new self
-    #       end
+    #       escape { do_something_unsafe }
+    #     rescue => err
+    #       publish :error, err.messages
+    #     end
+    #       publish :success
     #     end
     #   end
     #
-    #   service = GetItem.new
-    #   service.subscribe listener
-    #   service.run
-    #   # => the listener will be sent the error(messages).
-    #
     # @yield the block.
+    # @raise [Hexx::Service::Invalid] if the block raised the +StandardError+.
     # @return the value returned by the block.
     def escape
       yield
-    rescue Service::Invalid => err
-      publish :error, Message.from(err.service)
+    rescue Invalid => err
+      raise err
     rescue => err
-      publish :error, [Message.new(type: "error", text: err.message)]
+      errors.add :base, err.message
+      raise Invalid.new(self)
     end
 
     # Translates given key in current service's scope.
@@ -220,24 +239,7 @@ module Hexx
       I18n.t text, options.merge(scope: scope)
     end
 
-    # @!attribute messages
-    # The array of service messages, added by the {#add_message} helper.
-    #
-    # @example
-    #   class Test < Hexx::Service
-    #     def run
-    #       add_message "info", :ok
-    #       messages
-    #     end
-    #   end
-    #   result = Test.new.run.first
-    #   result.type
-    #   # => "info"
-    #   result.text
-    #   # => "translation not found: en.activemodel.messages.models.test.ok"
-    #
-    # @return [Array<Hexx::Service::Message>] The array of message objects.
-    attr_accessor :messages
+    attr_writer :messages
 
     # Adds the translated message to the {#messages} array.
     # @example (see Service#messages)

data/lib/hexx/service/invalid.rb

@@ -55,15 +55,21 @@ module Hexx
       # Returns a list of error messages from the service.
       #
       # @example
+      #   service.errors.add :base, "some error"
+      #
       #   error = Hexx::Service::Invalid.new service
-      #   error.messages            # => [#<Hexx::Message... >]
-      #   error.messages.first.type # => "error"
+      #   error.messages
+      #   # => [#<Hexx::Service::Message @type="error" @text="some error" >]
       #
-      # @return [Array<Hexx::Service::Message>] The list of messages.
+      # @return [Array<Hexx::Service::Message>] The list of error messages.
       def messages
-        service.errors.values.flatten.map do |text|
-          Message.new type: "error", text: text
-        end
+        errors.map { |text| Message.new type: "error", text: text }
+      end
+
+      private
+
+      def errors
+        service.errors.messages.values.flatten
       end
     end
   end

data/lib/hexx/version.rb

@@ -2,5 +2,5 @@
 module Hexx
 
   # Current release.
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/spec/hexx/service/invalid_spec.rb

@@ -24,16 +24,17 @@ module Hexx
       describe "#messages" do
 
         let(:service) { Service.new }
-        before do
-          allow(service).to receive_message_chain(:errors, :values)
-            .and_return [%w(1 2)]
-        end
         subject { Invalid.new(service).messages }
+        let(:message) { subject.first }
+
+        it "returns an array" do
+          expect(subject).to be_kind_of Array
+        end
 
-        it "returns a list of messages" do
-          expect(subject.map(&:class).uniq).to eq [Service::Message]
-          expect(subject.map(&:type).uniq).to eq ["error"]
-          expect(subject.map(&:text).uniq).to eq %w(1 2)
+        it "returns error messages" do
+          service.errors.send :add, :base, "some error"
+          expected = Service::Message.new(type: "error", text: "some error")
+          expect(message).to eq expected
         end
       end
 

data/spec/hexx/service_spec.rb

@@ -91,6 +91,13 @@ module Hexx
       end
     end
 
+    describe "#messages" do
+
+      it "returns an array" do
+        expect(subject.messages).to be_kind_of Array
+      end
+    end
+
     describe "private" do
 
       let!(:service) { Service.new }
@@ -136,13 +143,6 @@ module Hexx
         end
       end
 
-      describe "#messages" do
-
-        it "returns an array" do
-          expect(subject.messages).to be_kind_of Array
-        end
-      end
-
       describe "#messages=" do
 
         it "sets #messages" do
@@ -180,35 +180,29 @@ module Hexx
 
         context "when a block raises Service::Invalid error" do
 
-          before { subject.errors.add :base, :text }
-          let(:run) do
-            subject.escape { fail Service::Invalid.new(subject) }
-          end
-
-          it "rescues" do
-            expect { run }.not_to raise_error
-          end
+          let!(:exception) { Service::Invalid.new(Service.new) }
 
-          it "publishes an :error with service messages" do
-            expect(listener).to receive(:error)
-            run
+          it "re-raises the exception" do
+            expect { subject.escape { fail exception } }
+              .to raise_error { exception }
           end
         end
 
         context "when a block raises StandardError" do
 
-          let(:run) { subject.escape { fail "text" } }
+          let(:run)     { subject.escape { fail "text" } }
+          let(:message) { Service::Message.new type: "error", text: "text" }
 
-          it "rescues" do
-            expect { run }.not_to raise_error
+          it "re-raises the Service::Invalid" do
+            expect { run }.to raise_error { Service::Invalid }
           end
 
-          it "publishes an :error with a message" do
-            expect(listener).to receive(:error) do |messages|
-              expect(messages)
-                .to eq [Service::Message.new(type: "error", text: "text")]
+          it "adds error to the messages" do
+            begin
+              run
+            rescue => err
+              expect(err.messages).to eq [message]
             end
-            run
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexx
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Andrew Kozin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel