gettext_i18n_rails 0.4.3 → 0.4.4

data/Gemfile

@@ -5,6 +5,7 @@ gem 'fast_gettext'
 group :dev do
   gem 'haml'
   gem 'slim'
+  gem 'hamlet'
   gem 'ruby_parser'
   gem 'gettext'
   gem 'sqlite3', '~>1.3.4'

data/Gemfile.lock

@@ -40,6 +40,8 @@ GEM
       locale (>= 2.0.5)
     git (1.2.5)
     haml (3.1.4)
+    hamlet (0.1)
+      slim (~> 1.0)
     hike (1.2.1)
     i18n (0.6.0)
     jeweler (1.6.4)
@@ -114,6 +116,7 @@ DEPENDENCIES
   fast_gettext
   gettext
   haml
+  hamlet
   jeweler
   rails (~> 3)
   rake

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/gettext_i18n_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gettext_i18n_rails"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = "2012-01-13"
+  s.date = "2012-03-10"
   s.email = "grosser.michael@gmail.com"
   s.files = [
     "Gemfile",
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     "lib/gettext_i18n_rails/active_record.rb",
     "lib/gettext_i18n_rails/backend.rb",
     "lib/gettext_i18n_rails/haml_parser.rb",
+    "lib/gettext_i18n_rails/hamlet_parser.rb",
     "lib/gettext_i18n_rails/html_safe_translations.rb",
     "lib/gettext_i18n_rails/i18n_hacks.rb",
     "lib/gettext_i18n_rails/model_attributes_finder.rb",
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
     "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/hamlet_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",

data/lib/gettext_i18n_rails/hamlet_parser.rb

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

data/lib/gettext_i18n_rails/tasks.rb

@@ -16,6 +16,7 @@ namespace :gettext do
     $LOAD_PATH << File.join(File.dirname(__FILE__),'..','..','lib')
     require 'gettext_i18n_rails/haml_parser'
     require 'gettext_i18n_rails/slim_parser'
+    require 'gettext_i18n_rails/hamlet_parser'
 
 
     if GetText.respond_to? :update_pofiles_org

data/spec/gettext_i18n_rails/hamlet_parser_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+require "gettext_i18n_rails/hamlet_parser"
+
+describe GettextI18nRails::HamletParser do
+  let(:parser){ GettextI18nRails::HamletParser }
+
+  describe "#target?" do
+    it "targets .hamlet" do
+      parser.target?('foo/bar/xxx.hamlet').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/slim_parser_spec.rb

@@ -23,10 +23,18 @@ describe GettextI18nRails::SlimParser do
       end
     end
 
+    xit "can parse 1.9 syntax" do
+      with_file 'div = _("xxxx", foo: :bar)' 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
+end

metadata

@@ -1,45 +1,33 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gettext_i18n_rails
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 0.4.4
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
 platform: ruby
-authors: 
+authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2012-03-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fast_gettext
-  version_requirements: *id001
+  requirement: &20283380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *20283380
 description: 
 email: grosser.michael@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -52,6 +40,7 @@ files:
 - lib/gettext_i18n_rails/active_record.rb
 - lib/gettext_i18n_rails/backend.rb
 - lib/gettext_i18n_rails/haml_parser.rb
+- lib/gettext_i18n_rails/hamlet_parser.rb
 - lib/gettext_i18n_rails/html_safe_translations.rb
 - lib/gettext_i18n_rails/i18n_hacks.rb
 - lib/gettext_i18n_rails/model_attributes_finder.rb
@@ -65,42 +54,36 @@ files:
 - 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/hamlet_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
 homepage: http://github.com/grosser/gettext_i18n_rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3876065388999349156
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Simple FastGettext Rails integration.
 test_files: []
-