stringex 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2E3OGEzOWQzMzM2YTFiZWY2YzliZTJjM2MyMDFmODAxMjQ2YWZmZg==
+    OGQxMmNjMmIwMzU1MzY0YzdmMWEzZjhiYjI0MTk5ZGE4M2ZiODY0Mg==
   data.tar.gz: !binary |-
-    ODY3ZjFjMDIxNjJjMTk3OTI3NzM1YzQwODQ3YjMzODgwNDU1Nzk5Mg==
+    YzkxMzZiYTBmZWM0YWUyYTMyYWY0MDgzNDRhM2IxNmJjZWM2MDZmOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzA1OTg0MTdjZWZkNzkwOGU3YTcxMmM0N2ZiYWU0NDk3NWU0YWZlN2YxMDQz
-    ZDUyNjk0MDZjNTEwOWI0ZTMxNjY1NWZiNzhkYmVhOWVmMGEwMDQwYzM1MDQ1
-    OTEzNGRmNDc3ZDk4NmM2ZjdhZWI2N2RmMDAzMGIzN2JiMGNiN2Q=
+    MmMxMmRmNTg3NGY0Nzg1M2Q2MWM4NTk5M2I0NjAxMjgwNmIwZjljZmEzZmNj
+    MGE4MWYwOGNjYTRkMzM5NzRhMTdjMzI3MWVhNzY4NzBkNTQ2ZTM0YWEzYzE1
+    ZmM1YWY2NmY0MzM5ZDk4MTc2MjQzNWVkZTU5NDNmNjZkZmNlMDM=
   data.tar.gz: !binary |-
-    OTE5NTdmZTUzNWZkMTU2NTRkZWE0MjQ4ZjI4MTIzY2VmNTBmODBmYTcyMDZj
-    Yjc3ZTllZWJhNmRjZjhiODgzNWJjZGVhMzllYzk1NWFkZTg0NjM3OTI1NDRl
-    NjdkZWQ2YmNkOTJjNDBmODBhYThmNTI4ODhkNWUzZGEzNDI1MWE=
+    MTA2MjBkMTVkYWVlMzM0MDA4Y2JmODNjMGM4NWM5MjBkZjM3YmJiMmFkZjA4
+    YjQyNDBkOWMwMDE3YmI4ZDkwNjE1ZWQ2ODdjMzMzZTU4OTBmZjE1NDU2NTQ0
+    OGY4ZDA2MWU2MjUyYWM1NTZhNTNjZDRmOTk5NDYwZjcxNTQyMzY=

data/Gemfile

@@ -14,7 +14,13 @@ group :development do
     puts "Mongoid requires Ruby higher than 1.8.x"
   end
   gem "RedCloth", "4.2.9" # Can I state that I really dislike camelcased gem names?
-  gem "sqlite3", "1.3.7"
   gem "travis-lint", "1.7.0"
   gem "i18n", "0.6.1"
+  # For non-Jruby...
+  gem "sqlite3", "1.3.7", :platform => [:ruby, :mswin, :mingw]
+  # And for Jruby...
+  platform :jruby do
+    # gem "jdbc-sqlite3"
+    # gem "activerecord-jdbcsqlite3-adapter"
+  end
 end

data/README.rdoc

@@ -28,6 +28,8 @@ which will populate the <tt>url</tt> attribute on the object with the converted
                              if you are routing solely on the generated slug as you will no longer
                              be guaranteed to lookup the expected record based on a duplicate slug.</em>
 <tt>:limit</tt>:: If set, will limit length of url generated. Default is nil.
+<tt>:truncate_words</tt>:: Used with :limit. If set to false, the url will be truncated to the last
+                           whole word before the limit was reached. Default is true.
 
 In order to use the generated url attribute, you will probably want to override <tt>to_param</tt> like so, in your Model:
 

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/lib/stringex/acts_as_url/adapter/active_record.rb

@@ -11,7 +11,7 @@ module Stringex
       private
 
         def klass_previous_instances(&block)
