pavlov 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28147e53a9ec3060b50d87d0ffa15929c17f006c
-  data.tar.gz: 4f508eb3d010a7f276f68ff269d71ca86e200549
+  metadata.gz: 32f5a2414ffc45283f8602bafb5f8715a4e99a26
+  data.tar.gz: 642831b040f9a90ebe6b8633488a7ffbbb9dc797
 SHA512:
-  metadata.gz: c9c8cb195850d0e8deb4f8e70c08ba86a587104b66a8f78b920678d0bcf903ebfde8f51dea33e26ce22cd87dda1a7a6a41ad4da5db8090b87d1216ed27385b66
-  data.tar.gz: 8bb36fef06d09c8ef8c4a0e91bfb402dee5c95f863aac3aff77200619f69631c1ce371009e120d108556aa693b068a5461f9a1ffc294a09d57088a7e6e94ed77
+  metadata.gz: c2e4a6194b6717b64c7f475ee255d07a8078f1b0643a61e5bc86c7c2934765880c12c6cdee9979b1aca6cc5a8c0754e9d9c64c4322cda1806b1e104c530a74c6
+  data.tar.gz: b185b09010c0551e84bf1a25c9a8eca765ec4ffeb9fa73c19c97e017068145718610e3698aba31ec3d4b4a7efc5b446fd8083d89f5528e3f9cd484b0844a9254

data/lib/pavlov/alpha_compatibility.rb

@@ -1,60 +1,6 @@
 require 'pavlov'
 
 module Pavlov
-  def self.old_command command_name, *args
-    klass = class_for_command(command_name)
-    command command_name, arguments_to_attributes(klass, args)
-  end
-
-  def self.old_interactor interactor_name, *args
-    klass = class_for_interactor(interactor_name)
-    interactor interactor_name, arguments_to_attributes(klass, args)
-  end
-
-  def self.old_query query_name, *args
-    klass = class_for_query(query_name)
-    query query_name, arguments_to_attributes(klass, args)
-  end
-
-  def self.arguments_to_attributes(operation_class, arguments)
-    attribute_keys = operation_class.attribute_set.map(&:name)
-
-    # TODO: this can be done so much better, but I don't know how.
-    hash = {}
-    arguments.each_with_index do |value, index|
-      hash[attribute_keys[index].to_sym] = value
-    end
-    hash
-  end
-
-  module Helpers
-    def old_interactor name, *args
-      args = add_compatibility_pavlov_options args
-      Pavlov.old_interactor name, *args
-    end
-
-    def old_query name, *args
-      args = add_compatibility_pavlov_options args
-      Pavlov.old_query name, *args
-    end
-
-    def old_command name, *args
-      args = add_compatibility_pavlov_options args
-      Pavlov.old_command name, *args
-    end
-
-    private
-
-    def add_compatibility_pavlov_options args
-      # TODO: we should do this at a point where we know how many arguments we need
-      # so we can decide if we need to merge with another options object or
-      # just add it.
-      new_args = Array(args)
-      new_args << pavlov_options unless pavlov_options == {}
-      new_args
-    end
-  end
-
   class ValidationError < StandardError
   end
 

data/lib/pavlov/helpers.rb

@@ -20,8 +20,6 @@ module Pavlov
 
     def with_pavlov_options hash
       if pavlov_options != {}
-        hash ||= {}
-
         if hash.has_key? 'pavlov_options'
           hash[:pavlov_options] = pavlov_options.merge(hash[:pavlov_options])
         else

data/lib/pavlov/operation.rb

@@ -12,32 +12,32 @@ module Pavlov
     include Pavlov::Helpers
     include Virtus
 
-    def validate
-      return false if attributes_without_defaults_missing_values?
-
-      raise Pavlov::ValidationError, 'an argument is invalid' unless valid?
-
-      true
-    end
-
     def valid?
+      check_validation
       true
+    rescue Pavlov::ValidationError
+      false
     end
 
     def call(*args, &block)
-      validate
+      check_validation
       check_authorization
       execute(*args, &block)
     end
 
     private
 
+    def check_authorization
+      raise_unauthorized unless authorized?
+    end
+
     def raise_unauthorized(message = 'Unauthorized')
       raise Pavlov::AccessDenied, message
     end
 
-    def check_authorization
-      raise_unauthorized unless authorized?
+    def check_validation
+      raise Pavlov::ValidationError, 'some arguments were not given' if attributes_without_defaults_missing_values?
+      raise Pavlov::ValidationError, 'an argument is invalid' unless validate
     end
 
     def attributes_without_defaults_missing_values?
@@ -46,6 +46,10 @@ module Pavlov
       end
     end
 
+    def validate
+      true # no-op, users should override this
+    end
+
     module ClassMethods
       # make our interactors behave as Resque jobs
       def perform(*args)

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.6'
+  VERSION = '0.1.7'
 end

metadata

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