hexx 6.0.3 → 7.0.0

data/spec/hexx/service_invalid_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+
+module Hexx
+  describe ServiceInvalid do
+
+    let(:service) { Service.new }
+    let(:error)   { Hexx::Message.new(type: "error", text: "some error") }
+
+    describe ".new" do
+
+      subject { Invalid }
+
+      it "fails if no arguments given" do
+        expect { described_class.new }.to raise_error ArgumentError
+      end
+
+      it "initializes the #service" do
+        expect { described_class.new Service.new }.not_to raise_error
+      end
+    end
+
+    describe "#messages" do
+
+      subject { described_class.new(service).messages }
+      let(:message) { subject.first }
+
+      it "returns an array" do
+        expect(subject).to be_kind_of Array
+      end
+
+      it "returns error messages" do
+        service.errors.send :add, :base, error.text
+        expect(message).to eq error
+      end
+    end
+
+    describe "#message" do
+
+      subject { described_class.new(service).message }
+
+      it "returns a proper message" do
+        expect(subject).to eq "Service invalid: #{ service.inspect }"
+      end
+    end
+  end
+end

data/spec/hexx/service_spec.rb

@@ -14,120 +14,47 @@ module Hexx
 
     let!(:described_class) { Test }
 
-    it "extends Hexx::Dependable" do
-      expect(described_class).to be_kind_of Hexx::Dependable
-    end
-
-    it "includes ActiveModel::Validations" do
-      expect(subject).to be_kind_of ActiveModel::Validations
-    end
-
     it "includes Whisper::Publisher" do
       expect(subject).to be_kind_of Wisper::Publisher
     end
 
-    describe "class helpers" do
-
-      describe ".allow_params" do
-
-        it "accepts one argument" do
-          expect { described_class.send :allow_params, :name }
-            .not_to raise_error
-        end
-
-        it "accepts a list of arguments" do
-          expect { described_class.send :allow_params, :name, :type }
-            .not_to raise_error
-        end
-
-        it "accepts an array of arguments" do
-          expect { described_class.send :allow_params, %w(name type) }
-            .not_to raise_error
-        end
-
-        it "requires strings or symbols" do
-          expect { described_class.send :allow_params, 1 }
-            .to raise_error SyntaxError
-        end
-
-        it "requires non-empty values" do
-          expect { described_class.send :allow_params, "" }
-            .to raise_error ArgumentError
-        end
-
-        it "requires values" do
-          expect { described_class.send :allow_params }
-            .to raise_error ArgumentError
-        end
-
-        context "with valid argument" do
-
-          before  { described_class.send :allow_params, :name }
-          subject do
-            described_class.new(name: "name", wrong: "wrong").with_callbacks
-          end
-
-          it "allows initialization of the parameter" do
-            expect(subject.params).to eq("name" => "name")
-          end
-
-          it "defines private getter for the parameter" do
-            expect(described_class.private_instance_methods)
-              .to be_include :name
-            expect { subject.params["name"] = "new" }
-              .to change { subject.name }.to "new"
-          end
-
-          it "defines private setter for the parameter" do
-            expect(described_class.private_instance_methods)
-              .to be_include :name=
-            expect { subject.name = "new" }
-              .to change { subject.params["name"] }.to "new"
-          end
-        end
-      end
+    it "includes helpers from Parameters" do
+      expect(described_class).to include Hexx::Helpers::Parameters
+      expect(described_class).to have_private_method :allow_params
+      expect(subject).to have_private_method :params
     end
 
-    describe ".new" do
-
-      let(:value) { "text" }
-      before      { described_class.send :allow_params, :name }
-      subject     { described_class.new(name: value).with_callbacks }
-
-      it "stringifies params keys" do
-        expect(subject.params["name"]).to eq value
-        expect(subject.params[:name]).to be_nil
-      end
+    it "includes helpers from Messages" do
+      expect(described_class).to include Hexx::Helpers::Messages
+      expect(subject).to have_public_method  :messages
+      expect(subject).to have_private_method :messages=
+      expect(subject).to have_private_method :add_message
+      expect(subject).to have_private_method :t
     end
 
-    # TODO: move this to private helpers
-    describe "#with_callbacks" do
-
-      context "without a prefix" do
-
-        subject { described_class.new.with_callbacks }
+    it "includes helpers from Validations" do
+      expect(described_class).to include Hexx::Helpers::Validations
+      expect(subject).to have_private_method :validate!
+    end
 
-        it "makes all private methods public" do
-          expect(subject.respond_to? :something).to be_truthy
-          expect(subject.respond_to? :on_something).to be_truthy
-          expect { subject.something }.not_to raise_error
-          expect { subject.on_something }.not_to raise_error
-        end
-      end
+    it "includes helpers from Exceptions" do
+      expect(described_class).to include Hexx::Helpers::Exceptions
+      expect(described_class).to have_private_method :raises
+      expect(subject).to have_private_method :on_error
+      expect(subject).to have_private_method :escape
+    end
 
-      context "with a prefix" do
+    it "doesn't extend Hexx::Dependable by default" do
+      expect(described_class).not_to be_kind_of Hexx::Dependable
+    end
 
-        subject { described_class.new.with_callbacks prefix: :on }
+    describe ".new" do
 
-        it "makes prefixed private methods public" do
-          expect(subject.respond_to? :on_something).to be_truthy
-          expect { subject.on_something }.not_to raise_error
-        end
+      before  { described_class.send :allow_params, :name }
+      subject { described_class.new(name: "name", code: "code") }
 
-        it "doesn't make other private methods public" do
-          expect(subject.respond_to? :something).to be_falsey
-          expect { subject.something }.to raise_error
-        end
+      it "assigns params properly" do
+        expect(subject.send :params).to eq("name" => "name")
       end
     end
 
@@ -138,153 +65,25 @@ module Hexx
       end
     end
 
-    describe "#messages" do
-
-      it "returns an array" do
-        expect(subject.messages).to be_kind_of Array
-      end
-    end
-
-    describe "instance helpers" do
-
-      let(:service) { Service.new name: "name" }
-      subject { service.with_callbacks }
+    describe "##run_service" do
 
-      describe "#validate!" do
-
-        it "passes when service is valid" do
-          expect { subject.validate! }.not_to raise_error
-        end
-
-        it "fails when service is invalid" do
-          allow(service).to receive(:valid?).and_return false
-          expect { subject.validate! }
-            .to raise_error { Service::Invalid.new(service) }
-        end
+      def service_spy(result)
+        object = described_class.new
+        allow(object).to receive(:run) { object.send :publish, result }
+        class_spy described_class.name, new: object
       end
 
-      describe "#t" do
-
-        let(:scope)      { %w(activemodel messages models hexx/service) }
-        let(:traslation) { I18n.t(:text, scope: scope, name: "name") }
-
-        it "translates symbols in the service scope" do
-          expect(subject.t(:text, name: "name")).to eq traslation
-        end
-
-        it "doesn't translate the string" do
-          expect(subject.t("text")).to eq "text"
-        end
-      end
-
-      describe "#messages=" do
-
-        it "sets #messages" do
-          expect { subject.messages = ["text"] }
-            .to change { subject.messages }.to ["text"]
-        end
-      end
-
-      describe "#add_message" do
-
-        before        { subject.add_message :info, :text }
-        let(:message) { subject.messages.first }
-
-        it "adds a new message" do
-          expect(message).to be_kind_of Service::Message
-          expect(message.type).to eq "info"
-        end
-
-        it "translates a symbol" do
-          translation = subject.t :text
-          expect(message.text).to eq translation
-        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
+      let(:other_service_class) { service_spy :result }
+      before { allow(subject).to receive(:on_service_result) }
 
-        it "adds errors to the service" do
-          begin; subject.on_error [message]; rescue; end
-          expect(subject.errors.messages).to eq(base: ["error"])
-        end
+      it "if wrong class given it fails with TypeError" do
+        expect { subject.send :run_service, String, :on_string }
+          .to raise_error { TypeError }
       end
 
-      describe "#escape" do
-
-        let(:listener) { double "listener" }
-        before { subject.subscribe listener }
-
-        it "yields a block" do
-          value  = "Hello!"
-          result = subject.escape { value }
-          expect(result).to eq value
-        end
-
-        context "when a block raises Service::Invalid error" do
-
-          let!(:exception) { Service::Invalid.new(Service.new) }
-
-          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(:message) { Service::Message.new type: "error", text: "text" }
-
-          it "re-raises the Service::Invalid" do
-            expect { run }.to raise_error { Service::Invalid }
-          end
-
-          it "adds error to the messages" do
-            begin
-              run
-            rescue => err
-              expect(err.messages).to eq [message]
-            end
-          end
-        end
-      end
-
-      describe "#run_service" do
-
-        let!(:other) { double "other", subscribe: nil, run: nil }
-        before { allow(described_class).to receive(:new).and_return other }
-
-        it "if wrong class given it fails with TypeError" do
-          expect { subject.run_service String, :on_string }
-            .to raise_error { TypeError }
-        end
-
-        it "creates a service object" do
-          options = { "name" => "some name" }
-          expect(described_class).to receive(:new).with options
-          subject.run_service described_class, :on_service, options
-        end
-
-        it "subscribes self for the service notifications" do
-          expect(other).to receive(:subscribe) do |listener, params|
-            expect(listener).to eq subject.with_callbacks
-            expect(params).to eq(prefix: :on_service)
-          end
-          subject.run_service described_class, :on_service
-        end
-
-        it "runs the service object after subscriptions" do
-          expect(other).to receive(:subscribe).ordered
-          expect(other).to receive(:run).ordered
-          subject.run_service described_class, :on_service
-        end
+      it "receives notifications from a service object" do
+        subject.send :run_service, other_service_class, :on_service
+        expect(subject).to have_received(:on_service_result)
       end
     end
   end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require "coveralls"
 root = File.expand_path "../..", __FILE__
 
 # Support files and Rspec settings
-Dir[File.join(root, "spec/initializers/*.rb")].each { |file| require file }
+Dir[File.join(root, "spec/support/**/*.rb")].each { |file| require file }
 
 # Application files
 Coveralls.wear!

data/spec/support/matchers/methods.rb

@@ -0,0 +1,11 @@
+RSpec::Matchers.define :have_private_method do |name|
+  match do |object|
+    expect(object.private_methods).to include(name)
+  end
+end
+
+RSpec::Matchers.define :have_public_method do |name|
+  match do |object|
+    expect(object.public_methods).to include(name)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexx
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 7.0.0
 platform: ruby
 authors:
 - Andrew Kozin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -151,31 +151,40 @@ files:
 - lib/hexx.rb
 - lib/hexx/coercible.rb
 - lib/hexx/configurable.rb
+- lib/hexx/creators/base.rb
+- lib/hexx/creators/coercion.rb
+- lib/hexx/creators/dependency.rb
+- lib/hexx/creators/module_dependency.rb
+- lib/hexx/creators/parameter.rb
 - lib/hexx/dependable.rb
-- lib/hexx/helpers/base.rb
-- lib/hexx/helpers/coercion.rb
-- lib/hexx/helpers/dependency.rb
-- lib/hexx/helpers/module_dependency.rb
-- lib/hexx/helpers/parameter.rb
+- lib/hexx/helpers/exceptions.rb
+- lib/hexx/helpers/messages.rb
+- lib/hexx/helpers/parameters.rb
+- lib/hexx/helpers/validations.rb
+- lib/hexx/message.rb
 - lib/hexx/null.rb
 - lib/hexx/service.rb
-- lib/hexx/service/invalid.rb
-- lib/hexx/service/message.rb
 - lib/hexx/service/with_callbacks.rb
+- lib/hexx/service_invalid.rb
 - lib/hexx/version.rb
 - spec/hexx/coercible_spec.rb
 - spec/hexx/configurable_spec.rb
 - spec/hexx/dependable_spec.rb
+- spec/hexx/helpers/exceptions_spec.rb
+- spec/hexx/helpers/messages_spec.rb
+- spec/hexx/helpers/parameters_spec.rb
+- spec/hexx/helpers/validations_spec.rb
+- spec/hexx/message_spec.rb
 - spec/hexx/null_spec.rb
-- spec/hexx/service/invalid_spec.rb
-- spec/hexx/service/message_spec.rb
+- spec/hexx/service_invalid_spec.rb
 - spec/hexx/service_spec.rb
-- spec/initializers/focus.rb
-- spec/initializers/garbage_collection.rb
-- spec/initializers/i18n.rb
-- spec/initializers/random_order.rb
-- spec/initializers/rspec.rb
 - spec/spec_helper.rb
+- spec/support/initializers/focus.rb
+- spec/support/initializers/garbage_collection.rb
+- spec/support/initializers/i18n.rb
+- spec/support/initializers/random_order.rb
+- spec/support/initializers/rspec.rb
+- spec/support/matchers/methods.rb
 homepage: https://github.com/nepalez/hexx
 licenses:
 - MIT
@@ -203,17 +212,22 @@ summary: Service objects for Rails.
 test_files:
 - spec/spec_helper.rb
 - spec/hexx/service_spec.rb
+- spec/hexx/message_spec.rb
 - spec/hexx/null_spec.rb
-- spec/hexx/service/message_spec.rb
-- spec/hexx/service/invalid_spec.rb
+- spec/hexx/helpers/parameters_spec.rb
+- spec/hexx/helpers/messages_spec.rb
+- spec/hexx/helpers/validations_spec.rb
+- spec/hexx/helpers/exceptions_spec.rb
+- spec/hexx/service_invalid_spec.rb
 - spec/hexx/coercible_spec.rb
 - spec/hexx/dependable_spec.rb
 - spec/hexx/configurable_spec.rb
-- spec/initializers/garbage_collection.rb
-- spec/initializers/i18n.rb
-- spec/initializers/focus.rb
-- spec/initializers/random_order.rb
-- spec/initializers/rspec.rb
+- spec/support/matchers/methods.rb
+- spec/support/initializers/garbage_collection.rb
+- spec/support/initializers/i18n.rb
+- spec/support/initializers/focus.rb
+- spec/support/initializers/random_order.rb
+- spec/support/initializers/rspec.rb
 - Rakefile
 - ".rubocop.yml"
 has_rdoc: