hexx 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaff6d822dd7f231f89ffba298094e1a311d1e26
-  data.tar.gz: f01924567547d0783d8b115a704bd3db1df2712d
+  metadata.gz: 7290018a93943ca2db70630dac37ed9d1b2eabfe
+  data.tar.gz: 04b3a2c21598e88beda09d3f2a8bcee7622ba105
 SHA512:
-  metadata.gz: 120122ede3804bc647773a57acb7c77cd5f12e68400a4e9bc75a5c1aef7779bc20c2e02c963577c3fb54a4fddb074900bb7e9492ef799f64f88893cd878c6c66
-  data.tar.gz: 2491a49115d87e35d4d6c0d3ec06ae8a1291c49e5a57ac10d931e863f75b2e1bb19fff4f09b565d7b1a2de22a339cfc67add03d0ecf9a83cd655de9962b571de
+  metadata.gz: e93648cc19a96e0dca81731ce200b443a4d10e394356e329f0995061cf5ea9656758f42a382b65d465125baa6bc38013f94f5d39b2d00ffe3c04922c6317c5db
+  data.tar.gz: 4169b5355f71c1a1bb1c431edacb47e68d81990c6b74c6164a71aebc5d0b85c098be054f9f6789239c4c371b26144224e4379e78bc3f36b1b5764af7a909a1fd

data/lib/hexx/service.rb

@@ -272,5 +272,10 @@ module Hexx
     def validate!
       fail Invalid.new(self) unless valid?
     end
+
+    def on_error(messages)
+      messages.map(&:text).each { |text| errors.add :base, text }
+      fail Invalid.new(self)
+    end
   end
 end

data/lib/hexx/service/message.rb

@@ -42,20 +42,6 @@ module Hexx
         @type, @text = type.to_s, text.to_s
       end
 
-      # Extracts error messages from ActiveRecord or ActiveModel objects.
-      #
-      # @example
-      #   Message.from(object)
-      #   # => [#<Hexx::Service::Message ...>]
-      #
-      # @param  [ActiveRecord::Base] object The object to extract messages from.
-      # @return [Array<Hexx::Service::Message>] The array of extracted messages.
-      def self.from(object)
-        object.errors.values.flatten.map do |text|
-          new type: "error", text: text
-        end
-      end
-
       # Distinguishes two messages by type and text.
       #
       # @example

data/lib/hexx/service/parameters.rb

@@ -35,7 +35,22 @@ module Hexx
         # @param [Array<Symbol, String>] keys The list of allowed parameters.
         def allow_params(*keys)
           @params = keys.map(&:to_s)
-          attr_accessor(*params)
+          define_individual_params
+        end
+
+        def define_individual_params
+          params.each do |name|
+            add_getter(name)
+            add_setter(name)
+          end
+        end
+
+        def add_getter(name)
+          define_method(name) { params[name] }
+        end
+
+        def add_setter(name)
+          define_method("#{name}=") { |value| params[name] = value }
         end
       end
 
@@ -48,7 +63,6 @@ module Hexx
       # @param [Hash] params ({}) The parameters of the service object.
       def initialize(params = {})
         extract_params_from params
-        @params.each { |key, value| public_send "#{ key }=", value }
       end
 
       # @!attribute [r] params

data/lib/hexx/version.rb

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

data/spec/hexx/service/message_spec.rb

@@ -17,20 +17,6 @@ module Hexx
         end
       end
 
-      describe ".from" do
-
-        subject       { Message }
-        let(:service) { Service.new }
-        before        { service.public_send(:errors).add :base, :text }
-
-        it "extracts error messages from a record" do
-          message = subject.from(service).first
-          expect(message).to be_kind_of Message
-          expect(message.type).to eq "error"
-          expect(message.text).to eq service.errors.values.flatten.first
-        end
-      end
-
       describe "#type" do
 
         subject { Message.new type: "info", text: "text" }

data/spec/hexx/service_spec.rb

@@ -42,9 +42,15 @@ module Hexx
         expect(subject.params["wrong"]).to be_nil
       end
 
-      it "initializes attributes from params" do
+      it "define individual params' getters" do
         expect(subject.name).to eq value
       end
+
+      it "defines individual params' setters" do
+        subject.name = :another_name
+        expect(subject.name).to eq :another_name
+        expect(subject.params["name"]).to eq :another_name
+      end
     end
 
     describe "#with_callbacks" do
@@ -98,7 +104,7 @@ module Hexx
       end
     end
 
-    describe "private" do
+    describe "helpers" do
 
       let!(:service) { Service.new }
       subject { service.with_callbacks }
@@ -113,6 +119,7 @@ module Hexx
 
         it "defines instance attributes" do
           expect(Test.instance_methods).to be_include :name
+          expect(Test.instance_methods).to be_include :name=
         end
       end
 
@@ -167,6 +174,21 @@ module Hexx
         end
       end
 
+      describe "#on_error" do
+
+        let!(:message) { Service::Message.new(type: "error", text: "error") }
+
+        it "fails with Service::Invalid" do
+          expect { subject.on_error [message] }
+            .to raise_error { Service::Invalid }
+        end
+
+        it "adds errors to the service" do
+          begin; subject.on_error [message]; rescue; end
+          expect(subject.errors.messages).to eq(base: ["error"])
+        end
+      end
+
       describe "#escape" do
 
         let(:listener) { double "listener" }

metadata

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