fast_gettext 0.7.1 → 0.8.0

data/spec/fast_gettext/vendor/string_spec.rb

@@ -1,14 +1,6 @@
 require "spec_helper"
 
 describe String do
-  def pending_18
-    if RUBY_VERSION > '1.9'
-      yield
-    else
-      pending "does not work on 1.8"
-    end
-  end
-
   before :all do
     if "i18n gem overwrites % method".respond_to?(:interpolate_without_ruby_19_syntax)
       class String
@@ -92,14 +84,16 @@ describe String do
   end
 
   describe 'with i18n loaded' do
+    let(:pending_condition) { (RUBY_VERSION < "1.9" and ActiveRecord::VERSION::MAJOR == 3) or ActiveRecord::VERSION::MAJOR >= 4 }
+
     it "interpolates if i18n is loaded before" do
-      pending_18 do
+      pending_if pending_condition, "does not work on ree + rails 3 or rails 4"  do
         system("bundle exec ruby spec/cases/interpolate_i18n_before_fast_gettext.rb  > /dev/null 2>&1").should == true
       end
     end
 
     it "interpolates if i18n is loaded before" do
-      pending_18 do
+      pending_if pending_condition, "does not work on ree + rails 3 or rails 4"  do
         system("bundle exec ruby spec/cases/interpolate_i18n_after_fast_gettext.rb > /dev/null 2>&1").should == true
       end
     end

data/spec/locale/de/test.po

@@ -41,6 +41,9 @@ msgstr "Modell"
 msgid "Untranslated"
 msgstr ""
 
+msgid "Untranslated and translated in test2"
+msgstr ""
+
 #: app/views/cars/show.html.erb:3 locale/model_attributes.rb:4
 msgid "Car|Wheels count"
 msgstr "Räderzahl"

data/spec/locale/de/test2.po

@@ -1,8 +1,6 @@
-# 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.
-#
+# this is the same file as test.po but with "2" added to each translation
+# and one extra translation added
+
 #, fuzzy
 msgid ""
 msgstr ""
@@ -16,56 +14,51 @@ msgstr ""
 "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}"
+msgstr "vor %{relative_time} 2"
 
-#: app/views/cars/show.html.erb:5
 msgid "Axis"
-msgid_plural "Axis"
-msgstr[0] "Achse"
-msgstr[1] "Achsen"
+msgid_plural "Axis 2"
+msgstr[0] "Achse 2"
+msgstr[1] "Achsen 2"
 
-#: app/controllers/cars_controller.rb:47
 msgid "Car was successfully created."
-msgstr "Auto wurde erfolgreich gespeichert"
+msgstr "Auto wurde erfolgreich gespeichert 2"
 
-#: app/controllers/cars_controller.rb:64
 msgid "Car was successfully updated."
-msgstr "Auto wurde erfolgreich aktualisiert"
+msgstr "Auto wurde erfolgreich aktualisiert 2"
 
-#: app/views/cars/show.html.erb:1 locale/model_attributes.rb:3
 msgid "Car|Model"
-msgstr "Modell"
+msgstr "Modell 2"
 
 msgid "Untranslated"
+msgstr ""
+
+msgid "Untranslated and translated in test2"
 msgstr "Translated"
 
-#: app/views/cars/show.html.erb:3 locale/model_attributes.rb:4
 msgid "Car|Wheels count"
-msgstr "Räderzahl"
+msgstr "Räderzahl 2"
 
-#: app/views/cars/show.html.erb:7
 msgid "Created"
-msgstr "Erstellt"
+msgstr "Erstellt 2"
 
-#: app/views/cars/show.html.erb:9
 msgid "Month"
-msgstr "Monat"
+msgstr "Monat 2"
 
-#: locale/model_attributes.rb:2
 msgid "car"
-msgstr "Auto"
+msgstr "Auto 2"
 
-#: 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!"
+"gefunden wurde! 2"
 
-#: locale/test_escape.rb:2
 msgid "You should escape '\\' as '\\\\'."
