fast_gettext 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c64b65d333ec41fdb6f8800ebdaaf90ae47f00f
-  data.tar.gz: ba624c3b0b8e272dd9c592e450230c880f3a68bc
+  metadata.gz: 9d48793768d16644c39ec7da70a50c30571ccbf8
+  data.tar.gz: 942aded77246f1df2d26d9b19ab5a790d92de577
 SHA512:
-  metadata.gz: 1497386c209b21fc06f92eac9d0839981b828f4d1318646ea5fd9e975ba7702e123633200ac9696671f81faf9571428cf88c9ffea2fee3dc5dfdb19eded9ba9b
-  data.tar.gz: 00a88e10cb2a44d65d15413dbd9010d3e531392be5b668af336bd0c2413c23b6f00ff9b4eb1cbd1ebe2d7d2e6fb12e1d91bd87007061025fd67fdf8173f22639
+  metadata.gz: 47fc218deca6269b8455e268267e9d737a731107096e2ce8616ef03608aaf0fcb0e8ab4b75eae5b83c59f26c91c16096c1a7ca4ffe59de8ad219633ec8e7a0fc
+  data.tar.gz: 2c426523021a29ef41cac4ffebb10913e11f3b9f7819919352fc938ba2dc1234e6db0a7b256b4930b62dab4519a8db645dbe8211e78b89b2ee2a6da6588e410f

data/lib/fast_gettext/cache.rb

@@ -0,0 +1,42 @@
+module FastGettext
+  class Cache
+    def initialize
+      @store = {}
+      reload!
+    end
+
+    def fetch(key)
+      translation = @current[key]
+      if translation.nil? # uncached
+        @current[key] = yield || false # TODO get rid of this false hack and cache :missing
+      else
+        translation
+      end
+    end
+
+    # TODO only used for tests, maybe if-else around it ...
+    def []=(key, value)
+      @current[key] = value
+    end
+
+    # key performance gain:
+    # - no need to lookup locale on each translation
+    # - no need to lookup text_domain on each translation
+    # - super-simple hash lookup
+    def switch_to(text_domain, locale)
+      @store[text_domain] ||= {}
+      @store[text_domain][locale] ||= {}
+      @store[text_domain][locale][""] = false # ignore gettext meta key when translating
+      @current = @store[text_domain][locale]
+    end
+
+    def delete(key)
+      @current.delete(key)
+    end
+
+    def reload!
+      @current = {}
+      @current[""] = false
+    end
+  end
+end

data/lib/fast_gettext/storage.rb

@@ -1,3 +1,5 @@
+require 'fast_gettext/cache'
+
 module FastGettext
   # Responsibility:
   #  - store data threadsave
@@ -13,7 +15,7 @@ module FastGettext
     [:available_locales, :_locale, :text_domain, :pluralisation_rule].each do |method_name|
       key = "fast_gettext_#{method_name}".to_sym
       define_method "#{method_name}=" do |value|
-        update_current_cache if Thread.current[key] != Thread.current[key]=value
+        switch_cache if Thread.current[key] != Thread.current[key]=value
       end
     end
 
@@ -29,50 +31,41 @@ module FastGettext
       locales.map{|s|s.to_s}
     end
 
-    # == cattr_accessor :default_available_locales
-    @@default_available_locales = nil
-    def default_available_locales=(avail_locales)
-      @@default_available_locales = avail_locales
-      update_current_cache
-    end
+    # cattr_accessor with defaults
+    [
+      [:default_available_locales, "nil"],
+      [:default_text_domain, "nil"],
+      [:cache_class, "FastGettext::Cache"]
+    ].each do |name, default|
+      eval <<-Ruby
+        @@#{name} = #{default}
+        def #{name}=(value)
+          @@#{name} = value
+          switch_cache
+        end
 
-    def default_available_locales
-      @@default_available_locales
+        def #{name}
+          @@#{name}
+        end
+      Ruby
     end
 
