gettext_i18n_rails 0.7.2 → 0.8.0

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - rbx

data/Gemfile

@@ -5,7 +5,6 @@ gem 'appraisal'
 gem 'bump'
 gem 'gettext'
 gem 'haml'
-gem 'hamlet'
 gem 'rails'
 gem 'rake'
 gem 'ruby_parser', '~> 2.3' # 3 breaks haml/slim parsing

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gettext_i18n_rails (0.7.2)
+    gettext_i18n_rails (0.8.0)
       fast_gettext (>= 0.4.8)
 
 GEM
@@ -46,8 +46,6 @@ GEM
     gettext (2.3.3)
       locale
     haml (3.1.7)
-    hamlet (0.5.0.1)
-      slim (~> 1.0.0)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
@@ -121,7 +119,6 @@ DEPENDENCIES
   gettext
   gettext_i18n_rails!
   haml
-  hamlet
   rails
   rake
   rspec

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/slim/hamlet files (does not support ruby 1.9 syntax)
+Add `ruby_parser` if you want to find translations inside haml/slim files (does not support ruby 1.9 syntax)
 
 
     # Gemfile
@@ -233,4 +233,6 @@ If want to use your .PO files on client side javascript you should have a look a
 
 [Michael Grosser](http://grosser.it)<br/>
 grosser.michael@gmail.com<br/>
-License: MIT
+License: MIT<br/>
+[![Build Status](https://travis-ci.org/grosser/gettext_i18n_rails.png)](https://travis-ci.org/grosser/gettext_i18n_rails)
+

data/gemfiles/rails.2.3.gemfile

@@ -3,14 +3,14 @@
 source :rubygems
 
 gem "appraisal"
-gem "haml"
-gem "slim"
-gem "hamlet"
-gem "ruby_parser", "~> 2.3"
+gem "bump"
 gem "gettext"
-gem "sqlite3"
+gem "haml"
 gem "rake"
+gem "ruby_parser", "~> 2.3"
 gem "rspec"
+gem "slim"
+gem "sqlite3"
 gem "rails", "~>2.3.0"
 
 gemspec :path=>"../"

data/gemfiles/rails.2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.7.1)
+    gettext_i18n_rails (0.7.2)
       fast_gettext (>= 0.4.8)
 
 GEM
@@ -20,13 +20,12 @@ GEM
     appraisal (0.5.1)
       bundler
       rake
+    bump (0.3.5)
     diff-lcs (1.1.3)
     fast_gettext (0.6.11)
     gettext (2.3.3)
       locale
     haml (3.1.7)
-    hamlet (0.5.0.1)
-      slim (~> 1.0.0)
     locale (2.0.8)
     rack (1.1.3)
     rails (2.3.14)
@@ -60,10 +59,10 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  bump
   gettext
   gettext_i18n_rails!
   haml
-  hamlet
   rails (~> 2.3.0)
   rake
   rspec

data/gemfiles/rails.3.0.gemfile

@@ -3,14 +3,14 @@
 source :rubygems
 
 gem "appraisal"
-gem "haml"
-gem "slim"
-gem "hamlet"
-gem "ruby_parser", "~> 2.3"
+gem "bump"
 gem "gettext"
-gem "sqlite3"
+gem "haml"
 gem "rake"
+gem "ruby_parser", "~> 2.3"
 gem "rspec"
+gem "slim"
+gem "sqlite3"
 gem "rails", "~>3.0.0"
 
 gemspec :path=>"../"

data/gemfiles/rails.3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.7.1)
+    gettext_i18n_rails (0.7.2)
       fast_gettext (>= 0.4.8)
 
 GEM
@@ -39,6 +39,7 @@ GEM
       rake
     arel (2.0.10)
     builder (2.1.2)
+    bump (0.3.5)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -46,8 +47,6 @@ GEM
     gettext (2.3.3)
       locale
     haml (3.1.7)
-    hamlet (0.5.0.1)
-      slim (~> 1.0.0)
     i18n (0.5.0)
     json (1.7.5)
     locale (2.0.8)
@@ -108,10 +107,10 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  bump
   gettext
   gettext_i18n_rails!
   haml
-  hamlet
   rails (~> 3.0.0)
   rake
   rspec

data/gemfiles/rails.3.1.gemfile

@@ -3,14 +3,14 @@
 source :rubygems
 
 gem "appraisal"
-gem "haml"
-gem "slim"
-gem "hamlet"
-gem "ruby_parser", "~> 2.3"
+gem "bump"
 gem "gettext"
-gem "sqlite3"
+gem "haml"
 gem "rake"
+gem "ruby_parser", "~> 2.3"
 gem "rspec"
+gem "slim"
+gem "sqlite3"
 gem "rails", "~>3.1.0"
 
 gemspec :path=>"../"

data/gemfiles/rails.3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.7.1)
+    gettext_i18n_rails (0.7.2)
       fast_gettext (>= 0.4.8)
 
 GEM
