haml-magic-translations 0.4.0 → 0.5.0

data/README.rdoc

@@ -2,11 +2,11 @@
 
 This plugin provides "magical translations" in your .haml files. What does it
 mean? It's mean that all your raw texts in templates will be automatically
-translated by GetText, FastGettext or Gettext backend from I18n. No more 
+translated by GetText, FastGettext or Gettext backend from I18n. No more
 complicated translation keys and ugly translation methods in views. Now you can
-only write in your language, nothing more. At the end of your work you can easy 
-find all phrases to translate and generate .po files for it. This type of files 
-are also more readable and easier to translate, thanks to it you save your 
+only write in your language, nothing more. At the end of your work you can easy
+find all phrases to translate and generate .po files for it. This type of files
+are also more readable and easier to translate, thanks to it you save your
 time with translations.
 
 === Installation
@@ -14,76 +14,79 @@ time with translations.
 You can install haml-magic-translations directly from rubygems:
 
   gem install haml-magic-translations
-  
+
 ...or as Ruby on Rails plugin:
 
   script/plugin install git://github.com/kriss/haml-magic-translations
 or
-  rails plugin install git://github.com/kriss/haml-magic-translations 
+  rails plugin install git://github.com/kriss/haml-magic-translations
 
 === Gettings started with Gettext
 
-To use automatical translations you have to using new I18n with Gettext backend, 
+To use automatical translations you have to using new I18n with Gettext backend,
 GetText or FastGettext, properly installed and configured. To enable plugin
 you have to do following things:
 
   Haml::MagicTranslations.enable(:i18n) # this backend is used by default
-  
+
 Available backends are +:i18n+, +:gettext+ and +:fast_gettext+
 
 Now you have to add path to all your .po files with locales. Eg. for i18n backend
-it will be something like:    
-  
+it will be something like:
+
   I18n.load_path += Dir["path/to/your/locales/*.{po}")]
-  
+
 And that's all. Now you can enjoy automatically translations in your .haml files!
 
 === Examples
 
-Now you can write what you want, and at the end of work you 
+Now you can write what you want, and at the end of work you
 will easy found all phrases to translate. Check out following example:
 
   %p This is my simple dummy text.
   %p And more lorem ipsum...
   %p= link_to _("This will be also translated"), "#"
-  
-Those translations are allso allowing you to use standard Haml interpolation. 
-You can easy write: 
-  
+
+Those translations are allso allowing you to use standard Haml interpolation.
+You can easy write:
+
   %p This is my text with #{"interpolation".upcase}... Great, isn't it?
   %p
     This multiline string
     Will be also translated
-    
+
 And text from codes above will be stored in .po files as:
 
   # File test1.haml, line 1
   msgid "This is my simple dummy text"
   msgstr "This is my dummy translation of dummy text"
-  
+
   # File test2.haml, line 1
   msgid "This is my text with %s... Great, isn't it?"
   msgstr "Next one %s translation!"
-  
+
   # File test4.haml, line 3
   msgid "This multiline string"
   msgstr ""
-  
+
   # File test2.haml, line 4
   msgid "Will be also translated"
   msgstr ""
-  
-Notice that in multiline strings each line is translated separatelly. 
-  
+
+Notice that in multiline strings each line is translated separatelly.
+
 Generator for .po files also includes information where your phrases are placed
-in filesystem. Thanks to it you don't forget about any even small word to 
-translate. 
+in filesystem. Thanks to it you don't forget about any even small word to
+translate.
 
 === Extracting strings and merging translations
 
 In order to extract translatable strings and merge with existing translation,
-this gem provides an Haml parser for RGetText. You can either use it directly
-or through the provided Rake task. Here's an example on how to use the later:
+this gem provides an Haml parser for GetText::Tools::XGetText. This requires
+gettext >= 2.3 to be available.
+
+You can either use it directly or through the provided Rake task. Here's an
+example on how to use the later:
 
   Haml::MagicTranslations::Tasks::UpdatePoFiles.new do |t|
     t.text_domain = 'my_project'

data/Rakefile

@@ -20,7 +20,7 @@ time with translations.
     gem.authors = ["Kriss Kowalik", "potager.org"]
     gem.add_dependency "haml", "~> 3.1"
     gem.add_development_dependency "actionpack"
-    gem.add_development_dependency "gettext"
+    gem.add_development_dependency "gettext", ">= 2.3"
     gem.add_development_dependency "fast_gettext"
     gem.add_development_dependency "rspec", ">= 2"
     gem.add_development_dependency "rdoc", ">= 2.4.2"

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/haml-magic-translations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{haml-magic-translations}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kriss Kowalik", "potager.org"]
-  s.date = %q{2013-03-15}
+  s.date = %q{2013-03-21}
   s.description = %q{This plugin provides "magical translations" in your .haml files. What does it
 mean? It's mean that all your raw texts in templates will be automatically
 translated by GetText, FastGettext or Gettext backend from I18n. No more 
@@ -33,10 +33,10 @@ time with translations.
     "init.rb",
     "lib/haml-magic-translations.rb",
     "lib/haml/magic_translations.rb",
-    "lib/haml/magic_translations/rgettext/haml_parser.rb",
     "lib/haml/magic_translations/tasks.rb",
-    "spec/haml/magic_translations/rgettext/haml_parser_spec.rb",
+    "lib/haml/magic_translations/xgettext/haml_parser.rb",
     "spec/haml/magic_translations/tasks_spec.rb",
+    "spec/haml/magic_translations/xgettext/haml_parser_spec.rb",
     "spec/haml/magic_translations_spec.rb",
     "spec/locales/en.po",
     "spec/locales/pl.po",
@@ -44,17 +44,16 @@ time with translations.
   ]
   s.homepage = %q{http://github.com/potager/haml-magic-translations}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.8.23}
   s.summary = %q{Provides automaticaly translations in haml templates}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<haml>, ["~> 3.1"])
       s.add_development_dependency(%q<actionpack>, [">= 0"])
-      s.add_development_dependency(%q<gettext>, [">= 0"])
+      s.add_development_dependency(%q<gettext>, [">= 2.3"])
       s.add_development_dependency(%q<fast_gettext>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 2"])
       s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
@@ -62,7 +61,7 @@ time with translations.
     else
       s.add_dependency(%q<haml>, ["~> 3.1"])
       s.add_dependency(%q<actionpack>, [">= 0"])
-      s.add_dependency(%q<gettext>, [">= 0"])
+      s.add_dependency(%q<gettext>, [">= 2.3"])
       s.add_dependency(%q<fast_gettext>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 2"])
       s.add_dependency(%q<rdoc>, [">= 2.4.2"])
@@ -71,7 +70,7 @@ time with translations.
   else
     s.add_dependency(%q<haml>, ["~> 3.1"])
     s.add_dependency(%q<actionpack>, [">= 0"])
-    s.add_dependency(%q<gettext>, [">= 0"])
+    s.add_dependency(%q<gettext>, [">= 2.3"])
     s.add_dependency(%q<fast_gettext>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 2"])
     s.add_dependency(%q<rdoc>, [">= 2.4.2"])

data/lib/haml/magic_translations/tasks.rb

@@ -4,9 +4,9 @@ require 'rake'
 require 'rake/tasklib'
 require 'gettext'
 require 'gettext/tools'
-require 'gettext/tools/rgettext'
+require 'gettext/tools/xgettext'
 
-require 'haml/magic_translations/rgettext/haml_parser'
+require 'haml/magic_translations/xgettext/haml_parser'
 
 module Haml::MagicTranslations::Tasks # :nodoc:
   # Rake task to generate and update PO files for a project using
@@ -75,7 +75,7 @@ module Haml::MagicTranslations::Tasks # :nodoc:
         [ :lang, :po_root, :verbose ].each do |opt|
           options[opt] = send(opt) if send(opt)
         end
-        GetText::RGetText.add_parser(Haml::MagicTranslations::RGetText::HamlParser)
+        GetText::Tools::XGetText.add_parser(Haml::MagicTranslations::XGetText::HamlParser)
         GetText.update_pofiles(text_domain, files, app_version, options)
       end
     end

data/lib/haml/magic_translations/{rgettext → xgettext}/haml_parser.rb

@@ -4,12 +4,12 @@ require 'json'
 require 'haml'
 require 'haml/magic_translations'
 
-module Haml::MagicTranslations::RGetText # :nodoc:
-  # RGetText parser for Haml files
+module Haml::MagicTranslations::XGetText # :nodoc:
+  # XGetText parser for Haml files
   #
   # === Example
   #
-  #   GetText::RGetText.add_parser(Haml::MagicTranslations::RGetText::HamlParser)
+  #   GetText::Tools::XGetText.add_parser(Haml::MagicTranslations::XGetText::HamlParser)
   #   GetText.update_pofiles(text_domain, files, app_version, options)
   #
   module HamlParser
@@ -19,7 +19,7 @@ module Haml::MagicTranslations::RGetText # :nodoc:
       File.extname(file) == '.haml'
     end
 
-    def parse(file, ary = []) # :nodoc:
+    def parse(file) # :nodoc:
       Parser.new(file).parse
     end
 
@@ -37,15 +37,15 @@ module Haml::MagicTranslations::RGetText # :nodoc:
       end
 
       def parse
-        Haml::Engine.send(:include, RGetTextEngine)
+        Haml::Engine.send(:include, XGetTextEngine)
         engine = Haml::Engine.new(
             content, :filename => @file,
-                     :rgettext => true,
+                     :xgettext => true,
                      :magic_translations => false).targets
       end
     end
 
-    module RGetTextEngine # :nodoc:all
+    module XGetTextEngine # :nodoc:all
       def add_target(text, lineno = @node.line)
         @targets = {} if @targets.nil?
         unless text.empty?
@@ -71,7 +71,7 @@ module Haml::MagicTranslations::RGetText # :nodoc:
       #
       # So let's hook in the parser, just for this specific case.
       def parse_tag(line)
-        return super unless self.options[:rgettext]
+        return super unless self.options[:xgettext]
 
         tag_name, attributes, attributes_hashes, object_ref, nuke_outer_whitespace,
           nuke_inner_whitespace, action, value, last_line = super(line)
@@ -91,29 +91,29 @@ module Haml::MagicTranslations::RGetText # :nodoc:
       end
 
       def compile_plain
-        return super unless self.options[:rgettext]
+        return super unless self.options[:xgettext]
 
         add_target(@node.value[:text])
       end
 
       def compile_doctype
-        return super unless self.options[:rgettext]
+        return super unless self.options[:xgettext]
       end
 
       def compile_script
-        return super unless self.options[:rgettext]
+        return super unless self.options[:xgettext]
 
         yield if block_given?
       end
 
       def compile_silent_script
-        return super unless self.options[:rgettext]
+        return super unless self.options[:xgettext]
 
         yield if block_given?
       end
 
       def compile_tag
-        return super unless self.options[:rgettext]
+        return super unless self.options[:xgettext]
 
         # handle explicit translations in attributes
         @node.value[:attributes_hashes].each do |hash_string|
@@ -126,11 +126,11 @@ module Haml::MagicTranslations::RGetText # :nodoc:
       end
 
       def compile_filter
-        return super unless self.options[:rgettext]
+        return super unless self.options[:xgettext]
 
         case @node.value[:name]
         when 'markdown', 'maruku'
-          add_target(@node.value[:text].rstrip.gsub(/\n/, '\n'))
+          add_target(@node.value[:text].rstrip)
         when 'javascript'
           lineno = 0
           @node.value[:text].split(/\r\n|\r|\n/).each do |line|

data/spec/haml/magic_translations/tasks_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 require 'haml/magic_translations/tasks'
-require 'gettext/tools/rgettext'
+require 'gettext/tools/xgettext'
 
 module Haml::MagicTranslations::Tasks
   describe UpdatePoFiles do
@@ -65,9 +65,9 @@ module Haml::MagicTranslations::Tasks
           task.text_domain, task.files, task.app_version, {})
         run
       end
-      it 'should add a parser for ".haml" files to RGetText' do
+      it 'should add a parser for ".haml" files to XGetText' do
         GetText.stub!(:update_pofiles)
-        GetText::RGetText.should_receive(:add_parser) do |haml_parser|
+        GetText::Tools::XGetText.should_receive(:add_parser) do |haml_parser|
           haml_parser.should respond_to(:parse)
           haml_parser.should be_a_target('example.haml')
         end

data/spec/haml/magic_translations/{rgettext → xgettext}/haml_parser_spec.rb

@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
 
 require 'spec_helper'
-require 'haml/magic_translations/rgettext/haml_parser'
+require 'haml/magic_translations/xgettext/haml_parser'
 
-module Haml::MagicTranslations::RGetText
+module Haml::MagicTranslations::XGetText
   describe HamlParser do
     describe '.target?' do
       subject { HamlParser }
@@ -192,7 +192,7 @@ module Haml::MagicTranslations::RGetText
             HAML
           end
           it 'should properly add it to translations' do
-             should == [["First paragraph\\n\\nSecond paragraph", '(haml):1']]
+             should == [["First paragraph\n\nSecond paragraph", '(haml):1']]
           end
         end
         context 'after extracting translations' do

data/spec/haml/magic_translations_spec.rb

@@ -221,7 +221,7 @@ module Haml
             lang = File.basename(src).gsub(/\.po$/, '')
             dest = File.join(tmpdir, lang, 'LC_MESSAGES', 'test.mo')
             FileUtils.mkdir_p(File.dirname(dest))
-            GetText.rmsgfmt(src, dest)
+            GetText::Tools::MsgFmt.run(src, '-o', dest)
           end
           Haml::MagicTranslations.enable :gettext
           GetText.bindtextdomain 'test', :path => tmpdir

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml-magic-translations
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: fast_gettext
   requirement: !ruby/object:Gem::Requirement
@@ -146,10 +146,10 @@ files:
 - init.rb
 - lib/haml-magic-translations.rb
 - lib/haml/magic_translations.rb
-- lib/haml/magic_translations/rgettext/haml_parser.rb
 - lib/haml/magic_translations/tasks.rb
-- spec/haml/magic_translations/rgettext/haml_parser_spec.rb
+- lib/haml/magic_translations/xgettext/haml_parser.rb
 - spec/haml/magic_translations/tasks_spec.rb
+- spec/haml/magic_translations/xgettext/haml_parser_spec.rb
 - spec/haml/magic_translations_spec.rb
 - spec/locales/en.po
 - spec/locales/pl.po