-
     def text_domain
       Thread.current[:fast_gettext_text_domain] || default_text_domain
     end
 
-    # == cattr_accessor :default_text_domain
-    @@default_text_domain = nil
-    def default_text_domain=(domain)
-      @@default_text_domain = domain
-      update_current_cache
-    end
-
-    def default_text_domain
-      @@default_text_domain
-    end
-
-
     # if overwritten by user( FastGettext.pluralisation_rule = xxx) use it,
     # otherwise fall back to repo or to default lambda
     def pluralisation_rule
       Thread.current[:fast_gettext_pluralisation_rule] ||  current_repository.pluralisation_rule || lambda{|i| i!=1}
     end
 
-    def current_cache
-      Thread.current[:fast_gettext_current_cache] || {}
-    end
-
-    def current_cache=(cache)
-      Thread.current[:fast_gettext_current_cache] = cache
+    def cache
+      Thread.current[:fast_gettext_cache] ||= cache_class.new
     end
 
     def reload!
-      self.current_cache = {}
+      cache.reload!
       translation_repositories.values.each(&:reload)
     end
 
@@ -82,13 +75,6 @@ module FastGettext
       @@translation_repositories
     end
 
-    # used to speedup simple translations, does not work for pluralisation
-    # caches[text_domain][locale][key]=translation
-    @@caches={}
-    def caches
-      @@caches
-    end
-
     def current_repository
       translation_repositories[text_domain] || raise(NoTextDomainConfigured)
     end
@@ -98,26 +84,16 @@ module FastGettext
     end
 
     def cached_find(key)
-      translation = current_cache[key]
-      if translation.nil? # uncached
-        current_cache[key] = current_repository[key] || false
-      else
-        translation
-      end
+      cache.fetch(key) { current_repository[key] }
     end
 
     def cached_plural_find(*keys)
       key = '||||' + keys * '||||'
-      translation = current_cache[key]
-      if translation.nil? # uncached
-        current_cache[key] = current_repository.plural(*keys) || false
-      else
-        translation
-      end
+      cache.fetch(key) { current_repository.plural(*keys) }
     end
 
     def expire_cache_for(key)
-      current_cache.delete(key)
+      cache.delete(key)
     end
 
     def locale
@@ -140,7 +116,7 @@ module FastGettext
     @@default_locale = nil
     def default_locale=(new_locale)
       @@default_locale = best_locale_in(new_locale)
-      update_current_cache
+      switch_cache
     end
 
     def default_locale
@@ -196,11 +172,8 @@ module FastGettext
       locale.sub(/^([a-zA-Z]{2,3})[-_]([a-zA-Z]{2,3})$/){$1.downcase+'_'+$2.upcase}
     end
 
-    def update_current_cache
-      caches[text_domain] ||= {}
-      caches[text_domain][locale] ||= {}
-      caches[text_domain][locale][""] = false #ignore gettext meta key when translating
-      self.current_cache = caches[text_domain][locale]
+    def switch_cache
+      cache.switch_to(text_domain, locale)
     end
   end
 end

data/lib/fast_gettext/version.rb

@@ -1,3 +1,3 @@
 module FastGettext
-  VERSION = Version = '0.8.1'
+  VERSION = Version = '0.9.0'
 end

metadata

@@ -1,50 +1,121 @@
 --- !ruby/object:Gem::Specification
 name: fast_gettext
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
-dependencies: []
+date: 2014-07-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: michael@grosser.it
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- Appraisals
-- CHANGELOG
-- Gemfile
-- Gemfile.lock
-- Rakefile
-- Readme.md
-- benchmark/base.rb
-- benchmark/baseline.rb
-- benchmark/fast_gettext.rb
-- benchmark/i18n_simple.rb
-- benchmark/ideal.rb
-- benchmark/locale/de.yml
-- benchmark/locale/de/LC_MESSAGES/large.mo
-- benchmark/misc/threadsave.rb
-- benchmark/namespace/fast_gettext.rb
-- benchmark/namespace/original.rb
-- benchmark/original.rb
-- examples/db/migration.rb
-- examples/missing_translation_logger.rb
-- fast_gettext.gemspec
-- gemfiles/rails23.gemfile
-- gemfiles/rails23.gemfile.lock
-- gemfiles/rails32.gemfile
-- gemfiles/rails32.gemfile.lock
-- gemfiles/rails40.gemfile
-- gemfiles/rails40.gemfile.lock
 - lib/fast_gettext.rb
