fast_gettext 2.0.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 183bb8e8189ae58adc5a33621eae23da634f4a68e6629fa705323ce9bd5f97dd
-  data.tar.gz: 2e0a657b867f347e746601a93b615449ef7e1f530bf531f346509e0c9ae8b643
+  metadata.gz: 70c22bbca4ca33f6445edaff4da234fb2c2a0b8a3ccc954d1f7353490fa63627
+  data.tar.gz: b04c5cfd44d7eb617d503dbd80beb88a69f35aa654fda00c560c86e5b209a940
 SHA512:
-  metadata.gz: b735d946318eeafaecc3c817d3c8709e28b1cd9938d32a29c9a1de33fb53ff6cac5a6f224d438c7d6713121aaf23670b8e1ea45201ce4492677126ec0f97cd8c
-  data.tar.gz: ce132742a3a3352546260905e6fcd36c3eac54ae0e27e5f6bfc5ffb69282b33e5d0c64a5f6868a2589481fbfd25e92fe29a412217942a54019ea3dd31c378394
+  metadata.gz: e6ba6f8da19725a3a23ad7bd5d1bfdfe8bef6db6a3ab58fc5afea74625f4425d8313353c5f978df930acd132c46db467d55358513eaadcf24bdfe6c2c1b95fcb
+  data.tar.gz: 762e7fa657ea3cf1bc69cf2136db1121d811772dd540b680ff49a74e6f3f45f4bcefb0425ed734f4168b9c0ce0a590fd2a386b3f14194a5e5238f074dc65786e

data/CHANGELOG

@@ -1,3 +1,4 @@
+2.1.0 -- Remove taint checking https://github.com/grosser/fast_gettext/pull/133
 2.0.0 -- Changed p_ separator to \0004 https://github.com/grosser/fast_gettext/pull/107 add np and add gettext aliases
 1.6.0 -- Remove restrictions around yaml file names
 1.1.0 -- translations are no longer eager loaded for improved startup performance, pass `eager_load: true` to preload for example in preforked web server

data/LICENSE

@@ -0,0 +1,78 @@
+Copyright (C) 2013 Michael Grosser <michael@grosser.it>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+# for lib/fast_gettext/vendor/*
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them,
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/Readme.md

@@ -126,7 +126,7 @@ p_('File', 'Open') == _("File\004Open") == "öffnen"
 p_('Context', 'not-found') == 'not-found'
 ```
 
-#### `s_()` or `sgetext()`: translation with namespace
+#### `s_()` or `sgettext()`: translation with namespace
 
 ```ruby
 s_('File|Open') == _('File|Open') == "öffnen"
@@ -153,13 +153,13 @@ sn_('Fruit|Apple', 'Apples', 1) == 'Apfel'
 
 #### `N_()` and `Nn_()`: make dynamic translations available to the parser.
 
-In many instances, your strings will not be found the by the ruby-parse. These methods
+In many instances, your strings will not be found by the ruby parsing. These methods
 allow for those strings to be discovered.
 
 ```
 N_("active"); N_("inactive"); N_("paused") # possible value of status for parser to find.
 Nn_("active", "inactive", "paused")        # alternative method
-_("Your account is %{account_state}.") % { account_state: status }
+_("Your account is %{account_state}.") % { account_state: _(status) }
 ```
 
 
@@ -180,7 +180,7 @@ Use the [original GetText](http://github.com/ruby-gettext/gettext) to create and
 
 ### Database
 [Example migration for ActiveRecord](http://github.com/grosser/fast_gettext/blob/master/examples/db/migration.rb)<br/>
-The default plural separator is `||||` but you may overwrite it (or suggest a better one..).
+The default plural separator is `||||` but you may overwrite it (or suggest a better one...).
 
 This is usable with any model DataMapper/Sequel or any other(non-database) backend, the only thing you need to do is respond to the self.translation(key, locale) call.
 If you want to use your own models, have a look at the [default models](http://github.com/grosser/fast_gettext/tree/master/lib/fast_gettext/translation_repository/db_models) to see what you want/need to implement.
@@ -305,7 +305,7 @@ Unfound may not always mean missing, if you choose not to translate a word becau
 A lambda or anything that responds to `call` will do as callback. A good starting point may be `examples/missing_translations_logger.rb`.
 
 ### Plugins
-Want a xml version ?
+Want an xml version?
 Write your own TranslationRepository!
 
 ```Ruby
@@ -362,7 +362,7 @@ Alternatively you can use [merge repository](https://github.com/grosser/fast_get
 
 #### Block defaults
 
-All the translation methods (includ MultiDomain) support a block default, a feature not provided by ruby-gettext.  When a translation is
+All the translation methods (including MultiDomain) support a block default, a feature not provided by ruby-gettext.  When a translation is
 not found, if a block is provided the block is always returned. Otherwise, a key is returned. Methods doing pluralization will attempt a simple translation of alternate keys.
 
 ```ruby
@@ -422,4 +422,4 @@ Mo/Po-file parsing from Masao Mutoh, see vendor/README
 [Michael Grosser](http://grosser.it)<br/>
 michael@grosser.it<br/>
 License: MIT, some vendor parts under the same license terms as Ruby (see headers)<br/>
-[![Build Status](https://travis-ci.org/grosser/fast_gettext.png)](https://travis-ci.org/grosser/fast_gettext)
+[![CI](https://github.com/grosser/fast_gettext/actions/workflows/actions.yml/badge.svg)](https://github.com/grosser/fast_gettext/actions/workflows/actions.yml)

data/lib/fast_gettext/storage.rb

@@ -172,7 +172,7 @@ module FastGettext
       locales = locales.to_s.gsub(/\s/, '')
       found = [[]]
       locales.split(',').each do |part|
-        if part =~ /;q=/ # contains language and weight ?
+        if part.include? ';q=' # contains language and weight ?
           found.last << part.split(/;q=/)
           found.last.flatten!
           found << []

data/lib/fast_gettext/translation_repository/base.rb

@@ -47,7 +47,7 @@ module FastGettext
         Dir[File.join(path, '*')].each do |locale_folder|
           next unless File.basename(locale_folder) =~ LOCALE_REX
 
-          file = File.join(locale_folder, relative_file_path).untaint
+          file = File.join(locale_folder, relative_file_path)
           next unless File.exist? file
 
           locale = File.basename(locale_folder)

data/lib/fast_gettext/translation_repository/db.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'active_record'
 module FastGettext
   module TranslationRepository
     # Responsibility:
@@ -31,7 +30,7 @@ module FastGettext
       end
 
       def pluralisation_rule
-        @model.pluralsation_rule if @model.respond_to? :pluralsation_rule
+        @model.pluralisation_rule if @model.respond_to? :pluralisation_rule
       end
 
       def [](key)
@@ -51,6 +50,7 @@ module FastGettext
       end
 
       def self.require_models
+        require 'active_record'
         folder = "fast_gettext/translation_repository/db_models"
         require "#{folder}/translation_key"
         require "#{folder}/translation_text"

data/lib/fast_gettext/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastGettext
-  VERSION = Version = '2.0.1' # rubocop:disable Naming/ConstantName
+  VERSION = Version = '2.2.0' # rubocop:disable Naming/ConstantName
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fast_gettext
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-21 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +143,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG
+- LICENSE
 - Readme.md
 - lib/fast_gettext.rb
 - lib/fast_gettext/cache.rb
@@ -195,15 +182,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A simple, fast, memory-efficient and threadsafe implementation of GetText