-          klass.find_each(:conditions => {settings.url_attribute => [nil, '']}, &block)
+          klass.where(settings.url_attribute => [nil, '']).find_each(&block)
         end
 
         def self.orm_class

data/lib/stringex/configuration/acts_as_url.rb

@@ -14,7 +14,8 @@ module Stringex
           :exclude,
           :force_downcase,
           :limit,
-          :replace_whitespace_with
+          :replace_whitespace_with,
+          :truncate_words,
         ].inject(Hash.new){|m, x| m[x] = settings.send(x); m}
       end
 

data/lib/stringex/configuration/string_extensions.rb

@@ -11,7 +11,8 @@ module Stringex
           :exclude => [],
           :force_downcase => true,
           :limit => nil,
-          :replace_whitespace_with => "-"
+          :replace_whitespace_with => "-",
+          :truncate_words => true
         }
       end
     end

data/lib/stringex/localization/conversion_expressions.rb

@@ -3,7 +3,7 @@
 module Stringex
   module Localization
     module ConversionExpressions
-      ABBREVIATION = /(\s|^)([[:alpha:]](\.[[:alpha:]])+(\.?)[[:alpha:]]*(\s|$))/
+      ABBREVIATION = /(\s|\(|^)([[:alpha:]](\.[[:alpha:]])+(\.?)[[:alpha:]]*(\s|\)|$))/
 
       ACCENTED_HTML_ENTITY = /&([A-Za-z])(grave|acute|circ|tilde|uml|ring|cedil|slash);/
 

data/lib/stringex/string_extensions.rb

@@ -94,10 +94,31 @@ module Stringex
       end
 
       # Returns the string limited in size to the value of limit.
-      def limit(limit = nil)
-        limit.nil? ? self : self[0...limit]
+      def limit(limit = nil, truncate_words = true)
+        if limit.nil?
+          self
+        else
+          truncate_words == false ? self.whole_word_limit(limit) : self[0...limit]
+        end
       end
 
+      def whole_word_limit(limit)
+        whole_words = []
+        words = self.split('-')
+
+        words.each do |word|
+          if word.size > limit
+            break
+          else
+            whole_words << word
+            limit -= (word.size + 1)
+          end
+        end
+
+        whole_words.join('-')
+      end
+
+
       # Performs multiple text manipulations. Essentially a shortcut for typing them all. View source
       # below to see which methods are run.
       def remove_formatting(options = {})
@@ -167,7 +188,7 @@ module Stringex
         dummy = remove_formatting(options).
                   replace_whitespace(whitespace_replacement_token).
                   collapse("-").
-                  limit(options[:limit])
+                  limit(options[:limit], options[:truncate_words])
         dummy.downcase! unless options[:force_downcase] == false
         dummy
       end

data/stringex.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "stringex"
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Russell Norris"]
-  s.date = "2013-09-17"
+  s.date = "2014-02-03"
   s.description = "Some [hopefully] useful extensions to Ruby's String class. Stringex is made up of three libraries: ActsAsUrl [permalink solution with better character translation], Unidecoder [Unicode to ASCII transliteration], and StringExtensions [miscellaneous helper methods for the String class]."
   s.email = "rsl@luckysneaks.com"
   s.extra_rdoc_files = [
@@ -280,9 +280,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["= 1.8.4"])
       s.add_development_dependency(%q<mongoid>, ["= 3.1.4"])
       s.add_development_dependency(%q<RedCloth>, ["= 4.2.9"])
-      s.add_development_dependency(%q<sqlite3>, ["= 1.3.7"])
       s.add_development_dependency(%q<travis-lint>, ["= 1.7.0"])
       s.add_development_dependency(%q<i18n>, ["= 0.6.1"])
+      s.add_development_dependency(%q<sqlite3>, ["= 1.3.7"])
     else
       s.add_dependency(%q<activerecord>, ["= 3.2.13"])
       s.add_dependency(%q<dm-core>, ["= 1.2.0"])
@@ -292,9 +292,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["= 1.8.4"])
       s.add_dependency(%q<mongoid>, ["= 3.1.4"])
       s.add_dependency(%q<RedCloth>, ["= 4.2.9"])
-      s.add_dependency(%q<sqlite3>, ["= 1.3.7"])
       s.add_dependency(%q<travis-lint>, ["= 1.7.0"])
       s.add_dependency(%q<i18n>, ["= 0.6.1"])
+      s.add_dependency(%q<sqlite3>, ["= 1.3.7"])
     end
   else
     s.add_dependency(%q<activerecord>, ["= 3.2.13"])
@@ -305,9 +305,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["= 1.8.4"])
     s.add_dependency(%q<mongoid>, ["= 3.1.4"])
     s.add_dependency(%q<RedCloth>, ["= 4.2.9"])
-    s.add_dependency(%q<sqlite3>, ["= 1.3.7"])
     s.add_dependency(%q<travis-lint>, ["= 1.7.0"])
     s.add_dependency(%q<i18n>, ["= 0.6.1"])
+    s.add_dependency(%q<sqlite3>, ["= 1.3.7"])
   end
 end
 

data/test/unit/acts_as_url_integration_test.rb

@@ -326,4 +326,22 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
     @doc = Document.create(:title => "a b/c d")
     assert_equal "a-b/c-d", @doc.url
   end
+
+  def test_should_truncate_words_by_default
+    Document.class_eval do
+      acts_as_url :title, :limit => 20
+    end
+
+    @doc = Document.create(:title => "title with many whole words")
+    assert_equal 'title-with-many-whol', @doc.url
+  end
+
+  def test_should_not_truncate_words
+    Document.class_eval do
+      acts_as_url :title, :limit => 20, :truncate_words => false
+    end
+
+    @doc = Document.create(:title => "title with many whole words")
+    assert_equal 'title-with-many', @doc.url
+  end
 end

data/test/unit/localization/da_test.rb

@@ -24,7 +24,7 @@ class DanishYAMLLocalizationTest < Test::Unit::TestCase
     "100%" => "100 procent",
     "cost+tax" => "cost plus tax",
     "batman/robin fan fiction" => "batman skråstreg robin fan fiction",
-    "dial *69" => "dial stjerne 69",
+    "dial *69" => "dial stjerne 69"
     # " i leave whitespace on ends unchanged " => " i leave whitespace on ends unchanged "
   }.each do |original, converted|
     define_method "test_character_conversion: '#{original}'" do

data/test/unit/string_extensions_test.rb

@@ -89,12 +89,19 @@ class StringExtensionsTest < Test::Unit::TestCase
       "Rabbits aren't real" =>
         "rabbits-arent-real",
       "R$ isn't R" =>
-        "reais-isnt-r"
+        "reais-isnt-r",
+      "Last Friday Night (T.G.I.F.)" =>
+        "last-friday-night-tgif"
     }.each do |html, plain|
       assert_equal plain, html.to_url
     end
   end
 
+  def test_to_url_with_danish_characters
+    Stringex::Localization.locale = :da
+    assert_equal "roedgroed-med-floede", "Rødgrød med fløde".to_url
+  end
+
   def test_to_url_with_excludes
     assert_equal "So Fucking Special", "So Fucking Special".to_url(:exclude => "So Fucking Special")
   end
@@ -152,11 +159,11 @@ class StringExtensionsTest < Test::Unit::TestCase
 
   def test_localized_vulgar_fractions_conversion
     Stringex::Localization.backend = :internal
-    Stringex::Localization.store_translations :de, :vulgar_fractions, {
+    Stringex::Localization.store_translations :da, :vulgar_fractions, {
       :one_fourth => "en fjerdedel",
       :half => "en halv"
     }
-    Stringex::Localization.locale = :de
+    Stringex::Localization.locale = :da
 
     {
       "&frac14;" => "en fjerdedel",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stringex
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Russell Norris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -123,47 +123,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.2.9
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: travis-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: travis-lint
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.3.7
 description: ! 'Some [hopefully] useful extensions to Ruby''s String class. Stringex
   is made up of three libraries: ActsAsUrl [permalink solution with better character
   translation], Unidecoder [Unicode to ASCII transliteration], and StringExtensions