sinatra-r18n 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 980560087822a104c3e8e0bd634444fc0725ac8b
-  data.tar.gz: 14181c56941803446262a83b7105f6f9d1473f06
+SHA256:
+  metadata.gz: 9d3c2992234343118814eef964dbc36ecc55acccc76505b2808abf4e31e3091c
+  data.tar.gz: 424ba607babdf58467c73bc70e8a077b050485635620e967be5d4c67c7319f48
 SHA512:
-  metadata.gz: 077f01b3aa5e3bc591f90026629135d6932b13cad19a22e46fae16344156ef04c8457eaefb147213b51f10807b119ce086d558268141071a8ddb0caf245a1bd4
-  data.tar.gz: ac2ad288826447161062adebcb852596ec812b133c793676d9832c30e096deec8914cce0a48ae71ac8fc06081157d80883d8a2295c1e09813df60937b43cca6a
+  metadata.gz: cab53364047a6d1a10153256094eda43ecdbbf1d8680e7258d876bfd1e99c7346fbfb302834e76d6d3fa014dd400deb5d87390708255d3b3d0bc129d6dd1c3d6
+  data.tar.gz: 0fd56d9c6a3ec7f5f2757075e9e546ef2e4255d82521ac0ce1f5ede75f963bff4cbb5ae4cec5dde292a971d3f0ce7e0653ef2302c07feff6f8bc8d872253d64e

data/.rspec

@@ -1 +1 @@
---format documentation --colour
+--format documentation --colour --warnings --require spec_helper

data/README.md

@@ -46,7 +46,7 @@ information.
      ```ruby
     class YourApp < Sinatra::Base
       register Sinatra::R18n
-      set :root, File.dirname(__FILE__)
+      set :root, __dir__
      ```
 
 4. Add locale to your URLs. For example:

data/Rakefile

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
-task :default => :spec
+task default: :spec
 
 task :clobber_package do
-  rm_r 'pkg' rescue nil
+  rm_rf 'pkg'
 end
-task :clobber => [:clobber_package]
+task clobber: [:clobber_package]

data/lib/sinatra/r18n.rb

@@ -1,21 +1,21 @@
-=begin
-Sinatra extension to i18n support.
-
-Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=end
+# frozen_string_literal: true
+
+# Sinatra extension to i18n support.
+#
+# Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'sinatra/base'
 require 'r18n-core'
@@ -24,10 +24,10 @@ module Sinatra
   module R18n
     def self.registered(app)
       app.helpers ::R18n::Helpers
-      app.set :default_locale, Proc.new { ::R18n::I18n.default }
-      app.set :translations,   Proc.new { ::R18n.default_places }
+      app.set :default_locale, (proc { ::R18n::I18n.default })
+      app.set :translations,   (proc { ::R18n.default_places })
 
-      ::R18n.default_places { File.join(app.root, 'i18n/') }
+      ::R18n.default_places { File.join(app.root, 'i18n') }
 
       app.before do
         ::R18n.clear_cache! if self.class.development?
@@ -44,8 +44,10 @@ module Sinatra
             locales.insert(0, session[:locale])
           end
 
-          ::R18n::I18n.new(locales, ::R18n.default_places,
-            off_filters: :untranslated, on_filters: :untranslated_html)
+          ::R18n::I18n.new(
+            locales, ::R18n.default_places,
+            off_filters: :untranslated, on_filters: :untranslated_html
+          )
         end
       end
     end

data/sinatra-r18n.gemspec

@@ -1,4 +1,6 @@
-require File.expand_path('../../r18n-core/lib/r18n-core/version', __FILE__)
+# frozen_string_literal: true
+
+require_relative '../r18n-core/lib/r18n-core/version'
 
 Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
@@ -7,14 +9,14 @@ Gem::Specification.new do |s|
   s.date     = Time.now.strftime('%Y-%m-%d')
 
   s.summary     = 'A Sinatra extension that provides i18n support'
-  s.description = <<-EOF
+  s.description = <<-DESC
     A Sinatra extension that provides i18n support to translate your web
     application. It is just a wrapper for R18n core library.
     It has nice Ruby-style syntax, filters, flexible locales, custom loaders,
     translation support for any classes, time and number localization, several
     user language support, agnostic core package with out-of-box support for
     Rails, Sinatra and desktop applications.
-  EOF
+  DESC
 
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -26,6 +28,6 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/ai/r18n/tree/master/sinatra-r18n'
   s.license  = 'LGPL-3'
 
-  s.add_dependency 'sinatra',   ">= 1.3"
   s.add_dependency 'r18n-core', "= #{R18n::VERSION}"
+  s.add_dependency 'sinatra',   '>= 1.3'
 end

data/spec/app/app.rb

