truncator 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a581c6b09af87c1884e8ca26e183bdbecde6720
-  data.tar.gz: 7148ecbe12e7a6194160faa65b440deecdfd3c48
+  metadata.gz: e5276cca37ceaa33ed7d3cbdb991a55a63dc1c5e
+  data.tar.gz: 66bc5849518bce29397004be96990e33c5ef0106
 SHA512:
-  metadata.gz: 5797b1313e40f87537056625bfabe8e4896307b9b317fd4eb3b91077a783767dc3ad4e498c9fdd513b7346f72e82c71ad23cbc4377f6ece0b88bca42e5ccacf9
-  data.tar.gz: 8c3ef973cce8f7cf4cbba2783ec003f2c582e61af1d58b841b57a48f191575d69996fee457d97ed91795bf0a58b006b5ceef0147b1fa44beb32f835cb2437f20
+  metadata.gz: 0f3bacbb6ff2f4aef0cb8c268af58e04ec30e5b6f8b572039ae175bfb355ff9471d7f31216f43d967c2e8f877adb32f81f20106d4b4a7194a55e2f51e2eed9d3
+  data.tar.gz: 4b681896df0dcf909040b6fb9e2a6e512a749b6660dbe911c295baa9c730cbb69ceda4f82990e1d96dae551fbd4d17036726ac74bbec5d74aa5d95c2f6484571

data/.travis.yml

@@ -1,12 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.1.6
   - ruby-head
-  - rbx-2.1.1
-  - jruby-head
-matrix:
-  allow_failures:
-    - rvm: rbx-2.1.1
-    - rvm: jruby-head
 notifications:
   email: false

data/Gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :debug do
-  gem "byebug", platforms: :mri
+  gem "pry-byebug", platforms: :mri
 end

data/lib/truncator/extended_uri.rb

@@ -30,14 +30,14 @@ module Truncator
       end
 
       def query_parameters
-        if RUBY_VERSION == '2.1.0' and RUBY_REVISION >= 40460
-          URI.decode_www_form(self.query)
-        else
+        if query_bug_in_ruby?
           begin
             URI.decode_www_form(self.query)
           rescue ArgumentError # fixed in ruby 2.1.0 r40460
             raise QueryParamWithoutValueError
           end
+        else
+          URI.decode_www_form(self.query)
         end
       end
 
@@ -62,6 +62,10 @@ module Truncator
         port = self.port
         self.to_s.include? ":#{port}"
       end
+
+      def query_bug_in_ruby?
+        Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.1.0')
+      end
     end
   end
 end

data/lib/truncator/url_parser.rb

@@ -16,7 +16,7 @@ module Truncator
           return uri.truncate(truncation_length)
         end
 
-        if not uri.ordinary_hostname?
+        if !uri.ordinary_hostname?
           if uri.query
             uri.query_parameters = [uri.query_parameters.first]
             return uri.to_s + SEPARATOR
@@ -27,12 +27,12 @@ module Truncator
 
         return uri.special_format if uri.special_format.valid_length?(truncation_length)
 
-        if uri.path_blank? and not uri.query
+        if uri.path_blank? && !uri.query
           return uri.special_format.truncate!(truncation_length)
         end
 
         if uri.query
-            return uri.special_format.truncate!(truncation_length)
+          return uri.special_format.truncate!(truncation_length)
         else
           if uri.host.valid_length?(truncation_length)
             result = truncate_by_shortest(uri, truncation_length)

data/lib/truncator/version.rb

@@ -1,3 +1,3 @@
 module Truncator
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/url_parser_spec.rb

@@ -2,9 +2,7 @@ require 'spec_helper'
 require 'truncator'
 
 describe Truncator::UrlParser do
-
   describe ".shorten_url" do
-
     context "when no truncation length is specified, the URL is too long, has sublevels, but no query params" do
       let(:shortened) { Truncator::UrlParser.shorten_url "http://www.foo.com/this/is/a/b/c/d/e/f/string.html" }
 
@@ -185,13 +183,5 @@ describe Truncator::UrlParser do
         end
       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(missing_param_value).should == 'https://npiregistry.cms.hhs.gov/NPPESRe...'
-      end
-    end
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: truncator
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - freemanoid
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 description: url truncator
@@ -73,8 +73,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -98,17 +98,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Truncate urls as much as possible