truncator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 664e2bb87bc33032c0dd931d417c22d87fc0f241
-  data.tar.gz: e05bfc012e31afaf14ebfddde0776f6a532020e2
+  metadata.gz: a955ce36bed47fb70bdf80ca507b96eefa350305
+  data.tar.gz: cd95f97f6ec5bf3a7be1d927fcda8b4df55daee2
 SHA512:
-  metadata.gz: 80c8cd8755b1d0bda2c98ebbaf80522c8196d851121c4ef7b9e51c2d3986b5a1abf28b984dbb262efac38bcd224dcc9394f23c70c92b5e620fde3282c0f760fa
-  data.tar.gz: ab977d4f710eedffc3b9502338f7a40b8ff8a39d601e7d9ec53299ce7edb0ea575d764c055bc15a84ba75bd5281580fe33e0234a4b04c2abd9ce090a16e10dfc
+  metadata.gz: 7cf9be753cd247d469b1c478296e32db838c4b7ef468f369f69ed9a0c22bfa6917883560eadffb73c0de964ed7f805cecc3946faed614c4448141d2be464b857
+  data.tar.gz: 44f17ec44daed9292f285f68a0d0362b492e26813a27e84ad7d1c3229198326b72a6cf332e73541749f5d7798f47da2773e9c1fd1bcaa9883ee01afbce5c22a4

data/.gitignore

@@ -17,4 +17,5 @@ test/version_tmp
 tmp
 .rspec
 .ruby-version
+.ruby-gemset
 Gemfile.lock

data/lib/truncator/extended_uri.rb

@@ -27,23 +27,6 @@ module Truncator
         self
       end
 
-      def last_path_with_query
-        str = "#{self.paths.last}"
-        if self.query
-          str += "?#{self.query}"
-        end
-        str
-      end
-
-      def last_path_with_query=(str)
-        last_path, query = str.split('?')
-        _paths = self.paths
-        _paths[-1] = last_path.to_s if _paths.last
-        self.paths = _paths
-        self.query = query
-        self
-      end
-
       def query_parameters
         URI.decode_www_form(self.query)
       end

data/lib/truncator/url_parser.rb

@@ -31,17 +31,17 @@ module Truncator
         end
 
         if uri.query
-          if uri.host.invalid_length?(truncation_length) and uri.last_path_with_query.length > truncation_length
-            uri = truncate_last_path_segment(uri, truncation_length)
-          elsif uri.special_format.valid_length?(truncation_length + uri.last_path_with_query.length) or not uri.path_blank?
             return uri.special_format.truncate!(truncation_length)
-          end
         else
           if uri.host.valid_length?(truncation_length)
-            uri = truncate_by_shortest(uri, truncation_length)
+            result = truncate_by_shortest(uri, truncation_length)
+            if result
+              uri = result
+            else
+              return uri.special_format.truncate!(truncation_length)
+            end
           else
-            uri = truncate_all_paths_except_last(uri)
-            uri = truncate_last_path_segment(uri, truncation_length)
+            return uri.special_format.truncate!(truncation_length)
           end
         end
 
@@ -49,22 +49,6 @@ module Truncator
       end
 
       private
-        def truncate_all_paths_except_last(uri)
-          uri = uri.dup
-          paths = uri.paths
-          if paths.size > 1
-            uri.paths = [SEPARATOR, paths.last]
-          end
-          uri
-        end
-
-        def truncate_last_path_segment(uri, truncation_length)
-          uri = uri.dup
-          last_path_with_query = uri.last_path_with_query
-          uri.last_path_with_query = last_path_with_query.truncate(truncation_length)
-          uri
-        end
-
         def sort_paths_by_length_and_index!(paths)
           paths.lazy.with_index.sort_by { |a, i| [a.size, i] }.map(&:first)
         end
@@ -83,13 +67,18 @@ module Truncator
         end
 
         # Truncate the uri via truncating the shortest possible path sequence
+        # return nil if can't truncate
         def truncate_by_shortest(uri, target_length)
           uri = uri.dup
           sorted_sequences = sort_paths_by_length_and_index!(paths_sequences_from_uri(uri))
           truncated_part = find_truncated_sequence(uri, sorted_sequences, target_length)
 
-          uri.path = uri.path.sub(truncated_part, SEPARATOR)
-          uri
+          if truncated_part
+            uri.path = uri.path.sub(truncated_part, SEPARATOR)
+            uri
+          else
+            nil
+          end
         end
     end
   end

data/lib/truncator/version.rb

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

data/spec/url_parser_spec.rb

@@ -73,12 +73,26 @@ describe Truncator::UrlParser do
     context "when the URL contains a really long host name and a long trailing filename" do
       let(:shortened) { Truncator::UrlParser.shorten_url("http://www128376218.skjdhfskdjfhs.lqdkwjqlkwjdqlqwkjd.com/some/path/1234567890123456789012345678901234test_of_the_mergency_broadcastingnet_work.html", 30) }
 
-      it "should not truncate the host name and truncated the last part of the path to truncation length and all dirs" do
-        shortened.should == "www128376218.skjdhfskdjfhs.lqdkwjqlkwjdqlqwkjd.com/.../123456789012345678901234567..."
+      it "should truncate to 30 chars with ellipses" do
+        shortened.should == "www128376218.skjdhfskdjfhs...."
+      end
+    end
+
+    context 'when turning subfolder(s) into ellipses does not truncate enough' do
+      let(:hypenated_url) { 'http://www.whitehouse.gov/contact/submit-questions-and-comments' }
+      it 'should truncate to 30 chars with ellipses' do
+        Truncator::UrlParser.shorten_url(hypenated_url, 30).should == 'www.whitehouse.gov/contact/...'
+      end
+    end
+
+    context "when the URL contains a short host name, short folder names, and a longer trailing filename" do
+      let(:shortened) { Truncator::UrlParser.shorten_url("http://www.ddd.com/some/path/123456789.html", 30) }
+
+      it "should truncate to 30 chars with ellipses" do
+        shortened.should == "www.ddd.com/.../123456789.html"
       end
     end
 
-    #TODO: this and the next spec can be merged
     context "when the URL contains a really long host name and is an http url and has an empty path" do
       let(:shortened) { Truncator::UrlParser.shorten_url("http://www128376218.skjdhfskdj.lqdkwjqlkwjdqlqwkjd.com/", 30) }
 
@@ -98,8 +112,8 @@ describe Truncator::UrlParser do
     context "when the URL contains a really long host name and has a really long query parameter" do
       let(:shortened) { Truncator::UrlParser.shorten_url("http://www128376218.skjdhfskdjfhs.lqdkwjqlkwjdqlqwkjd.com/?cmd=1234567890123456789012345678901234&api_key=1234567890123456789012345678901234", 30) }
 
-      it "should not truncate the host name but truncate the query parameter" do
-        shortened.should == "www128376218.skjdhfskdjfhs.lqdkwjqlkwjdqlqwkjd.com/?cmd=1234567890123456789012..."
+      it "should truncate to 30 chars with ellipses" do
+        shortened.should == "www128376218.skjdhfskdjfhs...."
       end
     end
 

metadata

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