r18n-rails-api 1.1.11 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95934fcd7dab04c55e3a3e26e77a222a743389d9
-  data.tar.gz: 22cbe765710c61b1ffbdadae27f482f0d7c66ca9
+  metadata.gz: e3b8232967c7ede7aa7c45724c20e9a0a025f474
+  data.tar.gz: 1b4630a00ed475b1a75b8a84187e96111879d232
 SHA512:
-  metadata.gz: 1ee1b04b3fc3a3e17e0aadaf8738d028db8337a37818a4f658ce94addddc4c854176944f72a4a78822e5524e275a0562ebaa85a6722ab72d0d74d19443ea0812
-  data.tar.gz: 6b84c05d65282b0f5932fdefba6cd3a06ec0010137a7c59a75cb2bbabf2738318a9cd4371d9a2ba30ae51a851a2883125aa83e9b06a69652674aaeec3e1a3c13
+  metadata.gz: 91815fe8b045489832685abcc407f64e75027b550b4b3b0777161c7631034bb5c67da8f126cf5e146c403582d8705153905e927428a27b0c43fa43dce9526cdc
+  data.tar.gz: 1d32715e9e807786b7f740e68e9dfae59e565e92055737eaa2631b46c2e0eb3dda35e2baac245d2ed6b7838b01bcb544537b9da27daa05ba5d197d93515a3f07

data/README.md

@@ -22,8 +22,8 @@ users: !!pl
 ```ruby
 require 'r18n-rails-api'
 
-i18n.greeting(:name => 'John') #=> "Hi, John"
-i18n.users(:count => 5)        #=> "5 users"
+i18n.greeting(name: 'John') #=> "Hi, John"
+i18n.users(count: 5)        #=> "5 users"
 ```
 
 ### Rails Translations
@@ -47,7 +47,7 @@ require 'r18n-rails-api'
 I18n.load_path = ['i18n/en.yml']
 i18n = R18n::I18n.new('en', R18n::Loader::Rails)
 
-i18n.posts(:count => 5) #=> "5 posts"
+i18n.posts(count: 5) #=> "5 posts"
 ```
 
 ### Backend
@@ -60,9 +60,9 @@ require 'r18n-rails-api'
 R18n.set('en', 'path/to/translation')
 I18n.backend = R18n::Backend
 
-I18n.l Time.now, :format => :full #=> "6th of December, 2009 22:44"
-I18n.t :greeting, :name => 'John' #=> "Hi, John"
-I18n.t :users, :count => 5        #=> "5 users"
+I18n.l Time.now, format: :full #=> "6th of December, 2009 22:44"
+I18n.t :greeting, name: 'John' #=> "Hi, John"
+I18n.t :users, count: 5        #=> "5 users"
 ```
 
 ## R18n Features

data/lib/r18n-rails-api/backend.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 R18n backend for Rails I18n.
 
@@ -26,7 +25,7 @@ module R18n
   #
   #   R18n.set locales, R18n::Loader::Rails
   #
-  #   I18n.l Time.now, :format => :full #=> "6th of December, 2009 22:44"
+  #   I18n.l Time.now, format: :full #=> "6th of December, 2009 22:44"
   class Backend
     include ::I18n::Backend::Transliterator
 

data/lib/r18n-rails-api/filters.rb

@@ -60,7 +60,7 @@ R18n::Filters.add('pl', :named_pluralization) do |content, config, param|
     hash[type]
   elsif content.is_a? R18n::UnpluralizetedTranslation
     R18n::RailsUnpluralizetedTranslation.new(config[:locale], config[:path],
-        :locale => config[:locale], :translations => content.to_hash)
+        locale: config[:locale], translations: content.to_hash)
   else
     content
   end

data/lib/r18n-rails-api/loader.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Loader for Rails translations.
 

data/lib/r18n-rails-api/rails_plural.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 =begin
 Converter between R18n and Rails I18n plural keys.
 
@@ -28,7 +27,7 @@ module R18n
 
     # Convert Rails I18n plural key to R18n.
     def self.to_r18n(k)
-      { :zero  => 0, :one => 1, :few => 2, :many => 'n', :other => 'n' }[k]
+      { zero: 0, one: 1, few: 2, many: 'n', other: 'n' }[k]
     end
 
     # Convert R18n plural key to Rails I18n.

data/r18n-rails-api.gemspec

@@ -2,10 +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 = 'r18n-rails-api'
-  s.version = R18n::VERSION.dup
-  s.date = Time.now.strftime('%Y-%m-%d')
-  s.summary = 'Rails I18n compatibility for R18n'
+  s.name     = 'r18n-rails-api'
+  s.version  = R18n::VERSION.dup
+  s.date     = Time.now.strftime('%Y-%m-%d')
+
+  s.summary     = 'Rails I18n compatibility for R18n'
   s.description = <<-EOF
     R18n backend for Rails I18n and R18n filters and loader to support Rails
     translation format.

data/spec/backend_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path('../spec_helper', __FILE__)
 
 describe R18n::Backend do
@@ -10,116 +9,116 @@ describe R18n::Backend do
   end
 
   it "returns available locales" do
-    I18n.available_locales.should =~ [:en, :ru]
+    expect(I18n.available_locales).to match_array([:en, :ru])
   end
 
   it "localizes objects" do
     time = Time.at(0).utc
     date = Date.parse('1970-01-01')
 
-    I18n.l(time).should == 'Thu, 01 Jan 1970 00:00:00 +0000'
-    I18n.l(date).should == '1970-01-01'
+    expect(I18n.l(time)).to eq 'Thu, 01 Jan 1970 00:00:00 +0000'
+    expect(I18n.l(date)).to eq '1970-01-01'
 
-    I18n.l(time, :format => :short).should == '01 Jan 00:00'
-    I18n.l(time, :format => :full).should == '1st of January, 1970 00:00'
+    expect(I18n.l(time, format: :short)).to eq '01 Jan 00:00'
+    expect(I18n.l(time, format: :full)).to  eq '1st of January, 1970 00:00'
 
-    I18n.l(-5000.5).should == '−5,000.5'
+    expect(I18n.l(-5000.5)).to eq '−5,000.5'
   end
 
   it "translates by key and scope" do
-    I18n.t('in.another.level').should               == 'Hierarchical'
-    I18n.t(:level, :scope => 'in.another').should   == 'Hierarchical'
-    I18n.t(:'another.level', :scope => 'in').should == 'Hierarchical'
+    expect(I18n.t('in.another.level')).to            eq 'Hierarchical'
+    expect(I18n.t(:level, scope: 'in.another')).to   eq 'Hierarchical'
+    expect(I18n.t(:'another.level', scope: 'in')).to eq 'Hierarchical'
   end
 
   it "uses pluralization and variables" do
-    I18n.t('users', :count => 0).should == '0 users'
-    I18n.t('users', :count => 1).should == '1 user'
-    I18n.t('users', :count => 5).should == '5 users'
+    expect(I18n.t('users', count: 0)).to eq '0 users'
+    expect(I18n.t('users', count: 1)).to eq '1 user'
+    expect(I18n.t('users', count: 5)).to eq '5 users'
   end
 
   it "uses another separator" do
-    I18n.t('in/another/level', :separator => '/').should == 'Hierarchical'
+    expect(I18n.t('in/another/level', separator: '/')).to eq 'Hierarchical'
   end
 
   it "translates array" do
-    I18n.t(['in.another.level', 'in.default']).should == ['Hierarchical',
-                                                          'Default']
+    expect(I18n.t(['in.another.level', 'in.default'])).to eq(
+      ['Hierarchical', 'Default'])
   end
 
   it "uses default value" do
-    I18n.t(:missed, :default => 'Default').should                 == 'Default'
-    I18n.t(:missed, :default => :default, :scope => :in).should   == 'Default'
-    I18n.t(:missed, :default => [:also_no, :'in.default']).should == 'Default'
-    I18n.t(:missed, :default => proc { |key| key.to_s }).should   == 'missed'
+    expect(I18n.t(:missed, default: 'Default')).to                 eq 'Default'
+    expect(I18n.t(:missed, default: :default, scope: :in)).to      eq 'Default'
+    expect(I18n.t(:missed, default: [:also_no, :'in.default'])).to eq 'Default'
+    expect(I18n.t(:missed, default: proc { |key| key.to_s })).to   eq 'missed'
   end
 
   it "raises error on no translation" do
