fast_gettext 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/fast_gettext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fast_gettext}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-01-30}
+  s.date = %q{2010-04-07}
   s.email = %q{grosser.michael@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -85,7 +85,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/grosser/fast_gettext}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A simple, fast and threadsafe implementation of GetText}
   s.test_files = [
     "spec/spec_helper.rb",

data/spec/aa_unconfigued_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__),'spec_helper')
+require 'spec/spec_helper'
 
 describe 'unconfigured' do
   it "gives a useful error message when trying to just translate" do

data/spec/fast_gettext/mo_file_spec.rb

@@ -1,7 +1,6 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','spec_helper')
+require 'spec/spec_helper'
 
-de_file = File.join(current_folder,'..','locale','de','LC_MESSAGES','test.mo')
+de_file = File.join('spec','locale','de','LC_MESSAGES','test.mo')
 de = FastGettext::MoFile.new(de_file)
 
 describe FastGettext::MoFile do

data/spec/fast_gettext/storage_spec.rb

@@ -1,5 +1,4 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','spec_helper')
+require 'spec/spec_helper'
 
 describe 'Storage' do
   include FastGettext::Storage

data/spec/fast_gettext/translation_repository/base_spec.rb

@@ -1,5 +1,4 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','..','spec_helper')
+require 'spec/spec_helper'
 require 'fast_gettext/translation_repository/base'
 
 describe 'FastGettext::TranslationRepository::Base' do

data/spec/fast_gettext/translation_repository/chain_spec.rb

@@ -1,5 +1,4 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','..','spec_helper')
+require 'spec/spec_helper'
 
 class MockRepo
   def [](key)#should_receive :[] does not work so well...

data/spec/fast_gettext/translation_repository/db_spec.rb

@@ -1,5 +1,4 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','..','spec_helper')
+require 'spec/spec_helper'
 
 require 'active_record'
 require 'fast_gettext/translation_repository/db'

data/spec/fast_gettext/translation_repository/logger_spec.rb

@@ -1,5 +1,4 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','..','spec_helper')
+require 'spec/spec_helper'
 
 describe 'FastGettext::TranslationRepository::Logger' do
   before do

data/spec/fast_gettext/translation_repository/mo_spec.rb

@@ -1,10 +1,8 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','..','spec_helper')
-
+require 'spec/spec_helper'
 
 describe 'FastGettext::TranslationRepository::Mo' do
   before do
-    @rep = FastGettext::TranslationRepository.build('test',:path=>File.join(current_folder,'..','..','locale'))
+    @rep = FastGettext::TranslationRepository.build('test',:path=>File.join('spec', 'locale'))
     @rep.is_a?(FastGettext::TranslationRepository::Mo).should be_true
   end
 
@@ -24,7 +22,7 @@ describe 'FastGettext::TranslationRepository::Mo' do
 
   it "has access to the mo repositories pluralisation rule" do
     FastGettext.locale = 'en'
-    rep = FastGettext::TranslationRepository.build('plural_test',:path=>File.join(current_folder,'..','..','locale'))
+    rep = FastGettext::TranslationRepository.build('plural_test',:path=>File.join('spec','locale'))
     rep['car'].should == 'Test'#just check it is loaded correctly
     rep.pluralisation_rule.call(2).should == 3
   end

data/spec/fast_gettext/translation_repository/po_spec.rb

@@ -1,10 +1,8 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','..','spec_helper')
-
+require 'spec/spec_helper'
 
 describe 'FastGettext::TranslationRepository::Po' do
   before do
-    @rep = FastGettext::TranslationRepository.build('test',:path=>File.join(current_folder,'..','..','locale'),:type=>:po)
+    @rep = FastGettext::TranslationRepository.build('test',:path=>File.join('spec','locale'),:type=>:po)
     @rep.is_a?(FastGettext::TranslationRepository::Po).should be_true
   end
 
@@ -24,7 +22,7 @@ describe 'FastGettext::TranslationRepository::Po' do
 
   it "has access to the mo repositories pluralisation rule" do
     FastGettext.locale = 'en'
