gettext_i18n_rails 0.4.0 → 0.4.1

data/Gemfile

@@ -3,6 +3,10 @@ source :rubygems
 gem 'fast_gettext'
 
 group :dev do
+  gem 'haml'
+  gem 'slim'
+  gem 'ruby_parser'
+  gem 'gettext'
   gem 'sqlite3', '~>1.3.4'
   gem 'rails', ENV['RAILS'] || '~>3'
   gem 'rake'

data/Gemfile.lock

@@ -36,13 +36,17 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.7.0)
     fast_gettext (0.5.13)
+    gettext (2.1.0)
+      locale (>= 2.0.5)
     git (1.2.5)
+    haml (3.1.4)
     hike (1.2.1)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    locale (2.0.5)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -84,11 +88,18 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
+    ruby_parser (2.3.1)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.10)
+    slim (1.1.0)
+      temple (~> 0.3.5)
+      tilt (~> 1.3.2)
     sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
+    temple (0.3.5)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -101,8 +112,12 @@ PLATFORMS
 
 DEPENDENCIES
   fast_gettext
+  gettext
+  haml
   jeweler
   rails (~> 3)
   rake
   rspec (~> 2)
+  ruby_parser
+  slim
   sqlite3 (~> 1.3.4)

data/Readme.md

@@ -27,9 +27,13 @@ Setup
     gem 'gettext_i18n_rails'
 
 ##### Optional:
-If you want to find translations or build .mo files
+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
+
+
     # Gemfile
     gem 'gettext', '>=1.9.3', :require => false, :group => :development
+    gem 'ruby_parser', :require => false, :group => :development
 
 #### Rails 2
 
@@ -189,13 +193,13 @@ When you run
 
     rake gettext:find
 
-by default the following files are going to be scanned for translations: {app,lib,config,locale}/**/*.{rb,erb,haml}. If
+by default the following files are going to be scanned for translations: {app,lib,config,locale}/**/*.{rb,erb,haml,slim}. If
 you want to specify a different list, you can redefine files_to_translate in the gettext namespace in a file like
 lib/tasks/gettext.rake:
 
     namespace :gettext do
       def files_to_translate
-        Dir.glob("{app,lib,config,locale}/**/*.{rb,erb,haml,rhtml}")
+        Dir.glob("{app,lib,config,locale}/**/*.{rb,erb,haml,slim,rhtml}")
       end
     end
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/gettext_i18n_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gettext_i18n_rails"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = "2012-01-03"
+  s.date = "2012-01-10"
   s.email = "grosser.michael@gmail.com"
   s.files = [
     "Gemfile",
@@ -29,19 +29,22 @@ Gem::Specification.new do |s|
     "lib/gettext_i18n_rails/model_attributes_finder.rb",
     "lib/gettext_i18n_rails/railtie.rb",
     "lib/gettext_i18n_rails/ruby_gettext_extractor.rb",
+    "lib/gettext_i18n_rails/slim_parser.rb",
     "lib/gettext_i18n_rails/string_interpolate_fix.rb",
     "lib/gettext_i18n_rails/tasks.rb",
     "lib/tasks/gettext_rails_i18n.rake",
     "spec/gettext_i18n_rails/action_controller_spec.rb",
     "spec/gettext_i18n_rails/active_record_spec.rb",
     "spec/gettext_i18n_rails/backend_spec.rb",
+    "spec/gettext_i18n_rails/haml_parser_spec.rb",
+    "spec/gettext_i18n_rails/slim_parser_spec.rb",
     "spec/gettext_i18n_rails/string_interpolate_fix_spec.rb",
     "spec/gettext_i18n_rails_spec.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/grosser/gettext_i18n_rails"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "Simple FastGettext Rails integration."
 
   if s.respond_to? :specification_version then

data/lib/gettext_i18n_rails/haml_parser.rb

@@ -14,18 +14,15 @@ module GettextI18nRails
     end
 
     def parse(file, msgids = [])
-      return msgids unless load_haml
-      require 'gettext_i18n_rails/ruby_gettext_extractor'
-
-      text = IO.readlines(file).join
-
-      haml = Haml::Engine.new(text)
-      code = haml.precompiled
-      return RubyGettextExtractor.parse_string(code, file, msgids)
+      return msgids unless prepare_haml_parsing
+      text = File.read(file)
+      code = Haml::Engine.new(text).precompiled()
+      RubyGettextExtractor.parse_string(code, file, msgids)
     end
 
-    def load_haml
+    def prepare_haml_parsing
       return true if @haml_loaded
+
       begin
         require "#{::Rails.root.to_s}/vendor/plugins/haml/lib/haml"
       rescue LoadError
@@ -36,8 +33,11 @@ module GettextI18nRails
           return false
         end
       end
+
+      require 'gettext_i18n_rails/ruby_gettext_extractor'
       @haml_loaded = true
     end
   end
 end
+
 GetText::RGetText.add_parser(GettextI18nRails::HamlParser)

data/lib/gettext_i18n_rails/slim_parser.rb

@@ -0,0 +1,37 @@
+require 'gettext/tools'
+begin
+  require 'gettext/tools/rgettext'
+rescue LoadError #version prior to 2.0
+  require 'gettext/rgettext'
+end
+
+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)
+    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
+    end
+  end
+end
+
+GetText::RGetText.add_parser(GettextI18nRails::SlimParser)

data/lib/gettext_i18n_rails/tasks.rb

@@ -15,6 +15,7 @@ namespace :gettext do
     load_gettext
     $LOAD_PATH << File.join(File.dirname(__FILE__),'..','..','lib')
     require 'gettext_i18n_rails/haml_parser'
+    require 'gettext_i18n_rails/slim_parser'
 
 
     if GetText.respond_to? :update_pofiles_org
@@ -120,6 +121,6 @@ namespace :gettext do
   end
 
   def files_to_translate
-    Dir.glob("{app,lib,config,#{locale_path}}/**/*.{rb,erb,haml}")
+    Dir.glob("{app,lib,config,#{locale_path}}/**/*.{rb,erb,haml,slim}")
   end
 end

data/spec/gettext_i18n_rails/action_controller_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", File.dirname(__FILE__))
+require "spec_helper"
 
 FastGettext.silence_errors
 

data/spec/gettext_i18n_rails/active_record_spec.rb

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.expand_path("../spec_helper", File.dirname(__FILE__))
+require "spec_helper"
 
 FastGettext.silence_errors
 

data/spec/gettext_i18n_rails/backend_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../spec_helper", File.dirname(__FILE__))
+require "spec_helper"
 
 FastGettext.silence_errors
 

data/spec/gettext_i18n_rails/haml_parser_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+require "gettext_i18n_rails/haml_parser"
+
+describe GettextI18nRails::HamlParser do
+  let(:parser){ GettextI18nRails::HamlParser }
+
+  describe "#target?" do
+    it "targets .haml" do
+      parser.target?('foo/bar/xxx.haml').should == true
+    end
+
+    it "does not target anything else" do
+      parser.target?('foo/bar/xxx.erb').should == false
+    end
+  end
+
+  describe "#parse" do
+    it "finds messages in haml" do
+      with_file '= _("xxxx")' do |path|
+        parser.parse(path, []).should == [
+          ["xxxx", "#{path}:1"]
+        ]
+      end
+    end
+
+    it "does not find messages in text" do
+      with_file '_("xxxx")' do |path|
+        parser.parse(path, []).should == []
+      end
+    end
+  end
+end

data/spec/gettext_i18n_rails/slim_parser_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+require "gettext_i18n_rails/slim_parser"
+
+describe GettextI18nRails::SlimParser do
+  let(:parser){ GettextI18nRails::SlimParser }
+
+  describe "#target?" do
+    it "targets .slim" do
+      parser.target?('foo/bar/xxx.slim').should == true
+    end
+
+    it "does not target anything else" do
+      parser.target?('foo/bar/xxx.erb').should == false
+    end
+  end
+
+  describe "#parse" do
+    it "finds messages in slim" do
+      with_file 'div = _("xxxx")' do |path|
+        parser.parse(path, []).should == [
+          ["xxxx", "#{path}:1"]
+        ]
+      end
+    end
+
+    it "does not find messages in text" do
+      with_file 'div _("xxxx")' do |path|
+        parser.parse(path, []).should == []
+      end
+    end
+  end
+end

data/spec/gettext_i18n_rails/string_interpolate_fix_spec.rb

@@ -1,5 +1,5 @@
-require File.expand_path("../spec_helper", File.dirname(__FILE__))
-require 'gettext_i18n_rails/string_interpolate_fix'
+require "spec_helper"
+require "gettext_i18n_rails/string_interpolate_fix"
 
 describe "String#%" do
   it "is not safe if it was not safe" do

data/spec/gettext_i18n_rails_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("spec_helper", File.dirname(__FILE__))
+require "spec_helper"
 
 FastGettext.silence_errors
 

data/spec/spec_helper.rb

@@ -2,9 +2,38 @@ require 'rubygems'
 
 $LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
 
+require 'tempfile'
 require 'active_support'
 require 'active_record'
 require 'action_controller'
 require 'action_mailer'
 require 'fast_gettext'
 require 'gettext_i18n_rails'
+
+begin
+  Gem.all_load_paths
+rescue
+  puts "Fixing Gem.all_load_paths"
+  module Gem;def self.all_load_paths;[];end;end
+end
+
+module Rails
+  def self.root
+    File.dirname(__FILE__)
+  end
+
+  module VERSION
+    MAJOR = 3
+    MINOR = 1
+    PATCH = 0
+    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
+  end
+end
+
+def with_file(content)
+  Tempfile.open('gettext_i18n_rails_specs') do |f|
+    f.write(content)
+    f.close
+    yield f.path
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gettext_i18n_rails
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-03 00:00:00 Z
+date: 2012-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,10 +29,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
-  type: :runtime
   name: fast_gettext
+  version_requirements: *id001
 description: 
 email: grosser.michael@gmail.com
 executables: []
@@ -57,12 +57,15 @@ files:
 - lib/gettext_i18n_rails/model_attributes_finder.rb
 - lib/gettext_i18n_rails/railtie.rb
 - lib/gettext_i18n_rails/ruby_gettext_extractor.rb
+- lib/gettext_i18n_rails/slim_parser.rb
 - lib/gettext_i18n_rails/string_interpolate_fix.rb
 - lib/gettext_i18n_rails/tasks.rb
 - lib/tasks/gettext_rails_i18n.rake
 - spec/gettext_i18n_rails/action_controller_spec.rb
 - spec/gettext_i18n_rails/active_record_spec.rb
 - spec/gettext_i18n_rails/backend_spec.rb
+- spec/gettext_i18n_rails/haml_parser_spec.rb
+- spec/gettext_i18n_rails/slim_parser_spec.rb
 - spec/gettext_i18n_rails/string_interpolate_fix_spec.rb
 - spec/gettext_i18n_rails_spec.rb
 - spec/spec_helper.rb
@@ -95,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Simple FastGettext Rails integration.