otto 0.3.2 → 0.4.0

data/CHANGES.txt

@@ -1,5 +1,10 @@
 OTTO, CHANGES
 
+#### 0.4.0 (2015-04-06) ###############################
+
+* ADDED: Locale support via env['rack.locale']
+
+
 #### 0.3.2 (2013-01-27) ###############################
 
 * CHANGE: send_cookie doesn't set domain

data/README.md

@@ -1,4 +1,4 @@
-# Otto - 0.3
+# Otto - 0.4
 
 **Auto-define your rack-apps in plain-text.**
 
@@ -31,8 +31,8 @@ Here is an example:
     GET   /robots.txt               App#robots_text
     GET   /product/:prodid          App#display_product
 
-    # You can also define these handlers when no 
-    # route can be found or there's a server error. (optional) 
+    # You can also define these handlers when no
+    # route can be found or there's a server error. (optional)
     GET   /404                      App#not_found
     GET   /500                      App#server_error
 
@@ -73,13 +73,13 @@ There is nothing special about the Ruby class. The only requirement is that the
         rules = 'User-agent: *', 'Disallow: /private'
         res.body = rules.join($/)
       end
-      
+
       def display_product
         res.header['Content-Type'] = "application/json; charset=utf-8"
         prodid = req.params[:prodid]
         res.body = '{"product":%s,"msg":"Hint: try another value"}' % [prodid]
       end
-      
+
       def not_found
         res.status = 404
         res.body = "Item not found!"
@@ -93,29 +93,29 @@ There is nothing special about the Ruby class. The only requirement is that the
 
 ### Rackup ###
 
-There is also nothing special about the rackup file. It just builds a Rack app using your routes file. 
+There is also nothing special about the rackup file. It just builds a Rack app using your routes file.
 
     require 'otto'
     require 'app'
-    
+
     app = Otto.new("./routes")
-    
-    map('/') { 
+
+    map('/') {
       run app
     }
 
 See the examples/ directory for a working app.
 
-    
+
 ## Installation
 
 Get it in one of the following ways:
-     
+
     $ gem install otto
     $ sudo gem install otto
     $ git clone git://github.com/delano/otto.git
 
-You can also download via [tarball](http://github.com/delano/otto/tarball/latest) or [zip](http://github.com/delano/otto/zipball/latest). 
+You can also download via [tarball](http://github.com/delano/otto/tarball/latest) or [zip](http://github.com/delano/otto/zipball/latest).
 
 
 ## More Information

data/VERSION.yml

@@ -1,3 +1,3 @@
 :MAJOR: 0
-:MINOR: 3
-:PATCH: 2
+:MINOR: 4
+:PATCH: 0

data/lib/otto.rb

@@ -33,7 +33,8 @@ class Otto
     @routes_literal = { :GET => {} }
     @route_definitions = {}
     @option = opts.merge({
-      :public => nil
+      :public => nil,
+      :locale => 'en'
     })
     load(path) unless path.nil?
     super()
@@ -84,6 +85,8 @@ class Otto
   end
 
   def call env
+    locale = determine_locale env
+    env['rack.locale'] = locale || self.option[:locale]
     if option[:public] && safe_dir?(option[:public])
       @static_route ||= Rack::File.new(option[:public])
     end
@@ -182,6 +185,20 @@ class Otto
     end
   end
 
+  def determine_locale env
+    accept_langs = env['HTTP_ACCEPT_LANGUAGE']
+    locales = accept_langs.split(',').map { |l|
+      l += ';q=1.0' unless l =~ /;q=\d+(?:\.\d+)?$/
+      l.split(';q=')
+    }.sort_by { |locale, qvalue|
+      qvalue.to_f
+    }.collect { |locale, qvalue|
+      locale
+    }.reverse
+    STDERR.puts "locale: #{locales} (#{accept_langs})" if Otto.debug
+    locales.empty? ? nil : locales
+  end
+
   module Static
     extend self
     def server_error

data/otto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "otto"
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = "2011-12-20"
+  s.date = "2015-04-06"
   s.description = "Auto-define your rack-apps in plaintext."
   s.email = "delano@solutious.com"
   s.extra_rdoc_files = [
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/delano/otto"
   s.require_paths = ["lib"]
   s.rubyforge_project = "otto"
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.23"
   s.summary = "Auto-define your rack-apps in plaintext."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otto
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70115756593820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70115756593820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70115756593340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70115756593340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.6
 description: Auto-define your rack-apps in plaintext.
 email: delano@solutious.com
 executables: []
@@ -73,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: otto
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Auto-define your rack-apps in plaintext.