url_validator 0.0.4 → 0.0.5

data/Rakefile

@@ -2,13 +2,12 @@ require 'bundler'
 
 require 'rubygems'
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
 
 
-Spec::Rake::SpecTask.new('spec') do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new('spec') do |t|
+  t.pattern = 'spec/**/*_spec.rb'
 end
 

data/lib/url_validator/version.rb

@@ -1,4 +1,4 @@
 module UrlValidator
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end
 

data/lib/url_validator.rb

@@ -11,11 +11,10 @@ module ActiveModel
         schemes = options[:schemes] || %w(http https)
         url_regexp = /^((#{schemes.join('|')}):\/\/){0,1}[a-z0-9]+([a-z0-9\-\.]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$/ix
         preffered_schema = options[:preffered_schema] || "#{schemes.first}://"
-
         options[:attributes].each do |attribute|
           value = record.send(attribute).to_s
           next if value.blank? && (options[:allow_blank] || options[:allow_nil])
-          record.send("#{attribute}=", preffered_schema << value) if !value.start_with?(*schemes)
+          record.send("#{attribute}=", preffered_schema + value) if !value.start_with?(*schemes)
           normalized_value = record.send("#{attribute}_normalized")
           begin
             uri = Addressable::URI.parse(value)

data/spec/models/user_spec.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'spec_helper'
 
 describe "User" do
@@ -123,6 +125,15 @@ describe "User" do
       @user.should be_valid
       @user.errors[:website].should be_empty
     end
+
+    it "should return correct data" do
+      @user.website = "website.com"
+      @user.url = "website.com/blog"
+      @user.should be_valid
+      @user.website.should == "http://website.com"
+      @user.url.should == "http://website.com/blog"
+    end
+
   end
 
   context "with ActiveRecord" do
@@ -222,7 +233,7 @@ describe "User" do
 
     it "should show correct message" do
       @user.valid?
-      @user.errors[:website].to_s.should == 'bad bad URL'
+      @user.errors[:website].join.should == 'bad bad URL'
     end
   end
 
@@ -233,7 +244,7 @@ describe "User" do
 
     it "should show correct message" do
       @user.valid?
-      @user.errors[:website].to_s.should == 'is not a valid URL'
+      @user.errors[:website].join.should == 'is not a valid URL'
     end
   end
 

data/spec/resources/user.rb

@@ -1,7 +1,7 @@
 class User
   include ActiveModel::Validations
 
-  attr_accessor :website, :url
+  attr_accessor :website
 
   validates_url :website, :message => 'bad bad URL'
 end

data/spec/resources/user_with_blank.rb

@@ -1,8 +1,8 @@
 class UserWithBlank
   include ActiveModel::Validations
 
-  attr_accessor :website
+  attr_accessor :website, :url
 
-  validates_url :website, :allow_blank => true
+  validates_url :website, :url, :allow_blank => true
 end
 

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/resources')
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rubygems'
-require 'spec'
+require 'rspec'
 require 'sqlite3'
 require 'active_record'
 require 'active_record/base'

data/url_validator.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "url_validator"
 
   s.add_development_dependency "rspec"
-  s.add_development_dependency "ruby-debug"
+  s.add_development_dependency "ruby-debug19"
   s.add_development_dependency "sqlite3"
   s.add_dependency "rails", "~>3.0.1"
   s.add_dependency "addressable"

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: url_validator
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - Zdenko Nevrala
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 +02:00
+date: 2011-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,23 +21,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: ruby-debug19
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -54,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -68,11 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 0
-        - 1
         version: 3.0.1
   type: :runtime
   version_requirements: *id004
@@ -84,9 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
@@ -130,23 +108,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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: url_validator
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: URL validator