sinatra-r18n 2.0.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9285f88a5ade1f6c850d9de0063de9256a99b9b
-  data.tar.gz: e764bc3d49a3c5422cf5c4a78fee5542bf54dd0f
+  metadata.gz: 8241e09100d6bf1426b7297658b0171b3de4d10e
+  data.tar.gz: 0f515ff11d71ef514f3d48a5394bcd04065442a3
 SHA512:
-  metadata.gz: 823e201e910b6361e4c94be7d370f2363f88c53a155e1a24435b107e2c75830439f179409d9584476927289d8517e79334a7c9f3d0a2c9336afd18f361867e28
-  data.tar.gz: ba4aed89faafbbd1e0fc344b4a2902f249539903861f531149ca196b328177ab0e8fb5ad800ab6bfcb91237fdbb72c9c6c85901f0ea37901d741bcfaaa3d22c8
+  metadata.gz: 68a179486a9d012feff4924572e79d1e9d6e0f6a68d6f56ceca3514edf1bfaf6a915fcf13a1f6f697dd6615eed8a4f364114ca506860461363bb15e376ed8f9c
+  data.tar.gz: c513c5b3e179c06815cd8ae522d0679d543812bd1a50cbd31f331849c3ee77c3808b5b24899773ceafa78beda247e764ab0f568f26ac0e1e9a4b38a2d51c3b6b

data/README.md

@@ -25,7 +25,7 @@ information.
      ```yaml
     post:
       friends: Post only for friends
-      tags: Post tags is %1
+      tags: Post tags are %1
 
     comments: !!pl
       0: No comments

data/spec/sinatra-r18n_spec.rb

@@ -30,17 +30,41 @@ describe Sinatra::R18n do
   end
 
   it "autodetects user locale" do
-    get '/locale', {}, {'HTTP_ACCEPT_LANGUAGE' => 'ru,en;q=0.9'}
+    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' }
+    expect(last_response).to be_ok
+    expect(last_response.body).to eq 'Русский'
+  end
+
+  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' } }
     expect(last_response).to be_ok
     expect(last_response.body).to eq 'Русский'
   end
 
+  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', { }
+    expect(last_response).to be_ok
+    expect(last_response.body).to eq 'English'
+  end
+
   it "returns locales list" do
     get '/locales'
     expect(last_response).to be_ok

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-r18n
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.1.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.1.0
 description: |2
       A Sinatra extension that provides i18n support to translate your web
       application. It is just a wrapper for R18n core library.