localeapp 3.0.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 187204f032c72f78eb45ace5926a7291cb493cf3b5912deb9c94a1625044127b
-  data.tar.gz: aa94e545971bc4cd66007f20f0c488808774f3280857264e79190192a366cc1f
+  metadata.gz: 85de9c28ef6cb1e929598b0e15d57ad7c24096dcc69e58f5980381a2d3462402
+  data.tar.gz: 89c70dcc761979df1ead452d5063f412d3dfccf8238e331fb0c2f7a7e4f235c8
 SHA512:
-  metadata.gz: 9c6d8ed04be34b75f34b83d517ce8dd16c4d436b1b03bdd7cfd73414f89677b75de47ec5df3e4eb842557aebd882bc81b905d5aeffae983f69ccc8e932d11e0b
-  data.tar.gz: 6ac0d69eff3a388880ca32e03de49d0ef4030bee7af8d402e1aba40ffa69cf5dea1924e9548dc68f89a4a67f397e27e31dc8f13fec6eebfe265f570c54c46b9f
+  metadata.gz: 0b9ad084d7e4128a62a307c4b011b9267be038f21f32262608aa548f94c7325325d403eed5815c74ac018c4742ae6543a11bdde1a2ff1d1c4f8658ddfbc259dd
+  data.tar.gz: cdc7790c9f6d8a62c3f5db3af4a3d848a7cbda9a3dbe95cd47beee2381fb48dfac0e646db9a3891fadc28c8a5a3bfff2e959b84a5e2c51449e3e6bbbf1de8643

data/.travis.yml

@@ -1,14 +1,15 @@
 sudo: required
 dist: trusty
 before_install:
-  - gem install bundler
+  - gem install bundler -v '< 2'
 rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
+  - 2.6.0
+  - 2.5.3
+  - 2.4.5
+  - 2.3.8
+  - 2.2.10
   - 2.1.10
-  - jruby-9.1.15.0
+  - jruby
 gemfile:
   - Gemfile
   - spec/gemfiles/i18n_0.7.gemfile
@@ -17,4 +18,4 @@ gemfile:
   - spec/gemfiles/i18n_1.0.gemfile
 notifications:
   slack:
-    secure: JryUWfe2JR0cfNT+TIHwryy8NS8m9/hbRhg+5UqwuYWuEp6gtcWCA05wKsajQyRrGaNGYKu81RA9jpQrirgQWzDUJl5o3sEWbqKZv3pW0ybn8Tx52N1mxW3Puar5KLZ8TPRphKKIJ8/1EhAh4zpC5Mtxv8Sz1/AHuqnlu6l+bb4=
+    secure: dPiP4+6xO6L9/RfXyivr2X2UohSD8CDdnnY57BvNgGVvFtQ2LUP9s1mDxj7gbBGhRZJzTMZlM/PU7bT9O9JCJPcpUs4dWg748KZ0ZGOslnv8yfzNbRh9U5OzyEjch2PFkEhpQPnuVCiof+ahjfxQQSkokpsbNa9DLlDmUapXFPY=

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # master
 
+# Version 3.2.0
+
+* Support ruby 3.0 (thanks to [@spilin](https://github.com/spilin))
+
+# Version 3.1.3
+
+* Fix deprecation warning in Rails 6 initialization (thanks to [@ryanb](https://github.com/ryanb) for [reporting it](https://github.com/Locale/localeapp/issues/276))
+
+# Version 3.1.2
+
+* Fix a bug when `.env` is a directory (thanks to [@xijo](https://github.com/xijo) for [reporting it](https://github.com/Locale/localeapp/pull/262))
+
+# Version 3.1.1
+
+* Remove I18n Hash#deep_merge! usage
+* Support ruby 2.6
+
+# Version 3.1.0
+
+* add `localeapp cp`
+
 # Version 3.0.1
 
 * actually prevent `CVE-2013-0269 / OSVDB-101137` (3.0.0 was supposed to)

data/README.md

@@ -1,10 +1,11 @@
 # Locale
 
-[![Build status](https://secure.travis-ci.org/Locale/localeapp.png)](http://travis-ci.org/Locale/localeapp)
-[![Code Climate](https://codeclimate.com/github/Locale/localeapp.png)](https://codeclimate.com/github/Locale/localeapp)
-[![Gem Version](https://badge.fury.io/rb/localeapp.png)](http://badge.fury.io/rb/localeapp)
+[![Build status](https://secure.travis-ci.org/Locale/localeapp.svg)](http://travis-ci.org/Locale/localeapp)
+[![Code Climate](https://codeclimate.com/github/Locale/localeapp.svg)](https://codeclimate.com/github/Locale/localeapp)
+[![Security](https://hakiri.io/github/Locale/localeapp/master.svg)](https://hakiri.io/github/Locale/localeapp/master)
+[![Gem Version](https://badge.fury.io/rb/localeapp.svg)](http://badge.fury.io/rb/localeapp)
 
-The localeapp gem connects your rails app to the Locale service on http://www.localeapp.com. Locale makes hand editing translation files something you don't have to do.
+The `localeapp` gem connects your Rails app to the Locale service on https://www.localeapp.com. Locale makes hand editing translation files something you don't have to do.
 
 The gem hooks into the i18n exception mechanism to send missing translations to the app. When translated content has been added it's automatically pulled down so you can see it straight away.
 
@@ -91,6 +92,14 @@ You can create translations on the command line by running:
 
 You must provide at least one translation and the locale code must already exist in the project.
 
+## Copy a translation
+
+You can copy a translation on the command line by running:
+
+    localeapp cp key.source_name key.destination_name
+
+If the destination key name exists in the project the content is overwritten, otherwise a new key is created.
+
 ## Automatically pulling translations
 
 There are two ways to do this, one that suits a single developer working the code locally and one where the translations are being pulled down to a staging (or live) server.
@@ -169,6 +178,10 @@ You can contact us via the support link at the bottom of the page or emailing su
 
 See corresponding [contributing guidelines][3].
 
+## Known bugs
+
+We are aware about a compatibility issue with JRuby 9.1 and i18n 1.3. Our recommandation so far is to use i18n < 1.3 if you are using JRuby 9.1.
+
 ## License
 
 Copyright (c) 2014 [Locale][5] and other [contributors][6], released under the [MIT License][4].

data/bin/localeapp

@@ -34,7 +34,7 @@ module LocaleappGLIWrapper
       global_options[:k]
     elsif ENV['LOCALEAPP_API_KEY']
       ENV['LOCALEAPP_API_KEY']
-    elsif File.exist?('.env') && IO.read('.env') =~ /^LOCALEAPP_API_KEY=(\w+)$/
+    elsif File.file?('.env') && IO.read('.env') =~ /^LOCALEAPP_API_KEY=(\w+)$/
       $1
     else
       nil
@@ -138,6 +138,20 @@ module LocaleappGLIWrapper
     end
   end
 
+  desc "copies a key in the project"
+  arg_name "<source key name> <dest key name>"
+  command :cp do |c|
+    c.action do |global_options, options, args|
+      source_name = args.shift
+      dest_name = args.shift
+      if source_name.nil? || dest_name.nil?
+        exit_now! "localeapp cp requires a source key name and a destination key name", 1
+      else
+        Localeapp::CLI::Copy.new(global_options).execute(source_name, dest_name, *args)
+      end
+    end
+  end
+
   desc "Pulls one or all translations from localeapp.com"
   arg_name "<key> (optional)"
   command :pull do |c|

data/features/cp.feature

@@ -0,0 +1,19 @@
+Feature: `cp' command
+
+  Scenario: Copies the given translation
+    Given I have a valid project on localeapp.com with api key "MYAPIKEY" and the translation key "foo.bar"
+    And an initializer file
+    When I successfully run `localeapp cp foo.bar foo.baz`
+    Then the output should contain:
+    """
+    Localeapp cp
+
+    Copying key: foo.bar to foo.baz
+    Success!
+    """
+
+  Scenario: Reports an error when the given API key is incorrect
+    Given no project exist on localeapp.com with API key "MYAPIKEY"
+    When I run `localeapp -k MYAPIKEY cp foo.bar foo.baz`
+    Then the exit status must be 70
+    And the output must match /error.+404/i

data/features/step_definitions/cli_steps.rb

@@ -56,6 +56,7 @@ When /^I have a valid project on localeapp\.com with api key "([^"]*)" and the t
   uri = "https://api.localeapp.com/v1/projects/#{api_key}/translations/#{key_name.gsub(/\./, '%2E')}"
   add_fake_web_uri(:delete, uri, ['200', 'OK'], '')
   add_fake_web_uri(:post, uri + '/rename', ['200', 'OK'], '')
+  add_fake_web_uri(:post, uri + '/copy', ['200', 'OK'], '')
 end
 
 When /^I have a LOCALEAPP_API_KEY env variable set to "(.*?)"$/ do |api_key|

data/lib/localeapp.rb

@@ -24,6 +24,7 @@ require 'localeapp/cli/update'
 require 'localeapp/cli/add'
 require 'localeapp/cli/remove'
 require 'localeapp/cli/rename'
+require 'localeapp/cli/copy'
 require 'localeapp/cli/daemon'
 
 module Localeapp

data/lib/localeapp/cli/copy.rb

@@ -0,0 +1,28 @@
+module Localeapp
+  module CLI
+    class Copy < Command
+      include ::Localeapp::ApiCall
+
+      def execute(source_name, dest_name, *rest)
+        @output.puts "Localeapp cp"
+        @output.puts ""
+        @output.puts "Copying key: #{source_name} to #{dest_name}"
+        api_call :copy,
+          :url_options => { :source_name => source_name },
+          :payload => { :dest_name => dest_name },
+          :success => :report_success,
+          :failure => :report_failure,
+          :max_connection_attempts => 1
+      end
+
+      def report_success(response)
+        @output.puts "Success!"
+      end
+
+      def report_failure(response)
+        @output.puts "Failed!"
+        fail APIResponseError, "API returned #{response.code} status code"
+      end
+    end
+  end
+end

data/lib/localeapp/rails.rb

@@ -4,7 +4,9 @@ module Localeapp
   module Rails
     def self.initialize
 
-      ActionController::Base.send(:include, Localeapp::Rails::Controller)
+      ActiveSupport.on_load(:action_controller) do
+        ActionController::Base.send(:include, Localeapp::Rails::Controller)
+      end
 
       # match all versions between https://github.com/rails/rails/commit/d57ce232a885b21e1d6d1f9fbf60bc5908ad880d and https://github.com/rails/rails/commit/4dbce79e95e3f56a9b48992dea4531493a5008cc on all branches
       if rails_version_matches_all?('~> 4.0.10.rc1') |

data/lib/localeapp/rails/force_exception_handler_in_translation_helper.rb

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

data/lib/localeapp/routes.rb

@@ -6,6 +6,7 @@ require "localeapp/routes/remove"
 require "localeapp/routes/rename"
 require "localeapp/routes/missing_translations"
 require "localeapp/routes/import"
+require "localeapp/routes/copy"
 
 module Localeapp
   module Routes
@@ -19,5 +20,6 @@ module Localeapp
     include Rename
     include MissingTranslations
     include Import
+    include Copy
   end
 end

data/lib/localeapp/routes/copy.rb

@@ -0,0 +1,24 @@
+module Localeapp
+  module Routes
+    module Copy
+      def copy_endpoint(options = {})
+        [:post, copy_url(options)]
+      end
+
+      def copy_url(options = {})
+        url = http_scheme.build(base_options.merge(:path => copy_path(options[:source_name], options[:format])))
+        url.to_s
+      end
+
+    private
+
+      def copy_path(source_name, format = nil)
+        raise "copy_path requires source name" if source_name.nil?
+        path = translations_path << "/#{escape_key(source_name)}" << "/copy"
+        path << ".#{format}" if format
+        path
+      end
+
+    end
+  end
+end

data/lib/localeapp/updater.rb

@@ -11,7 +11,7 @@ module Localeapp
           translations = Localeapp.load_yaml_file(filename)
           if data['translations'] && data['translations'][short_code]
             new_data = { short_code => data['translations'][short_code] }
-            translations.deep_merge!(new_data)
+            translations = deep_merge translations, new_data
           end
         else
           translations = { short_code => data['translations'][short_code] }
@@ -42,6 +42,16 @@ module Localeapp
 
     private
 
+    def deep_merge(original, other)
+      original.merge other do |_, a, b|
+        if Hash === a && Hash === b
+          deep_merge a, b
+        else
+          b
+        end
+      end
+    end
+
     def generate_yaml(translations)
       YAML.dump(translations, :line_width => -1)[4..-1]
     end

data/lib/localeapp/version.rb

@@ -1,3 +1,3 @@
 module Localeapp
-  VERSION = "3.0.1"
+  VERSION = "3.2.0"
 end

data/localeapp.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "localeapp"
   s.version     = Localeapp::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Christopher Dell", "Chris McGrath", "Michael Baudino"]
-  s.email       = ["chris@tigrish.com", "chris@octopod.info", "michael.baudino@alpine-lab.com"]
+  s.authors     = ["Christopher Dell", "Chris McGrath", "Michael Baudino", "Thibault Dalban"]
+  s.email       = ["chris@tigrish.com", "chris@octopod.info", "michael.baudino@alpine-lab.com", "thibault.dalban@alpine-lab.com"]
   s.homepage    = "http://www.localeapp.com"
   s.summary     = %q{Easy i18n translation management with localeapp.com}
   s.description = %q{Synchronizes i18n translation keys and content with localeapp.com so you don't have to manage translations by hand.}

data/spec/localeapp/cli/copy_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+describe Localeapp::CLI::Copy, "#execute(source_name, dest_name, *rest)" do
+  def do_action(source_name = "test.source_name", dest_name = "test.dest_name")
+    @command.execute(source_name, dest_name)
+  end
+
+  before(:each) do
+    @output = StringIO.new
+    @command = Localeapp::CLI::Copy.new(:output => @output)
+  end
+
+  it "makes the api call to the translations endpoint with the destination name as the post body" do
+    with_configuration do
+      expect(@command).to receive(:api_call).with(
+        :copy,
+        :url_options => { :source_name => "test.source_name" },
+        :payload => { :dest_name => "test.dest_name" },
+        :success => :report_success,
+        :failure => :report_failure,
+        :max_connection_attempts => anything
+      )
+      do_action
+    end
+  end
+end

data/spec/localeapp/routes_spec.rb

@@ -124,6 +124,24 @@ describe Localeapp::Routes do
     end
   end
 
+  describe "#copy_endpoint(options = {})" do
+    it "returns :post and the copy url for the options" do
+      with_configuration(@config) do
+        options = { :source_name => "foo.bar" }
+        expect(@routes).to receive(:copy_url).with(options).and_return("url")
+        expect(@routes.copy_endpoint(options)).to eq([:post, "url"])
+      end
+    end
+  end
+
+  describe "#copy_url(options = {})" do
+    it "extends the project_url and includes the escaped key name" do
+      with_configuration(@config) do
+        expect(@routes.copy_url(:source_name => "test.key")).to eq("https://test.host/v1/projects/API_KEY/translations/test%2Ekey/copy")
+      end
+    end
+  end
+
   describe "#export_url" do
     it "it extends the project_url and defaults to yml" do
       with_configuration(@config) do

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: localeapp
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Christopher Dell
 - Chris McGrath
 - Michael Baudino
+- Thibault Dalban
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -164,6 +165,7 @@ email:
 - chris@tigrish.com
 - chris@octopod.info
 - michael.baudino@alpine-lab.com
+- thibault.dalban@alpine-lab.com
 executables:
 - localeapp
 extensions: []
@@ -181,6 +183,7 @@ files:
 - cucumber.yml
 - features/add.feature
 - features/bad_command.feature
+- features/cp.feature
 - features/env_file.feature
 - features/environment.feature
 - features/help.feature
@@ -203,6 +206,7 @@ files:
 - lib/localeapp/api_caller.rb
 - lib/localeapp/cli/add.rb
 - lib/localeapp/cli/command.rb
+- lib/localeapp/cli/copy.rb
 - lib/localeapp/cli/daemon.rb
 - lib/localeapp/cli/install.rb
 - lib/localeapp/cli/pull.rb
@@ -225,6 +229,7 @@ files:
 - lib/localeapp/rails/mimic_rails_missing_translation_display.rb
 - lib/localeapp/routes.rb
 - lib/localeapp/routes/base.rb
+- lib/localeapp/routes/copy.rb
 - lib/localeapp/routes/export.rb
 - lib/localeapp/routes/import.rb
 - lib/localeapp/routes/missing_translations.rb
@@ -250,6 +255,7 @@ files:
 - spec/localeapp/api_call_spec.rb
 - spec/localeapp/api_caller_spec.rb
 - spec/localeapp/cli/add_spec.rb
+- spec/localeapp/cli/copy_spec.rb
 - spec/localeapp/cli/daemon_spec.rb
 - spec/localeapp/cli/install_spec.rb
 - spec/localeapp/cli/pull_spec.rb
@@ -292,8 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: localeapp
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Easy i18n translation management with localeapp.com