haml-magic-translations 4.0.3 → 4.1.0

data/README.rdoc

@@ -85,16 +85,18 @@ In order to extract translatable strings and merge with existing translation,
 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:
+With gettext >= 3, Rake tasks can be defined as follow:
 
-  Haml::MagicTranslations::Tasks::UpdatePoFiles.new do |t|
-    t.text_domain = 'my_project'
-    t.files = Dir.glob("views/**/*.{rb,haml}") << "lib/my_project.rb"
-    t.app_version = 'my_project 0.1'
+  require 'gettext/tools/task'
+  require 'haml/magic_translations/xgettext/haml_parser'
+
+  GetText::Tools::XGetText.add_parser(Haml::MagicTranslations::XGetText::HamlParser)
+  GetText::Tools::Task.define do |task|
+    task.spec = Gem::Specification.load('coquelicot.gemspec')
+    task.files = Dir.glob('views/**/*.{rb,haml}') << 'lib/my_project.rb'
   end
 
-This will add a +update_pofiles+ task that will update PO files that can be
+This will add a +gettext:po:update+ task that will update PO files that can be
 found in the +po+ directory.
 
 === Copyrights

data/VERSION

@@ -1 +1 @@
-4.0.3
+4.1.0

data/haml-magic-translations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{haml-magic-translations}
-  s.version = "4.0.3"
+  s.version = "4.1.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{2014-05-05}
+  s.date = %q{2014-05-06}
   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 

data/spec/haml/magic_translations_spec.rb

@@ -210,6 +210,7 @@ module Haml
     context 'with I18n as backend' do
       before(:each) do
         Haml::MagicTranslations.enable :i18n
+        I18n.config.enforce_available_locales = false
         I18n.locale = :pl
         I18n.load_path += Dir[File.join(File.dirname(__FILE__), "../locales/*.po")]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml-magic-translations
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -162,9 +162,7 @@ files:
 - init.rb
 - lib/haml-magic-translations.rb
 - lib/haml/magic_translations.rb
-- lib/haml/magic_translations/tasks.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

data/lib/haml/magic_translations/tasks.rb

@@ -1,83 +0,0 @@
-# -*- coding: UTF-8 -*-
-
-require 'rake'
-require 'rake/tasklib'
-require 'gettext'
-require 'gettext/tools'
-require 'gettext/tools/xgettext'
-
-require 'haml/magic_translations/xgettext/haml_parser'
-
-module Haml::MagicTranslations::Tasks # :nodoc:
-  # Rake task to generate and update PO files for a project using
-  # Haml::MagicTranslations
-  #
-  # === Example
-  #
-  # Rakefile excerpt:
-  #
-  #   Haml::MagicTranslations::Tasks::UpdatePoFiles.new do |t|
-  #     t.text_domain = 'my_project'
-  #     t.files = Dir.glob("views/**/*.{rb,haml}") << "lib/my_project.rb"
-  #     t.app_version = 'my_project 0.1'
-  #   end
-  #
-  # Updating PO files in the ++po++ directory will be done by issuing:
-  #
-  #   rake update_pofiles
-  #
-  class UpdatePoFiles < ::Rake::TaskLib
-    # The name of the task
-    attr_accessor :name
-
-    # the textdomain name (see GetText.update_pofiles)
-    attr_accessor :text_domain
-
-    # an Array of target files, that should be parsed for messages
-    attr_accessor :files
-
-    # the application information which appears "Project-Id-Version: #app_version" in the pot/po-files
-    attr_accessor :app_version
-
-    # update files only for one language - the language specified by this option
-    attr_accessor :lang
-
-    # the root directory of po-files
-    attr_accessor :po_root
-
-    # an array with the options, passed through to the gnu msgmerge tool
-    #
-    # Symbols are automatically translated to options with dashes,
-    # example: ++[:no_wrap, :no_fuzzy_matching, :sort_output]++ translated to
-    # ++--no-fuzzy-matching --sort-output++.
-    attr_accessor :msgmerge
-
-    # true to show verbose messages. default is false
-    attr_accessor :verbose
-
-    def initialize(name = :update_pofiles)
-      @name = name
-
-      yield self if block_given?
-
-      define
-    end
-
-  protected
-
-    def define
-      desc "Update PO files"
-      task(name) do
-        [ :text_domain, :files, :app_version ].each do |opt|
-          abort "`#{opt}` needs to be set." if send(opt).nil?
-        end
-        options = {}
-        [ :lang, :po_root, :verbose ].each do |opt|
-          options[opt] = send(opt) if send(opt)
-        end
-        GetText::Tools::XGetText.add_parser(Haml::MagicTranslations::XGetText::HamlParser)
-        GetText.update_pofiles(text_domain, files, app_version, options)
-      end
-    end
-  end
-end

data/spec/haml/magic_translations/tasks_spec.rb

@@ -1,105 +0,0 @@
-# -*- coding: UTF-8 -*-
-
-require 'spec_helper'
-require 'haml/magic_translations/tasks'
-require 'gettext/tools/xgettext'
-
-module Haml::MagicTranslations::Tasks
-  describe UpdatePoFiles do
-    before do
-      ::Rake.application.clear
-    end
-
-    def run
-      ::Rake.application.tasks[0].invoke
-    end
-
-    context 'with text_domain is not set' do
-      let(:task) { UpdatePoFiles.new }
-      before do
-        task.files = [ 'test' ]
-        task.app_version = 'test 1.0'
-        # silence abort message
-        STDERR.stub(:write)
-      end
-      it 'should abort' do
-        expect { run }.to raise_error(SystemExit)
-      end
-    end
-
-    context 'with files is not set' do
-      let(:task) { UpdatePoFiles.new }
-      before do
-        task.text_domain = 'test'
-        task.app_version = 'test 1.0'
-        # silence abort message
-        STDERR.stub(:write)
-      end
-      it 'should abort' do
-        expect { run }.to raise_error(SystemExit)
-      end
-    end
-
-    context 'with app_version is not set' do
-      let(:task) { UpdatePoFiles.new }
-      before do
-        task.text_domain = 'test'
-        task.files = [ 'test' ]
-        # silence abort message
-        STDERR.stub(:write)
-      end
-      it 'should abort' do
-        expect { run }.to raise_error(SystemExit)
-      end
-    end
-
-    context 'with text_domain, files and app_version set' do
-      let (:task) { UpdatePoFiles.new }
-      before(:each) do
-        task.text_domain = 'test'
-        task.files = [ 'test' ]
-        task.app_version = 'test 1.0'
-      end
-      it 'should call update_pofiles' do
-        expect(GetText).to receive(:update_pofiles).with(
-          task.text_domain, task.files, task.app_version, {})
-        run
-      end
-      it 'should add a parser for ".haml" files to XGetText' do
-        allow(GetText).to receive(:update_pofiles)
-        expect(GetText::Tools::XGetText).to receive(:add_parser) do |haml_parser|
-          expect(haml_parser).to respond_to(:parse)
-          expect(haml_parser).to be_a_target('example.haml')
-        end
-        run
-      end
-      context 'with lang set' do
-        it 'should pass lang in options' do
-          task.lang = 'pl'
-          allow(GetText).to receive(:update_pofiles).with(
-            task.text_domain, task.files, task.app_version,
-            hash_including(:lang => task.lang))
-          run
-        end
-      end
-      context 'with po_root set' do
-        it 'should pass po_root in options' do
-          task.po_root = 'test/po'
-          expect(GetText).to receive(:update_pofiles).with(
-            task.text_domain, task.files, task.app_version,
-            hash_including(:po_root => task.po_root))
-          run
-        end
-      end
-      context 'with verbose set' do
-        it 'should pass verbose in options' do
-          task.verbose = true
-          expect(GetText).to receive(:update_pofiles).with(
-            task.text_domain, task.files, task.app_version,
-            hash_including(:verbose => task.verbose))
-          run
-        end
-      end
-    end
-  end
-end