-    lambda {
+    expect(-> {
       I18n.backend.translate(:en, :missed)
-    }.should raise_error(::I18n::MissingTranslationData)
-    lambda {
+    }).to raise_error(::I18n::MissingTranslationData)
+
+    expect(-> {
       I18n.t(:missed)
-    }.should raise_error(::I18n::MissingTranslationData)
+    }).to raise_error(::I18n::MissingTranslationData)
   end
 
   it "reloads translations" do
-    lambda { I18n.t(:other) }.should raise_error(::I18n::MissingTranslationData)
+    expect(-> { I18n.t(:other) }).to raise_error(::I18n::MissingTranslationData)
     I18n.load_path << OTHER
     I18n.reload!
-    I18n.t(:other).should == 'Other'
+    expect(I18n.t(:other)).to eq 'Other'
   end
 
   it "returns plain classes" do
-    I18n.t('in.another.level').class.should == ActiveSupport::SafeBuffer
-    I18n.t('in.another').class.should == Hash
+    expect(I18n.t('in.another.level').class).to eq ActiveSupport::SafeBuffer
+    expect(I18n.t('in.another').class).to eq Hash
   end
 
   it "returns correct unpluralized hash" do
-    I18n.t('users').should == { :one => '1 user', :other => '%{count} users' }
+    expect(I18n.t('users')).to eq ({ one: '1 user', other: '%{count} users' })
   end
 
   it "corrects detect untranslated, whem path is deeper than string" do
-    lambda {
+    expect(-> {
       I18n.t('in.another.level.deeper')
-    }.should raise_error(::I18n::MissingTranslationData)
+    }).to raise_error(::I18n::MissingTranslationData)
 
-    lambda {
+    expect(-> {
       I18n.t('in.another.level.go.deeper')
-    }.should raise_error(::I18n::MissingTranslationData)
+    }).to raise_error(::I18n::MissingTranslationData)
   end
 
   it "doesn't call String methods" do
-    I18n.t('in.another').class.should == Hash
+    expect(I18n.t('in.another').class).to eq Hash
   end
 
   it "doesn't call object methods" do
-    lambda {
+    expect(-> {
       I18n.t('in.another.level.to_sym')
-    }.should raise_error(::I18n::MissingTranslationData)
+    }).to raise_error(::I18n::MissingTranslationData)
   end
 
   it "works deeper pluralization" do
-    I18n.t('users.other', :count => 5).should == '5 users'
+    expect(I18n.t('users.other', count: 5)).to eq '5 users'
   end
 
   it "returns hash with symbols keys" do
-    I18n.t('in').should == {
-      :another => { :level => 'Hierarchical' },
-      :default => 'Default'
-    }
+    expect(I18n.t('in')).to eq({
+      another: { level: 'Hierarchical' },
+      default: 'Default'
+    })
   end
 
   it "changes locale in place" do
     I18n.load_path << PL
-    I18n.t('users', :count => 5).should == '5 users'
-    I18n.t('users', :count => 5, :locale => :ru).should == 'Много'
+    expect(I18n.t('users', count: 5)).to eq '5 users'
+    expect(I18n.t('users', count: 5, locale: :ru)).to eq 'Много'
 
-    I18n.l(Date.parse('1970-01-01'), :locale => :ru).should == '01.01.1970'
+    expect(I18n.l(Date.parse('1970-01-01'), locale: :ru)).to eq '01.01.1970'
   end
 
   it "has transliterate method" do
-    I18n.transliterate('café').should == 'cafe'
+    expect(I18n.transliterate('café')).to eq 'cafe'
   end
-
 end

data/spec/data/simple/ru.rb

@@ -1 +1 @@
-{ :ru => { :two => "Два" } }
+{ ru: { two: "Два" } }

data/spec/filters_spec.rb

@@ -1,28 +1,26 @@
-# encoding: utf-8
 require File.expand_path('../spec_helper', __FILE__)
 
 describe 'Rails filters' do
-
   it "uses named variables" do
-    i18n = R18n::Translation.new(EN, '', :locale => EN,
-      :translations => { 'echo' => 'Value is %{value}' })
+    i18n = R18n::Translation.new(EN, '', locale: EN,
+      translations: { 'echo' => 'Value is %{value}' })
 
