sinatra-r18n 0.4.14 → 1.0.0

data/.yardopts

@@ -1,3 +1,3 @@
 --charset utf-8
 -
-README.rdoc
+README.md

data/LICENSE

@@ -10,7 +10,7 @@
 the terms and conditions of version 3 of the GNU General Public
 License, supplemented by the additional permissions listed below.
 
-  0. Additional Definitions. 
+  0. Additional Definitions.
 
   As used herein, "this License" refers to version 3 of the GNU Lesser
 General Public License, and the "GNU GPL" refers to version 3 of the GNU
@@ -111,7 +111,7 @@ the following:
        a copy of the Library already present on the user's computer
        system, and (b) will operate properly with a modified version
        of the Library that is interface-compatible with the Linked
-       Version. 
+       Version.
 
    e) Provide Installation Information, but only if you would otherwise
    be required to provide such information under section 6 of the

data/README.md

@@ -0,0 +1,115 @@
+# Sinatra R18n Plugin
+
+Sinatra extension which provides i18n support to translate your web application.
+
+It is a wrapper for R18n core library. See R18n documentation for more
+information.
+
+# Features
+
+* Nice Ruby-style syntax.
+* Filters.
+* Flexible locales.
+* Custom translations loaders.
+* Translation support for any classes.
+* Time and number localization.
+* Several user language support.
+
+# How To
+
+1. Create translations dir `./i18n/`.
+2. Add file with translation to `./i18n/` with language code in file name
+   (for example, `en.yml` for English or `en-us.yml` USA English dialect).
+   For example, `./i18n/en.yml`:
+
+     ```yaml
+    post:
+      friends: Post only for friends
+      tags: Post tags is %1
+
+    comments: !!pl
+      0: No comments
+      1: One comment
+      n: %1 comments
+
+    html: !!html
+      <b>Don't escape HTML</b>
+     ```
+
+3. Add R18n to your Sinatra application:
+
+     ```ruby
+    require 'sinatra/r18n'
+     ```
+   If your application inherits from `Sinatra::Base` also add:
+
+     ```ruby
+    class YourApp < Sinatra::Base
+      register Sinatra::R18n
+      set :root, File.dirname(__FILE__)
+     ```
+
+4. Add locale to your URLs. For example:
+
+     ```ruby
+    get '/:locale/posts/:id' do
+      @post = Post.find(params[:id])
+      haml :post
+    end
+     ```
+   Or save locale in session, when user change it:
+
+     ```ruby
+    before do
+      session[:locale] = params[:locale] if params[:locale]
+    end
+     ```
+
+5. Use translation messages in views. For example in HAML:
+
+     ```haml
+    %p= t.post.friends
+    %p= t.post.tags(@post.tags.join(', '))
+
+    %h2= t.comments(@post.comments.size)
+     ```
+
+6. Print localized time and numbers. For example:
+
+     ```ruby
+    l @post.created_at, :human
+     ```
+
+7. Print available translations. For example in HAML:
+
+     ```haml
+     %ul
+        - r18n.available_locales.each do |locale|
+          %li
+            %a( href="/#{locale.code}/" )= locale.title
+     ```
+
+# Configuration
+
+You can change default locale and translations dir:
+
+```ruby
+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:
+
+```ruby
+set :translations, Dir.glob('./myplugins/*/i18n')
+```
+
+# License
+
+R18n is licensed under the GNU Lesser General Public License version 3.
+You can read it in LICENSE file or in http://www.gnu.org/licenses/lgpl.html.
+
+# Author
+
+Andrey “A.I.” Sitnik <andrey@sitnik.ru>

data/Rakefile

@@ -22,7 +22,8 @@ YARD::Rake::YardocTask.new do |yard|
 end
 
 task :clobber_doc do
-  rm_r 'doc' rescue nil
+  rm_r 'doc'     rescue nil
+  rm_r '.yardoc' rescue nil
 end
 task :clobber_package do
   rm_r 'pkg' rescue nil

data/lib/sinatra/r18n.rb

@@ -21,13 +21,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 require 'sinatra/base'
 require 'r18n-core'
 
-module Sinatra #::nodoc::
-  module R18n #::nodoc::
-    def self.registered(app) #::nodoc::
+module Sinatra
+  module R18n
+    def self.registered(app)
       app.helpers ::R18n::Helpers
       app.set :default_locale, 'en'
       app.set :translations, Proc.new { File.join(app.root, 'i18n/') }
 
+      ::R18n.default_places { settings.translations }
+
       app.before do
         ::R18n.set do
           ::R18n::I18n.default = settings.default_locale
@@ -39,12 +41,10 @@ module Sinatra #::nodoc::
             locales.insert(0, session[:locale])
           end
 
-          ::R18n::I18n.new(locales, settings.translations)
+          ::R18n::I18n.new(locales, ::R18n.default_places,
+            :off_filters => :untranslated, :on_filters => :untranslated_html)
         end
       end
-
-      ::R18n::Filters.off(:untranslated)
-      ::R18n::Filters.on(:untranslated_html)
     end
   end
 

data/sinatra-r18n.gemspec

@@ -13,18 +13,17 @@ Gem::Specification.new do |s|
     It has nice Ruby-style syntax, filters, flexible locales, custom loaders,
     translation support for any classes, time and number localization, several
     user language support, agnostic core package with out-of-box support for
-    Rails, Sinatra, Merb and desktop applications.
+    Rails, Sinatra and desktop applications.
   EOF
 
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.extra_rdoc_files = ['README.rdoc', 'LICENSE']
-  s.require_path = 'lib'
+  s.extra_rdoc_files = ['README.md', 'LICENSE']
+  s.require_path     = 'lib'
 
-  s.author = 'Andrey "A.I." Sitnik'
-  s.email = 'andrey@sitnik.ru'
-  s.homepage = 'http://r18n.rubyforge.org/'
-  s.rubyforge_project = 'sinatra-r18n'
+  s.author   = 'Andrey "A.I." Sitnik'
+  s.email    = 'andrey@sitnik.ru'
+  s.homepage = 'https://github.com/ai/r18n/tree/master/sinatra-r18n'
 
   s.add_dependency 'sinatra', [">= 1.3"]
   s.add_dependency 'r18n-core', ["= #{R18n::VERSION}"]
@@ -36,4 +35,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-core",         [">= 0"]
   s.add_development_dependency "rspec-expectations", [">= 0"]
   s.add_development_dependency "rspec-mocks",        [">= 0"]
+  s.add_development_dependency "redcarpet",          [">= 0"]
 end

data/spec/app/i18n/en.yml

@@ -1,7 +1,7 @@
 greater: 1 < 2 is true
 warning: !!html <b>Warning</b>
 post:
-  title: Post %1 
+  title: Post %1
   comments: !!pl
     0: No comments
     1: One comment

data/spec/sinatra-r18n_spec.rb

@@ -51,7 +51,7 @@ describe Sinatra::R18n do
   it "should format untranslated string" do
     get '/untranslated'
     last_response.should be_ok
-    last_response.body.should == 'post.<span style="color: red">no</span>'
+    last_response.body.should == 'post.<span style="color: red">[no]</span>'
   end
 
   it "should localize objects" do
@@ -60,4 +60,11 @@ describe Sinatra::R18n do
     last_response.body.should == "01/01/1970 00:00"
   end
 
+  it "should set default places" do
+    R18n.default_places.should ==
+      Pathname(__FILE__).dirname.expand_path.join('app/i18n/').to_s
+    R18n.set('en')
+    R18n.get.post.title(1).should == 'Post 1'
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,10 +1,7 @@
 # encoding: utf-8
-
-ENV['RACK_ENV'] = 'test'
-
-require 'bundler/setup'
 require 'pp'
 
+ENV['RACK_ENV'] = 'test'
 require File.join(File.dirname(__FILE__), 'app/app')
 
 require 'rack/test'

metadata

@@ -1,177 +1,199 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra-r18n
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 14
-  version: 0.4.14
 platform: ruby
-authors: 
+authors:
 - Andrey "A.I." Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
+date: 2012-06-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   name: r18n-core
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 4
-        - 14
-        version: 0.4.14
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 0
-        - 10
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.10
-  prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: yard
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-    - - "!="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ! '!='
+      - !ruby/object:Gem::Version
         version: 0.9.0
-  prerelease: false
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
-  name: rack-test
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rspec-core
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rspec-expectations
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec-mocks
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: *id009
-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"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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 and desktop
+  applications.\n"
 email: andrey@sitnik.ru
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files:
+- README.md
 - LICENSE
-files: 
+files:
 - .rspec
 - .yardopts
-- Gemfile
-- Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - lib/sinatra/r18n.rb
 - sinatra-r18n.gemspec
@@ -181,39 +203,35 @@ files:
 - spec/app/views/post.erb
 - spec/sinatra-r18n_spec.rb
 - spec/spec_helper.rb
-homepage: http://r18n.rubyforge.org/
+homepage: https://github.com/ai/r18n/tree/master/sinatra-r18n
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 4184599958665730813
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 4184599958665730813
 requirements: []
-
-rubyforge_project: sinatra-r18n
-rubygems_version: 1.7.2
+rubyforge_project: 
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Sinatra extension that provides i18n support to translate your web application.
 test_files: []
-
 has_rdoc: 

data/Gemfile

@@ -1,7 +0,0 @@
-source :rubygems
-
-gem 'psych', :platforms => :mri_19, :group => [ :test, :development ]
-
-gem 'r18n-core', :path => '../r18n-core/'
-
-gemspec

data/Gemfile.lock

@@ -1,48 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sinatra-r18n (0.4.14)
-      r18n-core (= 0.4.14)
-      sinatra (>= 1.3)
-
-PATH
-  remote: ../r18n-core/
-  specs:
-    r18n-core (0.4.14)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    psych (1.2.2)
-    rack (1.4.1)
-    rack-protection (1.2.0)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.3.3)
-    yard (0.7.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (>= 1.0.10)
-  psych
-  r18n-core!
-  rack-test
-  rake (>= 0, != 0.9.0)
-  rspec-core
-  rspec-expectations
-  rspec-mocks
-  sinatra-r18n!
-  yard

data/README.rdoc

@@ -1,97 +0,0 @@
-= Sinatra R18n Plugin
-
-Sinatra extension which provides i18n support to translate your web application.
-
-It is a wrapper for R18n core library. See R18n documentation for more 
-information.
-
-== Features
-
-* Nice Ruby-style syntax.
-* Filters.
-* Flexible locales.
-* Custom translations loaders.
-* Translation support for any classes.
-* Time and number localization.
-* Several user language support.
-
-== How To
-
-1. Create translations dir <tt>./i18n/</tt>.
-2. Add file with translation to <tt>./i18n/</tt> with language code in file name
-   (for example, <tt>en.yml</tt> for English or <tt>en-us.yml</tt> USA English
-   dialect). For example, <tt>./i18n/en.yml</tt>:
-
-     post:
-       friends: Post only for friends
-       tags: Post tags is %1
-     
-     comments: !!pl
-       0: No comments
-       1: One comment
-       n: %1 comments
-     
-     html: !!html
-       <b>Don't escape HTML</b>
-   
-3. Add R18n to your Sinatra application:
-   
-     require 'sinatra/r18n'
-   
-   If your application inherits from <tt>Sinatra::Base</tt> also add:
-   
-     class YourApp < Sinatra::Base
-       register Sinatra::R18n
-       set :root, File.dirname(__FILE__)
-   
-4. Add locale to your URLs. For example:
-   
-     get '/:locale/posts/:id' do
-       @post = Post.find(params[:id])
-       haml :post
-     end
-   
-   Or save locale in session, when user change it:
-   
-     before do
-       session[:locale] = params[:locale] if params[:locale]
-     end
-   
-5. Use translation messages in views. For example in HAML:
-     
-     %p= t.post.friends
-     %p= t.post.tags(@post.tags.join(', '))
-     
-     %h2= t.comments(@post.comments.size)
-   
-6. Print localized time and numbers. For example:
-   
-     l @post.created_at, :human
-   
-7. Print available translations. For example in HAML:
-   
-     %ul
-       - r18n.available_locales.each do |locale|
-         %li
-           %a( href="/#{locale.code}/" )= locale.title
-
-== Configuration
-
-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.
-You can read it in LICENSE file or in http://www.gnu.org/licenses/lgpl.html.
-
-== Author
-
-Andrey “A.I.” Sitnik <andrey@sitnik.ru>