validate_as_url 0.0.5 → 0.0.6

data/.gitignore

@@ -1,17 +1,20 @@
-*.gem
 *.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+*.sassc
+*.gem
+.sass-cache
+capybara-*.html
+.rspec
+/.bundle
+/vendor/bundle
+/log/*
+/tmp/*
+/db/*.sqlite3
+/public/system/*
+/coverage/
+/spec/tmp/*
+**.orig
+rerun.txt
+pickle-email-*.html
+.idea/.name
+
+.idea/*

data/Gemfile.lock

@@ -0,0 +1,17 @@
+PATH
+  remote: .
+  specs:
+    validate_as_url (0.0.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    rake (10.0.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  rake
+  validate_as_url!

data/README.rdoc

@@ -0,0 +1,51 @@
+= validate_as_url Gem for Rails 3.x
+
+Validate http and https urls for valid format with standard model validations.
+
+== Installation
+
+Installing as a gem:
+
+  gem install validate_as_url (recommended)
+
+Or in your Rails 3 Gemfile
+
+  gem 'validate_as_url', :git => 'git://github.com/mdima-it-guru/validate_as_url.git'
+
+For use in Rails project add to your Gemfile following line:
+
+  gem 'validate_as_url'
+
+== Usage
+
+# Rails 3
+ class Person < ActiveRecord::Base
+   validate_as_url :website
+ end
+
+=== Options
+
+  :message_invalid:
+    String. This messages appears when supplied url has wrong format. Default message: 'does not appear to be valid url',
+  :message_nil
+    String. This messages appears when supplied url is nill and 'allow_nil' is false . Default message: 'cannot be null',
+  :message_blank
+    String. This messages appears when supplied url is blank string and 'allow_blank' is false . Default message: 'cannot be blank',
+  :on
+     Symbol. Specifies when this validation is active (default is :save, other options :create, :update)
+  :allow_nil
+     Boolean. Allow nil values (default is false)
+  :allow_blank
+     Boolean. Allow blank values (default is false)
+
+== Testing
+
+Tested in Ruby 1.9.3
+
+== Resources
+
+* https://github.com/mdima-it-guru/validate_as_url
+
+== Credits
+
+Written by Mitrofanov Dmitry (http://myitguru.info), 2013.

data/lib/validate_as_url.rb

@@ -1,82 +1,65 @@
-module ValidateAsUrl
-
-	#require 'resolv'
-
-	MessageScope = defined?(ActiveModel) ? :activemodel : :activerecord
-
-	#LocalPartSpecialChars = /[\!\#\$\%\&\'\*\-\/\=\?\+\-\^\_\`\{\|\}\~]/
-
-	def self.validate_as_url(url, options={})
-		options ||={}
-
-		default_options = {
-			message_invalid: ::I18n.t(:invalid_url, :scope => [MessageScope, :errors, :messages], :default => 'does not appear to be valid url'),
-			message_nil:  ::I18n.t(:invalid_url, :scope => [MessageScope, :errors, :messages], :default => 'cannot be null'),
-			message_blank: ::I18n.t(:invalid_url, :scope => [MessageScope, :errors, :messages], :default => 'cannot be blank'),
-			allow_nil: false,
-			allow_blank: false
-		}
-		opts = options.merge(default_options) # merge the default options into the specified options, retaining all specified options
-
-		if opts[:allow_nil] == false
-			if url.nil?
-				return [ opts[:message_nil] ]
-			end
-		end
-
-		url = url.to_s.strip
-
-		if opts[:allow_blank] == false
-			if url.blank?
-				return [ opts[:message_blank] ]
+module ActiveRecord
+	module Validations
+		class ValidateAsUrl < ActiveModel::EachValidator # :nodoc:
+			def initialize(options)
+				default_options = {
+					message: 'does not appear to be valid url',
+					allow_nil: false,
+					allow_blank: false
+				}
+				super(default_options.merge!(options))
 			end
-		end
-
-		unless url =~ /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix
-			return [ opts[:message_invalid] ]
-		end
 
-		return nil    # represents no validation errors
-	end
+			def validate_each(record, attribute, value)
+				#finder_class = find_finder_class_for(record)
+				#table = finder_class.arel_table
+				#value = deserialize_attribute(record, attribute, value)
+				#
+				#relation = build_relation(finder_class, table, attribute, value)
+				#relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id)) if record.persisted?
+				#relation = scope_relation(record, table, relation)
+				#relation = finder_class.unscoped.where(relation)
+				#relation = relation.merge(options[:conditions]) if options[:conditions]
+				#
+				#
+				#
+				#
+				#
+				#
+				#if relation.exists?
+				#	error_options = options.except(:case_sensitive, :scope, :conditions)
+				#	error_options[:value] = value
+				#
+				#	record.errors.add(attribute, :taken, error_options)
+				#end
 
 
-	module Validations
-		def validate_as_url(*attr_names)
-			options = { :on => :save,
-			            :allow_nil => false,
-			            :allow_blank => false }
-			options.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+				#if opts[:allow_nil] == false
+				#	if url.nil?
+				#		record.errors.add(attribute, :nil)
+				#		return
+				#	end
+				#end
+				#
+				#url = url.to_s.strip
+				#
+				#if opts[:allow_blank] == false
+				#	if url.blank?
+				#		record.errors.add(attribute, :blank)
+				#		return
+				#	end
+				#end
 
-			validates_each(attr_names, options) do |record, attr_name, value|
-				errors = ::ValidateAsUrl::validate_as_url(value.to_s, options)
-				errors.each do |error|
-					record.errors.add(attr_name, error)
-				end unless errors.nil?
+				unless url =~ /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix
+					record.errors.add(attribute, :url_wrong_format)
+				end
 			end
 		end
-	end
-end
 
-if defined?(ActiveModel)
-	class AsUrlValidator < ActiveModel::EachValidator
-		def validate_each(record, attribute, value)
-			err = ::ValidateAsUrl::validate_as_url(value, options)
-			unless err.nil?
-				record.errors[attribute] << err
-				record.errors[attribute].flatten!
+		module ClassMethods
+			def validates_uniqueness_of(*attr_names)
+				validates_with ValidateAsUrl, _merge_attributes(attr_names)
 			end
 		end
 	end
-
-	module ActiveModel::Validations::HelperMethods
-		def validate_as_url(*attr_names)
-			validates_with ::AsUrlValidator, _merge_attributes(attr_names)
-		end
-	end
-else
-	if defined?(ActiveRecord)
-		class ActiveRecord::Base
-			extend ::AsUrlValidator::Validations
-		end
-	end
-end
+end

data/validate_as_url.gemspec

@@ -4,7 +4,7 @@
 
 Gem::Specification.new do |spec|
 	spec.name = "validate_as_url"
-	spec.version = '0.0.5'
+	spec.version = '0.0.6'
 	spec.author = ["Mitrofanov Dmitry"]
 	spec.email = ["mdima@it-guru.biz"]
 	spec.description = %q{This Gem is Used for Validations URLs}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate_as_url
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,16 +50,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
-- .idea/encodings.xml
-- .idea/misc.xml
-- .idea/modules.xml
-- .idea/scopes/scope_settings.xml
-- .idea/validate_as_url.iml
-- .idea/vcs.xml
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
-- README.md
+- README.rdoc
 - Rakefile
 - lib/validate_as_url.rb
 - validate_as_url.gemspec

data/.idea/encodings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-

data/.idea/misc.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-1.9.3-p327" project-jdk-type="RUBY_SDK" />
-</project>
-

data/.idea/modules.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/validate_as_url.iml" filepath="$PROJECT_DIR$/.idea/validate_as_url.iml" />
-    </modules>
-  </component>
-</project>
-

data/.idea/scopes/scope_settings.xml

@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>

data/.idea/validate_as_url.iml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="gem" name="Gem">
-      <configuration>
-        <option name="GEM_APP_ROOT_PATH" value="$MODULE_DIR$" />
-        <option name="GEM_APP_TEST_PATH" value="" />
-        <option name="GEM_APP_LIB_PATH" value="$MODULE_DIR$/lib" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.3.5, RVM: ruby-1.9.3-p327) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.0.4, RVM: ruby-1.9.3-p327) [gem]" level="application" />
-  </component>
-</module>
-

data/.idea/vcs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
-

data/README.md

@@ -1,29 +0,0 @@
-# ValidateAsUrl
-
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'validate_as_url'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install validate_as_url
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request