+- lib/fast_gettext/cache.rb
 - lib/fast_gettext/mo_file.rb
 - lib/fast_gettext/po_file.rb
 - lib/fast_gettext/storage.rb
@@ -66,45 +137,6 @@ files:
 - lib/fast_gettext/vendor/poparser.rb
 - lib/fast_gettext/vendor/string.rb
 - lib/fast_gettext/version.rb
-- spec/aa_unconfigued_spec.rb
-- spec/cases/fake_load_path/iconv.rb
-- spec/cases/iconv_fallback.rb
-- spec/cases/interpolate_i18n_after_fast_gettext.rb
-- spec/cases/interpolate_i18n_before_fast_gettext.rb
-- spec/cases/safe_mode_can_handle_locales.rb
-- spec/fast_gettext/mo_file_spec.rb
-- spec/fast_gettext/po_file_spec.rb
-- spec/fast_gettext/storage_spec.rb
-- spec/fast_gettext/translation_repository/base_spec.rb
-- spec/fast_gettext/translation_repository/chain_spec.rb
-- spec/fast_gettext/translation_repository/db_spec.rb
-- spec/fast_gettext/translation_repository/logger_spec.rb
-- spec/fast_gettext/translation_repository/mo_spec.rb
-- spec/fast_gettext/translation_repository/po_spec.rb
-- spec/fast_gettext/translation_repository/yaml_spec.rb
-- spec/fast_gettext/translation_repository_spec.rb
-- spec/fast_gettext/translation_spec.rb
-- spec/fast_gettext/vendor/iconv_spec.rb
-- spec/fast_gettext/vendor/string_spec.rb
-- spec/fast_gettext_spec.rb
-- spec/fuzzy_locale/de/test.po
-- spec/locale/de/LC_MESSAGES/test.mo
-- spec/locale/de/LC_MESSAGES/test2.mo
-- spec/locale/de/test.po
-- spec/locale/de/test2.po
-- spec/locale/en/LC_MESSAGES/plural_test.mo
-- spec/locale/en/LC_MESSAGES/test.mo
-- spec/locale/en/plural_test.po
-- spec/locale/en/test.po
-- spec/locale/gsw_CH/LC_MESSAGES/test.mo
-- spec/locale/gsw_CH/test.po
-- spec/locale/yaml/de.yml
-- spec/locale/yaml/de2.yml
-- spec/locale/yaml/en.yml
-- spec/locale/yaml/notfound.yml
-- spec/obsolete_locale/de/test.po
-- spec/spec_helper.rb
-- spec/support/be_accessible_matcher.rb
 homepage: http://github.com/grosser/fast_gettext
 licenses:
 - MIT
@@ -116,17 +148,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple, fast, memory-efficient and threadsafe implementation of GetText

data/.gitignore

@@ -1,2 +0,0 @@
-pkg
-benchmark/locle

data/.travis.yml

@@ -1,17 +0,0 @@
-bundler_args: ""
-script: "bundle exec rake spec"
-rvm:
-  - ree
-  - 1.9.3
-  - 2.0.0
-gemfile:
-  - gemfiles/rails23.gemfile
-  - gemfiles/rails32.gemfile
-  - gemfiles/rails40.gemfile
-bundler_args: --no-deployment
-matrix:
-  exclude:
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails23.gemfile
-    - rvm: ree
-      gemfile: gemfiles/rails40.gemfile