@@ -1,4 +1,6 @@
-require File.join(File.dirname(__FILE__), '../../lib/sinatra/r18n')
+# frozen_string_literal: true
+
+require_relative '../../lib/sinatra/r18n'
 require 'sinatra'
 
 get '/:locale/posts/:name' do
@@ -31,5 +33,5 @@ get '/warning' do
 end
 
 get '/untranslated' do
-  "#{t.post.no}"
+  t.post.no.to_s
 end

data/spec/sinatra-r18n_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe Sinatra::R18n do
   before(:all) do
@@ -10,81 +10,81 @@ describe Sinatra::R18n do
     app.set :environment, :test
   end
 
-  it "translates messages" do
+  it 'translates messages' do
     get '/en/posts/1'
     expect(last_response).to be_ok
     expect(last_response.body).to eq "<h1>Post 1</h1>\n"
   end
 
-  it "uses translations from default locale" do
+  it 'uses translations from default locale' do
     get '/ru/posts/1/comments'
     expect(last_response).to be_ok
     expect(last_response.body).to eq '3 comments'
   end
 
-  it "uses default locale" do
+  it 'uses default locale' do
     app.set :default_locale, 'ru'
     get '/locale'
     expect(last_response).to be_ok
     expect(last_response.body).to eq 'Русский'
   end
 
-  it "autodetects user locale" do
-    get '/locale', { }, { 'HTTP_ACCEPT_LANGUAGE' => 'ru,en;q=0.9' }
+  it 'autodetects user locale' do
+    get '/locale', {}, 'HTTP_ACCEPT_LANGUAGE' => 'ru,en;q=0.9'
     expect(last_response).to be_ok
     expect(last_response.body).to eq 'Русский'
   end
 
-  it "uses locale from param" do
-    get '/locale', { locale: 'ru' }
+  it 'uses locale from param' do
+    get '/locale', locale: 'ru'
     expect(last_response).to be_ok
     expect(last_response.body).to eq 'Русский'
   end
 
-  it "ignore empty param" do
-    get '/locale', { locale: '' }
+  it 'ignore empty param' do
+    get '/locale', locale: ''
     expect(last_response).to be_ok
     expect(last_response.body).to eq 'English'
   end
 
-  it "uses locale from session" do
-    get '/locale', { }, { 'rack.session' => { locale: 'ru' } }
+  it 'uses locale from session' do
+    get '/locale', {}, 'rack.session' => { locale: 'ru' }
     expect(last_response).to be_ok
     expect(last_response.body).to eq 'Русский'
   end
 
-  it "ignore empty session" do
-    get '/locale', { }, { 'rack.session' => { locale: '' } }
+  it 'ignore empty session' do
+    get '/locale', {}, 'rack.session' => { locale: '' }
     expect(last_response).to be_ok
     expect(last_response.body).to eq 'English'
   end
 
-  it "ignores empty locale" do
-    get '/locale', { }
+  it 'ignores empty locale' do
+    get '/locale', {}
     expect(last_response).to be_ok
     expect(last_response.body).to eq 'English'
   end
 
-  it "returns locales list" do
+  it 'returns locales list' do
     get '/locales'
     expect(last_response).to be_ok
     expect(last_response.body).to eq 'en: English; ru: Русский'
   end
 
-  it "formats untranslated string" do
+  it 'formats untranslated string' do
     get '/untranslated'
     expect(last_response).to be_ok
     expect(last_response.body).to eq 'post.<span style="color: red">[no]</span>'
   end
 
-  it "localizes objects" do
+  it 'localizes objects' do
     get '/time'
     expect(last_response).to be_ok
-    expect(last_response.body).to eq "1970-01-01 00:00"
+    expect(last_response.body).to eq '1970-01-01 00:00'
   end
 
-  it "sets default places" do
-    path = Pathname(__FILE__).dirname.expand_path.join('app/i18n/').to_s
+  it 'sets default places' do
+    path = File.join(__dir__, 'app', 'i18n')
     expect(R18n.default_places).to eq path
     R18n.set('en')
     expect(R18n.get.post.title(1)).to eq 'Post 1'

data/spec/spec_helper.rb

@@ -1,13 +1,18 @@
+# frozen_string_literal: true
+
 require 'pp'
 
 ENV['RACK_ENV'] = 'test'
-require File.join(File.dirname(__FILE__), 'app/app')
+require_relative 'app/app'
 
 require 'rack/test'
 
 module RSpecMixinExample
   include Rack::Test::Methods
-  def app(); Sinatra::Application; end
+
+  def app
+    Sinatra::Application
+  end
 end
 
 RSpec.configure { |c| c.include RSpecMixinExample }

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-r18n
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: r18n-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: r18n-core
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '1.3'
 description: |2
       A Sinatra extension that provides i18n support to translate your web
       application. It is just a wrapper for R18n core library.
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A Sinatra extension that provides i18n support