gettext_i18n_rails 0.6.2 → 0.6.3

data/Gemfile

@@ -2,11 +2,11 @@ source :rubygems
 gemspec
 
 gem 'haml'
-gem 'slim', :git => "https://github.com/grosser/slim.git", :ref => "rails2"
-gem 'hamlet', :git => "https://github.com/grosser/hamlet.rb.git", :ref => "all"
+gem 'slim'
+gem 'hamlet'
 gem 'ruby_parser'
 gem 'gettext'
-gem 'sqlite3', '~>1.3.4'
+gem 'sqlite3', '~>1.3.6'
 gem 'rails', ENV['RAILS'] || '~>3'
 gem 'rake'
 gem 'rspec', '~>2'

data/Gemfile.lock

@@ -1,24 +1,7 @@
-GIT
-  remote: https://github.com/grosser/hamlet.rb.git
-  revision: daf922bb40a9daa20fcc50a7e10c77cff772d688
-  ref: all
-  specs:
-    hamlet (0.5.0.1)
-      slim (~> 1.2.0)
-
-GIT
-  remote: https://github.com/grosser/slim.git
-  revision: f1b32d3b5422536b5f4f708dde55a13dc43568dc
-  ref: rails2
-  specs:
-    slim (1.2.1)
-      temple (~> 0.4.0)
-      tilt (~> 1.3.3)
-
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (0.6.2)
+    gettext_i18n_rails (0.6.3)
       fast_gettext
 
 GEM
@@ -55,10 +38,12 @@ GEM
     builder (3.0.0)
     diff-lcs (1.1.2)
     erubis (2.7.0)
-    fast_gettext (0.6.7)
+    fast_gettext (0.6.8)
     gettext (2.1.0)
       locale (>= 2.0.5)
     haml (3.1.4)
+    hamlet (0.1)
+      slim (~> 1.0)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.4)
@@ -107,11 +92,14 @@ GEM
     ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.10)
+    slim (1.2.1)
+      temple (~> 0.4.0)
+      tilt (~> 1.3.3)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.6)
     temple (0.4.0)
     thor (0.15.2)
     tilt (1.3.3)
@@ -127,10 +115,10 @@ DEPENDENCIES
   gettext
   gettext_i18n_rails!
   haml
-  hamlet!
-  rails (= 3.2.5)
+  hamlet
+  rails (~> 3)
   rake
   rspec (~> 2)
   ruby_parser
-  slim!
-  sqlite3 (~> 1.3.4)
+  slim
+  sqlite3 (~> 1.3.6)

data/Rakefile

@@ -4,9 +4,9 @@ task :spec do
   sh "rspec spec"
 end
 
-task :default do
-  ['2.3.14', '3.0.9', '3.1.0'].each do |version|
-    sh "export RAILS='#{version}' && (bundle check || bundle install) && bundle exec rake spec"
+task :default do # can fail when run with bundler
+  ['2.3.14', '~>3.0.15', '~>3.1.6', '~>3.2.6'].each do |version|
+    sh "export RAILS='#{version}' && (bundle check || bundle) && bundle exec rake spec"
   end
   sh "git checkout Gemfile.lock"
 end

data/lib/gettext_i18n_rails.rb

@@ -23,15 +23,15 @@ I18n.backend = GettextI18nRails::Backend.new
 
 require 'gettext_i18n_rails/i18n_hacks'
 
-require 'gettext_i18n_rails/active_record'
-# If configuration via Railties is not available force activerecord extensions
-if not defined?(Rails::Railtie) and defined?(ActiveRecord)
-  ActiveRecord::Base.extend GettextI18nRails::ActiveRecord
-end
-
-if not defined?(Rails::Railtie) and defined?(ActiveModel)
-  require 'gettext_i18n_rails/active_model'
+if defined? Rails::Railtie # Rails 3+
+  # load active_model extensions at the correct point in time
+  require 'gettext_i18n_rails/railtie'
+else
+  if defined? ActiveRecord
+    require 'gettext_i18n_rails/active_record'
+  elsif defined?(ActiveModel)
+    require 'gettext_i18n_rails/active_model'
+  end
 end
 
 require 'gettext_i18n_rails/action_controller' if defined?(ActionController) # so that bundle console can work in a rails project
-require 'gettext_i18n_rails/railtie'

data/lib/gettext_i18n_rails/active_record.rb

@@ -1,16 +1,14 @@
-# if running Rails 2 ActiveModel won't exist -- but we still need to load
-# our overrides for the include below to work
-begin
-  require 'active_model'
-rescue LoadError
-  require 'gettext_i18n_rails/active_model'
-end
+require 'gettext_i18n_rails/active_model'
+
+class ActiveRecord::Base
+  extend ActiveModel::Translation
 
-module GettextI18nRails::ActiveRecord
-  include ActiveModel::Translation
+  def self.human_attribute_name(*args)
+    super(*args)
+  end
 
   # method deprecated in Rails 3.1
-  def human_name(*args)
+  def self.human_name(*args)
     _(self.humanize_class_name)
   end
 end

data/lib/gettext_i18n_rails/backend.rb

@@ -5,6 +5,8 @@ module GettextI18nRails
     cattr_accessor :translate_defaults
     attr_accessor :backend
 
+    RUBY19 = (RUBY_VERSION > "1.9")
+
     def initialize(*args)
       self.backend = I18n::Backend::Simple.new(*args)
     end
@@ -18,7 +20,8 @@ module GettextI18nRails
         translation = FastGettext._(gettext_key)
         interpolate(translation, options)
       else
-        backend.translate locale, key, options
+        result = backend.translate(locale, key, options)
+        RUBY19 ? result.force_encoding("UTF-8") : result
       end
     end
 

data/lib/gettext_i18n_rails/html_safe_translations.rb

@@ -26,4 +26,4 @@ module GettextI18nRails
       text.to_s.html_safe
     end
   end
-end
+end

data/lib/gettext_i18n_rails/railtie.rb

@@ -1,20 +1,17 @@
-# add rake tasks if we are inside Rails
-if defined?(Rails::Railtie)
-  module GettextI18nRails
-    class Railtie < ::Rails::Railtie
-      config.gettext_i18n_rails = ActiveSupport::OrderedOptions.new
-      config.gettext_i18n_rails.msgmerge = %w[--sort-output --no-location --no-wrap]
-      config.gettext_i18n_rails.use_for_active_record_attributes = true
+module GettextI18nRails
+  class Railtie < ::Rails::Railtie
+    config.gettext_i18n_rails = ActiveSupport::OrderedOptions.new
+    config.gettext_i18n_rails.msgmerge = %w[--sort-output --no-location --no-wrap]
+    config.gettext_i18n_rails.use_for_active_record_attributes = true
 
-      rake_tasks do
-        require 'gettext_i18n_rails/tasks'
-      end
+    rake_tasks do
+      require 'gettext_i18n_rails/tasks'
+    end
 
-      config.after_initialize do |app|
-        if app.config.gettext_i18n_rails.use_for_active_record_attributes
-          ActiveSupport.on_load :active_record do
-            require 'gettext_i18n_rails/active_model.rb'
-          end
+    config.after_initialize do |app|
+      if app.config.gettext_i18n_rails.use_for_active_record_attributes
+        ActiveSupport.on_load :active_record do
+          require 'gettext_i18n_rails/active_model'
         end
       end
     end

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '0.6.2'
+  Version = VERSION = '0.6.3'
 end

data/spec/gettext_i18n_rails/active_model_spec.rb

@@ -13,4 +13,4 @@ describe ActiveModel::Name do
       name.human.should == 'Autositz'
     end
   end
-end
+end if ActiveRecord::VERSION::MAJOR >= 3

data/spec/gettext_i18n_rails/active_record_spec.rb

@@ -41,14 +41,14 @@ describe ActiveRecord::Base do
     it "translates error messages" do
       FastGettext.stub!(:current_repository).and_return('translate me'=>"Übersetz mich!")
       FastGettext._('translate me').should == "Übersetz mich!"
-      model.errors[:seat_color].should == ["Übersetz mich!"]
+      model.errors.full_messages.should == ["Seat color Übersetz mich!"]
     end
 
     it "translates scoped error messages" do
       pending 'scope is no longer added in 3.x' if ActiveRecord::VERSION::MAJOR >= 3
       FastGettext.stub!(:current_repository).and_return('activerecord.errors.translate me'=>"Übersetz mich!")
       FastGettext._('activerecord.errors.translate me').should == "Übersetz mich!"
-      model.errors[:seat_color].should == ["Übersetz mich!"]
+      model.errors.full_messages.should == ["Seat color Übersetz mich!"]
     end
 
     it "translates error messages with %{fn}" do

data/spec/gettext_i18n_rails/backend_spec.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require "spec_helper"
 
 FastGettext.silence_errors
@@ -41,6 +42,21 @@ describe GettextI18nRails::Backend do
       subject.translate('xx',:x ,:scope=>'xy.z').should == 'a'
     end
 
+    it "passes non-gettext keys to default backend" do
+      subject.backend.should_receive(:translate).with('xx', 'c', {}).and_return 'd'
+      FastGettext.stub(:current_repository).and_return 'a'=>'b'
+      subject.translate('xx', 'c', {}).should == 'd'
+    end
+
+    if RUBY_VERSION > "1.9"
+      it "produces UTF-8 when not using FastGettext to fix weird encoding bug" do
+        subject.backend.should_receive(:translate).with('xx', 'c', {}).and_return 'ü'.force_encoding("US-ASCII")
+        FastGettext.stub(:current_repository).and_return 'a'=>'b'
+        result = subject.translate('xx', 'c', {})
+        result.should == 'ü'
+      end
+    end
+
     # TODO NameError is raised <-> wtf ?
     xit "uses the super when the key is not translatable" do
       lambda{subject.translate('xx','y',:scope=>['xy','z'])}.should raise_error(I18n::MissingTranslationData)

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require 'action_controller'
 require 'action_mailer'
 require 'fast_gettext'
 require 'gettext_i18n_rails'
+require 'temple'
 
 begin
   Gem.all_load_paths
@@ -17,6 +18,15 @@ rescue
   module Gem;def self.all_load_paths;[];end;end
 end
 
+
+# make temple not blow up in rails 2 env
+class << Temple::Templates
+  alias_method :method_missing_old, :method_missing
+  def method_missing(name, engine, options = {})
+    name == :Rails || method_missing_old(name, engine, options)
+  end
+end
+
 module Rails
   def self.root
     File.dirname(__FILE__)
@@ -75,5 +85,3 @@ end
 class Idea < ActiveRecord::Base
   self.abstract_class = true
 end
-
-ActiveRecord::Base.extend GettextI18nRails::ActiveRecord

metadata

@@ -1,45 +1,38 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.6.3
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 2
-  version: 0.6.2
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fast_gettext
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id001
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: michael@grosser.it
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -77,37 +70,34 @@ files:
 - spec/gettext_i18n_rails_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/grosser/gettext_i18n_rails
-licenses: 
+licenses:
 - MIT
 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: -3221859057587682382
+required_rubygems_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"
+      hash: -3221859057587682382
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple FastGettext Rails integration.
 test_files: []
-