i18n_screwdriver 8.0 → 8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 985f287225f7ed2e2ca841b194933300f765507e
-  data.tar.gz: 8f4a5a9b52d1e4d816185a245f7ca7eb68273b74
+  metadata.gz: 3bcf4a98f37390d173a9fa6a82f3c595c17c98b4
+  data.tar.gz: 74c3c6b1abf2d63d27c1a081033f782c15af896d
 SHA512:
-  metadata.gz: 066ea43385e0fb9b4a6dbfb837fdc332da787fce9e44f8f5d9d933ec7f521c2fa09d2f8687dcdee6044a2b42e630c733bbe376876ec5189b0c7dfbcddfed7e38
-  data.tar.gz: 72661a41c29c395445c8728c424a0d98c3cf8d5193fb44b4dd57f0b8fe27895a2351c6d81f3dc55dede5fb3a994ce827b88509b3a8a690c4f6a7bbc7244e155a
+  metadata.gz: d92d15d612024f28392ebd6bf74f8951826a53842cb70ff0e2d5aeff5f6cbf5354c7893cb2ee8112179fe0d164fab85428a40299cb59a4cd4c7266963448a31d
+  data.tar.gz: d56782ac7f4b2b693b3cd741dfa9acb4f9a7a13d824159390668dc4186137419bb9768d00dea432c4dee2d7178b73591a51b32918377b788baca9d379350bd5b

data/lib/i18n_screwdriver/rails.rb

@@ -1,4 +1,3 @@
 require 'rails'
 require 'i18n_screwdriver/rails/engine'
 require "i18n_screwdriver/translation"
-

data/lib/i18n_screwdriver/translation.rb

@@ -1,5 +1,7 @@
 module I18nScrewdriver
   class Translation < String
+    Error = Class.new(StandardError)
+
     attr_accessor :text, :options
 
     def self.new(text, options = {}, &block)
@@ -10,17 +12,22 @@ module I18nScrewdriver
       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, "too many urls specified (#{urls.count} <> #{urls_to_interpolate_count})" unless urls.last.is_a?(Hash)
-          translation = new(translation % urls.last, :raw => true)
-        end
+        emit_warning("invalid number of urls specified (#{urls.count} <> #{urls_to_interpolate_count})") unless urls.count == urls_to_interpolate_count
         translation.linkify(block.binding, urls)
       end
 
       translation
     end
 
+    def self.emit_warning(message)
+      raise Error, message unless ::Rails.env.production?
+      ::Rails.logger.warn(%|I18nScrewdriver: #{message}\n#{application_frames(caller).join("\n")}|)
+    end
+
+    def self.application_frames(backtrace)
+      backtrace.select{ |path| path.starts_with?(::Rails.root.to_s) }
+    end
+
     def linkify(binding, urls)
       context = binding ? eval('self', binding) : self
       keep_html_safety do
@@ -42,4 +49,3 @@ module I18nScrewdriver
     end
   end
 end
-

data/lib/i18n_screwdriver/version.rb

@@ -1,3 +1,3 @@
 module I18nScrewdriver
-  VERSION = "8.0"
+  VERSION = "8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_screwdriver
 version: !ruby/object:Gem::Version
-  version: '8.0'
+  version: '8.1'
 platform: ruby
 authors:
 - Tobias Miesel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: i18n_screwdriver
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: make translating with rails i18n fun again