sinatra-r18n 1.1.11 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cd70925203e2c6b2b10cbbc6bcff70890b6f56d
-  data.tar.gz: a90d76c71d62d143f979bdca6d05216e73861b6b
+  metadata.gz: ec4e1325d8290c79eed4af34379b6e3722f393e2
+  data.tar.gz: 8c3896235edb6f362e789e63076759ef7f368049
 SHA512:
-  metadata.gz: 6e2ba669373fbe065639c5489b7b9f73bee5b8dfbc73f63a52a33380c245593f0690957fea80b2c6545240d7f507399066e405160b676b061315f168b311088c
-  data.tar.gz: 8253c27d59c23242c1d331115ba7a8f66d036df808043aa790ab7d666812c6cfcbadd0ad04b83c215f5feddc3760189a5accaa4f9c541814661362b5da0f71d4
+  metadata.gz: 800d2320d72f9a7d395b8171b0e987b4ab93ab786989a32c561a8fb91c2ff5924fc0c92747332527c281e8d6f6f3c99ab7396ebb2c0eba1c2be98644156ead67
+  data.tar.gz: 8665c0bbf9206fa58fae3f8e2d5630c0d75823b8c4ec7f29a4fefe7a0dc466f0f9676705922efd9a1eb1ef381872c86816f5fbd457314bff328ce3a1d7505408

data/lib/sinatra/r18n.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Sinatra extension to i18n support.
 
@@ -46,7 +45,7 @@ module Sinatra
           end
 
           ::R18n::I18n.new(locales, ::R18n.default_places,
-            :off_filters => :untranslated, :on_filters => :untranslated_html)
+            off_filters: :untranslated, on_filters: :untranslated_html)
         end
       end
     end

data/sinatra-r18n.gemspec

@@ -2,11 +2,11 @@ require File.expand_path('../../r18n-core/lib/r18n-core/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
-  s.name = 'sinatra-r18n'
-  s.version = R18n::VERSION.dup
-  s.date = Time.now.strftime('%Y-%m-%d')
-  s.summary = 'A Sinatra extension that provides i18n support to translate your
-    web application.'
+  s.name     = 'sinatra-r18n'
+  s.version  = R18n::VERSION.dup
+  s.date     = Time.now.strftime('%Y-%m-%d')
+
+  s.summary     = 'A Sinatra extension that provides i18n support'
   s.description = <<-EOF
     A Sinatra extension that provides i18n support to translate your web
     application. It is just a wrapper for R18n core library.

data/spec/app/app.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.join(File.dirname(__FILE__), '../../lib/sinatra/r18n')
 require 'sinatra'
 

data/spec/sinatra-r18n_spec.rb

@@ -1,10 +1,9 @@
-# encoding: utf-8
 require File.expand_path('../spec_helper', __FILE__)
 
 describe Sinatra::R18n do
   before(:all) do
     Sinatra::R18n.registered(app)
- 	end
+  end
 
   after do
     app.set :default_locale, 'en'
@@ -13,58 +12,57 @@ describe Sinatra::R18n do
 
   it "translates messages" do
     get '/en/posts/1'
-    last_response.should be_ok
-    last_response.body.should == "<h1>Post 1</h1>\n"
+    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
     get '/ru/posts/1/comments'
-    last_response.should be_ok
-    last_response.body.should == '3 comments'
+    expect(last_response).to be_ok
+    expect(last_response.body).to eq '3 comments'
   end
 
   it "uses default locale" do
     app.set :default_locale, 'ru'
     get '/locale'
-    last_response.should be_ok
-    last_response.body.should == 'Русский'
+    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'}
-    last_response.should be_ok
-    last_response.body.should == 'Русский'
+    expect(last_response).to be_ok
+    expect(last_response.body).to eq 'Русский'
   end
 
   it "uses locale from session" do
-    get '/locale', { }, { 'rack.session' => { :locale => 'ru' } }
-    last_response.should be_ok
-    last_response.body.should == 'Русский'
+    get '/locale', { }, { 'rack.session' => { locale: 'ru' } }
+    expect(last_response).to be_ok
+    expect(last_response.body).to eq 'Русский'
   end
 
   it "returns locales list" do
     get '/locales'
-    last_response.should be_ok
-    last_response.body.should == 'en: English; ru: Русский'
+    expect(last_response).to be_ok
+    expect(last_response.body).to eq 'en: English; ru: Русский'
   end
 
   it "formats untranslated string" do
     get '/untranslated'
-    last_response.should be_ok
-    last_response.body.should == 'post.<span style="color: red">[no]</span>'
+    expect(last_response).to be_ok
+    expect(last_response.body).to eq 'post.<span style="color: red">[no]</span>'
   end
 
   it "localizes objects" do
     get '/time'
-    last_response.should be_ok
-    last_response.body.should == "01/01/1970 00:00"
+    expect(last_response).to be_ok
+    expect(last_response.body).to eq "01/01/1970 00:00"
   end
 
   it "sets default places" do
-    R18n.default_places.should ==
-      Pathname(__FILE__).dirname.expand_path.join('app/i18n/').to_s
+    path = Pathname(__FILE__).dirname.expand_path.join('app/i18n/').to_s
+    expect(R18n.default_places).to eq path
     R18n.set('en')
-    R18n.get.post.title(1).should == 'Post 1'
+    expect(R18n.get.post.title(1)).to eq 'Post 1'
   end
-
 end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'pp'
 
 ENV['RACK_ENV'] = 'test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-r18n
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.11
+        version: 2.0.0
 description: |2
       A Sinatra extension that provides i18n support to translate your web
       application. It is just a wrapper for R18n core library.
@@ -87,7 +87,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A Sinatra extension that provides i18n support to translate your web application.
+summary: A Sinatra extension that provides i18n support
 test_files:
 - spec/app/app.rb
 - spec/app/i18n/en.yml