@@ -40,14 +40,13 @@ GEM
       rake
     arel (2.2.3)
     builder (3.0.4)
+    bump (0.3.5)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     fast_gettext (0.6.11)
     gettext (2.3.3)
       locale
     haml (3.1.7)
-    hamlet (0.5.0.1)
-      slim (~> 1.0.0)
     hike (1.2.1)
     i18n (0.6.1)
     json (1.7.5)
@@ -118,10 +117,10 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  bump
   gettext
   gettext_i18n_rails!
   haml
-  hamlet
   rails (~> 3.1.0)
   rake
   rspec

data/gemfiles/rails.3.2.gemfile

@@ -3,14 +3,14 @@
 source :rubygems
 
 gem "appraisal"
-gem "haml"
-gem "slim"
-gem "hamlet"
-gem "ruby_parser", "~> 2.3"
+gem "bump"
 gem "gettext"
-gem "sqlite3"
+gem "haml"
 gem "rake"
+gem "ruby_parser", "~> 2.3"
 gem "rspec"
+gem "slim"
+gem "sqlite3"
 gem "rails", "~>3.2.0"
 
 gemspec :path=>"../"

data/gemfiles/rails.3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/gettext_i18n_rails
   specs:
-    gettext_i18n_rails (0.7.1)
+    gettext_i18n_rails (0.7.2)
       fast_gettext (>= 0.4.8)
 
 GEM
@@ -39,14 +39,13 @@ GEM
       rake
     arel (3.0.2)
     builder (3.0.4)
+    bump (0.3.5)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     fast_gettext (0.6.11)
     gettext (2.3.3)
       locale
     haml (3.1.7)
-    hamlet (0.5.0.1)
-      slim (~> 1.0.0)
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
@@ -116,10 +115,10 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  bump
   gettext
   gettext_i18n_rails!
   haml
-  hamlet
   rails (~> 3.2.0)
   rake
   rspec

data/lib/gettext_i18n_rails/tasks.rb

@@ -16,7 +16,6 @@ namespace :gettext do
     $LOAD_PATH << File.join(File.dirname(__FILE__),'..','..','lib') # needed when installed as plugin
 
     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

data/lib/gettext_i18n_rails/version.rb

@@ -1,3 +1,3 @@
 module GettextI18nRails
-  Version = VERSION = '0.7.2'
+  Version = VERSION = '0.8.0'
 end

data/spec/gettext_i18n_rails/backend_spec.rb

@@ -53,7 +53,8 @@ describe GettextI18nRails::Backend do
 
     it "passes non-gettext keys to default backend" do
       subject.backend.should_receive(:translate).with('xx', 'c', {}).and_return 'd'
-      FastGettext.should_receive(:current_repository).and_return 'a'=>'b'
+      # TODO track down why this is called 3 times on 1.8 (only 1 time on 1.9)
+      FastGettext.stub(:current_repository).and_return 'a'=>'b'
       subject.translate('xx', 'c', {}).should == 'd'
     end
 

metadata

@@ -1,39 +1,49 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: gettext_i18n_rails
-version: !ruby/object:Gem::Version
-  version: 0.7.2
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
+  segments: 
+  - 0
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
-authors:
+authors: 
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-10 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: fast_gettext
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 4
+        - 8
         version: 0.4.8
   type: :runtime
+  requirement: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.4.8
 description: 
 email: michael@grosser.it
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
+- .travis.yml
 - Appraisals
 - Gemfile
 - Gemfile.lock
@@ -65,7 +75,6 @@ files:
 - lib/gettext_i18n_rails/base_parser.rb
 - lib/gettext_i18n_rails/gettext_hooks.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
@@ -81,41 +90,43 @@ 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/model_attributes_finder_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:
+licenses: 
 - MIT
 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1915795330397940793
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1915795330397940793
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple FastGettext Rails integration.
 test_files: []
+

data/lib/gettext_i18n_rails/hamlet_parser.rb

@@ -1,15 +0,0 @@
-require 'gettext_i18n_rails/base_parser'
-
-module GettextI18nRails
-  class HamletParser < BaseParser
-    def self.extension
-      "hamlet"
-    end
-
-    def self.convert_to_code(text)
-      Hamlet::Engine.new.call(text)
-    end
-  end
-end
-
-GettextI18nRails::GettextHooks.add_parser GettextI18nRails::HamletParser

data/spec/gettext_i18n_rails/hamlet_parser_spec.rb

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