pavlov 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13bc3cf5812e5e607d68b9609120e074dad275a4
-  data.tar.gz: ff07d489d86b0dba8a4bc8b4f694d0d771b14f57
+  metadata.gz: 31594240b64696361ea5deeb4a506ba17c5cd1c8
+  data.tar.gz: 1e8ccb1439a90046a11496bb6fa35c68209f5752
 SHA512:
-  metadata.gz: 56aef16927ef152a86585bb4acdfcf2a03b1463694d36d88a687216a30200e75037c3890730933cca0b4df2353ce1e75ba34016d8d5b67860b25b64dd8b3f79b
-  data.tar.gz: 72deaa24033f719ff780a7b2e2017b59d5618bae0f01a3be24ebd4ea8297ce2b86f5b0ea49a5bc36a9882610d5031292052444254bf927a1ef8d2c6e6574df71
+  metadata.gz: 6ddbe50610a56b8b4d0b52c4875cd3b3b2cd1652fe535fa179143316db2ed1254edce5fa3de0ab3b0c3c3f32f19869939e129d3c7206152ba85aadc032d46307
+  data.tar.gz: 83bd809253f41acaa8a3c11931950a4d6585ff99151b4919a7138c1d4c92884c5616cdaead48be9c91982c4e10966eb0eea8ec9e52df12545da93d5986490192

data/lib/pavlov.rb

@@ -10,22 +10,36 @@ module Pavlov
   end
 
   def self.command command_name, *args
-    class_name = "Commands::"+string_to_classname(command_name)
-    klass = get_class_by_string(class_name)
+    klass = class_for_command(command_name)
     klass.new(*args).call
   end
 
-  def self.interactor command_name, *args
-    class_name = "Interactors::"+string_to_classname(command_name)
-    klass = get_class_by_string class_name
+  def self.interactor interactor_name, *args
+    klass = class_for_interactor(interactor_name)
     klass.new(*args).call
   end
 
-  def self.query command_name, *args
-    class_name = "Queries::"+string_to_classname(command_name)
-    klass = get_class_by_string class_name
+  def self.query query_name, *args
+    klass = class_for_query(query_name)
     klass.new(*args).call
   end
+
+  private
+
+  def self.class_for_command command_name
+    class_name = 'Commands::' + string_to_classname(command_name)
+    get_class_by_string(class_name)
+  end
+
+  def self.class_for_interactor interactor_name
+    class_name = 'Interactors::' + string_to_classname(interactor_name)
+    get_class_by_string(class_name)
+  end
+
+  def self.class_for_query query_name
+    class_name = 'Queries::' + string_to_classname(query_name)
+    get_class_by_string(class_name)
+  end
 end
 
 require_relative 'pavlov/engine' if defined?(Rails)

data/lib/pavlov/alpha_compatibility.rb

@@ -2,35 +2,29 @@ require 'pavlov'
 
 module Pavlov
   def self.old_command command_name, *args
-    class_name = "Commands::"+string_to_classname(command_name)
-    klass = get_class_by_string(class_name)
-    attributes = arguments_to_attributes(klass, args)
-    klass.new(attributes).call
+    klass = class_for_command(command_name)
+    command command_name, arguments_to_attributes(klass, args)
   end
 
-  def self.old_interactor command_name, *args
-    class_name = "Interactors::"+string_to_classname(command_name)
-    klass = get_class_by_string class_name
-    attributes = arguments_to_attributes(klass, args)
-    klass.new(attributes).call
+  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 command_name, *args
-    class_name = "Queries::"+string_to_classname(command_name)
-    klass = get_class_by_string class_name
-    attributes = arguments_to_attributes(klass, args)
-    klass.new(attributes).call
+  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={}
+    hash = {}
     arguments.each_with_index do |value, index|
       hash[attribute_keys[index].to_sym] = value
     end
-    return hash
+    hash
   end
 
   module Helpers
@@ -50,14 +44,13 @@ module Pavlov
     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)
-      if pavlov_options != {}
-        new_args << pavlov_options
-      end
+      new_args << pavlov_options unless pavlov_options == {}
       new_args
     end
   end
@@ -67,36 +60,52 @@ module Pavlov
 
   module Validations
     def validate_hexadecimal_string param_name, param
-      raise Pavlov::ValidationError,  "#{param_name.to_s} should be an hexadecimal string." unless param.is_a? String and /\A[\da-fA-F]+\Z/.match param
+      return if param.is_a?(String) && /\A[\da-fA-F]+\Z/.match(param)
+
+      raise Pavlov::ValidationError,  "#{param_name.to_s} should be an hexadecimal string."
     end
 
     def validate_regex param_name, param, regex, message
-      raise Pavlov::ValidationError, "#{param_name.to_s} #{message}" unless regex.match param
+      return if regex.match param
+
+      raise Pavlov::ValidationError, "#{param_name.to_s} #{message}"
     end
 
     def validate_integer param_name, param, opts = {}
       return if opts[:allow_blank] && param.blank?
