fast_gettext 0.7.0 → 0.7.1

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec
 
 gem 'appraisal'

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    fast_gettext (0.7.0)
+    fast_gettext (0.7.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.8)
       activesupport (= 3.2.8)

data/Rakefile

@@ -1,9 +1,10 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'bump/tasks'
 require 'appraisal'
 
 task :default do
-  sh "bundle exec rake appraisal:install && bundle exec rake appraisal spec"
+  sh "rake appraisal:install && rake appraisal spec"
 end
 
 task :spec do

data/Readme.md

@@ -225,8 +225,10 @@ Mo/Po-file parsing from Masao Mutoh, see vendor/README
  - [Hoang Nghiem](https://github.com/hoangnghiem)
  - [Costa Shapiro](https://github.com/costa)
  - [Jamie Dyer](https://github.com/kernow)
+ - [Stephan Kulow](https://github.com/coolo)
+ - [Fotos Georgiadis](https://github.com/fotos)
 
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>
-License: MIT<br/>
+License: MIT, some vendor parts under the same license terms as Ruby (see headers)<br/>
 [![Build Status](https://travis-ci.org/grosser/fast_gettext.png)](https://travis-ci.org/grosser/fast_gettext)

data/fast_gettext.gemspec

@@ -8,5 +8,5 @@ Gem::Specification.new name, FastGettext::VERSION do |s|
   s.email = "michael@grosser.it"
   s.homepage = "http://github.com/grosser/#{name}"
   s.files = `git ls-files`.split("\n")
-  s.license = "MIT"
+  s.licenses = ["MIT", "Ruby"]
 end

data/gemfiles/rails.2.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "rake"

data/gemfiles/rails.2.gemfile.lock

@@ -4,7 +4,7 @@ PATH
     fast_gettext (0.7.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (2.3.14)
       actionpack (= 2.3.14)

data/gemfiles/rails.3.gemfile

@@ -1,6 +1,6 @@
 # This file was generated by Appraisal
 
-source :rubygems
+source "https://rubygems.org"
 
 gem "appraisal"
 gem "rake"

data/gemfiles/rails.3.gemfile.lock

@@ -4,7 +4,7 @@ PATH
     fast_gettext (0.7.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (3.2.8)
       actionpack (= 3.2.8)

data/lib/fast_gettext/storage.rb

@@ -72,6 +72,11 @@ module FastGettext
       Thread.current[:fast_gettext_current_cache] = cache
     end
 
+    def reload!
+      self.current_cache = {}
+      translation_repositories.values.each(&:reload)
+    end
+
     #global, since re-parsing whole folders takes too much time...
     @@translation_repositories={}
     def translation_repositories

data/lib/fast_gettext/translation_repository/base.rb

@@ -25,6 +25,10 @@ module FastGettext
         current_translations.plural(*keys)
       end
 
+      def reload
+        true
+      end
+
       protected
 
       def current_translations

data/lib/fast_gettext/translation_repository/chain.rb

@@ -38,6 +38,11 @@ module FastGettext
         end
         []
       end
+
+      def reload
+        chain.each(&:reload)
+        super
+      end
     end
   end
-end
+end

data/lib/fast_gettext/translation_repository/mo.rb

@@ -6,8 +6,8 @@ module FastGettext
     #  - provide access to translations in mo files
     class Mo < Base
       def initialize(name,options={})
-        find_and_store_files(name,options)
         super
+        reload
       end
 
       def available_locales
@@ -18,6 +18,11 @@ module FastGettext
         current_translations.pluralisation_rule
       end
 
+      def reload
+        find_and_store_files(@name, @options)
+        super
+      end
+
       protected
 
       def find_and_store_files(name,options)

data/lib/fast_gettext/translation_repository/yaml.rb

@@ -8,8 +8,8 @@ module FastGettext
     #  - provide access to translations in yaml files
     class Yaml < Base
       def initialize(name,options={})
-        find_and_store_files(options)
         super
+        reload
       end
 
       def available_locales
@@ -26,6 +26,11 @@ module FastGettext
         self['pluralisation_rule'] ? lambda{|n| eval(self['pluralisation_rule']) } : nil
       end
 
+      def reload
+        find_and_store_files(@options)
+        super
+      end
+
       protected
 
       MAX_FIND_DEPTH = 10
@@ -69,4 +74,4 @@ module FastGettext
       end
     end
   end
-end
+end

data/lib/fast_gettext/version.rb

@@ -1,3 +1,3 @@
 module FastGettext
-  VERSION = Version = '0.7.0'
+  VERSION = Version = '0.7.1'
 end

data/spec/fast_gettext/storage_spec.rb

@@ -23,14 +23,14 @@ describe 'Storage' do
     text_domain.should == 'xxx'
   end
 
-  def thread_save(method, value_a, value_b)
+  def thread_safe(method, value_a, value_b)
     send("#{method}=",value_a)
 
     # mess around with other threads
     100.times do
       Thread.new {FastGettext.send("#{method}=",value_b)}
     end
-    sleep 0.1 # Ruby 1.9 cannot switch threads fat enough <-> spec fails without this WTF!
+    sleep 0.1 # Ruby 1.9 cannot switch threads fast enough <-> spec fails without this WTF!
 
     !!(send(method) == value_a)
   end
@@ -41,16 +41,22 @@ describe 'Storage' do
     :text_domain=>['xx','yy'],
     :pluralisation_rule=>[lambda{|x|x==4},lambda{|x|x==1}]
   }.each do |method, (value_a, value_b)|
-    it "stores #{method} thread-save" do
-      thread_save(method, value_a, value_b).should == true
+    it "stores #{method} thread safe" do
+      thread_safe(method, value_a, value_b).should == true
     end
   end
 
-  it "stores translation_repositories non-thread-safe" do
-    self.translation_repositories[:x]=1
-    t = Thread.new{self.translation_repositories[:x]=2}
-    t.join
-    self.translation_repositories[:x].should == 2
+  context "non-thread safe" do
+    after do
+      self.translation_repositories.clear
+    end
+
+    it "stores translation_repositories" do
+      self.translation_repositories[:x]=1
+      t = Thread.new{self.translation_repositories[:x]=2}
+      t.join
+      self.translation_repositories[:x].should == 2
+    end
   end
 
   describe :pluralisation_rule do
@@ -65,7 +71,7 @@ describe 'Storage' do
 
   describe :default_locale do
     it "stores default_locale non-thread-safe" do
-      thread_save(:default_locale, 'de', 'en').should == false
+      thread_safe(:default_locale, 'de', 'en').should == false
     end
 
     it "does not overwrite locale" do
@@ -93,8 +99,8 @@ describe 'Storage' do
   end
 
   describe :default_text_domain do
-    it "stores default_text_domain non-thread-safe" do
-      thread_save(:default_text_domain, 'xx', 'en').should == false
+    it "stores default_text_domain non-thread safe" do
+      thread_safe(:default_text_domain, 'xx', 'en').should == false
     end
 
     it "uses default_text_domain when text_domain is not set" do
@@ -112,7 +118,7 @@ describe 'Storage' do
 
   describe :default_available_locales do
     it "stores default_available_locales non-thread-safe" do
-      thread_save(:default_available_locales, ['xx'], ['yy']).should == false
+      thread_safe(:default_available_locales, ['xx'], ['yy']).should == false
     end
 
     it "converts locales to s" do
@@ -216,6 +222,10 @@ describe 'Storage' do
       self.text_domain = rand(99999).to_s
     end
 
+    after do
+      self.translation_repositories.clear
+    end
+
     it "raises when a textdomain was empty" do
       begin
         FastGettext._('x')
@@ -288,6 +298,22 @@ describe 'Storage' do
     end
   end
 
+  describe :reload! do
+    it "reloads all repositories" do
+      FastGettext.translation_repositories.each do |name, repository|
+        repository.should_receive(:reload)
+      end
+
+      FastGettext.reload!
+    end
+
+    it "clears the cache" do
+      FastGettext.should_receive(:current_cache=).with({})
+
+      FastGettext.reload!
+    end
+  end
+
   describe :key_exist? do
     it "does not find default keys" do
       FastGettext._('abcde')

data/spec/fast_gettext/translation_repository/base_spec.rb

@@ -17,4 +17,8 @@ describe 'FastGettext::TranslationRepository::Base' do
   it "cannot pluralize" do
     @rep.plural('Axis','Axis').should == []
   end
+
+  it "can be reloaded" do
+    @rep.reload.should be_true
+  end
 end

data/spec/fast_gettext/translation_repository/chain_spec.rb

@@ -27,6 +27,10 @@ describe 'FastGettext::TranslationRepository::Chain' do
     it "has no pluralisation rule" do
       @rep.pluralisation_rule.should == nil
     end
+
+    it "returns true on reload" do
+      @rep.reload.should be_true
+    end
   end
 
   describe "filled chain" do
@@ -77,5 +81,18 @@ describe 'FastGettext::TranslationRepository::Chain' do
         @rep.pluralisation_rule.should == 'x'
       end
     end
+
+    describe :reload do
+      it "reloads all repositories" do
+        @one.should_receive(:reload)
+        @two.should_receive(:reload)
+        @rep.reload
+      end
+
+      it "returns true" do
+        @rep.chain.each { |c| c.stub(:reload) }
+        @rep.reload.should be_true
+      end
+    end
   end
 end

data/spec/fast_gettext/translation_repository/mo_spec.rb

@@ -20,6 +20,29 @@ describe 'FastGettext::TranslationRepository::Mo' do
     @rep.plural('Axis','Axis').should == ['Achse','Achsen']
   end
 
+  describe :reload do
+    before do
+      mo_file = FastGettext::MoFile.new('spec/locale/de/LC_MESSAGES/test2.mo')
+
+      FastGettext::MoFile.stub(:new).and_return(FastGettext::MoFile.empty)
+      FastGettext::MoFile.stub(:new).with('spec/locale/de/LC_MESSAGES/test.mo').and_return(mo_file)
+    end
+
+    it "can reload" do
+      FastGettext.locale = 'de'
+
+      @rep['Untranslated'].should be_nil
+
+      @rep.reload
+
+      @rep['Untranslated'].should == 'Translated'
+    end
+
+    it "returns true" do
+      @rep.reload.should be_true
+    end
+  end
+
   it "has access to the mo repositories pluralisation rule" do
     FastGettext.locale = 'en'
     rep = FastGettext::TranslationRepository.build('plural_test',:path=>File.join('spec','locale'))

data/spec/fast_gettext/translation_repository/yaml_spec.rb

@@ -33,6 +33,29 @@ describe 'FastGettext::TranslationRepository::Yaml' do
     @rep.plural('cars.axis').should == ['Achse', 'Achsen', nil, nil]
   end
 
+  describe :reload do
+    before do
+      yaml = YAML.load_file('spec/locale/yaml/de2.yml')
+
+      YAML.stub(:load_file).and_return('en' => {}, 'de' => {})
+      YAML.stub(:load_file).with('spec/locale/yaml/de.yml').and_return(yaml)
+    end
+
+    it "can reload" do
+      FastGettext.locale = 'de'
+
+      @rep['cars.car'].should == 'Auto'
+
+      @rep.reload
+
+      @rep['cars.car'].should == 'Aufzugskabine'
+    end
+
+    it "returns true" do
+      @rep.reload.should be_true
+    end
+  end
+
   it "handles unfound plurals with nil" do
     @rep.plural('cars.xxx').should == [nil, nil, nil, nil]
   end

data/spec/fast_gettext_spec.rb

@@ -24,6 +24,9 @@ describe FastGettext do
   it "provides access to FastGettext::Translations methods" do
     FastGettext._('car').should == 'Auto'
     _('car').should == 'Auto'
+    _("%{relative_time} ago").should == "vor %{relative_time}"
+    (_("%{relative_time} ago") % {:relative_time => 1}).should == "vor 1"
+    (N_("%{relative_time} ago") % {:relative_time => 1}).should == "1 ago"
     s_("XXX|not found").should == "not found"
     n_('Axis','Axis',1).should == 'Achse'
     N_('XXXXX').should == 'XXXXX'

data/spec/locale/de/test2.po

@@ -0,0 +1,71 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: version 0.0.1\n"
+"POT-Creation-Date: 2009-02-26 19:50+0100\n"
+"PO-Revision-Date: 2011-12-04 18:54+0900\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: app/helpers/translation_helper.rb:3
+msgid "%{relative_time} ago"
+msgstr "vor %{relative_time}"
+
+#: app/views/cars/show.html.erb:5
+msgid "Axis"
+msgid_plural "Axis"
+msgstr[0] "Achse"
+msgstr[1] "Achsen"
+
+#: app/controllers/cars_controller.rb:47
+msgid "Car was successfully created."
+msgstr "Auto wurde erfolgreich gespeichert"
+
+#: app/controllers/cars_controller.rb:64
+msgid "Car was successfully updated."
+msgstr "Auto wurde erfolgreich aktualisiert"
+
+#: app/views/cars/show.html.erb:1 locale/model_attributes.rb:3
+msgid "Car|Model"
+msgstr "Modell"
+
+msgid "Untranslated"
+msgstr "Translated"
+
+#: app/views/cars/show.html.erb:3 locale/model_attributes.rb:4
+msgid "Car|Wheels count"
+msgstr "Räderzahl"
+
+#: app/views/cars/show.html.erb:7
+msgid "Created"
+msgstr "Erstellt"
+
+#: app/views/cars/show.html.erb:9
+msgid "Month"
+msgstr "Monat"
+
+#: locale/model_attributes.rb:2
+msgid "car"
+msgstr "Auto"
+
+#: locale/testlog_phrases.rb:2
+msgid "this is a dynamic translation which was found thorugh gettext_test_log!"
+msgstr ""
+"Dies ist eine dynamische Übersetzung, die durch gettext_test_log "
+"gefunden wurde!"
+
+#: locale/test_escape.rb:2
+msgid "You should escape '\\' as '\\\\'."
+msgstr "Du solltest '\\' als '\\\\' escapen."
+
+msgid "Umläüte"
+msgstr "Umlaute"

data/spec/locale/yaml/de2.yml

@@ -0,0 +1,25 @@
+de:
+  simple: einfach
+  date:
+    relative: "vor %{relative_time}"
+
+  cars:
+    axis:
+      one: "Achse"
+      other: "Achsen"
+    silly:
+      one: '0'
+      other: '1'
+      plural2: '2'
+      plural3: '3'
+    model: "Modell"
+    wheel_count: "Räderzahl"
+    created: "Erstellt"
+    month: "Monat"
+    car: "Aufzugskabine"
+    messages:
+      created: "Auto wurde erfolgreich gespeichert"
+      updated: "Auto wurde erfolgreich aktualisiert"
+
+  test_log:
+    phrases: "Dies ist eine dynamische Übersetzung, die durch gettext_test_log gefunden wurde!"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fast_gettext
 version: !ruby/object:Gem::Version
+  version: 0.7.1
   prerelease: 
-  version: 0.7.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -88,7 +88,9 @@ files:
 - 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
@@ -96,6 +98,7 @@ files:
 - 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
@@ -104,31 +107,32 @@ files:
 homepage: http://github.com/grosser/fast_gettext
 licenses:
 - MIT
+- Ruby
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -2722134200546875497
-  none: false
+      hash: 278086574654590991
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -2722134200546875497
-  none: false
+      hash: 278086574654590991
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A simple, fast, memory-efficient and threadsafe implementation of GetText