validates_url_format_of 0.4.0 → 0.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b3da9effc4336d14d3fcb83603fd2ce960053c94
+  data.tar.gz: 347857fd8cceeb25541252bc6b1912acf4165056
+SHA512:
+  metadata.gz: ef0d57fa3ea78d62750171924434bcc176990c95dea3d4cbbe8ec8ddbdad2c50f07dd8a06e39ab2d324d47615877b228c0fb814d3013664a9a0b77b6cb5b9869
+  data.tar.gz: 435547d77d56fdc8899d78795566de08c3366d2d4aadb6586513372e46f261952b4d081efdecea6be3e2edcd48539a1c93975c0379c91a807b323b5d8345fe7b

data/Gemfile

@@ -5,15 +5,25 @@ gem 'rake'
 gem 'yard'
 
 platforms :jruby do
-  gem 'jruby-openssl'
   gem 'activerecord-jdbcsqlite3-adapter'
   gem 'jdbc-sqlite3'
+  gem 'jruby-openssl'
 end
 
 group :test do
+  gem 'backports'
   gem 'minitest'
+  gem 'rubocop', '>= 0.16', :platforms => [:ruby_19, :ruby_20, :ruby_21]
   gem 'simplecov', :require => false
   gem 'sqlite3', :platforms => :ruby
+  gem 'yardstick'
+end
+
+platforms :rbx do
+  gem 'racc'
+  gem 'rubinius-coverage', '~> 2.0'
+  gem 'rubysl', '~> 2.0'
+  gem 'rubysl-json', '~> 2.0'
 end
 
 gemspec

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Erik-Michels-Ober, Henrik Nyh, Josh Nichols, Nicholas Silva.
+Copyright (c) 2008 Erik Michels-Ober, Henrik Nyh, Josh Nichols, Nicholas Silva.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -10,10 +10,29 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-task :default => :test
+begin
+  require 'rubocop/rake_task'
+  Rubocop::RakeTask.new
+rescue LoadError
+  task :rubocop do
+    $stderr.puts 'Rubocop is disabled'
+  end
+end
 
 require 'yard'
 YARD::Rake::YardocTask.new do |task|
-  task.files   = ['LICENSE.md', 'lib/**/*.rb']
-  task.options = ['--markup', 'markdown']
+  task.files   = %w[LICENSE.md lib/**/*.rb]
+  task.options = %w[--markup markdown]
+end
+
+require 'yardstick/rake/measurement'
+Yardstick::Rake::Measurement.new do |measurement|
+  measurement.output = 'measurement/report.txt'
 end
+
+require 'yardstick/rake/verify'
+Yardstick::Rake::Verify.new do |verify|
+  verify.threshold = 50.0
+end
+
+task :default => [:test, :rubocop, :verify_measurements]

data/lib/validates_url_format_of.rb

@@ -1,13 +1,13 @@
 require 'active_record'
 
 module ValidatesUrlFormatOf
