otto 0.4.0 → 0.4.1

data/CHANGES.txt

@@ -1,15 +1,17 @@
 OTTO, CHANGES
 
+#### 0.4.1 (2015-04-07) ###############################
+
+* FIXED: Resolved error when ACCEPT-LANGUAGES header doesn't exist
+
 #### 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
 
-
 #### 0.3.1 (2012-12-17) ###############################
 
 * ADDED: Otto.debug (set w/ Otto.debug= or env variable OTTO_DEBUG)

data/VERSION.yml

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

data/lib/otto.rb

@@ -86,7 +86,7 @@ class Otto
 
   def call env
     locale = determine_locale env
-    env['rack.locale'] = locale || self.option[:locale]
+    env['rack.locale'] = locale
     if option[:public] && safe_dir?(option[:public])
       @static_route ||= Rack::File.new(option[:public])
     end
@@ -187,14 +187,18 @@ class Otto
 
   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
+    accept_langs = self.option[:locale] if accept_langs.to_s.empty?
+    locales = []
+    unless accept_langs.empty?
+      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
+    end
     STDERR.puts "locale: #{locales} (#{accept_langs})" if Otto.debug
     locales.empty? ? nil : locales
   end

data/otto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "otto"
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = "2015-04-06"
+  s.date = "2015-04-07"
   s.description = "Auto-define your rack-apps in plaintext."
   s.email = "delano@solutious.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: otto
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack