truncator 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a955ce36bed47fb70bdf80ca507b96eefa350305
-  data.tar.gz: cd95f97f6ec5bf3a7be1d927fcda8b4df55daee2
+  metadata.gz: 569306c1d30040a36691edb14d10dd202edd90ae
+  data.tar.gz: 9e8a3cca376177beb1ca8bfeb4ee17776334ff0e
 SHA512:
-  metadata.gz: 7cf9be753cd247d469b1c478296e32db838c4b7ef468f369f69ed9a0c22bfa6917883560eadffb73c0de964ed7f805cecc3946faed614c4448141d2be464b857
-  data.tar.gz: 44f17ec44daed9292f285f68a0d0362b492e26813a27e84ad7d1c3229198326b72a6cf332e73541749f5d7798f47da2773e9c1fd1bcaa9883ee01afbce5c22a4
+  metadata.gz: 783a55829c621c019b81ec3b0af3a9b1c696608498bed06c3418bc0137474458e962c9765542729b8479620c48518ca8cfd8ba44e13c4988c86e989548fc94d0
+  data.tar.gz: f53daacef940d209fbf99866fc4df388918507f8eb5642b855904776cb90a5054bb091cc4ee99a860648b151dbcf0b09ae0861f2d2a427dd720a774a0f5d4f7a

data/lib/truncator/extended_uri.rb

@@ -2,6 +2,8 @@ require 'uri'
 
 module Truncator
   module ExtendedURI
+    class QueryParamWithoutValueError < URI::Error; end
+
     refine URI::Generic do
       def ordinary_hostname?
         if %w(https ftp).include?(self.scheme) || self.userinfo || self.port_defined?
@@ -28,7 +30,11 @@ module Truncator
       end
 
       def query_parameters
-        URI.decode_www_form(self.query)
+        begin
+          URI.decode_www_form(self.query)
+        rescue ArgumentError # fixed in ruby 2.1.0 r40460
+          raise QueryParamWithoutValueError
+        end
       end
 
       def query_parameters=(params)

data/lib/truncator/url_parser.rb

@@ -12,6 +12,7 @@ module Truncator
         begin
           uri = URI(uri)
         rescue URI::InvalidURIError
+          uri.sub!(/\Ahttp:\/\//, '') # remove http protocol
           return uri.truncate(truncation_length)
         end
 
@@ -46,6 +47,9 @@ module Truncator
         end
 
         uri.special_format
+
+      rescue Truncator::ExtendedURI::QueryParamWithoutValueError
+        return uri.to_s.truncate(truncation_length)
       end
 
       private

data/lib/truncator/version.rb

@@ -1,3 +1,3 @@
 module Truncator
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/url_parser_spec.rb

@@ -173,8 +173,16 @@ describe Truncator::UrlParser do
     context 'when URL is invalid URL' do
       let(:dangerous_url) { "http://www.first.army.mil/family/contentdisplayFAFP.asp?ContentID=133&SiteID=\"><script>alert(String.fromCharCode(88,83,83))</script>" }
 
+      it 'should just perform a basic truncation after removing http://' do
+        Truncator::UrlParser.shorten_url(dangerous_url, 30).should == 'www.first.army.mil/family/c...'
+      end
+    end
+
+    context 'when URL contains query param with no value' do
+      let(:missing_param_value) { 'https://npiregistry.cms.hhs.gov/NPPESRegistry/DisplayProviderDetails.do?searchNpi=1629006051&city=&firstName=&orgName=&searchType=ind&state=&npi=1629006051&orgDba=&lastName=&zip' }
+
       it 'should just perform a basic truncation' do
-        Truncator::UrlParser.shorten_url(dangerous_url, 30).should == 'http://www.first.army.mil/f...'
+        Truncator::UrlParser.shorten_url(missing_param_value).should == 'https://npiregistry.cms.hhs.gov/NPPESRe...'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truncator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - freemanoid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport