i18nliner 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2db12d6bdf711b5e95c9a5d4ad41b9f89099090bcb3be1555d0487beaf643cb
-  data.tar.gz: c8f147f4df24fca4cd39f5960d168431947ef2b3963a67b771394ff86a5d5cdc
+  metadata.gz: 49a54d15655300760797d011db9521a123b23892478badcee8cfab3c7c890e25
+  data.tar.gz: 97409ad1106e9ed7c68567038bca41495e204545fce5b605b2b30e591072c399
 SHA512:
-  metadata.gz: 668686f434bf422b7eea80e953274702946f3698c56f3a5d3f74fb8f679230d52babb1454a7722c4df3c4dcbe48fed09a1b0dc662bc5fab744f8b14ce618c916
-  data.tar.gz: a953fff2982e2266056f065c0375b5c5631d005092bdd6f5a07f631e83eda27d3e8bae1a2cf5d21f34f734950b42654cad8396262c53faa507731045b54e089e
+  metadata.gz: d81cc7123036ef5a7f19224d2400b384f4049bee9be1ea9a99d40b12ea2db8739f547861e93bff7c51f7639c1877c0ae672a850325e85a59817ba678b455d31a
+  data.tar.gz: 0b465bc13a850bd61ffdbc2459d698f55719cc5cc5cab1bd55ca8e8bfabba8a12a7214def2c95a0fd682b50d4fd4af03092fd4815702081524f1fe92e468a18c

data/lib/i18nliner/extensions/core.rb

@@ -18,9 +18,19 @@ module I18nliner
 
         wrappers = options.delete(:wrappers) || options.delete(:wrapper)
         result = super(key, options)
+
+        # In rails 6.1+ views, sometimes an Object is used for the default, and that object needs to remain
+        # an object or it won't be recognized if it comes back as a string
+        return result if result.nil? || result.instance_of?(Object)
+
+        # If you are actually using nonprintable characters in your source string, you should feel ashamed
+        result = result.gsub("\\\\", "\uE124").gsub("\\*", "\uE123")
         if wrappers
           result = apply_wrappers(result, wrappers)
         end
+        was_html_safe = result.html_safe?
+        result = result.gsub("\uE123", '*').gsub("\uE124", "\\")
+        result = result.html_safe if was_html_safe
 
         result
       rescue ArgumentError
@@ -58,10 +68,15 @@ module I18nliner
           wrappers = Array(wrappers)
           wrappers = Hash[wrappers.each_with_index.map{ |w, i| ['*' * (1 + i), w]}]
         end
+        # If you are actually using nonprintable characters in your source string, you should feel ashamed
+        string.gsub!("\\\\", 26.chr)
+        string.gsub!("\\*", 27.chr)
         wrappers.sort_by{ |k, v| -k.length }.each do |k, v|
           pattern = pattern_for(k)
           string.gsub!(pattern, v)
         end
+        string.gsub!(27.chr, '*')
+        string.gsub!(26.chr, "\\")
         string.html_safe
       end
 

data/lib/i18nliner/processors/ruby_processor.rb

@@ -23,7 +23,7 @@ module I18nliner
         File.read(file)
       end
 
-      if defined?(::Rails) && ::Rails.version > '4'
+      if defined?(::Rails)
         CONTROLLER_PATH = %r{\A(.*/)?app/controllers/(.*)_controller\.rb\z}
         def scope_for(path)
           scope = path.dup

data/lib/i18nliner/reserved_keys.rb

@@ -0,0 +1,4 @@
+keys = I18n::RESERVED_KEYS.dup
+keys << :i18nliner_scope << :i18nliner_inferred_key
+I18n.send(:remove_const, :RESERVED_KEYS)
+I18n.const_set(:RESERVED_KEYS, keys)

data/lib/i18nliner.rb

@@ -3,6 +3,6 @@ require 'i18nliner/base'
 
 require 'i18nliner/extensions/core'
 I18n.send :extend, I18nliner::Extensions::Core
-I18n::RESERVED_KEYS << :i18nliner_scope << :i18nliner_inferred_key
+require 'i18nliner/reserved_keys'
 
 require 'i18nliner/railtie' if defined?(Rails)

data/spec/extensions/core_spec.rb

@@ -77,6 +77,11 @@ describe I18nliner::Extensions::Core do
         expect(i18n.translate("*bacon* > narwhals", :wrappers => ['<b>\1</b>'])).
           to eq "<b>bacon</b> &gt; narwhals"
       end
+
+      it "should allow escaping asterisks and backslashes" do
+        result = i18n.translate("Hello \\\\*b\\*b*.", :wrapper => '<b>\1</b>')
+        expect(result).to eq 'Hello \<b>b*b</b>.'
+      end
     end
   end
 

data/spec/processors/ruby_processor_spec.rb

@@ -9,7 +9,7 @@ describe I18nliner::Processors::RubyProcessor do
   end
 
   describe "#scope_for" do
-    if defined?(::Rails) && ::Rails.version > '4'
+    if defined?(::Rails)
       context "with a controller" do
         subject { @processor.scope_for("app/controllers/foos/bars_controller.rb") }
 

data/spec/reserved_keys_spec.rb

@@ -0,0 +1,8 @@
+require 'i18nliner/reserved_keys'
+
+describe I18n do
+  it "adds new reserved keys" do
+    expect(I18n::RESERVED_KEYS).to include(:i18nliner_scope)
+    expect(I18n::RESERVED_KEYS).to include(:i18nliner_inferred_key)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18nliner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-07 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: ruby_parser
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +188,7 @@ files:
 - lib/i18nliner/processors/erb_processor.rb
 - lib/i18nliner/processors/ruby_processor.rb
 - lib/i18nliner/railtie.rb
+- lib/i18nliner/reserved_keys.rb
 - lib/i18nliner/scope.rb
 - lib/tasks/i18nliner.rake
 - spec/commands/check_spec.rb
@@ -205,6 +206,7 @@ files:
 - spec/pre_processors/erb_pre_processor_spec.rb
 - spec/processors/erb_processor_spec.rb
 - spec/processors/ruby_processor_spec.rb
+- spec/reserved_keys_spec.rb
 homepage: http://github.com/jenseng/i18nliner
 licenses: []
 metadata: {}
@@ -216,14 +218,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: I18n made simple