format_url 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a072476a63d9b9c31ebc187d95e2439a99ecdfa
-  data.tar.gz: d54c57861929e45c0f42e082ce28635c6b708e5d
+  metadata.gz: 49045f22f1b4dc6c38f7780afaccc6739a9e1d71
+  data.tar.gz: 89c09e88c6bf952c9b7cdbd48b07dc0cd42f0ccf
 SHA512:
-  metadata.gz: 3974c69b58526ed3368687819b486cdf0e6c4a582977d04ff801d80d2e75d9e323b3d451bcb02a76a057f44e1aea2d3504be0265a896975115b51abe062ab60d
-  data.tar.gz: d106c53071f988a03fb4c54b84e7ee31329939ed45aedb3e3bd2dce3fe443e942d6d87925b794048bda06db71c2fd09d0a1f73839d1b32e0dd75620edb6c9ec0
+  metadata.gz: 997471c35942b28521716950e9c747b058d4b7e454d6cbb4e3f819544abe11fc2ec55732a9fd109e7dbff56d7212604ed9809910f8622f894eda70c2a35ea9f5
+  data.tar.gz: 1a2b2c53a816c8c1a5b7fb05c12a139b21e60659b4b11dcbe8fd0ce998eac10b7e2918b472c4ff8a3d844d26fc196524ac5830845122770b963233387daca159

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.0.4
+
+* Fixed schoolboy error - only validate when we actually have some data!
+
+## 0.0.3
+
+* Fixed regular expression again
+
 ## 0.0.2
 
 * Fixed regular expression so it plays nice with rails 4

data/lib/format_url.rb

@@ -4,7 +4,7 @@ require "format_url/railtie" if defined? Rails
 
 module FormatUrl
   def self.format_url(url)
-    if url.to_s !~ url_regexp && "http://#{url}" =~ url_regexp
+    if url && url.length > 0 && url.to_s !~ url_regexp && "http://#{url}" =~ url_regexp
       "http://#{url}"
     else
       url

data/lib/format_url/model_additions.rb

@@ -3,8 +3,8 @@ module FormatUrl
     def format_url(attribute)
       before_validation do
         send("#{attribute}=", FormatUrl.format_url(send(attribute)))
-      end
-      validates_format_of attribute, with: FormatUrl.url_regexp, message: "is not a valid URL"
+      end if attribute
+      validates_format_of attribute, with: FormatUrl.url_regexp, message: "is not a valid URL", :allow_blank => true
     end
   end
 end

data/lib/format_url/version.rb

@@ -1,3 +1,3 @@
 module FormatUrl
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: format_url
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - David Hopkinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec