sinatra-r18n 0.2.1 → 0.2.2

data/README.rdoc

@@ -24,24 +24,18 @@ information.
    
      post:
        friends: Post only for friends
-       tags: Post tags: %1  
+       tags: Post tags: %1
      
      comments: !!pl
        0: No comments
        1: One comment
        n: %1 comments
    
-3. Add R18n to your application:
+3. Add R18n to your Sinatra application:
    
-     require 'rubygems'
-     require 'sinatra'
      require 'sinatra/r18n'
    
-4. Set default locale (if it isn’t English):
-   
-     set :default_locale, 'ru'
-   
-5. Add locale to your URLs. For example:
+4. Add locale to your URLs. For example:
    
      get '/:locale/posts/:id' do
        @post = Post.find(params[:id])
@@ -54,18 +48,18 @@ information.
       session[:locale] = params[:locale] if params[:locale]
      end
    
-6. Use translation messages in view. For example in HAML:
+5. Use translation messages in view. For example in HAML:
      
      %p= i18n.post.friends
      %p= i18n.post.tags(@post.tags.join(', '))
      
      %h2= i18n.comments(@post.comments.size)
    
-7. Print localized time and numbers. For example:
+6. Print localized time and numbers. For example:
    
      i18n.l @post.created_at, :date
    
-8. Print available translation. For example in HAML:
+7. Print available translations. For example in HAML:
    
      %ul
        - i18n.translations.each_pair do |locale, title|

data/lib/sinatra/r18n.rb

@@ -19,6 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 =end
 
 require 'rubygems'
+gem 'sinatra'
 require 'sinatra/base'
 
 gem 'r18n-core', '~>0.2'
@@ -41,8 +42,9 @@ module Sinatra #::nodoc::
           end
           
           @i18n = ::R18n::I18n.new(locales, options.translations)
+        else
+          @i18n
         end
-        @i18n
       end
     end
   

data/spec/sinatra-r18n_spec.rb

@@ -2,42 +2,45 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe Sinatra::R18n do
+  before :all do
+    ::R18n.set(nil)
+  end
   
   it "should translate messages" do
     get '/ru/posts/1'
-    response.should be_ok
-    response.body.should == "<h1>Запись 1</h1>\n"
+    last_response.should be_ok
+    last_response.body.should == "<h1>Запись 1</h1>\n"
   end
   
   it "should use translations from default locale" do
     get '/ru/posts/1/comments'
-    response.should be_ok
-    response.body.should == '3 comments'
+    last_response.should be_ok
+    last_response.body.should == '3 comments'
   end
   
   it "should use default locale" do
     set :default_locale, 'ru'
     get '/locale'
-    response.should be_ok
-    response.body.should == 'Русский'
+    last_response.should be_ok
+    last_response.body.should == 'Русский'
   end
   
   it "should autodetect user locale" do
-    get '/locale', :env => {'HTTP_ACCEPT_LANGUAGE' => 'ru,en;q=0.9'}
-    response.should be_ok
-    response.body.should == 'Русский'
+    get '/locale', {}, {'HTTP_ACCEPT_LANGUAGE' => 'ru,en;q=0.9'}
+    last_response.should be_ok
+    last_response.body.should == 'Русский'
   end
   
   it "should use locale from session" do
-    get '/locale', :env => { 'rack.session' => { :locale => 'ru' } }
-    response.should be_ok
-    response.body.should == 'Русский'
+    get '/locale', {}, { 'rack.session' => { :locale => 'ru' } }
+    last_response.should be_ok
+    last_response.body.should == 'Русский'
   end
   
   it "should return locales list" do
     get '/locales'
-    response.should be_ok
-    response.body.should == 'ru: Русский; en: English'
+    last_response.should be_ok
+    last_response.body.should == 'ru: Русский; en: English'
   end
   
 end

data/spec/spec_helper.rb

@@ -3,7 +3,9 @@ require File.join(File.dirname(__FILE__), '../lib/sinatra/r18n')
 require File.join(File.dirname(__FILE__), 'app/app')
 
 require 'spec/interop/test'
-require 'sinatra/test'
-Test::Unit::TestCase.send :include, Sinatra::Test
+gem 'rack-test'
+require 'rack/test'
+Test::Unit::TestCase.send(:include, Rack::Test::Methods)
+Test::Unit::TestCase.send(:define_method, :app) { Sinatra::Application }
 
 set :environment, :test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-r18n
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 +04:00
+date: 2009-06-25 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 0.2.2
     version: 
 description: A Sinatra extension that provides i18n support to  translate your web application. It is just a wrap for R18n core library. It can format numbers and time to the rules of the user locale, has translation for common words, storage translation in YAML format with pluralization and procedures and has special support for countries with two official languages.
 email: andrey@sitnik.ru