validates_uri_format_of 0.1.1 → 0.2.0

data/README.md

@@ -1,4 +1,4 @@
-# validates\_uri\_format\_of
+# validates_uri_format_of
 
 Rails plugin that provides a `validates_uri_format_of` method to `ActiveRecord` models.
 You can require or disallow certain components of a URI.
@@ -22,7 +22,26 @@ After installing the plugin, it's used like
 
 ## Features
 
-Take a look at the lib/ and test/ directories.
+* `:schemes` – allowed URI schemes. Default: `['http','https']`
+* `:require_scheme` – Default: `true`
+* `:require_host` – Default: `true`
+* `:require_path` – Default: `true`
+* `:require_fqdn` – enforce a fully qualified domain name? Default: `nil`
+* `:with_port` – Default: `nil`
+* `:with_query` – `true` requires a query string (e.g. '?query'), `false` does not allow a query string. Default: `nil` (no check)
+* `:with_fragment` – `true` requires a fragment string (e.g. '#fragment'), `false` does not allow a fragment string. Default: `nil` (no check)
+* `:with_auth` – `true` requires authentication info (e.g. 'http://user:pass@example.com/'), `false` does not allow a fragment string. Default: `nil` (no check)
+* `:on` – Specifies when this validation is active (default is `:save`, other options `:create`, `:update`).
+* `:if` – Specifies a method, proc or string to call to determine if the validation should
+  occur (e.g. `:if => :allow_validation`, or `:if => Proc.new { |user| user.signup_step > 2 }`).
+  The method, proc or string should return or evaluate to a true or false value.
+* `:unless` – Specifies a method, proc or string to call to determine if the validation should
+  not occur (e.g. `:unless => :skip_validation`, or `:unless => Proc.new { |user| user.signup_step <= 2 }`).
+  The method, proc or string should return or evaluate to a true or false value.
+
+
+
+Do also a look at the lib/ and test/ directories.
 
 ## Credits and license
 

data/init.rb

@@ -1 +1 @@
-require 'lib/validates_uri_format_of'
+require 'validates_uri_format_of'

data/lib/validates_uri_format_of.rb

@@ -43,6 +43,28 @@ module ValidatesUriFormatOf
     :on             => :save
   }
   
+  # Merken, welche Optionen überhaupt bereitgestellt werden.
+  # Benötigen wir, um Exceptions zu schmeißen, falls unbekannte
+  # Optionen übergeben werden.
+  KNOWN_OPTIONS = {
+    # Eigene Optionen  -- Wird weiter unten in einer Schleife ergänzt
+    :schemes     => true,
+    :require_fqdn => true,
+    :message      => true,
+    
+    # Optionen von validates_each
+    :on          => true,
+    :allow_nil   => true,
+    :allow_blank => true,
+    :if          => true,
+    :unless      => true
+  }
+  for type_key, type_hash in ValidatesUriFormatOf::COMPONENTS
+    for opt_key, opt_value in type_hash
+      KNOWN_OPTIONS[:"#{type_key}_#{opt_key}"] = true
+    end
+  end
+  
   
   def validates_uri_format_of(*attr_names)
     configuration = {
@@ -50,12 +72,18 @@ module ValidatesUriFormatOf
     }.merge(DEFAULT_CONFIGURATION)
     
     configuration.update(attr_names.extract_options!)
-    #validates_each(attr_names, configuration) do |record, attr_name, value|
-    validates_each(attr_names) do |record, attr_name, value|
+    
+    for opt in configuration.keys
+      raise ArgumentError, "unknown option :#{opt}" unless KNOWN_OPTIONS[opt]
+    end
+    
+    # Übergebene Parameter rauspicken, die wir direkt validates_each übergeben können.
+    validates_each_configuration = Hash[configuration.select{|k,v| [:on, :allow_nil, :allow_blank, :if, :unless].include?(k) }]
+    validates_each(attr_names, validates_each_configuration) do |record, attr_name, value|
       begin
         raise(URI::InvalidURIError, "cannot be a #{value.class}") unless [NilClass, String].include?(value.class)
         
-        for meth in [:nil, :empty]
+        for meth in [:nil, :empty, :blank]
           if value.send("#{meth}?")
             if configuration[:"allow_#{meth}"]
               next

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: validates_uri_format_of
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Julian Kornberger
@@ -22,9 +23,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 2
         - 3
@@ -56,23 +59,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - :"rmagick libqt4-ruby libqt4-webkit"
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: URL Validation for ActiveRecord models.