-    i18n.echo(:value => 'R18n').should == 'Value is R18n'
-    i18n.echo(:value => -5.5).should   == 'Value is −5.5'
-    i18n.echo(:value => 5000).should   == 'Value is 5,000'
-    i18n.echo(:value => '<b>').should  == 'Value is &lt;b&gt;'
-    i18n.echo.should == 'Value is %{value}'
+    expect(i18n.echo(value: 'R18n')).to eq 'Value is R18n'
+    expect(i18n.echo(value: -5.5)).to   eq 'Value is −5.5'
+    expect(i18n.echo(value: 5000)).to   eq 'Value is 5,000'
+    expect(i18n.echo(value: '<b>')).to  eq 'Value is &lt;b&gt;'
+    expect(i18n.echo).to eq 'Value is %{value}'
   end
 
   it "uses old variables syntax" do
-    i18n = R18n::Translation.new(EN, '', :locale => EN,
-      :translations => { 'echo' => 'Value is {{value}}' })
-    i18n.echo(:value => 'Old').should == 'Value is Old'
+    i18n = R18n::Translation.new(EN, '', locale: EN,
+      translations: { 'echo' => 'Value is {{value}}' })
+    expect(i18n.echo(value: 'Old')).to eq 'Value is Old'
   end
 
   it "pluralizes by variable %{count}" do
-    i18n = R18n::Translation.new(EN, '', :locale => EN,
-      :translations => {
+    i18n = R18n::Translation.new(EN, '', locale: EN,
+      translations: {
         'users' => R18n::Typed.new('pl', {
           0 => 'no users',
           1 => '1 user',
@@ -30,9 +28,8 @@ describe 'Rails filters' do
         })
       })
 
-    i18n.users(:count => 0).should == 'no users'
-    i18n.users(:count => 1).should == '1 user'
-    i18n.users(:count => 5).should == '5 users'
+    expect(i18n.users(count: 0)).to eq 'no users'
+    expect(i18n.users(count: 1)).to eq '1 user'
+    expect(i18n.users(count: 5)).to eq '5 users'
   end
-
 end

data/spec/loader_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require File.expand_path('../spec_helper', __FILE__)
 
 describe R18n::Loader::Rails do
@@ -8,40 +7,48 @@ describe R18n::Loader::Rails do
   end
 
   it "returns available locales" do
-    @loader.available.should =~ [EN, RU]
+    expect(@loader.available).to match_array([EN, RU])
   end
 
   it "loads translation" do
-    @loader.load(RU).should == { 'one' => 'Один', 'two' => 'Два' }
+    expect(@loader.load(RU)).to eq({ 'one' => 'Один', 'two' => 'Два' })
   end
 
   it "changes pluralization" do
-    @loader.load(EN).should == {
+    expect(@loader.load(EN)).to eq({
       'users' => R18n::Typed.new('pl', {
-        0 => 'Zero', 1 => 'One', 2 => 'Few', 'n' => 'Other'
-       })
-    }
+        0   => 'Zero',
+        1   => 'One',
+        2   => 'Few',
+        'n' => 'Other'
+      })
+    })
   end
 
   it "changes Russian pluralization" do
     I18n.load_path = [PL]
-    @loader.load(RU).should == {
-      'users' => R18n::Typed.new('pl', {
-        0 => 'Ноль', 1 => 'Один', 2 => 'Несколько', 'n' => 'Много'
-       })
-    }
+    expect(@loader.load(RU)).to eq({
+      'users' => R18n::Typed.new('pl', {\
+        0   => 'Ноль',
+        1   => 'Один',
+        2   => 'Несколько',
+        'n' => 'Много'
+      })
+    })
   end
 
   it "reloads translations on load_path changes" do
     I18n.load_path << OTHER
-    @loader.load(RU).should == { 'one' => 'Один', 'two' => 'Два',
-                                 'three' => 'Три' }
+    expect(@loader.load(RU)).to eq({
+      'one'   => 'Один',
+      'two'   => 'Два',
+      'three' => 'Три'
+    })
   end
 
   it "changes hash on load_path changes" do
     before = @loader.hash
     I18n.load_path << OTHER
-    @loader.hash.should_not == before
+    expect(@loader.hash).not_to eq before
   end
-
 end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'pp'
 require 'i18n'
 require 'active_support'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails-api
 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: r18n-core
@@ -16,14 +16,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
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement