validates_as_uri 0.1.0 → 0.1.1

data/.gitignore

@@ -0,0 +1,4 @@
+pkg/*
+*.gem
+.bundle
+.rvmrc

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in gem-unico.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,23 @@
+PATH
+  remote: .
+  specs:
+    validates_as_uri (0.1.1)
+      activemodel (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activesupport (3.0.1)
+    builder (2.1.2)
+    i18n (0.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (>= 3.0.0)
+  validates_as_uri!

data/README.textile

@@ -4,15 +4,15 @@ URI validation for ActiveModel
 
 h2. Installation
 
-You can install as gem:
+gem install validates_as_uri
 
-<pre>gem "validates_as_uri"</pre>
+h2. Usage
 
-Or as plugin:
+Gemfile:
 
-<pre>$ rails plugin install git://github.com/sobrinho/validates_as_uri.git</pre>
+<pre>gem 'validate_as_uri'</pre>
 
-h2. Usage
+Model:
 
 <pre>class Repository < ActiveRecord::Base
   validates :url, :uri => { :protocols => %w(git svn) }

data/Rakefile

@@ -1,24 +1,14 @@
+require 'bundler'
+require 'rake'
 require 'rake/testtask'
 
-desc 'Default: run unit tests.'
-task :default => :test
+task :default => [:test]
 
-desc 'Test the validates_as_uri plugin.'
-Rake::TestTask.new(:test) do |t|
+Rake::TestTask.new("test") { |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-end
+  t.verbose = true
+  t.warning = true
+}
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "validates_as_uri"
-    gemspec.summary = "URI validation for ActiveModel"
-    gemspec.email = "gabriel.sobrinho@gmail.com"
-    gemspec.homepage = "http://github.com/sobrinho/validates_as_uri"
-    gemspec.authors = ["Gabriel Sobrinho"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
+Bundler::GemHelper.install_tasks

data/config/locales/validates_as_uri.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      invalid_uri: "must be a valid uri"

data/lib/validates_as_uri.rb

@@ -1 +1,3 @@
 require 'validates_as_uri/uri_validator'
+require 'validates_as_uri/version'
+require 'validates_as_uri/engine' if defined?(Rails)

data/lib/validates_as_uri/engine.rb

@@ -0,0 +1,4 @@
+module ValidateAsUri
+  class Engine < Rails::Engine
+  end
+end

data/lib/validates_as_uri/uri_validator.rb

@@ -1,9 +1,9 @@
 class UriValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    options[:protocols] ||= %w(http https)
+    protocols = options[:protocols] || %w(http https)
     
-    if value !~ %r{^(#{Array(options[:protocols]).join('|')})://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$}
-      record.errors.add(attribute, options[:message])
+    if value !~ %r{^(#{Array.wrap(protocols).join('|')})://[a-z0-9-]+(.[a-z0-9-]+)*(:[0-9]+)?(/.*)?$}
+      record.errors.add(attribute, options[:message] || :invalid_uri)
     end
   end
 end

data/lib/validates_as_uri/version.rb

@@ -0,0 +1,7 @@
+module ValidatesAsUri
+  MAJOR = 0
+  MINOR = 1
+  TINY  = 1
+  
+  VERSION = [MAJOR, MINOR, TINY].join('.')
+end

data/test/test_helper.rb

@@ -1,17 +1,15 @@
 require 'rubygems'
+require 'bundler/setup'
+require 'active_model'
 require 'test/unit'
-require 'active_support'
-require 'active_record'
-require 'validates_as_uri/uri_validator'
+require 'validates_as_uri'
 
-# create a temporary database
-ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
+class Repository < Struct.new(:url)
+  include ActiveModel::Validations
+  validates :url, :uri => { :protocols => %w(git svn) }
+end
 
-silence_stream(STDOUT) do
-  ActiveRecord::Schema.define do
-    create_table :repositories do |t|
-      t.string :url
-      t.string :homepage
-    end
-  end
+class Site < Struct.new(:url)
+  include ActiveModel::Validations
+  validates :url, :uri => true
 end

data/test/uri_validator_test.rb

@@ -0,0 +1,27 @@
+require 'test_helper'
+
+class UriValidatorTest < Test::Unit::TestCase
+  def test_valid_protocols
+    assert Repository.new('git://github.com/sobrinho/validates_as_uri.git').valid?
+    assert Repository.new('svn://svnhub.com/sobrinho/validates_as_uri').valid?
+    assert Site.new('http://github.com/').valid?
+    assert Site.new('https://github.com/').valid?
+  end
+  
+  def test_invalid_protocols
+    assert Repository.new('http://github.com/').invalid?
+    assert Repository.new('https://github.com/').invalid?
+    assert Site.new('git://github.com/sobrinho/validates_as_uri.git').invalid?
+    assert Site.new('svn://svnhub.com/sobrinho/validates_as_uri').invalid?
+  end
+  
+  def test_ip
+    assert Repository.new('git://10.0.0.1/sobrinho/validates_as_uri.git').valid?
+    assert Site.new('http://10.0.0.1/').valid?
+  end
+  
+  def test_port
+    assert Site.new('https://github.com:3000/').valid?
+    assert Site.new('https://10.0.0.1:3000/').valid?
+  end
+end

data/validates_as_uri.gemspec

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "validates_as_uri/version"
+
+Gem::Specification.new do |s|
+  s.name        = "validates_as_uri"
+  s.version     = ValidatesAsUri::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Gabriel Sobrinho"]
+  s.email       = ["gabriel.sobrinho@gmail.com"]
+  s.homepage    = "http://github.com/sobrinho/validates_as_uri"
+  s.summary     = %q{URI validation for ActiveModel}
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  s.add_dependency %q<activemodel>, [">= 3.0.0"]
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: validates_as_uri
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Gabriel Sobrinho
@@ -14,58 +15,83 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -03:00
+date: 2010-10-30 00:00:00 -02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activemodel
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id001
 description: 
-email: gabriel.sobrinho@gmail.com
+email: 
+- gabriel.sobrinho@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.textile
 - Rakefile
-- VERSION
-- init.rb
+- config/locales/validates_as_uri.yml
 - lib/validates_as_uri.rb
+- lib/validates_as_uri/engine.rb
 - lib/validates_as_uri/uri_validator.rb
+- lib/validates_as_uri/version.rb
 - test/test_helper.rb
-- test/validates_as_uri_test.rb
+- test/uri_validator_test.rb
+- validates_as_uri.gemspec
 has_rdoc: true
 homepage: http://github.com/sobrinho/validates_as_uri
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+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: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: URI validation for ActiveModel
 test_files: 
 - test/test_helper.rb
-- test/validates_as_uri_test.rb
+- test/uri_validator_test.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.0

data/init.rb

@@ -1 +0,0 @@
-require 'validates_as_uri'

data/test/validates_as_uri_test.rb

@@ -1,32 +0,0 @@
-require 'test_helper'
-
-class ValidatesUriCpfTest < ActiveSupport::TestCase
-  class Repository < ActiveRecord::Base
-    validates :url, :uri => { :protocols => %w(git svn) }
-    validates :homepage, :uri => true
-  end
-  
-  test "blank values" do
-    assert_equal false, Repository.new(:url => '', :homepage => '').valid?
-    assert_equal false, Repository.new(:url => false, :homepage => false).valid?
-    assert_equal false, Repository.new(:url => nil, :homepage => nil).valid?
-  end
-  
-  test "valid protocols" do
-    assert Repository.new(:url => 'git://github.com/sobrinho/validates_as_uri.git',
-                          :homepage => 'http://github.com/sobrinho/validates_as_uri').valid?
-
-    assert Repository.new(:url => 'svn://repository.com/sobrinho/validates_as_uri',
-                          :homepage => 'http://github.com/sobrinho/validates_as_uri').valid?
-  end
-  
-  test "invalid protocols" do
-    assert_equal false, Repository.new(:url => 'http://github.com/sobrinho/validates_as_uri.git',
-                                       :homepage => 'http://github.com/sobrinho/validates_as_uri').valid?
-  end
-  
-  test "ip and port" do
-    assert Repository.new(:url => 'git://127.0.0.1/sobrinho/validates_as_uri.git',
-                          :homepage => 'https://127.0.0.1:3000/sobrinho/validates_as_uri').valid?
-  end
-end