stringex 2.0.4 → 2.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTk5MGJkMmU1Nzk5Yzc4YWEwYzExMmYzZDMzNmY4ODg0MmIwMjM1Mw==
+    YzJhYzkxYjk0MzM2YzY0NjA3YTJlNTQwMzJiZTY0MTk4MWZiNzI1YQ==
   data.tar.gz: !binary |-
-    MTczNTY4NjEwMDFkNTdlNzQyZGI4MTZlNzJlOWZjODU1MWM2ZmE0ZQ==
+    M2JjNzFjZWJhN2NhZmZmNzhlMTM0ZThmNmUwMDNiZDQ2MGY1YTllZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzhlMWQwMmIxNDg1M2IyYjRmMjYwYTRlMGQyMWQ2YmI2ODhiNDVlNGZiZTE2
-    NGY4OTM5Y2M3MjRmYTA5ZDM2YWRhNzM4OTFhNDgxMDg2Y2E3ODU5YmJjM2Nh
-    ZGNmOTNjN2U3MDM2MzI4ZDNjYjc1MmM1YWVjZGY5ODk0MmE2MGU=
+    MDE4NDUxZjY1ZTdlMzc4M2E5NWVmNGFjN2MyY2M1ZDI4ZjQ0YzFlMzJiY2Y2
+    YjIzZGJlM2U2MDQ4NjgzNjA1NGRjYjdkNDQxYzdjMDBhZDMwYWVlNWRiMWVm
+    OTNkNjc0ZGM1YjlmODhjMDBhNzZhNGY4Mzc0M2U4NzE5M2NiMGY=
   data.tar.gz: !binary |-
-    YzU4ODc0MGE4MTEyZjk1NzAxNGQ3MWIyM2U3NDE1OTZkNWJjMzU5NTBlMDMy
-    MjRlNWYzZWVlZjI5YjUxZGNjNDJjYzg3ZjBiZjdkYzIyYjYxZWM4MTc2ZGQ4
-    MmM2OTdkMTM4NDgxMWNiOTFjNjBjYzk5MzQ5N2QzODUzNWVkOTI=
+    Zjc2YTJkOTM0YmM1NzlhMTEzZGY0NGQwNTExOGNlOTJkNWM2MTNiYTg0MWU4
+    ZDM5ZTcyZGVkN2NmOTMxMjkzOTg0MjgwMmM5ZGU4ZGE1N2E3YThiYWNiOGJh
+    MTAxOGM0Mjk3MWI5NTg0ODc5YzFlMmUwMTJhNWVmYWE4Zjk0Y2U=

data/Rakefile

@@ -29,10 +29,18 @@ end
 
 Rake::TestTask.new do |t|
   t.libs << 'lib' << 'test'
-  t.pattern   = 'test/**/*_test.rb'
+  t.pattern   = 'test/unit/**/*_test.rb'
   t.verbose   = true
 end
 
+namespace :test do
+  Rake::TestTask.new(:performance) do |t|
+    t.libs << 'lib' << 'test'
+    t.pattern   = 'test/performance/**/*_test.rb'
+    t.verbose   = true
+  end
+end
+
 desc 'Default: Run Stringex test suite using ActiveRecord as the ORM'
 task :default => [:setup_active_record_suite, :test]
 

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

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

@@ -27,13 +27,16 @@ module Stringex
 
           def store_translations(locale, scope, data)
             ::I18n.backend.store_translations(locale, { :stringex => { scope => data } })
+            reset_translations_cache
+          end
+
+          def translations
+            # Set up hash like translations[:en][:transliterations]["é"]
+            @translations ||= Hash.new { |hsh, locale| hsh[locale] = Hash.new({}).merge(i18n_translations_for(locale)) }
           end
 
           def initial_translation(scope, key, locale)
-            # I18n can't return a nil as default as this gets interpreted as if no default
-            # is specified, so we use a string instead.
-            translated = ::I18n.translate(key, :scope => [:stringex, scope], :locale => locale, :default => "__default__")
-            translated == "__default__" ? nil : translated
+            translations[locale][scope][key.to_sym]
           end
 
           def load_translations(locale = nil)
@@ -41,6 +44,15 @@ module Stringex
             path = Dir[File.join(LOAD_PATH_BASE, "#{locale}.yml")]
             ::I18n.load_path |= Dir[File.join(LOAD_PATH_BASE, "#{locale}.yml")]
             ::I18n.backend.load_translations
+            reset_translations_cache
+          end
+
+          def i18n_translations_for(locale)
+            ::I18n.translate("stringex", :locale => locale, :default => {})
+          end
+
+          def reset_translations_cache
+            @translations = nil
           end
         end
       end

data/stringex.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "stringex"
-  s.version = "2.0.4"
+  s.version = "2.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Russell Norris"]
-  s.date = "2013-07-15"
+  s.date = "2013-07-16"
   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 = [
@@ -231,25 +231,26 @@ Gem::Specification.new do |s|
     "locales/en.yml",
     "locales/pt-BR.yml",
     "stringex.gemspec",
-    "test/acts_as_url/adapter/active_record.rb",
-    "test/acts_as_url/adapter/data_mapper.rb",
-    "test/acts_as_url/adapter/mongoid.rb",
-    "test/acts_as_url_configuration_test.rb",
-    "test/acts_as_url_integration_test.rb",
-    "test/localization/da_test.rb",
-    "test/localization/default_test.rb",
-    "test/localization/en_test.rb",
-    "test/localization_test.rb",
-    "test/redcloth_to_html_test.rb",
-    "test/string_extensions_test.rb",
+    "test/performance/localization_performance_test.rb",
     "test/test_helper.rb",
-    "test/unicode_point_suite/basic_greek_test.rb",
-    "test/unicode_point_suite/basic_latin_test.rb",
-    "test/unicode_point_suite/codepoint_test_helper.rb",
-    "test/unidecoder/bad_localization.yml",
-    "test/unidecoder/localization.yml",
-    "test/unidecoder_test.rb",
-    "test/version_test.rb"
+    "test/unit/acts_as_url/adapter/active_record.rb",
+    "test/unit/acts_as_url/adapter/data_mapper.rb",
+    "test/unit/acts_as_url/adapter/mongoid.rb",
+    "test/unit/acts_as_url_configuration_test.rb",
+    "test/unit/acts_as_url_integration_test.rb",
+    "test/unit/localization/da_test.rb",
+    "test/unit/localization/default_test.rb",
+    "test/unit/localization/en_test.rb",
+    "test/unit/localization_test.rb",
+    "test/unit/redcloth_to_html_test.rb",
+    "test/unit/string_extensions_test.rb",
+    "test/unit/unicode_point_suite/basic_greek_test.rb",
+    "test/unit/unicode_point_suite/basic_latin_test.rb",
+    "test/unit/unicode_point_suite/codepoint_test_helper.rb",
+    "test/unit/unidecoder/bad_localization.yml",
+    "test/unit/unidecoder/localization.yml",
+    "test/unit/unidecoder_test.rb",
+    "test/unit/version_test.rb"
   ]
   s.homepage = "http://github.com/rsl/stringex"
   s.licenses = ["MIT"]

data/test/performance/localization_performance_test.rb

@@ -0,0 +1,24 @@
+require "test_helper"
+require 'stringex'
+require 'i18n'
+require 'benchmark'
+
+class LocalizationPerformanceTest < Test::Unit::TestCase
+  def setup
+    I18n.locale = :en
+    Stringex::Localization.reset!
+  end
+
+  def test_i18n_performance
+    Stringex::Localization.backend = :internal
+    internal_time = Benchmark.realtime { 100.times{ "alskdjfal".to_url } }
+
+    Stringex::Localization.backend = :i18n
+    i18n_time = Benchmark.realtime { 100.times{ "alskdjfal".to_url } }
+
+    percentage_difference = ((i18n_time - internal_time) / internal_time) * 100
+    allowed_difference = 25
+
+    assert percentage_difference <= allowed_difference, "The I18n backend is #{percentage_difference.to_i} percent slower than the internal backend. The allowed difference is #{allowed_difference} percent."
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stringex
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Russell Norris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -389,25 +389,26 @@ files:
 - locales/en.yml
 - locales/pt-BR.yml
 - stringex.gemspec
-- test/acts_as_url/adapter/active_record.rb
-- test/acts_as_url/adapter/data_mapper.rb
-- test/acts_as_url/adapter/mongoid.rb
-- test/acts_as_url_configuration_test.rb
-- test/acts_as_url_integration_test.rb
-- test/localization/da_test.rb
-- test/localization/default_test.rb
-- test/localization/en_test.rb
-- test/localization_test.rb
-- test/redcloth_to_html_test.rb
-- test/string_extensions_test.rb
+- test/performance/localization_performance_test.rb
 - test/test_helper.rb
-- test/unicode_point_suite/basic_greek_test.rb
-- test/unicode_point_suite/basic_latin_test.rb
-- test/unicode_point_suite/codepoint_test_helper.rb
-- test/unidecoder/bad_localization.yml
-- test/unidecoder/localization.yml
-- test/unidecoder_test.rb
-- test/version_test.rb
+- test/unit/acts_as_url/adapter/active_record.rb
+- test/unit/acts_as_url/adapter/data_mapper.rb
+- test/unit/acts_as_url/adapter/mongoid.rb
+- test/unit/acts_as_url_configuration_test.rb
+- test/unit/acts_as_url_integration_test.rb
+- test/unit/localization/da_test.rb
+- test/unit/localization/default_test.rb
+- test/unit/localization/en_test.rb
+- test/unit/localization_test.rb
+- test/unit/redcloth_to_html_test.rb
+- test/unit/string_extensions_test.rb
+- test/unit/unicode_point_suite/basic_greek_test.rb
+- test/unit/unicode_point_suite/basic_latin_test.rb
+- test/unit/unicode_point_suite/codepoint_test_helper.rb
+- test/unit/unidecoder/bad_localization.yml
+- test/unit/unidecoder/localization.yml
+- test/unit/unidecoder_test.rb
+- test/unit/version_test.rb
 homepage: http://github.com/rsl/stringex
 licenses:
 - MIT