-      raise Pavlov::ValidationError, "#{param_name.to_s} should be an integer." unless param.is_a? Integer
+      return if param.is_a?(Integer)
+
+      raise Pavlov::ValidationError, "#{param_name.to_s} should be an integer."
     end
 
     def validate_in_set param_name, param, set
-      raise Pavlov::ValidationError, "#{param_name.to_s} should be on of these values: #{set.inspect}." unless set.include? param
+      return if set.include? param
+
+      raise Pavlov::ValidationError, "#{param_name.to_s} should be on of these values: #{set.inspect}."
     end
 
     def validate_string param_name, param
-      raise Pavlov::ValidationError, "#{param_name.to_s} should be a string." unless param.is_a? String
+      return if param.is_a?(String)
+
+      raise Pavlov::ValidationError, "#{param_name.to_s} should be a string."
     end
 
     def validate_nonempty_string param_name, param
-      raise Pavlov::ValidationError, "#{param_name.to_s} should be a nonempty string." unless param.is_a?(String) && not(param.nil?) && not(param.empty?)
+      return if param.is_a?(String) && !param.empty?
+
+      raise Pavlov::ValidationError, "#{param_name.to_s} should be a nonempty string."
     end
 
     def validate_integer_string param_name, param
-      raise Pavlov::ValidationError, "#{param_name.to_s} should be an integer string." unless param.is_a? String and /\A\d+\Z/.match param
+      return if param.is_a?(String) && /\A\d+\Z/.match(param)
+
+      raise Pavlov::ValidationError, "#{param_name.to_s} should be an integer string."
     end
 
     def validate_not_nil param_name, param
-      raise Pavlov::ValidationError, "#{param_name.to_s} should not be nil." if param.nil?
+      return unless param.nil?
+
+      raise Pavlov::ValidationError, "#{param_name.to_s} should not be nil."
     end
   end
 

data/lib/pavlov/concern.rb

@@ -27,19 +27,19 @@
 module Pavlov
   module Concern
     def self.extended(base)
-      base.instance_variable_set("@_dependencies", [])
+      base.instance_variable_set('@_dependencies', [])
     end
 
     def append_features(base)
-      if base.instance_variable_defined?("@_dependencies")
-        base.instance_variable_get("@_dependencies") << self
+      if base.instance_variable_defined?('@_dependencies')
+        base.instance_variable_get('@_dependencies') << self
         return false
       else
         return false if base < self
         @_dependencies.each { |dep| base.send(:include, dep) }
         super
-        base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-        base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
+        base.extend const_get('ClassMethods') if const_defined?('ClassMethods')
+        base.class_eval(&@_included_block) if instance_variable_defined?('@_included_block')
       end
     end
 

data/lib/pavlov/helpers.rb

@@ -1,18 +1,15 @@
 module Pavlov
   module Helpers
     def interactor name, hash
-      hash = add_pavlov_options hash
-      Pavlov.interactor name, hash
+      Pavlov.interactor name, with_pavlov_options(hash)
     end
 
     def query name, hash
-      hash = add_pavlov_options hash
-      Pavlov.query name, hash
+      Pavlov.query name, with_pavlov_options(hash)
     end
 
     def command name, hash
-      hash = add_pavlov_options hash
-      Pavlov.command name, hash
+      Pavlov.command name, with_pavlov_options(hash)
     end
 
     def pavlov_options
@@ -20,7 +17,8 @@ module Pavlov
     end
 
     private
-    def add_pavlov_options hash
+
+    def with_pavlov_options hash
       if pavlov_options != {}
         hash ||= {}
 

data/lib/pavlov/operation.rb

@@ -12,7 +12,7 @@ module Pavlov
     def validate
       return false unless attributes_without_defaults_have_values
       if respond_to? :valid?
-        raise Pavlov::ValidationError, "an argument is invalid" unless valid?
+        raise Pavlov::ValidationError, 'an argument is invalid' unless valid?
       else
         true
       end
@@ -26,17 +26,17 @@ module Pavlov
 
     private
 
-    def raise_unauthorized(message='Unauthorized')
+    def raise_unauthorized(message = 'Unauthorized')
       raise Pavlov::AccessDenied, message
     end
 
     def check_authorization
-      raise_unauthorized if respond_to? :authorized?, true and not authorized?
+      raise_unauthorized if respond_to?(:authorized?, true) && !authorized?
     end
 
     def attributes_without_defaults_have_values
       attributes_without_value = attribute_set.select do |attribute|
-        not attribute.options.has_key?(:default) and send(attribute.name).nil?
+        !attribute.options.has_key?(:default) && send(attribute.name).nil?
       end
       attributes_without_value.empty?
     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.4"
+  VERSION = '0.1.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pavlov
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - marten@veldthuis.com
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus