i18nliner 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc705d5ce5735092cebbf57dd2d4241e0f9c29565163a7a300659b7b8fb39a1
-  data.tar.gz: e477d3007a6ecfa1914bc2acf0798f84ca00d0f75a18450e793fc47743b3a45a
+  metadata.gz: 7db05f72a6f74269e7600897f2910d08749e1e8d8a334cbd8678e5ed7fe3640b
+  data.tar.gz: 3ee6d0d8ed3bb20ed38f7d639d9b2a151c1a3ff1c3c09dc7379a8246fcbc6599
 SHA512:
-  metadata.gz: c9b27ba1617c266b3b627848ba465beb66674e55733274c5a850069845bea80c60acdddaea07cad3ed5de8c36ff432f159ffae7595cef4d94ba181f6f742a351
-  data.tar.gz: 736d2e7a69ededb1cc61d2cc6e6538c4ce1d187e58ea54a6c7dde845b6c22ac03d86b2677fdcd58d30e01c6dcdd39a79e00f1d83d608d510bbf571c66bb309d6
+  metadata.gz: 59db484754a91d810436e65063f705026bbbfdf042a141ca053d0555616a97e83a89cd59cb9654f7d9243ee28a0f81169d1e82f7697b5f55333ea4f55ec71abd
+  data.tar.gz: 397e276a16b5fc43603de1abdeb1594ccb3a13ed2709809299f1a68d1b536983a66d37ed5d41684cfeb6eb1e3bda381c8e4e121fb6dbacc0e1903973a3ffc6ce

data/lib/i18nliner/extensions/core.rb

@@ -53,15 +53,24 @@ module I18nliner
      private
 
       def apply_wrappers(string, wrappers)
+        # 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 string if string.instance_of?(Object)
+
         string = string.html_safe? ? string.dup : ERB::Util.h(string)
         unless wrappers.is_a?(Hash)
           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/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") }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18nliner
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2022-08-09 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
@@ -218,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