localeapp 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8e980b2b5650345f5dd313cc10d90565c933c80d
-  data.tar.gz: 71fb78f68e8ba17a77f455959e5ae93afba5b167
+SHA256:
+  metadata.gz: 805c6256d30038f1a1939798e4f26ac91f19f330b9741ed9c99c880c4baedafd
+  data.tar.gz: fd70529ab0d1df20710fd100ba9382e9451ac22d011a53dd047b42a25434d682
 SHA512:
-  metadata.gz: 1a250730215706813c93ec256abc58726f1174e21cc13a9a3cb8579c6abf7a4718c2b055102ab989c82a83bf7f770a6016e7f5230aec7467b206db8ef3856495
-  data.tar.gz: abbc4fdb58a0b443242893e96857ecee7630832e269244158354c99ea3cb231ffb5eda4bbd8bc1112070e0e944417e91d5ac28e085751dc3d16014aedc854393
+  metadata.gz: 957f7db15344c1406d2841581934e5be63bd795ddb3777bde5f928bee053df61dae6e5de25f813a0c07b81b4ae1eb843bc1713f039e81ec4f91490e4e7bfd2d0
+  data.tar.gz: 0d341f9b235d16688ce7f65de0dc5c129451823cb0562e446086d3f865a49ccede5b8a89789fc6ffd5e3ffe78f306c075871e635c6f9444788325ed7a6a88804

data/.gitignore

@@ -9,3 +9,4 @@ doc/*
 tmp/*
 .ruby-version
 .ruby-gemsets
+.rvmrc

data/.travis.yml

@@ -3,17 +3,18 @@ dist: trusty
 before_install:
   - gem install bundler
 rvm:
-  - 2.4.1
-  - 2.3.4
-  - 2.2.7
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
+  - 2.2.9
   - 2.1.10
-  - jruby
+  - jruby-9.1.15.0
 gemfile:
   - Gemfile
-  - gemfiles/i18n_0.4.gemfile
-  - gemfiles/i18n_0.5.gemfile
-  - gemfiles/i18n_0.6.gemfile
-  - gemfiles/i18n_0.7.gemfile
+  - spec/gemfiles/i18n_0.7.gemfile
+  - spec/gemfiles/i18n_0.8.gemfile
+  - spec/gemfiles/i18n_0.9.gemfile
+  - spec/gemfiles/i18n_1.0.gemfile
 notifications:
   slack:
     secure: JryUWfe2JR0cfNT+TIHwryy8NS8m9/hbRhg+5UqwuYWuEp6gtcWCA05wKsajQyRrGaNGYKu81RA9jpQrirgQWzDUJl5o3sEWbqKZv3pW0ybn8Tx52N1mxW3Puar5KLZ8TPRphKKIJ8/1EhAh4zpC5Mtxv8Sz1/AHuqnlu6l+bb4=

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # master
 
+# Version 3.0.0
+
+* drop support for i18n 0.4, 0.5 and 0.6 (ℹ️ Rails [dropped those in July 2014](https://github.com/rails/rails/commit/cd7d414e48f537278043bfc77cfb4217e8c89c24)))
+* add official support for i18n 0.8, 0.9 and 1.0
+* prevent users to use dependencies impacted by some vulnerabilities:
+  * OSVDB-101157
+  * CVE-2015-3448 / OSVDB-117461
+  * CVE-2013-0269 / OSVDB-101137
+  * CVE-2015-1820 / OSVDB-119878
+* fix a bug introduced in 2.5.0 where the exception handler was crashing with `TypeMismatch` error when `blacklisted_keys_pattern` was not explicitly configured
+
+# Version 2.5.0
+
+* Show fully-scoped keys in `ExceptionHandler` log messages (thanks to [@leonhooijer](https://github.com/leonhooijer))
+* Don't force raising an exception for blacklisted keys (thanks to [@leonhooijer](https://github.com/leonhooijer))
+
+# Version 2.4.0
+
+* Support pulling of single locales (thanks to [@full-of-foo](https://github.com/full-of-foo))
+
 # Version 2.3.0
 
 * Report import identifier on push success
@@ -26,7 +46,7 @@
 
 # Version 1.0.2
 
-* Fix a XSS vulnerability where translations keys could contain unescaped HTML (@grekko)
+* Fix a XSS vulnerability where translations keys could contain unescaped HTML (thanks to [@grekko](https://github.com/grekko))
 
 # Version 1.0.1
 
@@ -62,7 +82,7 @@
 
 # Version 0.8.0
 
-* Fix problem with line ending in three dots. (@holli)
+* Fix problem with line ending in three dots. (thanks to [@holli](https://github.com/holli))
 * Change deprecated File.exists? to File.exist?
 * Fix "install --github" so it appends README.md. Before it truncated the README.md file with new content, now it appends content in a more correct manner.
 * Fix .gitignore injection so it ensures a newline.
@@ -121,7 +141,7 @@
 
 # Version 0.6.9
 
-* Make rack a dependency as we actually use it (Thanks @martoche)
+* Make rack a dependency as we actually use it (thanks to [@martoche](https://github.com/martoche))
 
 # Version 0.6.8
 
@@ -181,21 +201,21 @@
 
 # Version 0.4.3
 
-* Make sure Psych is fully loaded before using it (Thanks @tenderlove)
+* Make sure Psych is fully loaded before using it (thanks to [@tenderlove](https://github.com/tenderlove))
 
 # Version 0.4.2
 
-* Improve compatibility of Psych with ruby 1.9.2 (Thanks @ardpac)
+* Improve compatibility of Psych with ruby 1.9.2 (thanks to [@ardpac](https://github.com/ardpac))
 
 # Version 0.4.1
 
-* Ignore HUP when backgrounded. (Thanks @xijo)
+* Ignore HUP when backgrounded. (thanks to [@xijo](https://github.com/xijo))
 * Add --standalone option to install to generate a .localeapp/ config directory. This enables usage outside of rails.
 
 # Version 0.4.0
 
 * Use Psych to generate the yaml if it's available (This will completely change your yaml the first time you do a localeapp pull and Psych is available)
-* Report when the directory to write the yml to doesn't exist (Thanks Robin Mehner)
+* Report when the directory to write the yml to doesn't exist (thanks to [@rmehner](https://github.com/rmehner))
 
 # Version 0.3.2
 
@@ -204,13 +224,13 @@
 # Version 0.3.1
 
 * Handle SocketError so we don't cause errors in client apps when they're not connected to the network
-* Fix bug with empty log file (Thanks Robin Mehner)
+* Fix bug with empty log file (thanks to [@rmehner](https://github.com/rmehner))
 
 # Version 0.3.0
 
 * Allow symbols for environment names in config file
-* `localeapp push` will now push all yaml files in a directory if it's given a directory instead of a file. (Thanks Bartłomiej Danek)
-* Better daemon support. `daemon_pid_file` and `daemon_log_file` configuration options. (Thanks again Bartłomiej Danek)
+* `localeapp push` will now push all yaml files in a directory if it's given a directory instead of a file (thanks to [@bartlomiejdanek](https://github.com/bartlomiejdanek))
+* Better daemon support. `daemon_pid_file` and `daemon_log_file` configuration options (thanks to [@bartlomiejdanek](https://github.com/bartlomiejdanek))
 
 # Version 0.2.0
 

data/bin/localeapp

@@ -138,10 +138,12 @@ module LocaleappGLIWrapper
     end
   end
 
-  desc "Pulls all translations from localeapp.com"
+  desc "Pulls one or all translations from localeapp.com"
+  arg_name "<key> (optional)"
   command :pull do |c|
     c.action do |global_options, options, args|
-      Localeapp::CLI::Pull.new(global_options).execute
+      locale_key = args[0]
+      Localeapp::CLI::Pull.new(global_options).execute(locale_key)
     end
   end
 

data/features/pull.feature

@@ -16,6 +16,27 @@ Feature: `pull' command
     Success!
     """
     And a file named "config/locales/en.yml" should exist
+    And a file named "config/locales/es.yml" should exist
+
+  Scenario: Pulls single translation
+    Given I have a translations on localeapp.com for the project with api key "MYAPIKEY"
+    And an initializer file
+    And a directory named "config/locales"
+    And a directory named "log"
+    When I successfully run `localeapp pull en`
+    Then the output should contain "Fetching en translations:"
+    And a file named "config/locales/en.yml" should exist
+    And a file named "config/locales/es.yml" should not exist
+
+  Scenario: Reports an error when a given locale is missing
+  Given I have a translations on localeapp.com for the project with api key "MYAPIKEY"
+    And an initializer file
+    When I run `localeapp pull err`
+    Then the exit status must be 1
+    And the output should contain:
+    """
+    Could not find given locale
+    """
 
   Scenario: Reports an error when locales directory is missing
     Given I have a translations on localeapp.com for the project with api key "MYAPIKEY"

data/lib/localeapp/cli/pull.rb

@@ -3,11 +3,11 @@ module Localeapp
     class Pull < Command
       include ::Localeapp::ApiCall
 
-      def execute
-        @output.puts "Localeapp Pull"
-        @output.puts ""
+      def execute(locale_key = nil)
+        @locale_key = locale_key
+        @output.puts "Localeapp Pull\n\n" \
+          "Fetching#{locale_key ? ' ' << locale_key : ''} translations:"
 
-        @output.puts "Fetching translations:"
         api_call :export,
           :success => :update_backend,
           :failure => :report_failure,
@@ -17,7 +17,7 @@ module Localeapp
       def update_backend(response)
         @output.puts "Success!"
         @output.puts "Updating backend:"
-        Localeapp.updater.dump(Localeapp.load_yaml(response))
+        Localeapp.updater.dump(Localeapp.yaml_data(response, @locale_key))
         @output.puts "Success!"
         Localeapp.poller.write_synchronization_data!(Time.now.to_i, Time.now.to_i)
       end

data/lib/localeapp/configuration.rb

@@ -46,7 +46,9 @@ module Localeapp
     # (defaults to 'development')
     attr_accessor :reloading_environments
 
-    # The names of environments where updates aren't pulled
+    # The names of environments where localeapp will poll for translations from
+    # Localeapp API (to check for new translations there) on every page request
+    # to your app's website.
     # (defaults to 'development')
     attr_accessor :polling_environments
 

data/lib/localeapp/exception_handler.rb

@@ -2,16 +2,17 @@ module Localeapp
   class ExceptionHandler
     def self.call(exception, locale, key_or_keys, options)
       keys = Array(key_or_keys).map { |key| ERB::Util.html_escape(key.to_s) }
+      scoped_keys = keys.map { |key| [options[:scope], key].compact.join(".") }
       Localeapp.log(exception.message)
       # Which exact exception is set up by our i18n shims
       if exception.is_a? Localeapp::I18nMissingTranslationException
-        Localeapp.log("Detected missing translation for key(s) #{keys.inspect}")
+        Localeapp.log("Detected missing translation for key(s) #{scoped_keys.inspect}")
 
         keys.each do |key|
           Localeapp.missing_translations.add(locale, key, nil, options || {})
         end
 
-        [locale, keys].join(', ')
+        [locale, scoped_keys].join(', ')
       else
         Localeapp.log('Raising exception')
         raise

data/lib/localeapp/rails/force_exception_handler_in_translation_helper.rb

@@ -14,7 +14,12 @@
 module Localeapp
   module ForceExceptionHandlerInTranslationHelper
     def translate(key, options = {})
-      super(key, {:raise => false}.merge(options))
+      full_key = [options[:scope], key].compact.join(".")
+      if full_key =~ Localeapp.configuration.blacklisted_keys_pattern
+        super(key, options)
+      else
+        super(key, {:raise => false}.merge(options))
+      end
     end
     alias :t :translate
   end

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "2.3.0"
+  VERSION = "3.0.0"
 end

data/lib/localeapp.rb

@@ -109,6 +109,15 @@ module Localeapp
       load_yaml(File.read(filename))
     end
 
+    def yaml_data(content, locale_key = nil)
+      yaml_data = Localeapp.load_yaml(content)
+      if locale_key
+        raise "Could not find given locale" unless yaml_data and yaml_data[locale_key]
+        yaml_data = {locale_key => yaml_data[locale_key]}
+      end
+      yaml_data
+    end
+
     def env_file_path
       ENV_FILE_PATH
     end

data/localeapp.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.1"
 
-  s.add_dependency('i18n', '~> 0.4')
-  s.add_dependency('json')
-  s.add_dependency('rest-client')
+  s.add_dependency('i18n', '>= 0.7', '< 2')
+  s.add_dependency('json', '>= 1.1.0')
+  s.add_dependency('rest-client', '>= 1.8.0')
   s.add_dependency('gli')
 
   s.add_development_dependency('rake')
@@ -33,5 +33,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency('aruba', '~> 0.8')
   s.add_development_dependency('cucumber', '~> 2.0')
   s.add_development_dependency('fakeweb')
-  s.add_development_dependency('appraisal')
 end

data/{gemfiles → spec/gemfiles}/i18n_0.7.gemfile

@@ -1,5 +1,3 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
 gem "i18n", "~> 0.7.0"
@@ -8,4 +6,4 @@ platforms :jruby do
   gem "jruby-openssl", "~> 0.6"
 end
 
-gemspec :path => "../"
+gemspec :path => "../.."

data/{gemfiles/i18n_0.4.gemfile → spec/gemfiles/i18n_0.8.gemfile}

@@ -1,11 +1,9 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "i18n", "~> 0.4.0"
+gem "i18n", "~> 0.8.0"
 
 platforms :jruby do
   gem "jruby-openssl", "~> 0.6"
 end
 
-gemspec :path => "../"
+gemspec :path => "../.."

data/{gemfiles/i18n_0.5.gemfile → spec/gemfiles/i18n_0.9.gemfile}

@@ -1,11 +1,9 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "i18n", "~> 0.5.0"
+gem "i18n", "~> 0.9.0"
 
 platforms :jruby do
   gem "jruby-openssl", "~> 0.6"
 end
 
-gemspec :path => "../"
+gemspec :path => "../.."

data/{gemfiles/i18n_0.6.gemfile → spec/gemfiles/i18n_1.0.gemfile}

@@ -1,11 +1,9 @@
-# This file was generated by Appraisal
-
 source "https://rubygems.org"
 
-gem "i18n", "~> 0.6.0"
+gem "i18n", "~> 1.0.0"
 
 platforms :jruby do
   gem "jruby-openssl", "~> 0.6"
 end
 
-gemspec :path => "../"
+gemspec :path => "../.."

data/spec/localeapp/exception_handler_spec.rb

@@ -46,4 +46,9 @@ describe Localeapp::ExceptionHandler, '#call(exception, locale, key, options)' d
       Localeapp::ExceptionHandler.call(exception, :en, 'foo', {})
     }.to_not raise_error
   end
+
+  it "handles the scope option" do
+    expect(I18n.t('foo.bar', scope: 'scoped')).to eq 'en, scoped.foo.bar'
+    expect(I18n.t(%w{foo.bar foo.baz}, scope: 'scoped')).to eq 'en, scoped.foo.bar, scoped.foo.baz'
+  end
 end

data/spec/localeapp_spec.rb

@@ -15,3 +15,20 @@ describe Localeapp, "#load_yaml(content)" do
     end
   end
 end
+
+describe Localeapp, "#yaml_data(content, locale_key = nil)" do
+  let(:content) { "en:\n   foo: bar" }
+  let(:locale_key) { "en" }
+
+  it "raises an exception if the given locale key is missing" do
+    with_configuration do
+      expect { Localeapp.yaml_data(content, "de") }.to raise_error("Could not find given locale")
+    end
+  end
+
+  it "finds the given locale key" do
+    with_configuration do
+      expect(Localeapp.yaml_data(content, locale_key)).to eq({"en" => {"foo" => "bar"}})
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Christopher Dell
@@ -10,50 +10,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -152,20 +158,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  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'
 description: Synchronizes i18n translation keys and content with localeapp.com so
   you don't have to manage translations by hand.
 email:
@@ -180,7 +172,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -207,10 +198,6 @@ files:
 - features/support/env.rb
 - features/support/hooks.rb
 - features/update.feature
-- gemfiles/i18n_0.4.gemfile
-- gemfiles/i18n_0.5.gemfile
-- gemfiles/i18n_0.6.gemfile
-- gemfiles/i18n_0.7.gemfile
 - lib/localeapp.rb
 - lib/localeapp/api_call.rb
 - lib/localeapp/api_caller.rb
@@ -256,6 +243,10 @@ files:
 - spec/fixtures/es.yml
 - spec/fixtures/string_log.yml
 - spec/fixtures/symbol_log.yml
+- spec/gemfiles/i18n_0.7.gemfile
+- spec/gemfiles/i18n_0.8.gemfile
+- spec/gemfiles/i18n_0.9.gemfile
+- spec/gemfiles/i18n_1.0.gemfile
 - spec/localeapp/api_call_spec.rb
 - spec/localeapp/api_caller_spec.rb
 - spec/localeapp/cli/add_spec.rb
@@ -302,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: localeapp
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Easy i18n translation management with localeapp.com

data/Appraisals

@@ -1,15 +0,0 @@
-appraise "i18n-0.4" do
-  gem "i18n", "~> 0.4.0"
-end
-
-appraise "i18n-0.5" do
-  gem "i18n", "~> 0.5.0"
-end
-
-appraise "i18n-0.6" do
-  gem "i18n", "~> 0.6.0"
-end
-
-appraise "i18n-0.7" do
-  gem "i18n", "~> 0.7.0"
-end