stringex 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9873c1bd3db8c441ab3daa62fe317e3497d5a06
-  data.tar.gz: dd04a038329594f84844c3e636b54a98e1d95717
+  metadata.gz: 14a1e9e04c5e4e2afcd9dfafbdeac75e4d3c5555
+  data.tar.gz: 6c161b8ad91a99fc8762c433e0a487e8854bf99e
 SHA512:
-  metadata.gz: 6da7370b5e50eb31c5ecdc5914181334cc7dd4e3230bb7baced02c67aef3cbac4ef3d1a3d3715b5d24cb72f3313ad85424567ce32d0d95b8528e42fe4e6c6552
-  data.tar.gz: 4ccd3f0efd3b3607afd93fe1e1bbe8e344657568d2db48e583ed92d6d3e5a34dadcc8f97bae0211a6b5fd6902a129728edfb1d35e0b5f68a51400cd4d7996633
+  metadata.gz: e8561c1e15f08e85444491d99169a2c4ef78c8be7dff5dfd49122a661cbdf362809590ab9c6aa4d6cdcc4575a812c97262dfd49f1322f4a0058d7f44763896ec
+  data.tar.gz: 5f8a82933cab72a549f614702c57703cf20f98397fd2e52a49b8f708f022923f1bca2ce9c5ed5ca3a43b1802ab2b89bb7af259ce3fb09d29a68706de48f1e2e0

data/Rakefile

@@ -30,14 +30,16 @@ end
 Rake::TestTask.new do |t|
   t.libs << 'lib' << 'test'
   t.pattern   = 'test/unit/**/*_test.rb'
-  t.verbose   = true
+  t.verbose   = false
+  t.warning   = false
 end
 
 namespace :test do
   Rake::TestTask.new(:performance) do |t|
     t.libs << 'lib' << 'test'
     t.pattern   = 'test/performance/**/*_test.rb'
-    t.verbose   = true
+    t.verbose   = false
+    t.warning   = false
   end
 end
 

data/VERSION

@@ -1 +1 @@
-2.6.1
+2.7.0

data/lib/stringex/acts_as_url.rb

@@ -33,6 +33,11 @@ module Stringex
       #                              differentiate between urls. Default is false[y]. See note on <tt>:scope</tt>.
       # <tt>:duplicate_count_separator</tt>:: String to use when forcing unique urls from non-unique strings.
       #                                       Default is "-".
+      # <tt>:duplicate_sequence</tt>:: Supply an enumerator to generate the values used to generate
+      #                                unique urls (when <tt>:allow_duplicates</tt> is false).
+      #                                By default, generates positive integers in sequence from 1.
+      #                                <strong>Note:</strong> The sequence is restarted for each record
+      #                                (by calling <tt>#rewind</tt>).
       # <tt>:force_downcase</tt>:: If false, allows generated url to contain uppercased letters. Default is false.
       # <tt>:exclude_list</tt>:: List of complete strings that should not be transformed by <tt>acts_as_url</tt>.
       #                          Default is empty.

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

@@ -120,13 +120,26 @@ module Stringex
 
         def handle_duplicate_url!
           return if !url_taken?(base_url)
-          n = 1
-          while url_taken?(duplicate_for_base_url(n))
-            n = n.succ
+          n = nil
+          sequence = duplicate_url_sequence.tap(&:rewind)
+          loop do
+            n = sequence.next
+            break unless url_taken?(duplicate_for_base_url(n))
           end
           write_url_attribute duplicate_for_base_url(n)
         end
 
+        def duplicate_url_sequence
+          settings.duplicate_sequence ||
+            Enumerator.new do |enum|
+              n = 1
+              loop do
+                enum.yield n
+                n += 1
+              end
+            end
+        end
+
         def url_taken?(url)
           if settings.url_taken_method
             instance.send(settings.url_taken_method, url)

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

@@ -33,7 +33,7 @@ module Stringex
         end
 
         def klass_previous_instances(&block)
-          klass.all(:conditions => {settings.url_attribute => [nil]}).each(&block)
+          klass.all(conditions: {settings.url_attribute => [nil]}).each(&block)
         end
 
         def primary_key
@@ -45,7 +45,7 @@ module Stringex
         end
 
         def url_owners
-          @url_owners ||= url_owners_class.all(:conditions => url_owner_conditions)
+          @url_owners ||= url_owners_class.all(conditions: url_owner_conditions)
         end
 
         def read_attribute(instance, name)
@@ -62,4 +62,4 @@ module Stringex
       end
     end
   end
-end
+end

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

@@ -11,7 +11,7 @@ module Stringex
 
         def add_new_record_url_owner_conditions
           return if instance.new_record?
-          @url_owner_conditions.merge! :id => {'$ne' => instance.id}
+          @url_owner_conditions.merge! id: {'$ne' => instance.id}
         end
 
         def add_scoped_url_owner_conditions
@@ -34,4 +34,4 @@ module Stringex
       end
     end
   end
-end
+end

data/lib/stringex/configuration/acts_as_url.rb

@@ -31,16 +31,16 @@ module Stringex
 
       def self.default_settings
         @default_settings ||= {
-          :allow_duplicates => false,
-          :callback_method => :before_validation,
-          :duplicate_count_separator => "-",
-          :enforce_uniqueness_on_sti_base_class => false,
-          :only_when_blank => false,
-          :scope_for_url => nil,
-          :sync_url => false,
-          :url_attribute => "url",
-          :blacklist => %w[new],
-          :blacklist_policy => lambda { |instance, url|
+          allow_duplicates: false,
+          callback_method: :before_validation,
+          duplicate_count_separator: "-",
+          enforce_uniqueness_on_sti_base_class: false,
+          only_when_blank: false,
+          scope_for_url: nil,
+          sync_url: false,
+          url_attribute: "url",
+          blacklist: %w[new],
+          blacklist_policy: lambda { |instance, url|
             "#{url}-#{instance.class.to_s.downcase}"
           }
         }.merge(Stringex::Configuration::StringExtensions.new.default_settings)

data/lib/stringex/configuration/string_extensions.rb

@@ -7,14 +7,14 @@ module Stringex
 
       def self.default_settings
         @default_settings ||= {
-          :allow_slash => false,
-          :exclude => [],
-          :force_downcase => true,
-          :limit => nil,
-          :replace_whitespace_with => "-",
-          :truncate_words => true
+          allow_slash: false,
+          exclude: [],
+          force_downcase: true,
+          limit: nil,
+          replace_whitespace_with: "-",
+          truncate_words: true
         }
       end
     end
   end
-end
+end

data/lib/stringex/localization.rb

@@ -45,7 +45,7 @@ module Stringex
         return translation unless translation.nil?
 
         if locale != default_locale
-          translate scope, key, options.merge(:locale => default_locale)
+          translate scope, key, options.merge(locale: default_locale)
         else
           default_conversion(scope, key) || options[:default]
         end

data/lib/stringex/localization/backend/i18n.rb

@@ -7,6 +7,7 @@ module Stringex
         class << self
           def reset!
             super
+            @locale = nil
             ::I18n.reload! if defined?(::I18n) && ::I18n.respond_to?(:reload!)
           end
 
@@ -31,7 +32,7 @@ module Stringex
           end
 
           def store_translations(locale, scope, data)
-            ::I18n.backend.store_translations(locale, { :stringex => { scope => data } })
+            ::I18n.backend.store_translations(locale, {stringex: {scope => data}})
             reset_translations_cache
           end
 
@@ -54,7 +55,7 @@ module Stringex
 
           def i18n_translations_for(locale)
             ensure_locales_enforced_or_not
-            ::I18n.translate("stringex", :locale => locale, :default => {})
+            ::I18n.translate("stringex", locale: locale, default: {})
           end
 
           def reset_translations_cache

data/lib/stringex/localization/conversion_expressions.rb

@@ -10,18 +10,18 @@ module Stringex
       APOSTROPHE = /(^|[[:alpha:]])'|`([[:alpha:]]|$)/
 
       CHARACTERS =  {
-        :and           => /\s*&\s*/,
-        :at            => /\s*@\s*/,
-        :degrees       => /\s*°\s*/,
-        :divide        => /\s*÷\s*/,
-        :dot           => /(\S|^)\.(\S)/,
-        :ellipsis      => /\s*\.{3,}\s*/,
-        :equals        => /\s*=\s*/,
-        :number        => /\s*#/,
-        :percent       => /\s*%\s*/,
-        :plus          => /\s*\+\s*/,
-        :slash         => /\s*(\\|\/|／)\s*/,
-        :star          => /\s*\*\s*/,
+        and:      /\s*&\s*/,
+        at:       /\s*@\s*/,
+        degrees:  /\s*°\s*/,
+        divide:   /\s*÷\s*/,
+        dot:      /(\S|^)\.(\S)/,
+        ellipsis: /\s*\.{3,}\s*/,
+        equals:   /\s*=\s*/,
+        number:   /\s*#/,
+        percent:  /\s*%\s*/,
+        plus:     /\s*\+\s*/,
+        slash:    /\s*(\\|\/|／)\s*/,
+        star:     /\s*\*\s*/,
       }
 
       # Things that just get converted to spaces
@@ -29,18 +29,18 @@ module Stringex
       CLEANUP_HTML_ENTITIES = /&[^;]+;/
 
       CURRENCIES_SUPPORTED_SIMPLE = {
-        :generic => /¤/,
-        :dollars => /\$/,
-        :euros   => /€/,
-        :pounds  => /£/,
-        :yen     => /¥/,
-        :reais   => /R\$/
+        generic: /¤/,
+        dollars: /\$/,
+        euros:   /€/,
+        pounds:  /£/,
+        yen:     /¥/,
+        reais:   /R\$/
       }
       CURRENCIES_SUPPORTED_COMPLEX = {
-        :dollars => :dollars_cents,
-        :euros   => :euros_cents,
-        :pounds  => :pounds_pence,
-        :reais   => :reais_cents
+        dollars: :dollars_cents,
+        euros:   :euros_cents,
+        pounds:  :pounds_pence,
+        reais:   :reais_cents
       }
       CURRENCIES_SUPPORTED = Regexp.new(CURRENCIES_SUPPORTED_SIMPLE.values.join('|'))
       CURRENCIES_SIMPLE = CURRENCIES_SUPPORTED_SIMPLE.inject({}) do |hash, content|
@@ -61,27 +61,27 @@ module Stringex
 
       HTML_ENTITIES = Proc.new(){
         base = {
-          :amp          => %w{#38 amp},
-          :cent         => %w{#162 cent},
-          :copy         => %w{#169 copy},
-          :deg          => %w{#176 deg},
-          :divide       => %w{#247 divide},
-          :double_quote => %w{#34 #822[012] quot ldquo rdquo dbquo},
-          :ellipsis     => %w{#8230 hellip},
-          :en_dash      => %w{#8211 ndash},
-          :em_dash      => %w{#8212 mdash},
-          :frac14       => %w{#188 frac14},
-          :frac12       => %w{#189 frac12},
-          :frac34       => %w{#190 frac34},
-          :gt           => %w{#62 gt},
-          :lt           => %w{#60 lt},
-          :nbsp         => %w{#160 nbsp},
-          :pound        => %w{#163 pound},
-          :reg          => %w{#174 reg},
-          :single_quote => %w{#39 #821[678] apos lsquo rsquo sbquo},
-          :times        => %w{#215 times},
-          :trade        => %w{#8482 trade},
-          :yen          => %w{#165 yen},
+          amp:          %w{#38 amp},
+          cent:         %w{#162 cent},
+          copy:         %w{#169 copy},
+          deg:          %w{#176 deg},
+          divide:       %w{#247 divide},
+          double_quote: %w{#34 #822[012] quot ldquo rdquo dbquo},
+          ellipsis:     %w{#8230 hellip},
+          en_dash:      %w{#8211 ndash},
+          em_dash:      %w{#8212 mdash},
+          frac14:       %w{#188 frac14},
+          frac12:       %w{#189 frac12},
+          frac34:       %w{#190 frac34},
+          gt:           %w{#62 gt},
+          lt:           %w{#60 lt},
+          nbsp:         %w{#160 nbsp},
+          pound:        %w{#163 pound},
+          reg:          %w{#174 reg},
+          single_quote: %w{#39 #821[678] apos lsquo rsquo sbquo},
+          times:        %w{#215 times},
+          trade:        %w{#8482 trade},
+          yen:          %w{#165 yen},
         }
         base.inject({}) do |hash, content|
           key, expression = content
@@ -107,21 +107,21 @@ module Stringex
 
       # Ordered by denominator then numerator of the value
       VULGAR_FRACTIONS = {
-        :half          => /(½|½|½)/,
-        :one_third     => /(⅓|⅓)/,
-        :two_thirds    => /(⅔|⅔)/,
-        :one_fourth    => /(¼|¼|¼)/,
-        :three_fourths => /(¾|¾|¾)/,
-        :one_fifth     => /(⅕|⅕)/,
-        :two_fifths    => /(⅖|⅖)/,
-        :three_fifths  => /(⅗|⅗)/,
-        :four_fifths   => /(⅘|⅘)/,
-        :one_sixth     => /(⅙|⅙)/,
-        :five_sixths   => /(⅚|⅚)/,
-        :one_eighth    => /(⅛|⅛)/,
-        :three_eighths => /(⅜|⅜)/,
-        :five_eighths  => /(⅝|⅝)/,
-        :seven_eighths => /(⅞|⅞)/,
+        half:          /(½|½|½)/,
+        one_third:     /(⅓|⅓)/,
+        two_thirds:    /(⅔|⅔)/,
+        one_fourth:    /(¼|¼|¼)/,
+        three_fourths: /(¾|¾|¾)/,
+        one_fifth:     /(⅕|⅕)/,
+        two_fifths:    /(⅖|⅖)/,
+        three_fifths:  /(⅗|⅗)/,
+        four_fifths:   /(⅘|⅘)/,
+        one_sixth:     /(⅙|⅙)/,
+        five_sixths:   /(⅚|⅚)/,
+        one_eighth:    /(⅛|⅛)/,
+        three_eighths: /(⅜|⅜)/,
+        five_eighths:  /(⅝|⅝)/,
+        seven_eighths: /(⅞|⅞)/,
       }
 
       WHITESPACE = /\s+/

data/lib/stringex/localization/default_conversions.rb

@@ -4,77 +4,77 @@ module Stringex
   module Localization
     module DefaultConversions
       CHARACTERS =  {
-        :and           => "and",
-        :at            => "at",
-        :degrees       => "degrees",
-        :divide        => "divided by",
-        :dot           => '\1 dot \2',
-        :ellipsis      => "dot dot dot",
-        :equals        => "equals",
-        :number        => "number",
-        :percent       => "percent",
-        :plus          => "plus",
-        :slash         => "slash",
-        :star          => "star",
+        and:      "and",
+        at:       "at",
+        degrees:  "degrees",
+        divide:   "divided by",
+        dot:      '\1 dot \2',
+        ellipsis: "dot dot dot",
+        equals:   "equals",
+        number:   "number",
+        percent:  "percent",
+        plus:     "plus",
+        slash:    "slash",
+        star:     "star",
       }
 
       CURRENCIES_SIMPLE = {
-        :generic       => '\1 dollars',
-        :dollars       => '\1 dollars',
-        :euros         => '\1 euros',
-        :pounds        => '\1 pounds',
-        :yen           => '\1 yen',
+        generic: '\1 dollars',
+        dollars: '\1 dollars',
+        euros:   '\1 euros',
+        pounds:  '\1 pounds',
+        yen:     '\1 yen',
       }
       CURRENCIES_COMPLEX = {
-        :dollars_cents => '\1 dollars \2 cents',
-        :euros_cents   => '\1 euros \2 cents',
-        :pounds_pence  => '\1 pounds \2 pence',
+        dollars_cents: '\1 dollars \2 cents',
+        euros_cents:   '\1 euros \2 cents',
+        pounds_pence:  '\1 pounds \2 pence',
       }
       CURRENCIES = CURRENCIES_SIMPLE.merge(CURRENCIES_COMPLEX)
 
       HTML_ENTITIES = {
-        :amp          => "and",
-        :cent         => " cents",
-        :copy         => "(c)",
-        :deg          => " degrees ",
-        :divide       => " divided by ",
-        :double_quote => '"',
-        :ellipsis     => "...",
-        :en_dash      => "-",
-        :em_dash      => "--",
-        :frac14       => "one fourth",
-        :frac12       => "half",
-        :frac34       => "three fourths",
-        :gt           => ">",
-        :lt           => "<",
-        :nbsp         => " ",
-        :pound        => " pounds ",
-        :reg          => "(r)",
-        :single_quote => "'",
-        :times        => "x",
-        :trade        => "(tm)",
-        :yen          => " yen "
+        amp:          "and",
+        cent:         " cents",
+        copy:         "(c)",
+        deg:          " degrees ",
+        divide:       " divided by ",
+        double_quote: '"',
+        ellipsis:     "...",
+        en_dash:      "-",
+        em_dash:      "--",
+        frac14:       "one fourth",
+        frac12:       "half",
+        frac34:       "three fourths",
+        gt:           ">",
+        lt:           "<",
+        nbsp:         " ",
+        pound:        " pounds ",
+        reg:          "(r)",
+        single_quote: "'",
+        times:        "x",
+        trade:        "(tm)",
+        yen:          " yen "
       }
 
       TRANSLITERATIONS = {}
 
       # Ordered by denominator then numerator of the value
       VULGAR_FRACTIONS = {
-        :half          => "half",
-        :one_third     => "one third",
-        :two_thirds    => "two thirds",
-        :one_fourth    => "one fourth",
-        :three_fourths => "three fourths",
-        :one_fifth     => "one fifth",
-        :two_fifths    => "two fifths",
-        :three_fifths  => "three fifths",
-        :four_fifths   => "four fifths",
-        :one_sixth     => "one sixth",
-        :five_sixths   => "five sixths",
-        :one_eighth    => "one eighth",
-        :three_eighths => "three eighths",
-        :five_eighths  => "five eighths",
-        :seven_eighths => "seven eighths",
+        half:          "half",
+        one_third:     "one third",
+        two_thirds:    "two thirds",
+        one_fourth:    "one fourth",
+        three_fourths: "three fourths",
+        one_fifth:     "one fifth",
+        two_fifths:    "two fifths",
+        three_fifths:  "three fifths",
+        four_fifths:   "four fifths",
+        one_sixth:     "one sixth",
+        five_sixths:   "five sixths",
+        one_eighth:    "one eighth",
+        three_eighths: "three eighths",
+        five_eighths:  "five eighths",
+        seven_eighths: "seven eighths",
       }
 
       class << self

data/lib/stringex/string_extensions.rb

@@ -52,7 +52,7 @@ module Stringex
       # It allows localization of conversions so you can use it to convert characters into your own language.
       # Example:
       #
-      #   I18n.backend.store_translations :de, { :stringex => { :characters => { :and => "und" } } }
+      #   I18n.backend.store_translations :de, { stringex: { characters: { and: "und" } } }
       #   I18n.locale = :de
       #   "ich & dich".convert_misc_characters # => "ich und dich"
       #

data/stringex.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: stringex 2.6.1 ruby lib
+# stub: stringex 2.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "stringex"
-  s.version = "2.6.1"
+  s.version = "2.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Russell Norris"]
-  s.date = "2016-07-14"
+  s.date = "2017-01-18"
   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 = [

data/test/unit/acts_as_url/adapter/activerecord.rb

@@ -8,15 +8,15 @@ puts "-------------------------------------------------"
 puts "Running ActsAsUrl tests with ActiveRecord adapter"
 puts "-------------------------------------------------"
 
-ActiveRecord::Base.establish_connection :adapter => "sqlite3", :database => ":memory:"
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Schema.define do
-  create_table :documents, :force => true do |t|
+  create_table :documents, force: true do |t|
     t.string :title, :other, :another, :url
   end
 
-  create_table :sti_base_documents, :force => true do |t|
+  create_table :sti_base_documents, force: true do |t|
     t.string :title, :other, :another, :url, :type
   end
 end

data/test/unit/acts_as_url/adapter/datamapper.rb

@@ -25,7 +25,7 @@ DefineTestClasses = proc do
     property :title,   String
     property :other,   String
     property :another, String
-    property :url,     String, :lazy => false
+    property :url,     String, lazy: false
 
     acts_as_url :title
   end
@@ -36,7 +36,7 @@ DefineTestClasses = proc do
     property :title,   String
     property :other,   String
     property :another, String
-    property :url,     String, :lazy => false
+    property :url,     String, lazy: false
     property :type,    String
 
     # This gets redefined in the only test that uses it but I want to be uniform

data/test/unit/acts_as_url/adapter/mongoid.rb

@@ -14,10 +14,10 @@ end
 
 class Document
   include Mongoid::Document
-  field :title,   :type => String
-  field :other,   :type => String
-  field :another, :type => String
-  field :url,     :type => String
+  field :title,   type: String
+  field :other,   type: String
+  field :another, type: String
+  field :url,     type: String
 
   acts_as_url :title
 end
@@ -32,11 +32,11 @@ end
 
 class STIBaseDocument
   include Mongoid::Document
-  field :title,   :type => String
-  field :other,   :type => String
-  field :another, :type => String
-  field :url,     :type => String
-  field :type,    :type => String
+  field :title,   type: String
+  field :other,   type: String
+  field :another, type: String
+  field :url,     type: String
+  field :type,    type: String
 
   # This gets redefined in the only test that uses it but I want to be uniform
   # in setting configuration details in the tests themselves

data/test/unit/acts_as_url_configuration_test.rb

@@ -9,7 +9,7 @@ class ActsAsUrlConfigurationTest < Test::Unit::TestCase
   end
 
   def test_can_set_base_settings
-    default_configuration = Stringex::Configuration::ActsAsUrl.new(:url_attribute => "original")
+    default_configuration = Stringex::Configuration::ActsAsUrl.new(url_attribute: "original")
     assert_equal "original", default_configuration.settings.url_attribute
 
     Stringex::ActsAsUrl.configure do |c|
@@ -26,7 +26,7 @@ class ActsAsUrlConfigurationTest < Test::Unit::TestCase
     system_configuration = Stringex::Configuration::ActsAsUrl.new
     assert_equal "special", system_configuration.settings.url_attribute
 
-    local_configuration = Stringex::Configuration::ActsAsUrl.new(:url_attribute => "local")
+    local_configuration = Stringex::Configuration::ActsAsUrl.new(url_attribute: "local")
     assert_equal "local", local_configuration.settings.url_attribute
   end
 

data/test/unit/acts_as_url_integration_test.rb

@@ -9,20 +9,53 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
   include AdapterSpecificTestBehaviors
 
   def test_should_create_url
-    @doc = Document.create(:title => "Let's Make a Test Title, <em>Okay</em>?")
+    @doc = Document.create(title: "Let's Make a Test Title, <em>Okay</em>?")
     assert_equal "lets-make-a-test-title-okay", @doc.url
   end
 
   def test_should_create_unique_url
-    @doc = Document.create(:title => "Unique")
-    @other_doc = Document.create(:title => "Unique")
+    @doc = Document.create(title: "Unique")
+    @other_doc = Document.create(title: "Unique")
     assert_equal "unique", @doc.url
     assert_equal "unique-1", @other_doc.url
   end
 
+  def test_should_allow_custom_duplicates
+    sequence = Enumerator.new { |enum| loop { enum.yield 12345 } }
+    Document.class_eval do
+      acts_as_url :title, duplicate_sequence: sequence
+    end
+
+    @doc = Document.create(title: "New")
+    @other_doc = Document.create(title: "New")
+    assert_equal "new-document", @doc.url
+    assert_equal "new-document-12345", @other_doc.url
+  end
+
+  def test_should_restart_duplicate_sequence_each_time
+    sequence = Enumerator.new do |enum|
+      n = 1
+      loop do
+        enum.yield n
+        n += 1
+      end
+    end
+    Document.class_eval do
+      acts_as_url :title, duplicate_sequence: sequence
+    end
+    @doc = Document.create(title: "Unique")
+    @other_doc = Document.create(title: "Unique")
+    @third_doc = Document.create(title: "Another")
+    @fourth_doc = Document.create(title: "Another")
+    assert_equal "unique", @doc.url
+    assert_equal "unique-1", @other_doc.url
+    assert_equal "another", @third_doc.url
+    assert_equal "another-1", @fourth_doc.url
+  end
+
   def test_should_avoid_blacklist
-    @doc = Document.create(:title => "New")
-    @other_doc = Document.create(:title => "new")
+    @doc = Document.create(title: "New")
+    @other_doc = Document.create(title: "new")
     assert_equal "new-document", @doc.url
     assert_equal "new-document-1", @other_doc.url
   end
@@ -30,60 +63,60 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
   def test_should_allow_customizing_blacklist
     Document.class_eval do
       # Un-blacklisting 'new' isn't advisable
-      acts_as_url :title, :blacklist => %w{special}
+      acts_as_url :title, blacklist: %w{special}
     end
 
-    @doc = Document.create(:title => "New")
-    @other_doc = Document.create(:title => "Special")
+    @doc = Document.create(title: "New")
+    @other_doc = Document.create(title: "Special")
     assert_equal 'new', @doc.url
     assert_equal 'special-document', @other_doc.url
   end
 
   def test_should_allow_customizing_blacklist_policy
     Document.class_eval do
-      acts_as_url :title, :blacklist_policy => Proc.new(){|instance, url|
+      acts_as_url :title, blacklist_policy: Proc.new(){|instance, url|
         "#{url}-customized"
       }
     end
 
-    @doc = Document.create(:title => "New")
-    @other_doc = Document.create(:title => "New")
+    @doc = Document.create(title: "New")
+    @other_doc = Document.create(title: "New")
     assert_equal 'new-customized', @doc.url
     assert_equal 'new-customized-1', @other_doc.url
   end
 
   def test_should_create_unique_url_when_partial_url_already_exists
-    @doc = Document.create(:title => "House Farms")
-    @other_doc = Document.create(:title => "House Farm")
+    @doc = Document.create(title: "House Farms")
+    @other_doc = Document.create(title: "House Farm")
 
     assert_equal "house-farms", @doc.url
     assert_equal "house-farm", @other_doc.url
   end
 
   def test_should_not_sync_url_by_default
-    @doc = Document.create(:title => "Stable as Stone")
+    @doc = Document.create(title: "Stable as Stone")
     @original_url = @doc.url
-    adapter_specific_update @doc, :title => "New Unstable Madness"
+    adapter_specific_update @doc, title: "New Unstable Madness"
     assert_equal @original_url, @doc.url
   end
 
   def test_should_allow_syncing_url
     Document.class_eval do
-      acts_as_url :title, :sync_url => true
+      acts_as_url :title, sync_url: true
     end
 
-    @doc = Document.create(:title => "Original")
+    @doc = Document.create(title: "Original")
     @original_url = @doc.url
-    adapter_specific_update @doc, :title => "New and Improved"
+    adapter_specific_update @doc, title: "New and Improved"
     assert_not_equal @original_url, @doc.url
   end
 
   def test_should_not_increment_count_on_repeated_saves
     Document.class_eval do
-      acts_as_url :title, :sync_url => true
+      acts_as_url :title, sync_url: true
     end
 
-    @doc = Document.create(:title => "Continuous or Constant")
+    @doc = Document.create(title: "Continuous or Constant")
     assert_equal "continuous-or-constant", @doc.url
     5.times do |n|
       @doc.save!
@@ -93,54 +126,54 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
 
   def test_should_allow_allowing_duplicate_url
     Document.class_eval do
-      acts_as_url :title, :allow_duplicates => true
+      acts_as_url :title, allow_duplicates: true
     end
 
-    @doc = Document.create(:title => "I am not a clone")
-    @other_doc = Document.create(:title => "I am not a clone")
+    @doc = Document.create(title: "I am not a clone")
+    @other_doc = Document.create(title: "I am not a clone")
     assert_equal @doc.url, @other_doc.url
   end
 
   def test_should_allow_scoping_url_uniqueness
     Document.class_eval do
-      acts_as_url :title, :scope => :other
+      acts_as_url :title, scope: :other
     end
 
-    @doc = Document.create(:title => "Mocumentary", :other => "I don't care if I'm unique for some reason")
-    @other_doc = Document.create(:title => "Mocumentary", :other => "Me either")
+    @doc = Document.create(title: "Mocumentary", other: "I don't care if I'm unique for some reason")
+    @other_doc = Document.create(title: "Mocumentary", other: "Me either")
     assert_equal @doc.url, @other_doc.url
   end
 
   def test_should_still_create_unique_urls_if_scoped_attribute_is_the_same
     Document.class_eval do
-      acts_as_url :title, :scope => :other
+      acts_as_url :title, scope: :other
     end
 
-    @doc = Document.create(:title => "Mocumentary", :other => "Suddenly, I care if I'm unique")
-    @other_doc = Document.create(:title => "Mocumentary", :other => "Suddenly, I care if I'm unique")
+    @doc = Document.create(title: "Mocumentary", other: "Suddenly, I care if I'm unique")
+    @other_doc = Document.create(title: "Mocumentary", other: "Suddenly, I care if I'm unique")
     assert_not_equal @doc.url, @other_doc.url
   end
 
   def test_should_allow_multiple_scopes
     Document.class_eval do
-      acts_as_url :title, :scope => [:other, :another]
+      acts_as_url :title, scope: [:other, :another]
     end
 
-    @doc = Document.create(:title => "Mocumentary", :other => "I don't care if I'm unique for some reason",
-      :another => "Whatever")
-    @other_doc = Document.create(:title => "Mocumentary", :other => "Me either", :another => "Whatever")
+    @doc = Document.create(title: "Mocumentary", other: "I don't care if I'm unique for some reason",
+      another: "Whatever")
+    @other_doc = Document.create(title: "Mocumentary", other: "Me either", another: "Whatever")
     assert_equal @doc.url, @other_doc.url
   end
 
   def test_should_only_create_unique_urls_for_multiple_scopes_if_both_attributes_are_same
     Document.class_eval do
-      acts_as_url :title, :scope => [:other, :another]
+      acts_as_url :title, scope: [:other, :another]
     end
 
-    @doc = Document.create(:title => "Mocumentary", :other => "Suddenly, I care if I'm unique",
-      :another => "Whatever")
-    @other_doc = Document.create(:title => "Mocumentary", :other => "Suddenly, I care if I'm unique",
-      :another => "Whatever")
+    @doc = Document.create(title: "Mocumentary", other: "Suddenly, I care if I'm unique",
+      another: "Whatever")
+    @other_doc = Document.create(title: "Mocumentary", other: "Suddenly, I care if I'm unique",
+      another: "Whatever")
     assert_not_equal @doc.url, @other_doc.url
   end
 
@@ -149,10 +182,10 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
       # Manually undefining the url method on Document which, in a real class not reused for tests,
       # would never have been defined to begin with.
       remove_method :url
-      acts_as_url :title, :url_attribute => :other
+      acts_as_url :title, url_attribute: :other
     end
 
-    @doc = Document.create(:title => "Anything at This Point")
+    @doc = Document.create(title: "Anything at This Point")
     assert_equal "anything-at-this-point", @doc.other
     assert_nil @doc.url
   ensure
@@ -164,21 +197,21 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
 
   def test_should_allow_updating_url_only_when_blank
     Document.class_eval do
-      acts_as_url :title, :only_when_blank => true
+      acts_as_url :title, only_when_blank: true
     end
 
     @string = 'the-url-of-concrete'
-    @doc = Document.create(:title => "Stable as Stone", :url => @string)
+    @doc = Document.create(title: "Stable as Stone", url: @string)
     assert_equal @string, @doc.url
-    @other_doc = Document.create(:title => "Stable as Stone")
+    @other_doc = Document.create(title: "Stable as Stone")
     assert_equal 'stable-as-stone', @other_doc.url
   end
 
   def test_should_mass_initialize_urls
-    @doc = Document.create(:title => "Initial")
-    @other_doc = Document.create(:title => "Subsequent")
-    adapter_specific_update @doc, :url => nil
-    adapter_specific_update @other_doc, :url => nil
+    @doc = Document.create(title: "Initial")
+    @other_doc = Document.create(title: "Subsequent")
+    adapter_specific_update @doc, url: nil
+    adapter_specific_update @other_doc, url: nil
     # Just making sure this got unset before the real test
     assert_nil @doc.url
     assert_nil @other_doc.url
@@ -196,13 +229,13 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
       # Manually undefining the url method on Document which, in a real class not reused for tests,
       # would never have been defined to begin with.
       remove_method :url
-      acts_as_url :title, :url_attribute => :other
+      acts_as_url :title, url_attribute: :other
     end
 
-    @doc = Document.create(:title => "Initial")
-    @other_doc = Document.create(:title => "Subsequent")
-    adapter_specific_update @doc, :other => nil
-    adapter_specific_update @other_doc, :other => nil
+    @doc = Document.create(title: "Initial")
+    @other_doc = Document.create(title: "Subsequent")
+    adapter_specific_update @doc, other: nil
+    adapter_specific_update @other_doc, other: nil
     # Just making sure this got unset before the real test
     assert_nil @doc.other
     assert_nil @other_doc.other
@@ -221,10 +254,10 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
   end
 
   def test_should_mass_initialize_empty_string_urls
-    @doc = Document.create(:title => "Initial")
-    @other_doc = Document.create(:title => "Subsequent")
-    adapter_specific_update @doc, :url => ''
-    adapter_specific_update @other_doc, :url => ''
+    @doc = Document.create(title: "Initial")
+    @other_doc = Document.create(title: "Subsequent")
+    adapter_specific_update @doc, url: ''
+    adapter_specific_update @other_doc, url: ''
     # Just making sure this got unset before the real test
     assert_equal '', @doc.url
     assert_equal '', @other_doc.url
@@ -246,7 +279,7 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
       end
     end
 
-    @doc = Document.create(:title => "Title String")
+    @doc = Document.create(title: "Title String")
     assert_equal "title-string-got-massaged", @doc.url
   ensure
     Document.class_eval do
@@ -257,22 +290,22 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
 
   def test_should_allow_customizing_duplicate_count_separator
     Document.class_eval do
-      acts_as_url :title, :duplicate_count_separator => "---"
+      acts_as_url :title, duplicate_count_separator: "---"
     end
 
-    @doc = Document.create(:title => "Unique")
-    @other_doc = Document.create(:title => "Unique")
+    @doc = Document.create(title: "Unique")
+    @other_doc = Document.create(title: "Unique")
     assert_equal "unique", @doc.url
     assert_equal "unique---1", @other_doc.url
   end
 
   def test_should_only_update_url_if_url_attribute_is_valid
     Document.class_eval do
-      acts_as_url :title, :sync_url => true
+      acts_as_url :title, sync_url: true
     end
     add_validation_on_document_title
 
-    @doc = Document.create(:title => "Valid Record", :other => "Present")
+    @doc = Document.create(title: "Valid Record", other: "Present")
     assert_equal "valid-record", @doc.url
     @doc.title = nil
     assert_equal false, @doc.valid?
@@ -283,61 +316,61 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
 
   def test_should_allow_customizing_url_limit
     Document.class_eval do
-      acts_as_url :title, :limit => 13
+      acts_as_url :title, limit: 13
     end
 
-    @doc = Document.create(:title => "I am much too long")
+    @doc = Document.create(title: "I am much too long")
     assert_equal "i-am-much-too", @doc.url
   end
 
   def test_handling_duplicate_urls_with_limits
     Document.class_eval do
-      acts_as_url :title, :limit => 13
+      acts_as_url :title, limit: 13
     end
 
-    @doc = Document.create(:title => "I am much too long and also duplicated")
+    @doc = Document.create(title: "I am much too long and also duplicated")
     assert_equal "i-am-much-too", @doc.url
-    @other_doc = Document.create(:title => "I am much too long and also duplicated")
+    @other_doc = Document.create(title: "I am much too long and also duplicated")
     assert_equal "i-am-much-too-1", @other_doc.url
   end
 
   def test_should_allow_excluding_specific_values_from_being_run_through_to_url
     Document.class_eval do
-      acts_as_url :title, :exclude => ["_So_Fucking_Special"]
+      acts_as_url :title, exclude: ["_So_Fucking_Special"]
     end
 
-    @doc = Document.create(:title => "_So_Fucking_Special")
+    @doc = Document.create(title: "_So_Fucking_Special")
     assert_equal "_So_Fucking_Special", @doc.url
-    @doc_2 = Document.create(:title => "But I'm a creep")
+    @doc_2 = Document.create(title: "But I'm a creep")
     assert_equal "but-im-a-creep", @doc_2.url
   end
 
   def test_should_allow_not_forcing_downcasing
     Document.class_eval do
-      acts_as_url :title, :force_downcase => false
+      acts_as_url :title, force_downcase: false
     end
 
-    @doc = Document.create(:title => "I have CAPS!")
+    @doc = Document.create(title: "I have CAPS!")
     assert_equal "I-have-CAPS", @doc.url
   end
 
   def test_should_allow_alternate_whitespace_replacements
     Document.class_eval do
-      acts_as_url :title, :replace_whitespace_with => "~"
+      acts_as_url :title, replace_whitespace_with: "~"
     end
 
-    @doc = Document.create(:title => "now with tildes")
+    @doc = Document.create(title: "now with tildes")
     assert_equal "now~with~tildes", @doc.url
   end
 
   def test_should_allow_enforcing_uniqueness_on_sti_base_class
     STIBaseDocument.class_eval do
-      acts_as_url :title, :enforce_uniqueness_on_sti_base_class => true
+      acts_as_url :title, enforce_uniqueness_on_sti_base_class: true
     end
 
-    @doc = STIChildDocument.create(:title => "Unique")
+    @doc = STIChildDocument.create(title: "Unique")
     assert_equal "unique", @doc.url
-    @doc_2 = AnotherSTIChildDocument.create(:title => "Unique")
+    @doc_2 = AnotherSTIChildDocument.create(title: "Unique")
     assert_equal "unique-1", @doc_2.url
   end
 
@@ -346,47 +379,47 @@ class ActsAsUrlIntegrationTest < Test::Unit::TestCase
       acts_as_url :title
     end
 
-    @doc = Document.create(:title => "a b/c d")
+    @doc = Document.create(title: "a b/c d")
     assert_equal "a-b-slash-c-d", @doc.url
   end
 
   def test_should_allow_slashes_to_be_allowed
     Document.class_eval do
-      acts_as_url :title, :allow_slash => true
+      acts_as_url :title, allow_slash: true
     end
 
-    @doc = Document.create(:title => "a b/c d")
+    @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
+      acts_as_url :title, limit: 20
     end
 
-    @doc = Document.create(:title => "title with many whole words")
+    @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
+      acts_as_url :title, limit: 20, truncate_words: false
     end
 
-    @doc = Document.create(:title => "title with many whole words")
+    @doc = Document.create(title: "title with many whole words")
     assert_equal 'title-with-many', @doc.url
   end
 
   def test_should_allow_overriding_url_taken_method
     Document.class_eval do
-      acts_as_url :title, :url_taken_method => :url_taken?
+      acts_as_url :title, url_taken_method: :url_taken?
 
       def url_taken?(url)
         ["unique", "unique-1", "unique-2"].include?(url)
       end
     end
 
-    @doc = Document.create(:title => "unique")
+    @doc = Document.create(title: "unique")
     assert_equal "unique-3", @doc.url
   end
 end

data/test/unit/localization_test.rb

@@ -11,7 +11,7 @@ class LocalizationTest < Test::Unit::TestCase
   def test_stores_translations
     Stringex::Localization.backend = :internal
 
-    data = { :one => "number one", :two => "number two" }
+    data = { one: "number one", two: "number two" }
     Stringex::Localization.store_translations :en, :test_store, data
 
     data.each do |key, value|
@@ -34,7 +34,7 @@ class LocalizationTest < Test::Unit::TestCase
   def test_can_translate
     Stringex::Localization.backend = :internal
 
-    data = { :one => "number one", :two => "number two" }
+    data = { one: "number one", two: "number two" }
     Stringex::Localization.store_translations :en, :test_translate, data
 
     data.each do |key, value|
@@ -45,7 +45,7 @@ class LocalizationTest < Test::Unit::TestCase
   def test_can_translate_when_given_string_as_key
     Stringex::Localization.backend = :internal
 
-    data = { :one => "number one", :two => "number two" }
+    data = { one: "number one", two: "number two" }
     Stringex::Localization.store_translations :en, :test_translate, data
 
     data.each do |key, value|
@@ -55,7 +55,7 @@ class LocalizationTest < Test::Unit::TestCase
 
   def test_returns_default_if_none_found
     Stringex::Localization.backend = :internal
-    assert_equal "my default", Stringex::Localization.translate(:test_default, :nonexistent, :default => "my default")
+    assert_equal "my default", Stringex::Localization.translate(:test_default, :nonexistent, default: "my default")
   end
 
   def test_returns_nil_if_no_default
@@ -91,7 +91,7 @@ class LocalizationTest < Test::Unit::TestCase
   def test_stores_translations_in_i18n
     Stringex::Localization.backend = :i18n
 
-    data = { :one => "number one", :two => "number two" }
+    data = { one: "number one", two: "number two" }
     Stringex::Localization.store_translations :en, :test_i18n_store, data
 
     data.each do |key, value|
@@ -102,9 +102,9 @@ class LocalizationTest < Test::Unit::TestCase
   def test_can_translate_using_i18n
     Stringex::Localization.backend = :i18n
 
-    data = { :one => "number one", :two => "number two" }
+    data = { one: "number one", two: "number two" }
 
-    I18n.backend.store_translations :en, { :stringex => { :test_i18n_translation => data } }
+    I18n.backend.store_translations :en, { stringex: { test_i18n_translation: data } }
 
     data.each do |key, value|
       assert_equal value, Stringex::Localization.translate(:test_i18n_translation, key)
@@ -117,7 +117,7 @@ class LocalizationTest < Test::Unit::TestCase
 
       assert_equal "Test blank", "Test&nbsp;blank".convert_miscellaneous_html_entities
 
-      Stringex::Localization.store_translations :en, :html_entities, { :nbsp => "" }
+      Stringex::Localization.store_translations :en, :html_entities, { nbsp: "" }
       assert_equal "Testblank", "Test&nbsp;blank".convert_miscellaneous_html_entities
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stringex
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Russell Norris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler