air18n 0.4.7 → 0.4.8

data/lib/air18n/phrase_translation.rb

@@ -707,9 +707,16 @@ module Air18n
 
     def self.detect_variables(search_in)
       case search_in
-      when String then search_in.scan(/\{\{(\w+)\}\}/).flatten + search_in.scan(/\%\{(\w+)\}/).flatten
-      when Array then search_in.inject(Set[]) { |carry, item| carry + detect_variables(item) }
-      when Hash then search_in.values.inject(Set[]) { |carry, item| carry + detect_variables(item) }
+      when String
+        search_in.scan(/\{\{(\w+)\}\}/).flatten +
+          search_in.scan(/\%\{(\w+)\}/).flatten +
+          search_in.scan(/\%(?:\d\$)?(?:[0\.]\d)?[dfsu@]/).flatten
+
+      when Array
+        search_in.inject(Set[]) { |carry, item| carry + detect_variables(item) }
+
+      when Hash
+        search_in.values.inject(Set[]) { |carry, item| carry + detect_variables(item) }
       else []
       end
     end

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.4.7"
+  VERSION = "0.4.8"
 end

data/spec/lib/air18n/phrase_translation_spec.rb

@@ -69,6 +69,28 @@ describe Air18n::PhraseTranslation do
       third_translation.previous_translation.value.should == "second translation"
   end
 
+  context 'detect_variables' do
+    it 'should detect ruby variables' do
+      Air18n::PhraseTranslation.detect_variables('This is a %{variable} %{yo}.').
+        should == ['variable', 'yo']
+    end
+
+    it 'should detect Android variables' do
+      Air18n::PhraseTranslation.detect_variables('hi %s %1$s %2$s %3$d %4$02d there').
+        should == ['%s', '%1$s', '%2$s', '%3$d', '%4$02d']
+    end
+
+    it 'should detect iPhone variables' do
+      Air18n::PhraseTranslation.detect_variables('hi %@ %u %d %.2f %1$@ %2$u there').
+        should == ['%@', '%u', '%d', '%.2f', '%1$@', '%2$u']
+    end
+
+    it 'should not detect non-variables' do
+      Air18n::PhraseTranslation.detect_variables('I am 45% sorry .for that.').
+        should be_empty
+    end
+  end
+
   context 'validations' do
     it 'Should check maximum length' do
       translation = FactoryGirl.create(:phrase_translation, :key => 'facebook description maxlength:10', :value => 'short')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n