-    rep = FastGettext::TranslationRepository.build('plural_test',:path=>File.join(current_folder,'..','..','locale'),:type=>:po)
+    rep = FastGettext::TranslationRepository.build('plural_test',:path=>File.join('spec','locale'),:type=>:po)
     rep['car'].should == 'Test'#just check it is loaded correctly
     rep.pluralisation_rule.call(2).should == 3
   end

data/spec/fast_gettext/translation_repository/yaml_spec.rb

@@ -1,9 +1,8 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','..','spec_helper')
+require 'spec/spec_helper'
 
 describe 'FastGettext::TranslationRepository::Yaml' do
   before do
-    @rep = FastGettext::TranslationRepository.build('test', :path => File.join(current_folder,'..', '..', 'locale', 'yaml'), :type => :yaml)
+    @rep = FastGettext::TranslationRepository.build('test', :path => File.join('spec', 'locale', 'yaml'), :type => :yaml)
     @rep.is_a?(FastGettext::TranslationRepository::Yaml).should be_true
     FastGettext.locale = 'de'
   end

data/spec/fast_gettext/translation_repository_spec.rb

@@ -1,5 +1,4 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','spec_helper')
+require 'spec/spec_helper'
 
 module FastGettext
   module TranslationRepository

data/spec/fast_gettext/translation_spec.rb

@@ -1,5 +1,4 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','spec_helper')
+require 'spec/spec_helper'
 
 describe FastGettext::Translation do
   include FastGettext::Translation

data/spec/fast_gettext_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(__FILE__))
+require 'spec/spec_helper'
 
 default_setup
 class IncludeTest

data/spec/vendor/iconv_spec.rb

@@ -1,10 +1,16 @@
-current_folder = File.dirname(__FILE__)
-$LOAD_PATH.unshift File.expand_path("../../lib", current_folder)
 
 describe 'Iconv' do
+  before do
+    @fake_load_path = File.join('spec','vendor','fake_load_path')
+  end
+
+  after do
+    $LOAD_PATH.delete @fake_load_path
+  end
+
   it "also works when Iconv was not found locally" do
     #prepare load path
-    $LOAD_PATH.unshift File.join(current_folder,'fake_load_path')
+    $LOAD_PATH.unshift @fake_load_path
     test = 1
     begin
       require 'iconv'
@@ -16,7 +22,7 @@ describe 'Iconv' do
     #load fast_gettext
     require 'fast_gettext'
 
-    FastGettext.add_text_domain('test',:path=>File.join(File.dirname(__FILE__),'..','locale'))
+    FastGettext.add_text_domain('test',:path=>File.join('spec','locale'))
     FastGettext.text_domain = 'test'
     FastGettext.available_locales = ['en','de']
     FastGettext.locale = 'de'

data/spec/vendor/string_spec.rb

@@ -1,8 +1,17 @@
-current_folder = File.dirname(__FILE__)
-require File.join(current_folder,'..','spec_helper')
+require 'spec/spec_helper'
 
 #just to make sure we did not mess up while copying...
 describe String do
+  before :all do
+    if "i18n gem overwrites % method".respond_to?(:interpolate_without_ruby_19_syntax)
+      class String
+        def %(*args)
+          interpolate_without_ruby_19_syntax(*args)
+        end
+      end
+    end
+  end
+
   it "does not translate twice" do
     ("%{a} %{b}" % {:a=>'%{b}',:b=>'c'}).should == '%{b} c'
   end

data/vendor/string.rb

@@ -10,8 +10,10 @@
 
 # Extension for String class. This feature is included in Ruby 1.9 or later.
 begin
-  raise unless ("a %{x}" % {:x=>'b'}) == 'a b'
+  raise ArgumentError if ("a %{x}" % {:x=>'b'}) != 'a b'
 rescue ArgumentError
+  # either we are on vanilla 1.8(call with hash raises ArgumentError)
+  # or someone else already patched % but did it wrong
   class String
     alias :_fast_gettext_old_format_m :% # :nodoc:
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fast_gettext
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 +01:00
+date: 2010-04-07 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -101,18 +106,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A simple, fast and threadsafe implementation of GetText