gettext_i18n_rails 0.6.6 → 0.7.0

data/Gemfile

@@ -5,7 +5,7 @@ gem 'haml'
 gem 'slim'
 gem 'hamlet'
 gem 'ruby_parser'
-gem 'gettext'
+gem 'gettext', "2.3.1", :github => "ruby-gettext/gettext" # waiting for 2.3.1 to be released
 gem 'sqlite3', '~>1.3.6'
 gem 'rails', ENV['RAILS'] || '~>3'
 gem 'rake'

data/Gemfile.lock

@@ -1,8 +1,15 @@
+GIT
+  remote: git://github.com/ruby-gettext/gettext.git
+  revision: 3c4822399d587831a479df7db2b1b28de0216093
+  specs:
+    gettext (2.3.1)
+      locale
+
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (0.6.6)
-      fast_gettext
+    gettext_i18n_rails (0.7.0)
+      fast_gettext (>= 0.4.8)
 
 GEM
   remote: http://rubygems.org/
@@ -38,9 +45,7 @@ GEM
     builder (3.0.0)
     diff-lcs (1.1.2)
     erubis (2.7.0)
-    fast_gettext (0.6.8)
-    gettext (2.1.0)
-      locale (>= 2.0.5)
+    fast_gettext (0.6.9)
     haml (3.1.4)
     hamlet (0.1)
       slim (~> 1.0)
@@ -48,7 +53,7 @@ GEM
     i18n (0.6.0)
     journey (1.0.4)
     json (1.7.3)
-    locale (2.0.5)
+    locale (2.0.8)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -112,7 +117,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  gettext
+  gettext (= 2.3.1)!
   gettext_i18n_rails!
   haml
   hamlet

data/Rakefile

@@ -13,18 +13,17 @@ end
 
 # extracted from https://github.com/grosser/project_template
 rule /^version:bump:.*/ do |t|
-  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
-  index = ['major', 'minor','patch'].index(t.name.split(':').last)
-  file = 'lib/gettext_i18n_rails/version.rb'
+  file = "lib/gettext_i18n_rails/version.rb"
 
+  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
+  index = ["major", "minor", "patch"].index(t.name.split(':').last)
   version_file = File.read(file)
   old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
   version_parts[index] = version_parts[index].to_i + 1
   version_parts[2] = 0 if index < 2 # remove patch for minor
   version_parts[1] = 0 if index < 1 # remove minor for major
   new_version = version_parts * '.'
-  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
 
+  File.open(file,"w"){|f| f.write(version_file.sub(old_version, new_version)) }
   sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}'"
 end
-

data/Readme.md

@@ -203,6 +203,11 @@ lib/tasks/gettext.rake:
       end
     end
 
+Using your translations from javascript
+=======================================
+
+If want to use your .PO files on client side javascript you should have a look at the [GettextI18nRailsJs](https://github.com/nubis/gettext_i18n_rails_js) extension.
+
 [Contributors](http://github.com/grosser/gettext_i18n_rails/contributors)
 ======
  - [ruby gettext extractor](http://github.com/retoo/ruby_gettext_extractor/tree/master) from [retoo](http://github.com/retoo)
@@ -227,4 +232,4 @@ lib/tasks/gettext.rake:
 
 [Michael Grosser](http://grosser.it)<br/>
 grosser.michael@gmail.com<br/>
-Hereby placed under public domain, do what you want, just do not hold me accountable...
+License: MIT

data/gettext_i18n_rails.gemspec

@@ -9,5 +9,5 @@ Gem::Specification.new name, GettextI18nRails::VERSION do |s|
   s.homepage = "http://github.com/grosser/#{name}"
   s.files = `git ls-files`.split("\n")
   s.license = "MIT"
-  s.add_runtime_dependency "fast_gettext"
+  s.add_runtime_dependency "fast_gettext", ">=0.4.8"
 end

data/lib/gettext_i18n_rails.rb

@@ -1,15 +1,11 @@
 require 'gettext_i18n_rails/version'
+require 'gettext_i18n_rails/gettext_hooks'
 
 module GettextI18nRails
-  extend self
 end
 
+# translate from everywhere
 require 'fast_gettext'
-if Gem::Version.new(FastGettext::VERSION) < Gem::Version.new("0.4.8")
-  raise "Please upgrade fast_gettext"
-end
-
-# include translations into all the places it needs to go...
 Object.send(:include, FastGettext::Translation)
 
 # make translations html_safe if possible and wanted
@@ -18,11 +14,14 @@ if "".respond_to?(:html_safe?)
   Object.send(:include, GettextI18nRails::HtmlSafeTranslations)
 end
 
+# set up the backend
 require 'gettext_i18n_rails/backend'
 I18n.backend = GettextI18nRails::Backend.new
 
+# make I18n play nice with FastGettext
 require 'gettext_i18n_rails/i18n_hacks'
 
+# translate activerecord errors
 if defined? Rails::Railtie # Rails 3+
   # load active_model extensions at the correct point in time
   require 'gettext_i18n_rails/railtie'
@@ -34,4 +33,5 @@ else
   end
 end
 
-require 'gettext_i18n_rails/action_controller' if defined?(ActionController) # so that bundle console can work in a rails project
+# make bundle console work in a rails project
+require 'gettext_i18n_rails/action_controller' if defined?(ActionController)

data/lib/gettext_i18n_rails/base_parser.rb

@@ -1,12 +1,15 @@
-require 'gettext/utils'
-begin
-  require 'gettext/tools/rgettext'
-rescue LoadError #version prior to 2.0
-  require 'gettext/rgettext'
-end
-
 module GettextI18nRails
   class BaseParser
+    # copy AS 3 feature so we can play nicely with AS2 and if rails env is not there
+    class << self
+      attr_accessor :parser_descendants
+    end
+    self.parser_descendants = []
+
+    def self.inherited(subclass)
+      parser_descendants << subclass
+    end
+
     def self.target?(file)
       File.extname(file) == ".#{extension}"
     end

data/lib/gettext_i18n_rails/gettext_hooks.rb

@@ -0,0 +1,31 @@
+module GettextI18nRails
+  module GettextHooks
+    def self.add_parsers_to_gettext
+      return if @add_parsers_to_gettext
+      @add_parsers_to_gettext = true
+
+      require "gettext_i18n_rails/haml_parser"
+      require "gettext_i18n_rails/hamlet_parser"
+      require "gettext_i18n_rails/slim_parser"
+
+      GettextI18nRails::BaseParser.parser_descendants.each do |parser|
+        xgettext.add_parser(parser)
+      end
+    end
+
+    def self.xgettext
+      @xgettext ||= begin
+        require 'gettext/tools/xgettext' # 2.3+
+        GetText::Tools::XGetText
+      rescue LoadError
+        begin
+          require 'gettext/tools/rgettext' # 2.0 - 2.2
+          GetText::RGetText
+        rescue LoadError # # 1.x
+          require 'gettext/rgettext'
+          GetText::RGetText
+        end
+      end
+    end
+  end
+end

data/lib/gettext_i18n_rails/haml_parser.rb

@@ -11,5 +11,3 @@ module GettextI18nRails
     end
   end
 end
-
-GetText::RGetText.add_parser(GettextI18nRails::HamlParser)

data/lib/gettext_i18n_rails/hamlet_parser.rb

@@ -11,6 +11,3 @@ module GettextI18nRails
     end
   end
 end
-
-GetText::RGetText.add_parser(GettextI18nRails::HamletParser)
-

data/lib/gettext_i18n_rails/ruby_gettext_extractor.rb

@@ -1,17 +1,6 @@
 # new ruby parser from retoo, that should help extracting "#{_('xxx')}", which is needed especially when parsing haml files
-#
-#!/usr/bin/ruby
-# parser/ruby.rb - look for gettext msg strings in ruby files
-
-require 'rubygems'
 require 'ruby_parser'
 
-begin
-  require 'gettext/tools/rgettext'
-rescue LoadError #version prior to 2.0
-  require 'gettext/rgettext'
-end
-
 module RubyGettextExtractor
   extend self
 

data/lib/gettext_i18n_rails/slim_parser.rb

@@ -11,5 +11,3 @@ module GettextI18nRails
     end
   end
 end
-
-GetText::RGetText.add_parser(GettextI18nRails::SlimParser)

data/lib/gettext_i18n_rails/tasks.rb

@@ -2,6 +2,7 @@ namespace :gettext do
   def load_gettext
     require 'gettext'
     require 'gettext/utils'
+    require 'gettext_i18n_rails/gettext_hooks'
   end
 
   desc "Create mo-files for L10n"
@@ -13,11 +14,9 @@ namespace :gettext do
   desc "Update pot/po files."
   task :find => :environment do
     load_gettext
-    $LOAD_PATH << File.join(File.dirname(__FILE__),'..','..','lib')
-    require 'gettext_i18n_rails/haml_parser'
-    require 'gettext_i18n_rails/slim_parser'
-    require 'gettext_i18n_rails/hamlet_parser'
+    $LOAD_PATH << File.join(File.dirname(__FILE__),'..','..','lib') # needed when installed as plugin
 
+    GettextI18nRails::GettextHooks.add_parsers_to_gettext
 
     if GetText.respond_to? :update_pofiles_org
       if defined?(Rails.application)
@@ -120,6 +119,7 @@ namespace :gettext do
     ENV['TEXTDOMAIN'] || (FastGettext.text_domain rescue nil) || "app"
   end
 
+  # do not rename, gettext_i18n_rails_js overwrites this to inject coffee + js
   def files_to_translate
     Dir.glob("{app,lib,config,#{locale_path}}/**/*.{rb,erb,haml,slim}")
   end

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '0.6.6'
+  Version = VERSION = '0.7.0'
 end

data/spec/gettext_i18n_rails/gettext_hooks_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+describe GettextI18nRails::GettextHooks do
+  describe ".add_parsers_to_gettext" do
+    def parsers
+      GettextI18nRails::GettextHooks.xgettext # load XGetText
+      GettextI18nRails::GettextHooks.instance_variable_set(:@add_parsers_to_gettext, nil) # can add_parsers_to_gettext multiple times
+      GetText::Tools::XGetText.class_variable_get(:@@default_parsers)
+    end
+
+    before do
+      parsers.clear
+    end
+
+    it "should add all parsers to gettext" do
+      expect{
+        GettextI18nRails::GettextHooks.add_parsers_to_gettext
+      }.to change{ parsers.size }.by(+3)
+    end
+
+    it "should not add them twice" do
+      expect{
+        GettextI18nRails::GettextHooks.add_parsers_to_gettext
+        GettextI18nRails::GettextHooks.add_parsers_to_gettext
+      }.to change{ parsers.size }.by(+3)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -79,7 +79,11 @@ class Part < ActiveRecord::Base
 end
 
 class NotConventional < ActiveRecord::Base
-  set_table_name :not_at_all_conventionals
+  if ActiveRecord::VERSION::MAJOR == 3
+    self.table_name = :not_at_all_conventionals
+  else
+    set_table_name :not_at_all_conventionals
+  end
 end
 
 class Idea < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.8
 description: 
 email: michael@grosser.it
 executables: []
@@ -46,6 +46,7 @@ files:
 - lib/gettext_i18n_rails/active_record.rb
 - lib/gettext_i18n_rails/backend.rb
 - lib/gettext_i18n_rails/base_parser.rb
+- lib/gettext_i18n_rails/gettext_hooks.rb
 - lib/gettext_i18n_rails/haml_parser.rb
 - lib/gettext_i18n_rails/hamlet_parser.rb
 - lib/gettext_i18n_rails/html_safe_translations.rb
@@ -62,6 +63,7 @@ files:
 - spec/gettext_i18n_rails/active_model_spec.rb
 - spec/gettext_i18n_rails/active_record_spec.rb
 - spec/gettext_i18n_rails/backend_spec.rb
+- spec/gettext_i18n_rails/gettext_hooks_spec.rb
 - spec/gettext_i18n_rails/haml_parser_spec.rb
 - spec/gettext_i18n_rails/hamlet_parser_spec.rb
 - spec/gettext_i18n_rails/model_attributes_finder_spec.rb
@@ -84,7 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1353912275182047211
+      hash: 1552868683702405680
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1353912275182047211
+      hash: 1552868683702405680
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24