pavlov 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8366cdc29ed0e3cf7c91b3d2d106b4cac9df808f
-  data.tar.gz: 882f35ce53f6c187d7d67293db6b70a8589554f8
+  metadata.gz: 13bc3cf5812e5e607d68b9609120e074dad275a4
+  data.tar.gz: ff07d489d86b0dba8a4bc8b4f694d0d771b14f57
 SHA512:
-  metadata.gz: 543829b42a71cf377f77bad528bf06cbf2cefc1ff6c534d863a54d036493e77e9a4efd797894b7b91ede168a2093ab7a2576ccdc8dbbb6bf6bad6661613a2117
-  data.tar.gz: fe236450becb09aee747e8c0571b6563323f78a36fe54b74dda601c17ff34b07ff283a006be2b1222dfe7836d2520983679b38e87cb1995360efcbad7d8a1eca
+  metadata.gz: 56aef16927ef152a86585bb4acdfcf2a03b1463694d36d88a687216a30200e75037c3890730933cca0b4df2353ce1e75ba34016d8d5b67860b25b64dd8b3f79b
+  data.tar.gz: 72deaa24033f719ff780a7b2e2017b59d5618bae0f01a3be24ebd4ea8297ce2b86f5b0ea49a5bc36a9882610d5031292052444254bf927a1ef8d2c6e6574df71

data/lib/pavlov.rb

@@ -31,8 +31,6 @@ end
 require_relative 'pavlov/engine' if defined?(Rails)
 require_relative 'pavlov/helpers'
 require_relative 'pavlov/access_denied'
-require_relative 'pavlov/validation_error'
-require_relative 'pavlov/validations'
 require_relative 'pavlov/operation'
 require_relative 'pavlov/command'
 require_relative 'pavlov/query'

data/lib/pavlov/alpha_compatibility.rb

@@ -62,7 +62,46 @@ module Pavlov
     end
   end
 
+  class ValidationError < StandardError
+  end
+
+  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
+    end
+
+    def validate_regex param_name, param, regex, message
+      raise Pavlov::ValidationError, "#{param_name.to_s} #{message}" unless regex.match param
+    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
+    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
+    end
+
+    def validate_string param_name, param
+      raise Pavlov::ValidationError, "#{param_name.to_s} should be a string." unless param.is_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?)
+    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
+    end
+
+    def validate_not_nil param_name, param
+      raise Pavlov::ValidationError, "#{param_name.to_s} should not be nil." if param.nil?
+    end
+  end
+
   module Operation
+    include Pavlov::Validations
     module ClassMethods
       def arguments(*args)
         # Add generic attribute for each argument

data/lib/pavlov/command.rb

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

data/lib/pavlov/concern.rb

@@ -0,0 +1,54 @@
+# Copyright (c) 2005-2011 David Heinemeier Hansson
+#           (c) 2013 Factlink, Inc
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# fork from active_support 3.2.14 : ActiveSuport::Concern
+# Removed deprecation warning, and don't include InstanceMethods
+#
+# Including InstanceMethods conflicts with Virtus (which also uses InstanceMethods)
+
+module Pavlov
+  module Concern
+    def self.extended(base)
+      base.instance_variable_set("@_dependencies", [])
+    end
+
+    def append_features(base)
+      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")
+      end
+    end
+
+    def included(base = nil, &block)
+      if base.nil?
+        @_included_block = block
+      else
+        super
+      end
+    end
+  end
+end

data/lib/pavlov/interactor.rb

@@ -1,10 +1,9 @@
-require 'active_support/concern'
-require 'active_support/inflector'
+require_relative 'concern'
 require 'pavlov/operation'
 
 module Pavlov
   module Interactor
-    extend ActiveSupport::Concern
+    extend Pavlov::Concern
     include Pavlov::Operation
 
     module ClassMethods

data/lib/pavlov/operation.rb

@@ -1,14 +1,12 @@
-require 'active_support/concern'
-require 'pavlov/validations'
+require_relative 'concern'
 require 'pavlov/helpers'
 require 'virtus'
 require_relative 'access_denied'
 
 module Pavlov
   module Operation
-    extend ActiveSupport::Concern
+    extend Pavlov::Concern
     include Pavlov::Helpers
-    include Pavlov::Validations
     include Virtus
 
     def validate

data/lib/pavlov/query.rb

@@ -1,9 +1,9 @@
-require 'active_support/concern'
+require_relative 'concern'
 require_relative 'operation'
 
 module Pavlov
   module Query
-    extend ActiveSupport::Concern
+    extend Pavlov::Concern
     include Pavlov::Operation
   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.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pavlov
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - marten@veldthuis.com
@@ -13,36 +13,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.7
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.7
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -199,16 +171,16 @@ files:
 - lib/pavlov/access_denied.rb
 - lib/pavlov/alpha_compatibility.rb
 - lib/pavlov/command.rb
+- lib/pavlov/concern.rb
 - lib/pavlov/engine.rb
 - lib/pavlov/helpers.rb
 - lib/pavlov/interactor.rb
 - lib/pavlov/operation.rb
 - lib/pavlov/query.rb
-- lib/pavlov/validation_error.rb
-- lib/pavlov/validations.rb
 - lib/pavlov/version.rb
 homepage: https://github.com/Factlink/pavlov/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/lib/pavlov/validation_error.rb

@@ -1,4 +0,0 @@
-module Pavlov
-  class ValidationError < StandardError
-  end
-end

data/lib/pavlov/validations.rb

@@ -1,45 +0,0 @@
-require 'pavlov/validation_error'
-
-module Pavlov
-  module Validations
-    def validate_hexadecimal_string param_name, 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, 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
-
-    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
-    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
-end