gettext-setup 0.18 → 0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6267255e8fcb739d61eff7d91551eb29da7bde07
-  data.tar.gz: 41dc3ab49b770c2558ccbe172a1c1f4266401f8c
+  metadata.gz: 37b01acc031b90d76e9682592cd03c3b2026b273
+  data.tar.gz: a473f0e5260a3546d48fdf11850c6d540a0321fb
 SHA512:
-  metadata.gz: 5f49c5048dfd8a630ad0e75925605fcc9e56edfd71271737ca1fc193ad1916c33c74cff91a219947617ec75e93ec7fb91f67e2d44d455eee476a07f3843e9e61
-  data.tar.gz: 14d08a1b4f0594eabfd5e191761752850d90fe05e543501f24b5cc45c6987b169f8d481d40f8a0f740284b3f2dd4e2f9571b6fc29a086ab1c953a44cbd5b3e7b
+  metadata.gz: 4b5496fe67a82255937ef93aa41122a97d8c8fba66dc320d093c4bc8e8cf70ac4f1bea67368bb47d69752eff637476a78c511e22ea980df2b2173a6a9997f65d
+  data.tar.gz: bbe45933b1ae4d9be41f174d46bdf4580aa58a8351c86d6b9eba353fb655a1238ea3f5e324ff4ba1c7315f0e5b64676a3244441f87c3759ceb0e57de713840c8

data/lib/gettext-setup/gettext_setup.rb

@@ -1,11 +1,12 @@
 # -*- encoding: utf-8 -*-
+
 require 'fast_gettext'
 require 'yaml'
 require 'locale'
 
 module GettextSetup
-  @@config = nil
-  @@translation_repositories = {}
+  @config = nil
+  @translation_repositories = {}
   FastGettext.default_available_locales = []
 
   # `locales_path` should include:
@@ -17,8 +18,8 @@ module GettextSetup
   # :file_format - one of the supported backends for fast_gettext (e.g. :po, :mo, :yaml, etc.)
   def self.initialize(locales_path, options = {})
     config_path = File.absolute_path('config.yaml', locales_path)
-    @@config = YAML.load_file(config_path)['gettext']
-    @@locales_path = locales_path
+    @config = YAML.load_file(config_path)['gettext']
+    @locales_path = locales_path
 
     # Make the translation methods available everywhere
     Object.send(:include, FastGettext::Translation)
@@ -30,7 +31,7 @@ module GettextSetup
 
     # 'chain' is the only available multi-domain type in fast_gettext 1.1.0 We should consider
     # investigating 'merge' once we can bump our dependency
-    FastGettext.add_text_domain('master_domain', type: :chain, chain: @@translation_repositories.values)
+    FastGettext.add_text_domain('master_domain', type: :chain, chain: @translation_repositories.values)
     FastGettext.default_text_domain = 'master_domain'
 
     # Likewise, be explicit in our default language choice.
@@ -40,31 +41,31 @@ module GettextSetup
     Locale.set_default(default_locale)
   end
 
-  def self.add_repository_to_chain(project_name,options)
+  def self.add_repository_to_chain(project_name, options)
     repository = FastGettext::TranslationRepository.build(project_name,
-                                                          :path => locales_path,
-                                                          :type => options[:file_format] || :po,
-                                                          :ignore_fuzzy => false)
-    @@translation_repositories[project_name] = repository unless @@translation_repositories.key? project_name
+                                                          path: locales_path,
+                                                          type: options[:file_format] || :po,
+                                                          ignore_fuzzy: false)
+    @translation_repositories[project_name] = repository unless @translation_repositories.key? project_name
   end
 
   def self.locales_path
-    @@locales_path
+    @locales_path
   end
 
   def self.config
-    @@config ||= {}
+    @config ||= {}
   end
 
   def self.translation_repositories
-    @@translation_repositories
+    @translation_repositories
   end
 
   def self.default_locale
-    config['default_locale'] || "en"
+    config['default_locale'] || 'en'
   end
 
-  def self.set_default_locale(new_locale)
+  def self.default_locale=(new_locale)
     FastGettext.default_locale = new_locale
     Locale.set_default(new_locale)
     config['default_locale'] = new_locale
@@ -81,31 +82,31 @@ module GettextSetup
   end
 
   def self.locales
-    explicit = Dir.glob(File::absolute_path('*/*.po', locales_path)).map do |x|
-      File::basename(File::dirname(x))
+    explicit = Dir.glob(File.absolute_path('*/*.po', locales_path)).map do |x|
+      File.basename(File.dirname(x))
     end
-    (explicit + [ default_locale]).uniq
+    (explicit + [default_locale]).uniq
   end
 
   # Given an HTTP Accept-Language header return the locale with the highest
   # priority from it for which we have a locale available. If none exists,
   # return the default locale
   def self.negotiate_locale(accept_header)
-    unless @@config
-      raise ArgumentError, "No config.yaml found! Use `GettextSetup.initialize(locales_path)` to locate your config.yaml"
+    unless @config
+      raise ArgumentError, 'No config.yaml found! Use `GettextSetup.initialize(locales_path)` to locate your config.yaml'
     end
     return FastGettext.default_locale if accept_header.nil?
-    available_locales = accept_header.split(",").map do |locale|
+    available_locales = accept_header.split(',').map do |locale|
       pair = locale.strip.split(';q=')
       pair << '1.0' unless pair.size == 2
       pair[0] = FastGettext.default_locale if pair[0] == '*'
       pair
-    end.sort_by do |(locale,qvalue)|
+    end.sort_by do |(_, qvalue)|
       -1 * qvalue.to_f
-    end.select do |(locale,_)|
+    end.select do |(locale, _)|
       FastGettext.available_locales.include?(locale)
     end
-    if available_locales and available_locales.first
+    if available_locales && available_locales.first
       available_locales.first.first
     else
       # We can't satisfy the request preference. Just use the default locale.

data/lib/gettext_setup.rb

@@ -0,0 +1 @@
+require 'gettext-setup/gettext_setup'

data/lib/tasks/gettext.rake

@@ -8,7 +8,6 @@ require_relative '../gettext-setup/gettext_setup'
 # GettextSetup.initialize(File.absolute_path('locales', Dir.pwd))
 
 namespace :gettext do
-
   def locale_path
     GettextSetup.locales_path
   end
@@ -33,7 +32,7 @@ namespace :gettext do
   end
 
   def pot_file_path
-    File.join(locale_path, GettextSetup.config['project_name'] + ".pot")
+    File.join(locale_path, GettextSetup.config['project_name'] + '.pot')
   end
 
   def generate_new_pot
@@ -43,36 +42,32 @@ namespace :gettext do
     bugs_address = config['bugs_address']
     copyright_holder = config['copyright_holder']
     # Done this way to allow the user to enter an empty string in the config.
-    if config.has_key?('comments_tag')
-      comments_tag = config['comments_tag']
-    else
-      comments_tag = 'TRANSLATORS'
-    end
-    version=`git describe`
-    system("rxgettext -o locales/#{project_name}.pot --no-wrap --sort-by-file " +
-           "--no-location --add-comments#{comments_tag.to_s == '' ? '' : '=' + comments_tag} --msgid-bugs-address '#{bugs_address}' " +
-           "--package-name '#{package_name}' " +
-           "--package-version '#{version}' " +
+    comments_tag = config.key?('comments_tag') ? config['comments_tag'] : 'TRANSLATORS'
+    version = `git describe`
+    system("rxgettext -o locales/#{project_name}.pot --no-wrap --sort-by-file " \
+           "--add-comments#{comments_tag.to_s == '' ? '' : '=' + comments_tag} --msgid-bugs-address '#{bugs_address}' " \
+           "--package-name '#{package_name}' " \
+           "--package-version '#{version}' " \
            "--copyright-holder='#{copyright_holder}' --copyright-year=#{Time.now.year} " +
-           "#{files_to_translate.join(" ")}")
+           files_to_translate.join(' '))
   end
 
-  desc "Generate a new POT file and replace old if strings changed"
+  desc 'Generate a new POT file and replace old if strings changed'
   task :update_pot do
-    if !File.exists? pot_file_path
-      puts "No existing POT file, generating new"
+    if !File.exist? pot_file_path
+      puts 'No existing POT file, generating new'
       generate_new_pot
     else
-      old_pot = pot_file_path + ".old"
+      old_pot = pot_file_path + '.old'
       File.rename(pot_file_path, old_pot)
       generate_new_pot
       begin
         _, stderr, status = Open3.capture3("msgcmp --use-untranslated '#{old_pot}' '#{pot_file_path}'")
         if status == 1 || /this message is not used/.match(stderr)
           File.delete(old_pot)
-          puts "String changes detected, replacing with updated POT file"
+          puts 'String changes detected, replacing with updated POT file'
         else
-          puts "No string changes detected, keeping old POT file"
+          puts 'No string changes detected, keeping old POT file'
           File.rename(old_pot, pot_file_path)
         end
       rescue IOError
@@ -82,15 +77,15 @@ namespace :gettext do
     end
   end
 
-  desc "Generate POT file"
+  desc 'Generate POT file'
   task :pot do
     generate_new_pot
     puts "POT file #{pot_file_path} has been generated"
   end
 
-  desc "Update PO file for a specific language"
+  desc 'Update PO file for a specific language'
   task :po, [:language] do |_, args|
-    language = args.language || ENV["LANGUAGE"]
+    language = args.language || ENV['LANGUAGE']
 
     # Let's do some pre-verification of the environment.
     if language.nil?
@@ -102,8 +97,8 @@ namespace :gettext do
     mkdir_p(language_path)
 
     po_file_path = File.join(language_path,
-                             GettextSetup.config['project_name'] + ".po")
-    if File.exists?(po_file_path)
+                             GettextSetup.config['project_name'] + '.po')
+    if File.exist?(po_file_path)
       system("msgmerge -U #{po_file_path} #{pot_file_path}")
     else
       system("msginit --no-translator -l #{language} -o #{po_file_path} -i #{pot_file_path}")

data/spec/lib/gettext_setup_spec.rb

@@ -1,16 +1,16 @@
-require "rspec/expectations"
+require 'rspec/expectations'
 require_relative '../spec_helper'
 
 describe GettextSetup do
   before(:each) do
-    GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures', 'locales'))
+    GettextSetup.initialize(File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'locales'))
   end
   let(:config) do
     GettextSetup.config
   end
   context 'initialize' do
-    it "sets up correctly" do
-      # GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures'))
+    it 'sets up correctly' do
+      # GettextSetup.initialize(File.join(File.dirname(File.dirname(__FILE__)), 'fixtures'))
       expect(GettextSetup.locales_path).to match(/\/spec\/fixtures/)
       expect(config['project_name']).to eq('sinatra-i18n')
       expect(config['package_name']).to eq('Sinatra i18n demo')
@@ -19,34 +19,34 @@ describe GettextSetup do
     end
   end
   context 'negotiate_locale' do
-    it "negotiates correctly" do
+    it 'negotiates correctly' do
       FastGettext.locale = GettextSetup.negotiate_locale('de')
       expect(FastGettext.locale).to eq('de')
       expect(_('Hello, world!')).to eq('Hallo, Welt!')
     end
-    it "chooses the default locale when no match is found" do
+    it 'chooses the default locale when no match is found' do
       expect(GettextSetup.negotiate_locale('no-match')).to eq(config['default_locale'])
     end
-    it "chooses the language with the highest q value" do
+    it 'chooses the language with the highest q value' do
       expect(GettextSetup.negotiate_locale('en;q=1, de;q=2')).to eq('de')
       expect(GettextSetup.negotiate_locale('en;q=1, de;q=0')).to eq('en')
     end
-    it "chooses the first value when q values are equal" do
+    it 'chooses the first value when q values are equal' do
       expect(GettextSetup.negotiate_locale('de;q=1, en;q=1')).to eq('de')
     end
   end
-  context 'set_default_locale' do
+  context 'setting default_locale' do
     before :each do
-      GettextSetup.set_default_locale('en')
+      GettextSetup.default_locale = 'en'
     end
     it 'allows setting the default locale' do
       expect(GettextSetup.default_locale).to eq('en')
-      GettextSetup.set_default_locale('de')
+      GettextSetup.default_locale = 'de'
       expect(GettextSetup.default_locale).to eq('de')
     end
   end
   context 'clear' do
-    it "can clear the locale" do
+    it 'can clear the locale' do
       expect(GettextSetup.default_locale).to eq('en')
       expect(GettextSetup.candidate_locales).to include('en')
       GettextSetup.clear
@@ -57,10 +57,12 @@ describe GettextSetup do
   context 'multiple locales' do
     # locales/ loads the de locale and alt_locales/ loads the jp locale
     before(:all) do
