fast_gettext 0.6.0 → 0.6.1

data/.travis.yml

@@ -0,0 +1,5 @@
+script: "bundle exec rake"
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3

data/Rakefile

@@ -1,6 +1,6 @@
 task :default do
-  sh "AR='~>2' bundle && bundle exec rspec spec" # ActiveRecord 2
-  sh "AR='~>3' bundle && bundle exec rspec spec" # ActiveRecord 3
+  sh "AR='~>2' && (bundle || bundle install) && bundle exec rspec spec" # ActiveRecord 2
+  sh "AR='~>3' && (bundle || bundle install) && bundle exec rspec spec" # ActiveRecord 3
 end
 
 task :benchmark do

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/fast_gettext.gemspec

@@ -4,14 +4,15 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{fast_gettext}
-  s.version = "0.6.0"
+  s.name = "fast_gettext"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-10-03}
-  s.email = %q{michael@grosser.it}
+  s.date = "2011-10-08"
+  s.email = "michael@grosser.it"
   s.files = [
+    ".travis.yml",
     "CHANGELOG",
     "Gemfile",
     "Gemfile.lock",
@@ -55,6 +56,8 @@ Gem::Specification.new do |s|
     "lib/fast_gettext/vendor/poparser.rb",
     "lib/fast_gettext/vendor/string.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/fast_gettext/mo_file_spec.rb",
@@ -68,7 +71,6 @@ Gem::Specification.new do |s|
     "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/fake_load_path/iconv.rb",
     "spec/fast_gettext/vendor/iconv_spec.rb",
     "spec/fast_gettext/vendor/string_spec.rb",
     "spec/fast_gettext_spec.rb",
@@ -87,10 +89,10 @@ Gem::Specification.new do |s|
     "spec/obsolete_locale/de/test.po",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/grosser/fast_gettext}
+  s.homepage = "http://github.com/grosser/fast_gettext"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{A simple, fast, memory-efficient and threadsafe implementation of GetText}
+  s.rubygems_version = "1.8.10"
+  s.summary = "A simple, fast, memory-efficient and threadsafe implementation of GetText"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/fast_gettext/vendor/iconv.rb

@@ -18,8 +18,12 @@
 #Modifications
 #wrapped inside FastGettext namespace to reduce conflic
 
+module FastGettext; end
+
 begin
+  old_verbose, $VERBOSE = $VERBOSE, nil # hide deprecation on 1.9.3
   require 'iconv'
+  FastGettext::Iconv = Iconv
 rescue LoadError
   # Provides Iconv.iconv which normally is provided through Ruby/GLib(1) functions.
   # This library is required for 'gettext'.
@@ -34,7 +38,7 @@ rescue LoadError
   # You can get binaries for Win32(One-Click Ruby Installer).
   # <URL: http://ruby-gnome2.sourceforge.jp/>
   module FastGettext
-    class Iconv2
+    class Iconv
       module Failure; end
       class InvalidEncoding < ArgumentError;  include Failure; end
       class IllegalSequence < ArgumentError;  include Failure; end
@@ -104,4 +108,6 @@ rescue LoadError
       end
     end
   end
-end
+ensure
+  $VERBOSE = old_verbose
+end

data/lib/fast_gettext/vendor/mofile.rb

@@ -15,7 +15,7 @@
     $Id: mo.rb,v 1.10 2008/06/17 16:40:52 mutoh Exp $
 =end
 
-require 'iconv'
+require 'fast_gettext/vendor/iconv'
 require 'stringio'
 
 #Modifications:
@@ -151,9 +151,8 @@ module FastGettext
           else
             if @output_charset
               begin
-                iconv = Iconv || FastGettext::Iconv
-                str = iconv.conv(@output_charset, @charset, str) if @charset
-              rescue iconv::Failure
+                str = FastGettext::Iconv.conv(@output_charset, @charset, str) if @charset
+              rescue FastGettext::Iconv::Failure
                 if $DEBUG
                   warn "@charset = ", @charset
                   warn"@output_charset = ", @output_charset
@@ -293,4 +292,4 @@ module FastGettext
       attr_reader :charset, :nplurals, :plural
     end
   end
-end
+end

data/spec/cases/iconv_fallback.rb

@@ -0,0 +1,22 @@
+$LOAD_PATH.unshift 'lib'
+$LOAD_PATH.unshift File.join('spec','cases','fake_load_path')
+
+# test that iconv cannot be found
+test = 1
+begin
+  require 'iconv'
+rescue LoadError
+  test = 2
+end
+raise unless test == 2
+
+# use FastGettext like normal and see if it fails
+require 'fast_gettext'
+
+FastGettext.add_text_domain('test',:path=>File.join('spec','locale'))
+FastGettext.text_domain = 'test'
+FastGettext.available_locales = ['en','de']
+FastGettext.locale = 'de'
+
+#translate
+raise unless FastGettext._('car') == 'Auto'

data/spec/fast_gettext/vendor/iconv_spec.rb

@@ -1,34 +1,7 @@
 require File.expand_path('spec/spec_helper')
 
 describe 'Iconv' do
-  before do
-    @fake_load_path = File.join('spec','fast_gettext','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 @fake_load_path
-    test = 1
-    begin
-      require 'iconv'
-    rescue LoadError
-      test = 2
-    end
-    test.should == 2
-
-    #load fast_gettext
-    require 'fast_gettext'
-
-    FastGettext.add_text_domain('test',:path=>File.join('spec','locale'))
-    FastGettext.text_domain = 'test'
-    FastGettext.available_locales = ['en','de']
-    FastGettext.locale = 'de'
-
-    #translate
-    FastGettext._('car').should == 'Auto'
+    system("bundle exec ruby spec/cases/iconv_fallback.rb").should == true
   end
-end
+end

data/spec/fast_gettext/vendor/string_spec.rb

@@ -1,6 +1,16 @@
 require File.expand_path('spec/spec_helper')
 
 describe String do
+  def pending_18
+    if RUBY_VERSION > '1.9'
+      yield
+    else
+      pending do
+        yield
+      end
+    end
+  end
+
   before :all do
     if "i18n gem overwrites % method".respond_to?(:interpolate_without_ruby_19_syntax)
       class String
@@ -85,13 +95,13 @@ describe String do
 
   describe 'with i18n loaded' do
     it "interpolates if i18n is loaded before" do
-      pending do
+      pending_18 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 do
+      pending_18 do
         system("bundle exec ruby spec/cases/interpolate_i18n_after_fast_gettext.rb > /dev/null 2>&1").should == true
       end
     end

metadata

@@ -1,33 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fast_gettext
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.6.1
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-03 00:00:00 +02:00
-default_executable: 
+date: 2011-10-08 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: michael@grosser.it
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -71,6 +61,8 @@ files:
 - lib/fast_gettext/vendor/poparser.rb
 - lib/fast_gettext/vendor/string.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/fast_gettext/mo_file_spec.rb
@@ -84,7 +76,6 @@ files:
 - 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/fake_load_path/iconv.rb
 - spec/fast_gettext/vendor/iconv_spec.rb
 - spec/fast_gettext/vendor/string_spec.rb
 - spec/fast_gettext_spec.rb
@@ -102,39 +93,31 @@ files:
 - spec/locale/yaml/notfound.yml
 - spec/obsolete_locale/de/test.po
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/grosser/fast_gettext
 licenses: []
-
 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 726899407
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A simple, fast, memory-efficient and threadsafe implementation of GetText
 test_files: []
-