i18nliner 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6bbc698173c1c8e33a96bff6fdd7d0ed5bd87f55
-  data.tar.gz: 6035d9a25b869329386a8618521399a5d39401ef
+SHA256:
+  metadata.gz: 7db05f72a6f74269e7600897f2910d08749e1e8d8a334cbd8678e5ed7fe3640b
+  data.tar.gz: 3ee6d0d8ed3bb20ed38f7d639d9b2a151c1a3ff1c3c09dc7379a8246fcbc6599
 SHA512:
-  metadata.gz: 5e2e83793439b90a69a7e16db742bc9d385e53953a5872ce90987bf8507b5254594d4edf3ff637d36e30c6f02acf6fc4aaa6703197c430618f9254ca4edf82eb
-  data.tar.gz: d239eb5dcea8c24fcdccad4870c3cd6b33c9a33898d13c20a1962a8387db64fbdc23aa71a907ac52049d3d6ecf1d49e52a20c38e852875c7a95369bcb3ef7fb7
+  metadata.gz: 59db484754a91d810436e65063f705026bbbfdf042a141ca053d0555616a97e83a89cd59cb9654f7d9243ee28a0f81169d1e82f7697b5f55333ea4f55ec71abd
+  data.tar.gz: 397e276a16b5fc43603de1abdeb1594ccb3a13ed2709809299f1a68d1b536983a66d37ed5d41684cfeb6eb1e3bda381c8e4e121fb6dbacc0e1903973a3ffc6ce

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rake'
+require 'bundler/gem_tasks'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -6,4 +7,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task :default => :spec

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/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.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jon Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 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
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: ya2yaml
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
 description: No .yml files. Inline defaults. Optional keys. Inferred interpolation
   values. Wrappers and blocks, so your templates look template-y and your translations
   stay HTML-free.
@@ -169,7 +169,6 @@ files:
 - lib/i18nliner/commands/color_formatter.rb
 - lib/i18nliner/commands/dump.rb
 - lib/i18nliner/commands/generic_command.rb
-- lib/i18nliner/commands/import.rb
 - lib/i18nliner/controller_scope.rb
 - lib/i18nliner/errors.rb
 - lib/i18nliner/erubi.rb
@@ -189,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
@@ -206,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: {}
@@ -217,15 +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: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: I18n made simple

data/lib/i18nliner/commands/import.rb

@@ -1,30 +0,0 @@
-require 'i18nliner/commands/generic_command'
-require 'i18nliner/extractors/translation_hash'
-require 'active_support/core_ext/enumerable'
-Dir[File.join(File.dirname(__FILE__), "../processors/*.rb")].each do |file|
-  require "i18nliner/processors/#{File.basename(file)}"
-end
-
-module I18nliner
-  module Commands
-    class Import < GenericCommand
-      attr_reader :translations, :errors
-
-      def initialize(options)
-        super
-      end
-
-      def success?
-      end
-
-      def print_summary
-      end
-
-      def run
-        print_summary unless @options[:silent]
-        success?
-      end
-    end
-  end
-end
-