-      GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures', 'alt_locales'))
+      GettextSetup.initialize(File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'alt_locales'))
     end
     it 'can aggregate locales across projects' do
-      expect(FastGettext.default_available_locales).to include('en','de','jp')
+      expect(FastGettext.default_available_locales).to include('en')
+      expect(FastGettext.default_available_locales).to include('de')
+      expect(FastGettext.default_available_locales).to include('jp')
     end
     it 'can switch to loaded locale' do
       FastGettext.locale = GettextSetup.negotiate_locale('de,en')
@@ -71,28 +73,28 @@ describe GettextSetup do
   end
   context 'translation repository chain' do
     before(:all) do
-      GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures', 'alt_locales'))
+      GettextSetup.initialize(File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'alt_locales'))
     end
     it 'chain is not nil' do
       expect(GettextSetup.translation_repositories).not_to be_nil
     end
     it 'can translate without switching text domains' do
-      FastGettext.locale = "de"
+      FastGettext.locale = 'de'
       expect(_('Hello, world!')).to eq('Hallo, Welt!')
-      FastGettext.locale = "jp"
+      FastGettext.locale = 'jp'
       expect(_('Hello, world!')).to eq('こんにちは世界')
     end
     it 'does not allow duplicate repositories' do
-      GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures', 'alt_locales'))
+      GettextSetup.initialize(File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'alt_locales'))
       repos = GettextSetup.translation_repositories
-      expect(repos.select { |k,v| k == 'alt_locales' }.size).to eq(1)
+      expect(repos.select { |k, _| k == 'alt_locales' }.size).to eq(1)
     end
     it 'does allow multiple unique domains' do
-      GettextSetup.initialize(File::join(File::dirname(File::dirname(__FILE__)), 'fixtures', 'locales'))
+      GettextSetup.initialize(File.join(File.dirname(File.dirname(__FILE__)), 'fixtures', 'locales'))
       repos = GettextSetup.translation_repositories
-      expect(repos.size) == 2
-      expect(repos.select { |k,v| k == 'alt_locales' }.size).to eq(1)
-      expect(repos.select { |k,v| k == 'sinatra-i18n' }.size).to eq(1)
+      expect(repos.size == 2)
+      expect(repos.select { |k, _| k == 'alt_locales' }.size).to eq(1)
+      expect(repos.select { |k, _| k == 'sinatra-i18n' }.size).to eq(1)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 require 'simplecov'
 SimpleCov.start do
-  add_filter "/spec/"
+  add_filter '/spec/'
 end
 
-require_relative '../lib/gettext-setup'
+require_relative '../lib/gettext_setup'

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: gettext-setup
 version: !ruby/object:Gem::Version
-  version: '0.18'
+  version: '0.19'
 platform: ruby
 authors:
 - Puppet
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: fast_gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
-  type: :runtime
+  name: fast_gettext
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.2
-  type: :runtime
+  name: gettext
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.2
 - !ruby/object:Gem::Dependency
-  name: locale
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  name: locale
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rack-test
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :development
+  name: rspec-core
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :development
+  name: rspec-expectations
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :development
+  name: rspec-mocks
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: simplecov
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: webmock
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rubocop
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A gem to ease i18n
@@ -201,8 +201,8 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- lib/gettext-setup.rb
 - lib/gettext-setup/gettext_setup.rb
+- lib/gettext_setup.rb
 - lib/tasks/gettext.rake
 - locales/config-sample.yaml
 - spec/fixtures/alt_locales/alt_locales.pot
@@ -217,33 +217,32 @@ homepage: https://github.com/puppetlabs/gettext-setup-gem
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.5
+signing_key:
 specification_version: 4
 summary: A gem to ease internationalization with fast_gettext
 test_files:
+- spec/spec_helper.rb
 - spec/fixtures/alt_locales/alt_locales.pot
 - spec/fixtures/alt_locales/config.yaml
 - spec/fixtures/alt_locales/jp/alt_locales.po
 - spec/fixtures/locales/config.yaml
-- spec/fixtures/locales/de/sinatra-i18n.po
 - spec/fixtures/locales/sinatra-i18n.pot
+- spec/fixtures/locales/de/sinatra-i18n.po
 - spec/lib/gettext_setup_spec.rb
-- spec/spec_helper.rb
-has_rdoc: 

data/lib/gettext-setup.rb

@@ -1 +0,0 @@
-require 'gettext-setup/gettext_setup'