air18n 0.1.9 → 0.1.10

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/lib/air18n/xss_detector.rb

@@ -9,7 +9,7 @@ module Air18n
       tags_b = normalize_tags(extract_tags(text_b))
       if has_dubious_escape_characters?(text_a) || has_dubious_escape_characters?(text_b)
         { :safe => false, :reason => 'Backslashes are not allowed' }
-      elsif tags_a != tags_b
+      elsif tags_a.group_by{|t| t} != tags_b.group_by{|t| t}
         { :safe => false, :reason => "HTML tags don't match: #{tags_a.inspect} vs. #{tags_b.inspect}" }
       else
         { :safe => true }

data/make_gem

@@ -1,5 +1,5 @@
 # Run this to push the new version of the gem to rubygems!
-v=0.1.9
+v=0.1.10
 gem build air18n.gemspec
 gem push air18n-${v}.gem
 

data/spec/lib/air18n/phrase_translation_spec.rb

@@ -42,6 +42,17 @@ describe Air18n::PhraseTranslation do
       translation.errors.should include :value
       translation.errors[:value].should include "Translation has 12 characters; maximum length 10 characters."
     end
+
+    it 'Should check variables' do
+      phrase = FactoryGirl.create(:phrase, :key => 'phone_number_not_revealed_time_zone', :value => "Your number won't be revealed. They can only call from 9am to 9pm %{time_zone}.")
+      translation = FactoryGirl.create(:phrase_translation, :phrase => phrase, :key => 'phone_number_not_revealed_time_zone', :value => '您的電話號碼將不會被透露。他們只能在上午9時至晚上9時%{time_zone}這段時間給您致電')
+      validated = translation.save
+      validated.should == true
+      translation.value = '您的電話號碼將不會被透露。他們只能在上午9時至晚上9時%{time_zon}這段時間給您致電'
+      translation.save.should be_false
+      translation.errors.should include :value
+      translation.errors[:value].should include "Var %{time_zone} missing from translation; Var %{time_zon} should not be in translation"
+    end
   end
 
   context 'helpers' do

data/spec/lib/air18n/xss_detector_spec.rb

@@ -25,12 +25,20 @@ describe Air18n::XssDetector do
     it "should detect tag mismatches" do
       Air18n::XssDetector::safe?("<tag>", "safe").should == { :safe => false, :reason => "HTML tags don't match: #{['<tag>'].inspect} vs. #{[].inspect}" }
       Air18n::XssDetector::safe?("safe", "<tag>").should == { :safe => false, :reason => "HTML tags don't match: #{[].inspect} vs. #{['<tag>'].inspect}" }
+      Air18n::XssDetector::safe?("<b>safe</b>", "<b>safe</b><b>").should == { :safe => false, :reason => "HTML tags don't match: #{['<b>', '</b>'].inspect} vs. #{['<b>', '</b>', '<b>'].inspect}" }
     end
 
     it "should allow quote mismatches in tags" do
       Air18n::XssDetector::safe?("<a href='/help/question/280' target='_blank'>Why is this required?</a>", "<a href='/help/question/280' target='_blank'>...</a>").should == { :safe => true }
       Air18n::XssDetector::safe?("<tag href='hi'>", "<tag href=\"hi\">").should == { :safe => true }
     end
+
+    it "should allow reordering tags" do
+      Air18n::XssDetector::safe?(
+        "<span class='count'>%{count}</span> %{pluralized_review} left in <a href='#listings/search/%{encoded_search}' class='search_link'>%{city}, %{state} %{country}</a>",
+        "in <a href='#listings/search/%{encoded_search}' class='search_link'>%{city}, %{state} %{country}</a> <span class='count'>%{count}</span> %{pluralized_review} left"
+      ).should == { :safe => true }
+    end
   end
 
   describe "extract_tags" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-06 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n