sinatra-r18n 0.4.10 → 0.4.11

data/Gemfile.lock

@@ -1,39 +1,42 @@
 PATH
   remote: .
   specs:
-    sinatra-r18n (0.4.10)
-      r18n-core (= 0.4.10)
-      sinatra (>= 0.9)
+    sinatra-r18n (0.4.11)
+      r18n-core (= 0.4.11)
+      sinatra (>= 1.3)
 
 PATH
   remote: ../r18n-core/
   specs:
-    r18n-core (0.4.10)
+    r18n-core (0.4.11)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     haml (2.2.24)
     hanna (0.1.12)
       haml (~> 2.2.8)
       rake (~> 0.8.2)
       rdoc (~> 2.3.0)
-    psych (1.2.0)
-    rack (1.2.2)
-    rack-test (0.5.7)
+    psych (1.2.1)
+    rack (1.3.4)
+    rack-protection (1.1.2)
+      rack
+    rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.8.7)
-    rcov (0.9.9)
+    rcov (0.9.10)
     rdoc (2.3.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    tilt (1.3)
+    rspec-mocks (2.6.0)
+    sinatra (1.3.0)
+      rack (~> 1.3)
+      rack-protection (~> 1.1)
+      tilt (~> 1.3)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby

data/README.rdoc

@@ -82,6 +82,11 @@ You can change default locale and translations dir:
   set :default_locale, 'ru'
   set :translations,   './translations'
 
+You can also provide an Array of translations directories, which may be
+useful, for instance, in a plugin-based architecture:
+
+  set :translations, Dir.glob('./myplugins/*/i18n')
+
 == License
 
 R18n is licensed under the GNU Lesser General Public License version 3.

data/Rakefile

@@ -3,7 +3,6 @@
 require 'rubygems'
 
 begin
-  require 'bundler'
   require 'bundler/setup'
   Bundler::GemHelper.install_tasks
 rescue LoadError

data/lib/sinatra/r18n.rb

@@ -27,26 +27,26 @@ module Sinatra #::nodoc::
       app.helpers ::R18n::Helpers
       app.set :default_locale, 'en'
       app.set :translations, Proc.new { File.join(app.root, 'i18n/') }
-      
+
       app.before do
         ::R18n.set do
-          ::R18n::I18n.default = options.default_locale
-          
+          ::R18n::I18n.default = settings.default_locale
+
           locales = ::R18n::I18n.parse_http(request.env['HTTP_ACCEPT_LANGUAGE'])
           if params[:locale]
             locales.insert(0, params[:locale])
           elsif session[:locale]
             locales.insert(0, session[:locale])
           end
-          
-          ::R18n::I18n.new(locales, options.translations)
+
+          ::R18n::I18n.new(locales, settings.translations)
         end
       end
-      
+
       ::R18n::Filters.off(:untranslated)
       ::R18n::Filters.on(:untranslated_html)
     end
   end
-  
+
   register R18n
 end

data/sinatra-r18n.gemspec

@@ -20,16 +20,15 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
   s.require_path = 'lib'
-  s.has_rdoc = true
 
   s.author = 'Andrey "A.I." Sitnik'
   s.email = 'andrey@sitnik.ru'
   s.homepage = 'http://r18n.rubyforge.org/'
   s.rubyforge_project = 'sinatra-r18n'
 
-  s.add_dependency 'sinatra', [">= 0.9"]
+  s.add_dependency 'sinatra', [">= 1.3"]
   s.add_dependency 'r18n-core', ["= #{R18n::VERSION}"]
-  
+
   s.add_development_dependency "bundler", [">= 1.0.10"]
   s.add_development_dependency "hanna", [">= 0"]
   s.add_development_dependency "rake", [">= 0", "!= 0.9.0"]

data/spec/sinatra-r18n_spec.rb

@@ -5,59 +5,59 @@ describe Sinatra::R18n do
   before(:all) do
     Sinatra::R18n.registered(app)
  	end
- 	
+
   after do
     set :default_locale, 'en'
     set :environment, :test
   end
-  
+
   it "should translate messages" do
     get '/en/posts/1'
     last_response.should be_ok
     last_response.body.should == "<h1>Post 1</h1>\n"
   end
-  
+
   it "should use translations from default locale" do
     get '/ru/posts/1/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'
     last_response.should be_ok
     last_response.body.should == 'Русский'
   end
-  
+
   it "should autodetect user locale" do
     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', {}, { 'rack.session' => { :locale => 'ru' } }
     last_response.should be_ok
     last_response.body.should == 'Русский'
   end
-  
+
   it "should return locales list" do
     get '/locales'
     last_response.should be_ok
     last_response.body.should == 'en: English; ru: Русский'
   end
-  
+
   it "should format untranslated string" do
     get '/untranslated'
     last_response.should be_ok
     last_response.body.should == 'post.<span style="color: red">no</span>'
   end
-  
+
   it "should localize objects" do
     get '/time'
     last_response.should be_ok
     last_response.body.should == "01/01/1970 00:00"
   end
-  
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-r18n
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 10
-  version: 0.4.10
+  - 11
+  version: 0.4.11
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -15,41 +15,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-08 00:00:00 +04:00
-default_executable: 
+date: 2011-10-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: sinatra
   prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 9
         segments: 
-        - 0
-        - 9
-        version: "0.9"
+        - 1
+        - 3
+        version: "1.3"
   requirement: *id001
-  type: :runtime
-  name: sinatra
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  name: r18n-core
   prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 25
         segments: 
         - 0
         - 4
-        - 10
-        version: 0.4.10
+        - 11
+        version: 0.4.11
   requirement: *id002
-  type: :runtime
-  name: r18n-core
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: bundler
   prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,9 +64,9 @@ dependencies:
         - 10
         version: 1.0.10
   requirement: *id003
-  type: :development
-  name: bundler
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: hanna
   prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,9 +78,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-  type: :development
-  name: hanna
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rake
   prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -99,9 +100,9 @@ dependencies:
         - 0
         version: 0.9.0
   requirement: *id005
-  type: :development
-  name: rake
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rack-test
   prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -113,9 +114,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-  type: :development
-  name: rack-test
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rspec-core
   prerelease: false
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -127,9 +128,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
-  type: :development
-  name: rspec-core
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rspec-expectations
   prerelease: false
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -141,9 +142,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id008
-  type: :development
-  name: rspec-expectations
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rspec-mocks
   prerelease: false
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -155,9 +156,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id009
-  type: :development
-  name: rspec-mocks
 - !ruby/object:Gem::Dependency 
+  type: :development
+  name: rcov
   prerelease: false
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -169,8 +170,6 @@ dependencies:
         - 0
         version: "0"
   requirement: *id010
-  type: :development
-  name: rcov
 description: "    A Sinatra extension that provides i18n support to translate your web\n    application. It is just a wrapper for R18n core library.\n    It has nice Ruby-style syntax, filters, flexible locales, custom loaders,\n    translation support for any classes, time and number localization, several\n    user language support, agnostic core package with out-of-box support for\n    Rails, Sinatra, Merb and desktop applications.\n"
 email: andrey@sitnik.ru
 executables: []
@@ -195,7 +194,6 @@ files:
 - spec/app/views/post.erb
 - spec/sinatra-r18n_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://r18n.rubyforge.org/
 licenses: []
 
@@ -225,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sinatra-r18n
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A Sinatra extension that provides i18n support to translate your web application.