i18n_screwdriver 2.2.0 → 3.0.0

data/lib/i18n_screwdriver/translation.rb

@@ -3,19 +3,30 @@ module I18nScrewdriver
     attr_accessor :text, :options
 
     def self.new(text, options = {}, &block)
-      super(I18n.translate(I18nScrewdriver.for_key(text), options)).tap do |translation|
-        translation.text = text
-        translation.options = options
-        translation.linkify(block.binding, *block.call) if block
+      translation = super(options[:raw] ? text : I18n.translate(I18nScrewdriver.for_key(text), options))
+      translation.text = text
+      translation.options = options
+
+      if block
+        urls = Array(block.call)
+        urls_to_interpolate_count = translation.scan(/<<.+?>>/).count
+        raise ArgumentError, "too few urls specified" if urls.count < urls_to_interpolate_count
+        if urls.count > urls_to_interpolate_count
+          raise ArgumentError, "expected extra url to be a hash intended for variable interpolation" unless urls.last.is_a?(Hash)
+          translation = new(translation % urls.last, :raw => true)
+        end
+        translation.linkify(block.binding, urls)
       end
+
+      translation
     end
 
-    def linkify(binding, *urls)
+    def linkify(binding, urls)
       context = binding ? eval('self', binding) : self
       keep_html_safety do
         gsub!(/<<.+?>>/).each_with_index do |text, index|
           context.instance_eval do
-            link_to text[2..-3], *urls[index]
+            link_to(text[2..-3], *urls[index])
           end
         end
       end

data/lib/i18n_screwdriver/version.rb

@@ -1,4 +1,4 @@
 module I18nScrewdriver
-  VERSION = "2.2.0"
+  VERSION = "3.0.0"
 end
 

metadata

@@ -2,7 +2,7 @@
 name: i18n_screwdriver
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Tobias Miesel
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :development