pavlov 0.0.1 → 0.1.0

data/lib/pavlov.rb

@@ -29,7 +29,6 @@ module Pavlov
 end
 
 require_relative 'pavlov/helpers'
-require_relative 'pavlov/utils'
 require_relative 'pavlov/access_denied'
 require_relative 'pavlov/validation_error'
 require_relative 'pavlov/validations'
@@ -37,5 +36,4 @@ require_relative 'pavlov/operation'
 require_relative 'pavlov/command'
 require_relative 'pavlov/query'
 require_relative 'pavlov/interactor'
-require_relative 'pavlov/entity'
 require_relative 'pavlov/version'

data/lib/pavlov/command.rb

@@ -1,11 +1,9 @@
 require 'active_support/concern'
+require_relative 'operation'
 
 module Pavlov
   module Command
     extend ActiveSupport::Concern
     include Pavlov::Operation
-    def authorized?
-      true
-    end
   end
 end

data/lib/pavlov/helpers.rb

@@ -7,12 +7,12 @@ module Pavlov
 
     def query name, *args
       args = add_pavlov_options args
-      Pavlov.query name, *args, pavlov_options
+      Pavlov.query name, *args
     end
 
     def command name, *args
       args = add_pavlov_options args
-      Pavlov.command name, *args, pavlov_options
+      Pavlov.command name, *args
     end
 
     def pavlov_options

data/lib/pavlov/interactor.rb

@@ -1,5 +1,6 @@
 require 'active_support/concern'
 require 'active_support/inflector'
+require 'pavlov/operation'
 
 module Pavlov
   module Interactor
@@ -16,5 +17,9 @@ module Pavlov
         @queue ||= :interactor_operations
       end
     end
+
+    def authorized?
+      raise NotImplementedError
+    end
   end
 end

data/lib/pavlov/operation.rb

@@ -1,47 +1,71 @@
 require 'active_support/concern'
+require 'pavlov/validations'
+require 'pavlov/helpers'
+require_relative 'access_denied'
 
 module Pavlov
   module Operation
     extend ActiveSupport::Concern
     include Pavlov::Helpers
     include Pavlov::Validations
-    include Pavlov::Utils
-    def pavlov_options
-      @options
+
+    def initialize(*params)
+      keys, names, @options = extract_arguments(params)
+      set_instance_variables keys, names
+      validate
+
+      check_authorization
+
+      finish_initialize if respond_to? :finish_initialize
     end
 
-    def raise_unauthorized(message='Unauthorized')
-      raise Pavlov::AccessDenied, message
+    def validate
+      if respond_to? :valid?
+        valid?
+      else
+        true
+      end
+    end
+
+    def call(*args, &block)
+      execute(*args, &block)
     end
 
-    def check_authority
-      raise_unauthorized unless respond_to? :authorized? and authorized?
+    private
+
+    def pavlov_options
+      @options
     end
 
-    def initialize *params
+    def extract_arguments(params)
       keys = (respond_to? :arguments) ? arguments : []
       names = params.first(keys.length)
+
       if params.length == keys.length + 1
-        @options = params.last
+        options = params.last
       elsif params.length == keys.length
-        @options = {}
+        options = {}
       else
         raise "wrong number of arguments."
       end
 
+      [keys, names, options]
+    end
+
+    def set_instance_variables(keys, names)
       (keys.zip names).each do |pair|
         name = "@" + pair[0].to_s
         value = pair[1]
         instance_variable_set(name, value)
       end
+    end
 
-      validate if respond_to? :validate
-      check_authority
-      finish_initialize if respond_to? :finish_initialize
+    def raise_unauthorized(message='Unauthorized')
+      raise Pavlov::AccessDenied, message
     end
 
-    def call
-      self.execute
+    def check_authorization
+      raise_unauthorized if respond_to? :authorized?, true and not authorized?
     end
 
     module ClassMethods
@@ -57,6 +81,10 @@ module Pavlov
         define_method :arguments do
           keys
         end
+
+        class_eval do
+          attr_reader(*keys)
+        end
       end
 
       # make our interactors behave as Resque jobs

data/lib/pavlov/query.rb

@@ -1,12 +1,9 @@
 require 'active_support/concern'
+require_relative 'operation'
 
 module Pavlov
   module Query
     extend ActiveSupport::Concern
     include Pavlov::Operation
-
-    def authorized?
-      true
-    end
   end
 end

data/lib/pavlov/validations.rb

@@ -1,21 +1,18 @@
-require_relative 'validations/errors'
-require_relative 'validations/not_valid'
-
 module Pavlov
   module Validations
-    def errors
-      @errors ||= Pavlov::Validations::Errors.new
-    end
-
     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
+      #warn "[DEPRECATION] `validate_hexadecimal_string` is deprecated. Please use the ActiveModel validation instead."
+      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
     end
 
     def validate_regex param_name, param, regex, message
+      #warn "[DEPRECATION] `validate_integer` is deprecated. Please use the default format_of ActiveModel validator instead."
       raise Pavlov::ValidationError, "#{param_name.to_s} #{message}" unless regex.match param
     end
 
-    def validate_integer param_name, param
+    def validate_integer param_name, param, opts = {}
+      #warn "[DEPRECATION] `validate_integer` is deprecated. Please use the default numericality ActiveModel validator with the :only_integer option instead."
+      return if opts[:allow_blank] && param.blank?
       raise Pavlov::ValidationError, "#{param_name.to_s} should be an integer." unless param.is_a? Integer
     end
 
@@ -24,14 +21,22 @@ module Pavlov
     end
 
     def validate_string param_name, param
+      #warn "[DEPRECATION] `validate_string` is deprecated. Please use the ActiveModel validation instead."
       raise Pavlov::ValidationError, "#{param_name.to_s} should be a string." unless param.is_a? String
     end
 
+    def validate_nonempty_string param_name, param
+      #warn "[DEPRECATION] `validate_string` is deprecated. Please use the ActiveModel validation with the :non_empty option instead."
+      raise Pavlov::ValidationError, "#{param_name.to_s} should be a nonempty string." unless param.is_a?(String) && not(param.nil?) && not(param.empty?)
+    end
+
     def validate_integer_string param_name, param
+      #warn "[DEPRECATION] `validate_integer_string` is deprecated. Please use the ActiveModel validation instead."
       raise Pavlov::ValidationError, "#{param_name.to_s} should be an integer string." unless param.is_a? String and /\A\d+\Z/.match param
     end
 
     def validate_not_nil param_name, param
+      #warn "[DEPRECATION] `validate_not_nil` is deprecated. Please use the default presence ActiveModel validator instead."
       raise Pavlov::ValidationError, "#{param_name.to_s} should not be nil." if param.nil?
     end
   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.0.1"
-end
+  VERSION = "0.1.0"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pavlov
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,7 +32,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.7
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.7
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -48,7 +64,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-stub-const
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -64,7 +80,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -80,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-bundler
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -96,7 +112,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: terminal-notifier-guard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -159,6 +175,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Pavlov is a opinionated toolbox to help you architect your Ruby project.
 email:
 - jan+pavlov@deelstra.org
@@ -169,17 +201,12 @@ files:
 - lib/pavlov.rb
 - lib/pavlov/access_denied.rb
 - lib/pavlov/command.rb
-- lib/pavlov/entity.rb
 - lib/pavlov/helpers.rb
-- lib/pavlov/helpers/safe_evaluator.rb
 - lib/pavlov/interactor.rb
 - lib/pavlov/operation.rb
 - lib/pavlov/query.rb
-- lib/pavlov/utils.rb
 - lib/pavlov/validation_error.rb
 - lib/pavlov/validations.rb
-- lib/pavlov/validations/errors.rb
-- lib/pavlov/validations/not_valid.rb
 - lib/pavlov/version.rb
 homepage: https://github.com/Factlink/pavlov/
 licenses: []
@@ -193,18 +220,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4075067472850494356
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4075067472850494356
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/pavlov/entity.rb

@@ -1,61 +0,0 @@
-require_relative 'helpers/safe_evaluator'
-
-module Pavlov
-  class Entity
-    def self.attributes *args
-      args.each do |attribute_name|
-        define_attribute_writer attribute_name
-        attr_reader attribute_name
-      end
-    end
-
-    def self.new hash = {}, &block
-      super().send :mutate, hash, &block
-    end
-
-    def update hash = {}, &block
-      self.dup.send :mutate, hash, &block
-    end
-
-    private
-    def mutate hash, &block
-      copy_hash_values hash
-      safely_evaluate_against(&block) if block_given?
-      validate if respond_to? :validate
-      self
-    end
-
-    def copy_hash_values hash
-      make_temporary_mutatable do
-        hash.each {|key,value| send("#{key}=",value)}
-      end
-    end
-
-    def safely_evaluate_against &block
-      make_temporary_mutatable do
-        caller_instance = eval "self", block.binding
-        evaluator = Pavlov::Helpers::SafeEvaluator.new(self, caller_instance)
-        evaluator.instance_eval(&block)
-      end
-      self
-    end
-
-    def make_temporary_mutatable &block
-      @mutable = true
-      block.call
-      @mutable = false
-    end
-
-    def self.define_attribute_writer attribute_name
-      define_method "#{attribute_name}=" do |new_value|
-        raise_not_mutable unless @mutable
-        instance_variable_symbol = "@#{attribute_name}".to_sym
-        instance_variable_set instance_variable_symbol, new_value
-      end
-    end
-
-    def raise_not_mutable
-      raise "This entity is immutable, please use 'instance = #{self.class.name}.new do; self.attribute = 'value'; end' or 'instance = instance.update do; self.attribute = 'value'; end'."
-    end
-  end
-end

data/lib/pavlov/helpers/safe_evaluator.rb

@@ -1,17 +0,0 @@
-module Pavlov
-  module Helpers
-    class SafeEvaluator < BasicObject
-      def initialize target_instance, caller_instance
-        @target_instance, @caller_instance = target_instance, caller_instance
-      end
-
-      def method_missing method_name, *args
-        if method_name[-1] == '='
-          @target_instance.public_send method_name, *args
-        else
-          @caller_instance.send method_name, *args
-        end
-      end
-    end
-  end
-end

data/lib/pavlov/utils.rb

@@ -1,7 +0,0 @@
-module Pavlov
-  module Utils
-    def hash_with_index(index, list)
-      list.each_with_object({}) {|u, hash| hash[u.send(index)] = u}
-    end
-  end
-end

data/lib/pavlov/validations/errors.rb

@@ -1,21 +0,0 @@
-module Pavlov
-  module Validations
-    module Errors
-      include Enumerable
-
-      def initialize 
-        @messages = {}
-      end
-
-      def each &block
-        @messages.each_key do |attribute|
-          @messages[attribute.to_s].each { |error| block.call attribute, error }
-        end
-      end
-
-      def add attribute, error_message
-        (@messages[attribute.to_s] ||= []) << error_message
-      end
-    end
-  end
-end

data/lib/pavlov/validations/not_valid.rb

@@ -1,7 +0,0 @@
-module Pavlov
-  module Validations
-    class NotValid < StandardError 
-      attr_accessor :errors
-    end
-  end
-end