-  IPv4_PART = /\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]/  # 0-255
+  IPV4_PART = /\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]/  # 0-255
   REGEXP = %r{
     \A
     https?://                                        # http:// or https://
     ([^\s:@]+:[^\s:@]*@)?                            # optional username:pw@
-    ( (xn--)?[a-z0-9]+([-.][a-z0-9]+)*\.[a-z]{2,6}\.? |  # domain (including Punycode/IDN)...
-        #{IPv4_PART}(\.#{IPv4_PART}){3} )            # or IPv4
+    ( (xn--)?(\-|[a-z0-9])+([-.][a-z0-9]+)*\.[a-z]{2,6}\.? |  # domain (including Punycode/IDN)...
+        #{IPV4_PART}(\.#{IPV4_PART}){3} )            # or IPv4
     (:\d{1,5})?                                      # optional port
     ([/?]\S*)?                                       # optional /whatever or ?whatever
     \Z
@@ -17,14 +17,16 @@ module ValidatesUrlFormatOf
   DEFAULT_MESSAGE_URL = 'does not appear to be valid'
 
   def validates_url_format_of(*attr_names)
-    options = { :allow_nil => false,
-                :allow_blank => false,
-                :with => REGEXP }
+    options = {
+      :allow_nil   => false,
+      :allow_blank => false,
+      :with        => REGEXP,
+    }
     options = options.merge(attr_names.pop) if attr_names.last.is_a?(Hash)
 
     attr_names.each do |attr_name|
       message = attr_name.to_s.match(/(_|\b)URL(_|\b)/i) ? DEFAULT_MESSAGE_URL : DEFAULT_MESSAGE
-      validates_format_of(attr_name, { :message => message }.merge(options))
+      validates_format_of(attr_name, {:message => message}.merge(options))
     end
   end
 end

data/test/helper.rb

@@ -1,13 +1,14 @@
-$:.unshift File.expand_path('..', __FILE__)
-$:.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('..', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  add_filter '/spec/'
+  minimum_coverage(100)
+end
 require 'validates_url_format_of'
 require 'active_record'
 require 'model'
-require 'minitest/unit'
-
-MiniTest::Unit.autorun
+require 'minitest/autorun'
 
 unless ActiveRecord::Base.connected?
   ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')

data/test/validates_url_format_of_test.rb

@@ -1,12 +1,11 @@
 require File.expand_path('../helper', __FILE__)
 
 class ValidatesUrlFormatOfTest < MiniTest::Unit::TestCase
-
   def setup
     @model = Model.new
   end
 
-  def test_should_allow_valid_urls
+  def test_should_allow_valid_urls # rubocop:disable MethodLength
     [
       'http://example.com',
       'http://example.com/',
@@ -28,7 +27,8 @@ class ValidatesUrlFormatOfTest < MiniTest::Unit::TestCase
       'https://example.com',
       'http://xn--rksmrgs-5wao1o.nu', # Punycode
       'http://example.com.', # Explicit TLD root period
-      'http://example.com./foo'
+      'http://example.com./foo',
+      'http://innsofaurora--com.rztrkr.com/accommodations/?rzreturn=1&rzsource=nc'
     ].each do |url|
       @model.homepage = url
       @model.save
@@ -36,20 +36,20 @@ class ValidatesUrlFormatOfTest < MiniTest::Unit::TestCase
     end
   end
 
-  def test_should_reject_invalid_urls
+  def test_should_reject_invalid_urls # rubocop:disable MethodLength
     [
-      nil, 1, "", " ", "url",
-      "www.example.com",
-      "http://ex ample.com",
-      "http://example.com/foo bar",
+      nil, 1, '', ' ', 'url',
+      'www.example.com',
+      'http://ex ample.com',
+      'http://example.com/foo bar',
       'http://256.0.0.1',
       'http://u:u:u@example.com',
       'http://r?ksmorgas.com',
 
       # These can all be valid local URLs, but should not be considered valid
       # for public consumption.
-      "http://example",
-      "http://example.c",
+      'http://example',
+      'http://example.c',
       'http://example.toolongtld'
     ].each do |url|
       @model.homepage = url
@@ -71,5 +71,4 @@ class ValidatesUrlFormatOfTest < MiniTest::Unit::TestCase
     @model.save
     assert_equal 'custom message', @model.errors[:custom_url].first
   end
-
 end

data/validates_url_format_of.gemspec

@@ -1,18 +1,18 @@
 Gem::Specification.new do |spec|
   spec.add_dependency 'activerecord', ['>= 3.1', '< 5']
   spec.add_development_dependency 'bundler', '~> 1.0'
-  spec.authors = ["Erik-Michels-Ober", "Henrik Nyh", "Josh Nichols", "Nicholas Silva"]
+  spec.authors = ['Erik Michels-Ober', 'Henrik Nyh', 'Josh Nichols', 'Nicholas Silva']
   spec.description = %q{Rails plugin that provides a validates_url_format_of method to ActiveRecord models. URLs are validated by regexp.}
-  spec.email = ['conickal@gmail.com']
-  spec.files = %w(LICENSE.md README.md Gemfile Rakefile validates_url_format_of.gemspec)
-  spec.files += Dir.glob("lib/**/*.rb")
-  spec.files += Dir.glob("test/**/*")
+  spec.email = %w[conickal@gmail.com]
+  spec.files = %w[LICENSE.md README.md Gemfile Rakefile validates_url_format_of.gemspec]
+  spec.files += Dir.glob('lib/**/*.rb')
+  spec.files += Dir.glob('test/**/*')
   spec.homepage = 'http://github.com/conickal/validates_url_format_of'
-  spec.licenses = ['MIT']
+  spec.licenses = %w[MIT]
   spec.name = 'validates_url_format_of'
-  spec.require_paths = ['lib']
+  spec.require_paths = %w[lib]
   spec.required_rubygems_version = '>= 1.3.5'
   spec.summary = %q{ActiveRecord URL Validation}
-  spec.test_files = Dir.glob("test/**/*")
-  spec.version = '0.4.0'
+  spec.test_files = Dir.glob('test/**/*')
+  spec.version = '0.4.1'
 end

metadata

@@ -1,55 +1,50 @@
 --- !ruby/object:Gem::Specification
 name: validates_url_format_of
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
-- Erik-Michels-Ober
+- Erik Michels-Ober
 - Henrik Nyh
 - Josh Nichols
 - Nicholas Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Rails plugin that provides a validates_url_format_of method to ActiveRecord
@@ -60,39 +55,38 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
 - LICENSE.md
 - README.md
-- Gemfile
 - Rakefile
-- validates_url_format_of.gemspec
 - lib/validates_url_format_of.rb
 - test/helper.rb
 - test/model.rb
 - test/validates_url_format_of_test.rb
+- validates_url_format_of.gemspec
 homepage: http://github.com/conickal/validates_url_format_of
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord URL Validation
 test_files:
 - test/helper.rb