-msgstr "Du solltest '\\' als '\\\\' escapen."
+msgstr "Du solltest '\\' als '\\\\' escapen. 2"
 
 msgid "Umläüte"
-msgstr "Umlaute"
+msgstr "Umlaute 2"
+
+msgid "only in test2 domain"
+msgstr "nur in test2 Domain"

data/spec/spec_helper.rb

@@ -14,8 +14,29 @@ RSpec.configure do |config|
 end
 
 def default_setup
+  # make sure all tests are really independent
+  Thread.current[:fast_gettext_text_domain] = nil
+  Thread.current[:fast_gettext__locale] = nil
+  Thread.current[:fast_gettext_available_locales] = nil
+  Thread.current[:fast_gettext_pluralisation_rule] = nil
+  Thread.current[:fast_gettext_current_cache] = nil
+  FastGettext.send(:class_variable_set, :@@translation_repositories, {})
+  FastGettext.send(:class_variable_set, :@@caches, {})
   FastGettext.add_text_domain('test',:path=>File.join(File.dirname(__FILE__),'locale'))
   FastGettext.text_domain = 'test'
   FastGettext.available_locales = ['en','de','gsw_CH']
   FastGettext.locale = 'de'
+  FastGettext.send(:update_current_cache)
+end
+
+def pending_if(condition, *args)
+  if condition
+    pending(*args) { yield }
+  else
+    yield
+  end
+end
+
+def setup_extra_domain
+  FastGettext.add_text_domain('test2',:path=>File.join(File.dirname(__FILE__),'locale'))
 end

metadata

@@ -1,22 +1,32 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: fast_gettext
-version: !ruby/object:Gem::Version
-  version: 0.7.1
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
-authors:
+authors: 
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+
+date: 2013-08-30 00:00:00 Z
 dependencies: []
+
 description: 
 email: michael@grosser.it
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Appraisals
@@ -39,10 +49,12 @@ files:
 - examples/db/migration.rb
 - examples/missing_translation_logger.rb
 - fast_gettext.gemspec
-- gemfiles/rails.2.gemfile
-- gemfiles/rails.2.gemfile.lock
-- gemfiles/rails.3.gemfile
-- gemfiles/rails.3.gemfile.lock
+- 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/mo_file.rb
 - lib/fast_gettext/po_file.rb
@@ -105,35 +117,38 @@ files:
 - spec/spec_helper.rb
 - spec/support/be_accessible_matcher.rb
 homepage: http://github.com/grosser/fast_gettext
-licenses:
+licenses: 
 - MIT
 - Ruby
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 278086574654590991
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 278086574654590991
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A simple, fast, memory-efficient and threadsafe implementation of GetText
 test_files: []
+

data/gemfiles/rails.2.gemfile.lock

@@ -1,56 +0,0 @@
-PATH
-  remote: /Users/mgrosser/code/tools/fast_gettext
-  specs:
-    fast_gettext (0.7.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
-    appraisal (0.5.1)
-      bundler
-      rake
-    bump (0.3.5)
-    diff-lcs (1.1.3)
-    i18n (0.6.1)
-    rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
-      rake (>= 0.8.3)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    sqlite3 (1.3.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  appraisal
-  bump
-  fast_gettext!
-  i18n
-  rails (~> 2.0)
-  rake
-  rspec
-  sqlite3

data/gemfiles/rails.3.gemfile.lock

@@ -1,112 +0,0 @@
-PATH
-  remote: /Users/mgrosser/code/tools/fast_gettext
-  specs:
-    fast_gettext (0.7.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
-      mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    appraisal (0.5.1)
-      bundler
-      rake
-    arel (3.0.2)
-    builder (3.0.4)
-    bump (0.3.5)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    json (1.7.5)
-    mail (2.4.4)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.3.7)
-    polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
-      bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  appraisal
-  bump
-  fast_gettext!
-  i18n
-  rails (~> 3.0)
-  rake
-  rspec
-  sqlite3