gettext_i18n_rails 0.4.5 → 0.4.6

data/Readme.md

@@ -28,7 +28,7 @@ Setup
 
 ##### Optional:
 Add `gettext` if you want to find translations or build .mo files<br/>
-Add `ruby_parser` if you want to find translations inside haml files
+Add `ruby_parser` if you want to find translations inside haml/slim/hamlet files (does not support ruby 1.9 syntax)
 
 
     # Gemfile

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/gettext_i18n_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gettext_i18n_rails"
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = "2012-03-12"
+  s.date = "2012-04-05"
   s.email = "grosser.michael@gmail.com"
   s.files = [
     "Gemfile",
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
     "lib/gettext_i18n_rails/action_controller.rb",
     "lib/gettext_i18n_rails/active_record.rb",
     "lib/gettext_i18n_rails/backend.rb",
+    "lib/gettext_i18n_rails/base_parser.rb",
     "lib/gettext_i18n_rails/haml_parser.rb",
     "lib/gettext_i18n_rails/hamlet_parser.rb",
     "lib/gettext_i18n_rails/html_safe_translations.rb",

data/lib/gettext_i18n_rails/base_parser.rb

@@ -0,0 +1,41 @@
+require 'gettext/utils'
+begin
+  require 'gettext/tools/rgettext'
+rescue LoadError #version prior to 2.0
+  require 'gettext/rgettext'
+end
+
+module GettextI18nRails
+  class BaseParser
+    def self.target?(file)
+      File.extname(file) == ".#{extension}"
+    end
+
+    def self.parse(file, msgids = [])
+      return msgids unless load_library
+      code = convert_to_code(File.read(file))
+      RubyGettextExtractor.parse_string(code, file, msgids)
+    rescue Racc::ParseError => e
+      $stderr.puts "file ignored: ruby_parser cannot read #{extension} files with 1.9 syntax --- (#{e.message})"
+      return msgids
+    end
+
+    def self.load_library
+      return true if @library_loaded
+
+      begin
+        require "#{::Rails.root.to_s}/vendor/plugins/#{extension}/lib/#{extension}"
+      rescue LoadError
+        begin
+          require extension # From gem
+        rescue LoadError
+          puts "A #{extension} file was found, but #{extension} library could not be found, so nothing will be parsed..."
+          return false
+        end
+      end
+
+      require 'gettext_i18n_rails/ruby_gettext_extractor'
+      @library_loaded = true
+    end
+  end
+end

data/lib/gettext_i18n_rails/haml_parser.rb

@@ -1,43 +1,15 @@
-require 'gettext/utils'
-begin
-  require 'gettext/tools/rgettext'
-rescue LoadError #version prior to 2.0
-  require 'gettext/rgettext'
-end
+require 'gettext_i18n_rails/base_parser'
 
 module GettextI18nRails
-  module HamlParser
-    module_function
-
-    def target?(file)
-      File.extname(file) == '.haml'
-    end
-
-    def parse(file, msgids = [])
-      return msgids unless prepare_haml_parsing
-      text = File.read(file)
-      code = Haml::Engine.new(text).precompiled()
-      RubyGettextExtractor.parse_string(code, file, msgids)
+  class HamlParser < BaseParser
+    def self.extension
+      "haml"
     end
 
-    def prepare_haml_parsing
-      return true if @haml_loaded
-
-      begin
-        require "#{::Rails.root.to_s}/vendor/plugins/haml/lib/haml"
-      rescue LoadError
-        begin
-          require 'haml'  # From gem
-        rescue LoadError
-          puts "A haml file was found, but haml library could not be found, so nothing will be parsed..."
-          return false
-        end
-      end
-
-      require 'gettext_i18n_rails/ruby_gettext_extractor'
-      @haml_loaded = true
+    def self.convert_to_code(text)
+      Haml::Engine.new(text).precompiled()
     end
   end
 end
 
-GetText::RGetText.add_parser(GettextI18nRails::HamlParser)
+GetText::RGetText.add_parser(GettextI18nRails::HamlParser)

data/lib/gettext_i18n_rails/hamlet_parser.rb

@@ -1,35 +1,13 @@
-require 'gettext/tools'
-begin
-  require 'gettext/tools/rgettext'
-rescue LoadError #version prior to 2.0
-  require 'gettext/rgettext'
-end
+require 'gettext_i18n_rails/base_parser'
 
 module GettextI18nRails
-  module HamletParser
-    module_function
-
-    def target?(file)
-      File.extname(file) == '.hamlet'
-    end
-
-    def parse(file, msgids = [])
-      return msgids unless prepare_hamlet_parsing
-      text = File.read(file)
-      code = Hamlet::Engine.new.call(text)
-      RubyGettextExtractor.parse_string(code, file, msgids)
+  class HamletParser < BaseParser
+    def self.extension
+      "hamlet"
     end
 
-    def prepare_hamlet_parsing
-      return true if @hamlet_loaded
-      begin
-        require 'hamlet'
-      rescue LoadError
-        puts "A hamlet file was found, but hamlet library could not be found, so nothing will be parsed..."
-        return false
-      end
-      require 'gettext_i18n_rails/ruby_gettext_extractor'
-      @hamlet_loaded = true
+    def self.convert_to_code(text)
+      Hamlet::Engine.new.call(text)
     end
   end
 end

data/lib/gettext_i18n_rails/slim_parser.rb

@@ -1,35 +1,13 @@
-require 'gettext/tools'
-begin
-  require 'gettext/tools/rgettext'
-rescue LoadError #version prior to 2.0
-  require 'gettext/rgettext'
-end
+require 'gettext_i18n_rails/base_parser'
 
 module GettextI18nRails
-  module SlimParser
-    module_function
-
-    def target?(file)
-      File.extname(file) == '.slim'
-    end
-
-    def parse(file, msgids = [])
-      return msgids unless prepare_slim_parsing
-      text = File.read(file)
-      code = Slim::Engine.new.call(text)
-      RubyGettextExtractor.parse_string(code, file, msgids)
+  class SlimParser < BaseParser
+    def self.extension
+      "slim"
     end
 
-    def prepare_slim_parsing
-      return true if @slim_loaded
-      begin
-        require 'slim'
-      rescue LoadError
-        puts "A slim file was found, but slim library could not be found, so nothing will be parsed..."
-        return false
-      end
-      require 'gettext_i18n_rails/ruby_gettext_extractor'
-      @slim_loaded = true
+    def self.convert_to_code(text)
+      Slim::Engine.new.call(text)
     end
   end
 end

data/spec/gettext_i18n_rails/haml_parser_spec.rb

@@ -23,10 +23,17 @@ describe GettextI18nRails::HamlParser do
       end
     end
 
+    it "ignores 1.9 errors" do
+      with_file '= _("xxxx", x: 1)' do |path|
+        $stderr.should_receive(:puts).with{|x| x =~ /file ignored/ }
+        parser.parse(path, [1]).should == [1]
+      end
+    end
+
     it "does not find messages in text" do
       with_file '_("xxxx")' do |path|
         parser.parse(path, []).should == []
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fast_gettext
-  requirement: &21390020 !ruby/object:Gem::Requirement
+  requirement: &13650380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21390020
+  version_requirements: *13650380
 description: 
 email: grosser.michael@gmail.com
 executables: []
@@ -39,6 +39,7 @@ files:
 - lib/gettext_i18n_rails/action_controller.rb
 - lib/gettext_i18n_rails/active_record.rb
 - lib/gettext_i18n_rails/backend.rb
+- lib/gettext_i18n_rails/base_parser.rb
 - lib/gettext_i18n_rails/haml_parser.rb
 - lib/gettext_i18n_rails/hamlet_parser.rb
 - lib/gettext_i18n_rails/html_safe_translations.rb
@@ -73,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3104048641149797128
+      hash: 846699544332952376
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: