pavlov 0.1.8.1 → 0.1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99aecac1d59af7be3c174ffef73dfa388bcc4303
-  data.tar.gz: a24bd54ec64f2825b1b7b5983eb19a0444de4086
+  metadata.gz: 7016775c6f4c49897e44a7cbb1d47d1fc284737b
+  data.tar.gz: 704dd818710d73271e7d0f0862a4e24f2a2950d6
 SHA512:
-  metadata.gz: b9fccb36eb44d786b958af7b4becf26563c14f61850873bec7f1529b79d6ae10ae87b137e5c32f3e9f0b4551b5e5c013b72cc6c50e0b904565230b3cf547c84b
-  data.tar.gz: 59d5f566ffd250268b0ad8597c8b870e2ec0e1855eaa6dfaf32633f1580ca26d9f59ae9a081b38101c692788a84baaced11a712873853c47ea1851903efa030d
+  metadata.gz: 7cdee8b6889becdc1c16a2b99d7e5a62c5248727c97917045e170dff6760599051e5d91bfb696ce4955374874e1f1dc9d4894fd9f683c71a42f05bee01a5ad98
+  data.tar.gz: 9eb0569bd7484a6165ba338c28989019127cc21f40a2a7411d0fede73e53fb7a6a415cb7416f98d307e61cfa02be6c57021082aaef3dfc2650899610faee4629

data/lib/pavlov.rb

@@ -1,33 +1,36 @@
 require 'pavlov/support/inflector'
 
 module Pavlov
-  def self.command command_name, *args
-    klass = class_for_command(command_name)
-    klass.new(*args).call
-  end
+  def self.command command_name, *args, &block
+    command = get_instance(Commands, command_name, *args)
 
-  def self.interactor interactor_name, *args
-    klass = class_for_interactor(interactor_name)
-    klass.new(*args).call
+    call_or_yield_instance command, &block
   end
 
-  def self.query query_name, *args
-    klass = class_for_query(query_name)
-    klass.new(*args).call
+  def self.interactor interactor_name, *args, &block
+    interactor = get_instance(Interactors, interactor_name, *args)
+
+    call_or_yield_instance interactor, &block
   end
 
-  private
+  def self.query query_name, *args, &block
+    query = get_instance(Queries, query_name, *args)
 
-  def self.class_for_command command_name
-    OperationFinder.find(Commands, command_name)
+    call_or_yield_instance query, &block
   end
 
-  def self.class_for_interactor interactor_name
-    OperationFinder.find(Interactors, interactor_name)
+  private
+
+  def self.get_instance(klass, name, *args)
+    OperationFinder.find(klass, name).new(*args)
   end
 
-  def self.class_for_query query_name
-    OperationFinder.find(Queries, query_name)
+  def self.call_or_yield_instance operation, &block
+    if block.nil?
+      operation.call
+    else
+      block.call operation
+    end
   end
 end
 

data/lib/pavlov/helpers.rb

@@ -1,15 +1,15 @@
 module Pavlov
   module Helpers
-    def interactor name, hash = {}
-      Pavlov.interactor name, with_pavlov_options(hash)
+    def interactor name, hash = {}, &block
+      Pavlov.interactor name, with_pavlov_options(hash), &block
     end
 
-    def query name, hash = {}
-      Pavlov.query name, with_pavlov_options(hash)
+    def query name, hash = {}, &block
+      Pavlov.query name, with_pavlov_options(hash), &block
     end
 
-    def command name, hash = {}
-      Pavlov.command name, with_pavlov_options(hash)
+    def command name, hash = {}, &block
+      Pavlov.command name, with_pavlov_options(hash), &block
     end
 
     def pavlov_options

data/lib/pavlov/operation.rb

@@ -35,7 +35,7 @@ module Pavlov
     end
 
     def call(*args, &block)
-      raise Pavlov::ValidationError, 'Some validations fail, cannot execute' unless valid?
+      fail Pavlov::ValidationError, 'Some validations fail, cannot execute' unless valid?
       check_authorization
       execute(*args, &block)
     end
@@ -47,11 +47,11 @@ module Pavlov
     end
 
     def raise_unauthorized(message = 'Unauthorized')
-      raise Pavlov::AccessDenied, message
+      fail Pavlov::AccessDenied, message
     end
 
     def check_validation
-      raise Pavlov::ValidationError, "Missing arguments: #{missing_arguments.inspect}" if missing_arguments.any?
+      fail Pavlov::ValidationError, "Missing arguments: #{missing_arguments.inspect}" if missing_arguments.any?
       validate
     end
 

data/lib/pavlov/version.rb

@@ -2,5 +2,5 @@ module Pavlov
   # We're doing this because we might write tests that deal
   # with other versions of bundler and we are unsure how to
   # handle this better.
-  VERSION = '0.1.8.1'
+  VERSION = '0.1.9.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pavlov
 version: !ruby/object:Gem::Version
-  version: 0.1.8.1
+  version: 0.1.9.0
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus