stringex 2.0.3 → 2.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmMxOWVlZjNkYzk5YTMyOWM1MGViNWNjZWE3Y2EyYzc4OGNiZTJiNA==
+    OTk5MGJkMmU1Nzk5Yzc4YWEwYzExMmYzZDMzNmY4ODg0MmIwMjM1Mw==
   data.tar.gz: !binary |-
-    NWM2ZjYwODhmZDU3ZDk0MzQzM2U4YmE2MGE5YzE0MzhmYzVmZWI5YQ==
+    MTczNTY4NjEwMDFkNTdlNzQyZGI4MTZlNzJlOWZjODU1MWM2ZmE0ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGI1Y2FiMGVhOGNmMjE4MmQwZDMyYjkwNzY2YzA0ZWQwN2I5NjAzZTZiODll
-    ZDRkZTdlOWVhMDkxYmQxOTE2OWYyM2IwZjdjMzk4ZTRmMGE2M2ZjYTBjYjdj
-    MDNhNDExZTIyNGJjMDE3OTk1NjA3NWFjMjFlYzYxMzI5ZDA1MjQ=
+    MzhlMWQwMmIxNDg1M2IyYjRmMjYwYTRlMGQyMWQ2YmI2ODhiNDVlNGZiZTE2
+    NGY4OTM5Y2M3MjRmYTA5ZDM2YWRhNzM4OTFhNDgxMDg2Y2E3ODU5YmJjM2Nh
+    ZGNmOTNjN2U3MDM2MzI4ZDNjYjc1MmM1YWVjZGY5ODk0MmE2MGU=
   data.tar.gz: !binary |-
-    NTdlMjBlMWZmOGQ4YzBiNjk1MWExNGQyNTRiOTgxYjUxZjY1OTUwZTg3Mzgy
-    MWNhNzQ2YmQ2NjQ1MjM2YjAwMDBjYmUwZTRiN2JiZGIyZTJhNTlhMGJjNzIy
-    MzYyZGNjNGRiZjNiMDQ4MjA5Yzg5NTk5ZWMyODBjOGY0N2ZhNTM=
+    YzU4ODc0MGE4MTEyZjk1NzAxNGQ3MWIyM2U3NDE1OTZkNWJjMzU5NTBlMDMy
+    MjRlNWYzZWVlZjI5YjUxZGNjNDJjYzg3ZjBiZjdkYzIyYjYxZWM4MTc2ZGQ4
+    MmM2OTdkMTM4NDgxMWNiOTFjNjBjYzk5MzQ5N2QzODUzNWVkOTI=

data/README.rdoc

@@ -95,14 +95,15 @@ A small collection of extensions on Ruby's String class. Please see the document
 
 With Stringex version 2.0 and higher, you can localize the different conversions in Stringex. Read more here[https://github.com/rsl/stringex/wiki/Localization-of-Stringex-conversions]. If you add a new language, please submit a pull request so we can make it available to other users also.
 
-== Using with Rails
+== Ruby on Rails Usage
 
-When using Stringex with Ruby on Rails, you automatically get built-in translations for miscellaneous characters, HTML entities, and vulgar fractions.
-
-You can see Stringex's standard translations here[https://github.com/rsl/stringex/tree/master/locales].
+When using Stringex with Ruby on Rails, you automatically get built-in translations for miscellaneous characters, HTML entities, and vulgar fractions. You can see Stringex's standard translations here[https://github.com/rsl/stringex/tree/master/locales].
 
 Currently, built-in translations are available for the following languages:
-English (en), Danish (da)
+
+  * English (en)
+  * Danish (da)
+  * Portugueuse Brazilian (pt-BR)
 
 You can easily add your own or customize the built-in translations - read here[https://github.com/rsl/stringex/wiki/Localization-of-Stringex-conversions]. If you add a new language, please submit a pull request so we can make it available to other users also.
 
@@ -110,7 +111,7 @@ If you don't want to use the Stringex built-in translations, you can force Strin
 
   Stringex::Localization.locale = :en
 
-== Note to users of CanCan
+== CanCan Usage Note
 
 You'll need to add a <tt>:find_by => :url</tt> to your <tt>load_and_authorize_resource</tt>.  Here's an example:
 
@@ -120,4 +121,6 @@ You'll need to add a <tt>:find_by => :url</tt> to your <tt>load_and_authorize_re
 
 If it's not obvious, some of the code for ActsAsUrl is based on Rick Olsen's permalink_fu[http://svn.techno-weenie.net/projects/plugins/permalink_fu/] plugin. Unidecoder is a Ruby port of Sean Burke's Text::Unidecode[http://interglacial.com/~sburke/tpj/as_html/tpj22.html] module for Perl. And, finally, the bulk of strip_html_tags[link:classes/Stringex/StringExtensions.html#M000005] in StringExtensions was stolen from Tobias Lütke's Regex in Typo[http://typosphere.org/].
 
+GIANT thanks to the many contributors who have helped make Stringex better and better: http://github.com/rsl/stringex/contributors
+
 copyright (c) 2008-2012 Lucky Sneaks, released under the MIT license

data/VERSION

@@ -1 +1 @@
-2.0.3
+2.0.4

data/lib/stringex/localization.rb

@@ -2,6 +2,7 @@
 
 require 'stringex/localization/converter'
 require 'stringex/localization/default_conversions'
+require 'stringex/localization/backend/base'
 require 'stringex/localization/backend/internal'
 require 'stringex/localization/backend/i18n'
 

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

@@ -0,0 +1,13 @@
+module Stringex
+  module Localization
+    module Backend
+      class Base
+        class << self
+          def reset!
+            instance_variables.each { |var| remove_instance_variable var }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,16 +1,16 @@
 module Stringex
   module Localization
     module Backend
-      module I18n
+      class I18n < Base
         LOAD_PATH_BASE = File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', '..', 'locales')
 
         class << self
           def locale
-            ::I18n.locale
+            @locale || ::I18n.locale
           end
 
           def locale=(new_locale)
-            ::I18n.locale = new_locale
+            @locale = new_locale
           end
 
           def default_locale
@@ -37,15 +37,11 @@ module Stringex
           end
 
           def load_translations(locale = nil)
-            locale ||= ::I18n.locale
+            locale ||= self.locale
             path = Dir[File.join(LOAD_PATH_BASE, "#{locale}.yml")]
             ::I18n.load_path |= Dir[File.join(LOAD_PATH_BASE, "#{locale}.yml")]
             ::I18n.backend.load_translations
           end
-
-          def reset!
-            # Can't reset I18n. Needed?
-          end
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Stringex
   module Localization
     module Backend
-      module Internal
+      class Internal < Base
         DEFAULT_LOCALE = :en
 
         class << self
@@ -40,10 +40,6 @@ module Stringex
           def initial_translation(scope, key, locale)
             translations[locale][scope][key.to_sym]
           end
-
-          def reset!
-            @translations = @locale = @default_locale = nil
-          end
         end
       end
     end

data/lib/stringex/localization/conversion_expressions.rb

@@ -25,7 +25,7 @@ module Stringex
       }
 
       # Things that just get converted to spaces
-      CLEANUP_CHARACTERS = /[\.,:;(){}\[\]\?!\^'ʼ"_\|]/
+      CLEANUP_CHARACTERS = /[\.,:;(){}\[\]\?!\^'ʼ"_\|<>]/
       CLEANUP_HTML_ENTITIES = /&[^;]+;/
 
       CURRENCIES_SUPPORTED_SIMPLE = {

data/lib/stringex/localization/converter.rb

@@ -36,6 +36,10 @@ module Stringex
         end
       end
 
+      def normalize_currency!
+        string.gsub! /(\d+),(\d+)/, '\1\2'
+      end
+
       def smart_strip!
         string.strip!
         @string = "#{starting_whitespace}#{string}#{ending_whitespace}"
@@ -71,7 +75,7 @@ module Stringex
         expressions.characters.each do |key, expression|
           next if key == :slash && options[:allow_slash]
           replacement = translate(key)
-          replacement = " #{replacement} " unless key == :dot
+          replacement = " #{replacement} " unless replacement == '' || key == :dot
           string.gsub! expression, replacement
         end
       end

data/lib/stringex/string_extensions.rb

@@ -53,6 +53,7 @@ module Stringex
       # before running this method.
       def convert_miscellaneous_characters(options = {})
         stringex_convert(options) do
+          normalize_currency!
           translate! :ellipses, :currencies, :abbreviations, :characters, :apostrophes
           cleanup_characters!
         end

data/stringex.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "stringex"
-  s.version = "2.0.3"
+  s.version = "2.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Russell Norris"]
-  s.date = "2013-06-17"
+  s.date = "2013-07-15"
   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 = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/stringex/configuration/configurator.rb",
     "lib/stringex/configuration/string_extensions.rb",
     "lib/stringex/localization.rb",
+    "lib/stringex/localization/backend/base.rb",
     "lib/stringex/localization/backend/i18n.rb",
     "lib/stringex/localization/backend/internal.rb",
     "lib/stringex/localization/conversion_expressions.rb",

data/test/localization_test.rb

@@ -4,6 +4,7 @@ require 'i18n'
 
 class LocalizationTest < Test::Unit::TestCase
   def setup
+    I18n.locale = :en
     Stringex::Localization.reset!
   end
 
@@ -120,4 +121,22 @@ class LocalizationTest < Test::Unit::TestCase
       assert_equal "Testblank", "Test&nbsp;blank".convert_miscellaneous_html_entities
     end
   end
+
+  def test_assigns_locale_in_i18n_backend
+    I18n.locale = :en
+    Stringex::Localization.backend = :i18n
+
+    assert_equal :en, Stringex::Localization.locale
+
+    I18n.locale = :jp
+    assert_equal :jp, Stringex::Localization.locale
+
+    Stringex::Localization.locale = :de
+    assert_equal :de, Stringex::Localization.locale
+    assert_equal :jp, I18n.locale
+
+    Stringex::Localization.locale = nil
+    assert_equal :jp, Stringex::Localization.locale
+    assert_equal :jp, I18n.locale
+  end
 end

data/test/string_extensions_test.rb

@@ -71,7 +71,11 @@ class StringExtensionsTest < Test::Unit::TestCase
       "У лукоморья дуб зеленый" =>
         "u-lukomoria-dub-zielienyi",
       "Here are some {braces}" =>
-        "here-are-some-braces"
+        "here-are-some-braces",
+      "$1,000" =>
+        "1000-dollars",
+      "«zut alors»" =>
+        "zut-alors"
     }.each do |html, plain|
       assert_equal plain, html.to_url
     end
@@ -214,4 +218,15 @@ class StringExtensionsTest < Test::Unit::TestCase
 
     assert_equal "now-with-hyphens", "----now---------with-hyphens--------".collapse("-")
   end
+
+  def test_empty_translations
+    Stringex::Localization.backend = :internal
+    Stringex::Localization.store_translations :de, :characters, {
+      :star => "",
+      :percent => "prozent"
+    }
+    Stringex::Localization.locale = :de
+
+    assert_equal "foobar ist 100 prozent gut", "foo*bar ist 100% gut".convert_miscellaneous_characters
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stringex
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Russell Norris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -195,6 +195,7 @@ files:
 - lib/stringex/configuration/configurator.rb
 - lib/stringex/configuration/string_extensions.rb
 - lib/stringex/localization.rb
+- lib/stringex/localization/backend/base.rb
 - lib/stringex/localization/backend/i18n.rb
 - lib/stringex/localization/backend/internal.rb
 - lib/stringex/localization/conversion_expressions.rb