gettext_i18n_rails 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/gettext_i18n_rails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gettext_i18n_rails}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/lib/gettext_i18n_rails.rb

@@ -22,6 +22,12 @@ require 'gettext_i18n_rails/backend'
 I18n.backend = GettextI18nRails::Backend.new
 
 require 'gettext_i18n_rails/i18n_hacks'
-require 'gettext_i18n_rails/active_record' if defined?(ActiveRecord)
+
+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
+
 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,21 +1,21 @@
-class ActiveRecord::Base
+module GettextI18nRails::ActiveRecord
   # CarDealer.sales_count -> s_('CarDealer|Sales count') -> 'Sales count' if no translation was found
-  def self.human_attribute_name(attribute, *args)
+  def human_attribute_name(attribute, *args)
     s_(gettext_translation_for_attribute_name(attribute))
   end
 
   # CarDealer -> _('car dealer')
-  def self.human_name(*args)
+  def human_name(*args)
     _(self.human_name_without_translation)
   end
 
-  def self.human_name_without_translation
+  def human_name_without_translation
     self.to_s.underscore.gsub('_',' ')
   end
 
   private
 
-  def self.gettext_translation_for_attribute_name(attribute)
+  def gettext_translation_for_attribute_name(attribute)
     "#{self}|#{attribute.to_s.split('.').map! {|a| a.gsub('_',' ').capitalize }.join('|')}"
   end
 end

data/lib/gettext_i18n_rails/railtie.rb

@@ -4,9 +4,19 @@ if defined?(Rails::Railtie)
     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
+
+      config.after_initialize do |app|
+        if app.config.gettext_i18n_rails.use_for_active_record_attributes
+          ActiveSupport.on_load :active_record do
+            extend GettextI18nRails::ActiveRecord
+          end
+        end
+      end
     end
   end
 end

data/spec/gettext_i18n_rails/active_record_spec.rb

@@ -19,6 +19,8 @@ ActiveRecord::Schema.define(:version => 1) do
   end
 end
 
+ActiveRecord::Base.extend GettextI18nRails::ActiveRecord
+
 class CarSeat < ActiveRecord::Base
   validates_presence_of :seat_color, :message=>"translate me"
   has_many :parts

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Michael Grosser