lazy_domain 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22211abf594c3ca41c920dedf2556c9c8181fb06
-  data.tar.gz: 2bb691ae29b03dfb5c262c235f23c663c65b65c4
+  metadata.gz: 97145afd64c8587003306a7506d5714958209a15
+  data.tar.gz: e5d92e18ef835249af2329d42e3c9a95c3994846
 SHA512:
-  metadata.gz: ff14b0436b383ca2266a878246e9b9ba43efe424b2e5a165ac0bd4c462436564254cc7f2c0a253c2056a1e87e80fc4986020ee7edfa52b61f4517fd157f1bf33
-  data.tar.gz: 2212be8528f9e956ee427e393a00c8307d73baf3f4a52a3dc98c0359b548ac26bc586b5d0dff6af7a78f4bb913a487f7d70c963e4b3bd7590262f0cd13778d42
+  metadata.gz: 9919922fd5e9ced77cd7d9b286046ba3d52cc35f7770c56db39ebe91d34f6de049c120e01b78e32621aca6103af064c48b9a52e0c6a1ccc9a5f0368b40d93c1a
+  data.tar.gz: a203fa59508c2a15db7a459d91dca55a8a4acda2b8800d5ad7cacf5a3ed1c8993bd4c26c4f0c8fe1146708707efc6c9d0c838ff1a036dad50bf84b43b88c0c6c

data/README.md

@@ -1,4 +1,5 @@
 # LazyDomain
+[![Build Status](https://travis-ci.org/m8ss/lazy_domain.svg?branch=master)](https://travis-ci.org/m8ss/lazy_domain) [![Code Climate](https://codeclimate.com/github/m8ss/lazy_domain/badges/gpa.svg)](https://codeclimate.com/github/m8ss/lazy_domain) [![Gem Version](https://badge.fury.io/rb/lazy_domain.svg)](https://badge.fury.io/rb/lazy_domain)
 
 Parse varying urls with [PublicSuffix](https://github.com/weppos/publicsuffix-ruby) the easy way.
 
@@ -10,10 +11,7 @@ LazyDomain assumes it could be either way and uses URI to make up the difference
 
 ## Installation
 
-```
-gem install lazy_domain
-
-```
+	$ gem install lazy_domain
 
 ## Usage
 
@@ -24,48 +22,48 @@ Because LazyDomain is simply a wrapper for [PublicSuffix](https://github.com/wep
 Example domain without subdomains.
 
 ```ruby
-	domain = LazyDomain.parse("google.com")
-	# => #<PublicSuffix::Domain>
-	domain.tld
-	# => "com"
-	domain.sld
-	# => "google"
-	domain.trd
-	# => nil
-	domain.domain
-	# => "google.com"
-	domain.subdomain
-	# => nil
+domain = LazyDomain.parse("google.com")
+# => #<PublicSuffix::Domain>
+domain.tld
+# => "com"
+domain.sld
+# => "google"
+domain.trd
+# => nil
+domain.domain
+# => "google.com"
+domain.subdomain
+# => nil
 ```
 
 Example domain with subdomains.
 
 ```ruby
-	domain = LazyDomain.parse("www.google.com")
-	# => #<PublicSuffix::Domain>
-	domain.tld
-	# => "com"
-	domain.sld
-	# => "google"
-	domain.trd
-	# => "www"
-	domain.domain
-	# => "google.com"
-	domain.subdomain
-	# => "www.google.com"
+domain = LazyDomain.parse("www.google.com")
+# => #<PublicSuffix::Domain>
+domain.tld
+# => "com"
+domain.sld
+# => "google"
+domain.trd
+# => "www"
+domain.domain
+# => "google.com"
+domain.subdomain
+# => "www.google.com"
 ```
 
 Simple validation example.
 
 ```ruby
-	LazyDomain.valid?("google.com")
-	# => true
+LazyDomain.valid?("google.com")
+# => true
 
-	LazyDomain.valid?("www.google.com")
-	# => true
+LazyDomain.valid?("www.google.com")
+# => true
 
-	LazyDomain.valid?("x.yz")
-	# => false
+LazyDomain.valid?("x.yz")
+# => false
 ```
 
 ## Advanced Usage
@@ -75,26 +73,26 @@ You can do everything mentioned above, but the magic of LazyDomain is you can no
 For example, all of this...
 
 ```ruby
-	domain = LazyDomain.parse("google.com")
+domain = LazyDomain.parse("google.com")
 
-	domain = LazyDomain.parse("http://google.com")
+domain = LazyDomain.parse("http://google.com")
 
-	domain = LazyDomain.parse("ftp://google.com")	
+domain = LazyDomain.parse("ftp://google.com")	
 
-	domain = LazyDomain.parse("somethingcrazy://google.com")
+domain = LazyDomain.parse("somethingcrazy://google.com")
 
-	domain = LazyDomain.parse("http://abc.defg.hijk.google.com")
+domain = LazyDomain.parse("http://abc.defg.hijk.google.com")
 
-	domain = LazyDomain.parse("http://abc.defg.hijk.google.com/asubdirectory/andanother")
+domain = LazyDomain.parse("http://abc.defg.hijk.google.com/asubdirectory/andanother")
 
 ```
 
 ...returns something like this.
 
-```ruby
 
-=> #<PublicSuffix::Domain:0x0055c2344f0168 @sld="google", @tld="com", @trd="abc.defg.hijk">
+```ruby
 
+# => #<PublicSuffix::Domain:0x0055c2344f0168 @sld="google", @tld="com", @trd="abc.defg.hijk">
 
 ```
 

data/Rakefile

@@ -1,5 +1,12 @@
 require 'rubygems'
 require 'rake'
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_lazy_domain*.rb'
+  test.verbose = true
+end
 
 desc 'Open console with lazy_domain loaded'
 task :console do

data/lib/lazy_domain.rb

@@ -6,17 +6,33 @@ module AutoHTTP
   # Looks for any character before '://'
   TP_REGEX = %r{[\w]+(\b:\/\/)}
 
+  # Looks if there is are non word characters before domain but no letters.
+  # Example is '://google.com' or '#$/google.com', etc.
+  BADURL_REGEX = /\A(\W+)/
+
   # Returns true if there is any character before '://'' in a url.
   # ie. 'something://google.com' or 'xyz://google.com'
   #
   # Returns false if somehting like '://google.com' or 'google.com'.
-  def hastp(str)
+  def hastp?(str)
     !(str =~ TP_REGEX).nil?
   end
 
+  # Boolean, returns true if anything besides '*://' is given
+  def bad_protocol?(str)
+    !(str =~ BADURL_REGEX).nil?
+  end
+
+  # Strip out the bad characters.
+  # If there is nothing bad to strip, returns the original string.
+  def strip_bad(str)
+    str.gsub!(BADURL_REGEX, '') || str
+  end
+
   # Add 'http://' if something is not already present.
   def autohttp(str)
-    str.prepend('http://') unless hastp(str)
+    strip_bad(str) if bad_protocol?(str)
+    str.prepend('http://') unless hastp?(str)
     str
   end
 end

data/lib/lazy_domain/version.rb

@@ -1,3 +1,3 @@
 module LazyDomain
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazy_domain
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - John Mason
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: public_suffix
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement