valid 0.3.0 → 0.3.1

data/lib/validation/rule/uri.rb

@@ -0,0 +1,31 @@
+module Validation
+  module Rule
+    class URI
+      def initialize(parts=[:host])
+        @required_parts = parts
+      end
+
+      def error_key
+        :uri
+      end
+
+      def params
+        {:required_elements => @required_parts}
+      end
+
+      def valid_value?(uri_string)
+        begin
+          uri = URI(uri_string)
+          @required_parts.each do |part|
+            if uri.send(part).nil? || uri.send(part).empty?
+              return false
+            end
+          end
+          true
+        rescue ::URI::InvalidURIError => e
+          return false
+        end
+      end
+    end
+  end
+end

data/lib/validation/validator.rb

@@ -53,8 +53,19 @@ module Validation
     # one error per field
     def valid?
       valid = true
+      all_rules = {}
 
-      rules.each_pair do |field, rules|
+      if self.instance_of?(Validation::Validator)
+        # use the normal instance variable
+        all_rules = self.rules
+
+      elsif self.is_a?(Validation::Validator) # inherited "stand-alone" validator
+        # in this case the rules have been defined in the class instance
+        # variable '@rules' since they were defined during the class definition
+        all_rules = self.class.rules
+      end
+
+      all_rules.each_pair do |field, rules|
         if ! @obj.respond_to?(field)
           raise InvalidKey
         end

data/lib/validation/version.rb

@@ -1,3 +1,3 @@
 module Validation
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valid
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -24,6 +24,7 @@ files:
 - lib/validation/rule/not_empty.rb
 - lib/validation/rule/numeric.rb
 - lib/validation/rule/phone.rb
+- lib/validation/rule/uri.rb
 - lib/validation/validator.rb
 - lib/validation/version.rb
 - lib/validation.rb