twingly-url 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2332efd0ec1df89e43ac8c6dbfe50e32111ee4e1
-  data.tar.gz: f9242f3818d99ef4b49d997898fd22fba951ea9d
+  metadata.gz: b66f417f0fe41cd5079277a287138abdbf43c310
+  data.tar.gz: 6f113bf8c3b862541943caac45b69e440c2b76f3
 SHA512:
-  metadata.gz: 614aac135b4e9c8fe61dbf9f0e5c13928c5e71f7b552bf980f6ae3331a17eb6cfcbd2d6421d5fdaf49bca9fca723d4a188c1585b8e7b77987a6cd8b27d9abcbc
-  data.tar.gz: 9d33a5f6ebb37eb410779cd40350df8bea3f7ffad72f93e8b8015e0dca086c3a86b66110cde34c28ac05a1da08985aeee2b46eba9fd6e0b4dce6f56e5e01e7f2
+  metadata.gz: 9055372e2fe3732ca1bf2dcbdbd82a7e83e2ed674b5ce90816c71aa8d8486ef3c82cf2ab7bab8aa507afac1b2987298dd23f3230a6769c86dc489a982e49f9e4
+  data.tar.gz: dcf3378ddc94bb335f2780b8a7186c308e542ef0bf10bc1d6f5450590145de671cc6a9ad3ab13ac9306fd7831fdfbbd71df4fe4711d3af9da00f37ff5c46401d

data/README.md

@@ -35,12 +35,13 @@ Note that this isn't a benchmark, we're using [ruby-prof] which will slow things
 
 ## Release workflow
 
-Build the gem.
+* Bump the version in `lib/twingly/version.rb`.
 
-    gem build twingly-url.gemspec
+* Make sure you are logged in as [twingly][twingly-rubygems] at RubyGems.org.
 
-[Publish](http://guides.rubygems.org/publishing/) the gem.
+* Build and [publish](http://guides.rubygems.org/publishing/) the gem.
 
-    gem push twingly-url-x.y.z.gem
+        bundle exec rake release
 
+[twingly-rubygems]: https://rubygems.org/profiles/twingly
 [ruby-prof]: http://ruby-prof.rubyforge.org/

data/lib/twingly/url.rb

@@ -10,7 +10,7 @@ module Twingly
   class URL
     include Comparable
 
-    SCHEMES = %w(http https)
+    ACCEPTED_SCHEMES = /\Ahttps?\z/i
     ENDS_WITH_SLASH = /\/+$/
 
     def self.parse(potential_url)
@@ -24,15 +24,14 @@ module Twingly
     end
 
     def self.internal_parse(potential_url)
-      if potential_url.is_a?(Addressable::URI)
-        addressable_uri = potential_url
-      else
-        addressable_uri = Addressable::URI.heuristic_parse(potential_url)
-      end
-
-      raise Twingly::Error::ParseError if addressable_uri.nil?
+      addressable_uri = to_addressable_uri(potential_url)
+      raise Twingly::URL::Error::ParseError if addressable_uri.nil?
 
       public_suffix_domain = PublicSuffix.parse(addressable_uri.display_uri.host)
+      raise Twingly::URL::Error::ParseError if public_suffix_domain.nil?
+
+      scheme = addressable_uri.scheme
+      raise Twingly::URL::Error::ParseError unless scheme =~ ACCEPTED_SCHEMES
 
       self.new(addressable_uri, public_suffix_domain)
     rescue Addressable::URI::InvalidURIError, PublicSuffix::DomainInvalid => error
@@ -100,7 +99,7 @@ module Twingly
     end
 
     def normalized_scheme
-      addressable_uri.scheme.downcase
+      scheme.downcase
     end
 
     def normalized_host
@@ -123,7 +122,7 @@ module Twingly
     end
 
     def valid?
-      addressable_uri && public_suffix_domain && SCHEMES.include?(normalized_scheme)
+      true
     end
 
     def <=>(other)
@@ -138,6 +137,15 @@ module Twingly
       sprintf("#<%s:0x%x %s>", self.class.name, __id__, self.to_s)
     end
 
+    private_class_method \
+    def self.to_addressable_uri(potential_url)
+     if potential_url.is_a?(Addressable::URI)
+        potential_url
+      else
+        Addressable::URI.heuristic_parse(potential_url)
+      end
+    end
+
     private
 
     attr_reader :addressable_uri, :public_suffix_domain

data/lib/twingly/url/null_url.rb

@@ -1,3 +1,5 @@
+require_relative "../url"
+
 module Twingly
   class URL
     class NullURL

data/lib/twingly/url/utilities.rb

@@ -1,3 +1,5 @@
+require_relative "../url"
+
 module Twingly
   class URL
     module Utilities

data/lib/twingly/version.rb

@@ -1,5 +1,5 @@
 module Twingly
   class URL
-    VERSION = "2.0.0"
+    VERSION = "3.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-url
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -104,9 +104,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -119,4 +119,3 @@ signing_key:
 specification_version: 4
 summary: Ruby library for URL handling
 test_files: []
-has_rdoc: