gettext_i18n_rails 0.7.0 → 0.7.1

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (0.7.0)
+    gettext_i18n_rails (0.7.1)
       fast_gettext (>= 0.4.8)
 
 GEM

data/lib/gettext_i18n_rails/base_parser.rb

@@ -1,15 +1,7 @@
+require 'gettext_i18n_rails/gettext_hooks'
+
 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

@@ -1,16 +1,8 @@
 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
+    # shoarter call / maybe the interface changes again ...
+    def self.add_parser(parser)
+      xgettext.add_parser(parser)
     end
 
     def self.xgettext

data/lib/gettext_i18n_rails/haml_parser.rb

@@ -11,3 +11,5 @@ module GettextI18nRails
     end
   end
 end
+
+GettextI18nRails::GettextHooks.add_parser GettextI18nRails::HamlParser

data/lib/gettext_i18n_rails/hamlet_parser.rb

@@ -11,3 +11,5 @@ module GettextI18nRails
     end
   end
 end
+
+GettextI18nRails::GettextHooks.add_parser GettextI18nRails::HamletParser

data/lib/gettext_i18n_rails/slim_parser.rb

@@ -11,3 +11,5 @@ module GettextI18nRails
     end
   end
 end
+
+GettextI18nRails::GettextHooks.add_parser GettextI18nRails::SlimParser

data/lib/gettext_i18n_rails/tasks.rb

@@ -2,7 +2,6 @@ namespace :gettext do
   def load_gettext
     require 'gettext'
     require 'gettext/utils'
-    require 'gettext_i18n_rails/gettext_hooks'
   end
 
   desc "Create mo-files for L10n"
@@ -16,7 +15,9 @@ namespace :gettext do
     load_gettext
     $LOAD_PATH << File.join(File.dirname(__FILE__),'..','..','lib') # needed when installed as plugin
 
-    GettextI18nRails::GettextHooks.add_parsers_to_gettext
+    require "gettext_i18n_rails/haml_parser"
+    require "gettext_i18n_rails/hamlet_parser"
+    require "gettext_i18n_rails/slim_parser"
 
     if GetText.respond_to? :update_pofiles_org
       if defined?(Rails.application)

data/lib/gettext_i18n_rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -63,7 +63,6 @@ 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
@@ -86,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1552868683702405680
+      hash: 4474784702351779304
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -95,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1552868683702405680
+      hash: 4474784702351779304
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/spec/gettext_i18n_rails/gettext_hooks_spec.rb

@@ -1,28 +0,0 @@
-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