translatr 0.1.1 → 0.1.2

data/lib/translatr/merger.rb

@@ -66,7 +66,7 @@ module Translatr
       vars = text_string.gsub(/%\{(\w+)\}/).to_a
       return nil if vars.empty?
       return [vars[0]] if vars.size == 1
-      vars
+      vars.uniq
     end
 
     def matching_variables?(target_string, source_string)

data/lib/translatr/version.rb

@@ -1,3 +1,3 @@
 module Translatr
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/translatr/merger_spec.rb

@@ -112,6 +112,12 @@ module Translatr
           merger.merge.should == { :foo => "target", :bar => "source %{baz}" }
         end
 
+        it "works with entries where variables match but their numbers differ" do
+          merger.target = { :foo => "target %{bar}", :bar => "target %{baz} %{baz}" }
+          merger.source = { :foo => "source %{bar} %{bar}", :bar => "source %{baz}"}
+          merger.merge.should == { :foo => "source %{bar} %{bar}", :bar => "source %{baz}" }
+        end
+
         it "ignores entries with markup when target has none and key doesn't end with '_html'"
       end
 
@@ -127,6 +133,10 @@ module Translatr
         it "gives a list of variables in a string" do
           merger.variables_in("foo %{bar}, %{baz}").should == ["%{bar}", "%{baz}"]
         end
+
+        it "gives duplicate variables only once" do
+          merger.variables_in("foo %{bar}, %{bar}").should == ["%{bar}"]
+        end
       end
 
       describe "#store" do

metadata

@@ -2,7 +2,7 @@
 name: translatr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Garret Alfert