i15r 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/i15r.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{i15r}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Balint Erdi"]

data/lib/i15r/base.rb

@@ -10,7 +10,7 @@ module I15R
     def self.get_i18n_message_string(text, prefix)
       #TODO: downcase does not work properly for accented chars, like 'Ú'
       #TODO: [:punct:] would be nice but it includes _ which we don't want to remove
-      key = text.strip.downcase.gsub(/[\s]/, '_').gsub(/[!?.,:"';()]/, '')
+      key = text.strip.downcase.gsub(/[\s\/]+/, '_').gsub(/[!?.,:"';()]/, '')
       indent = ""
       (0..prefix.split(".").size).each { |i| indent = "  " + indent }
       # silenced_if_testing do

data/lib/i15r/pattern_matchers/haml/tag_content_matcher.rb

@@ -34,7 +34,7 @@ module I15R
         register_matcher :match_haml_explicit_tag_content
 
         def self.match_haml_tag_content_just_text_on_line
-          patt = /^(\s*)([^.#!%\s][[:alpha:][:upper:]\s\d\!\-\.\?]+)$/
+          patt = /^(\s*)([^.#!%=\/\s][[:alpha:][:upper:]\s\d\!\-\.\?\/]+)$/
           matches(:haml) do |text, prefix|
             if m = patt.match(text)
               i18n_string = I15R::Base.get_i18n_message_string(m[2], prefix)

data/spec/haml/tag_content_matcher_spec.rb

@@ -21,6 +21,12 @@ describe I15R::PatternMatchers::Haml::TagContentMatcher do
     I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == i18ned
   end
 
+  it "should replace /-s with an _" do
+    plain = %(%p Do not close/reload while loading)
+    i18ned = %(%p= I18n.t("users.new.do_not_close_reload_while_loading"))
+    I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == i18ned
+  end
+
   it "should not replace an implict div with an assigned class" do
     plain = %(        .field)
     I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == plain
@@ -43,6 +49,16 @@ describe I15R::PatternMatchers::Haml::TagContentMatcher do
     I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == i18ned
   end
 
+  it "should not convert Ruby code to be evaluated" do
+    plain = "= yield"
+    I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == plain
+  end
+
+  it "should not convert comments" do
+    plain = "/ Do not remove the next line"
+    I15R::PatternMatchers::Haml::TagContentMatcher.run(plain, "users.new").should == plain
+  end
+
   describe "when text has non-english characters" do
     it "should replace a tag's content where the tag is an implicit div" do
       plain = %(#form_head Türkçe)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: i15r
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Balint Erdi