world-flags 0.4.4 → 0.4.5

data/Gemfile

@@ -1,6 +1,7 @@
 source :rubygems
 
-gem 'hashie'
+gem 'hashie', '~> 1.2'
+gem 'i18n',   '~> 0.6'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -107,8 +107,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  hashie
+  hashie (~> 1.2)
   httparty
+  i18n (~> 0.6)
   jeweler (>= 1.8.3)
   rails (>= 3.1)
   rdoc (>= 3.12)

data/README.md

@@ -36,7 +36,7 @@ Flags will be rendered in HTML as:
 </pre>
 ```
 
-The countries corresponding to the codes can be found at "http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2":http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+The countries corresponding to the codes can be found at [ISO 3166-1 alpha-2](http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2)
 
 ## Use
 
@@ -120,11 +120,13 @@ In the /config folder of this gem/engine there is a json file with all the engli
 
 To generate i18n data for your particular locale(s).
 
-## More configuration/usage tips
+## Configuration and usage tips
 
-[Handling flag selection](https://github.com/kristianmandrup/world-flags/wiki/Handling-flag-selection)
+See the [wiki](https://github.com/kristianmandrup/world-flags/wiki/)
+
+* [Configuration](https://github.com/kristianmandrup/world-flags/wiki/Configuration)
+* [Handling flag selection](https://github.com/kristianmandrup/world-flags/wiki/Handling-flag-selection)
 
-[Configuration](https://github.com/kristianmandrup/world-flags/wiki/Configuration)
 
 ## TODO for version 1.0
 

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/world_flags/rack_locale.rb

@@ -0,0 +1,31 @@
+require 'i18n'
+
+module Rack
+  class Locale
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      old_locale = I18n.locale
+      locale = nil
+
+      # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
+      if lang = env["HTTP_ACCEPT_LANGUAGE"]
+        lang = lang.split(",").map { |l|
+          l += ';q=1.0' unless l =~ /;q=\d+\.\d+$/
+          l.split(';q=')
+        }.first
+        locale = lang.first.split("-").first
+      else
+        locale = I18n.default_locale
+      end
+
+      locale = env['rack.locale'] = I18n.locale = locale.to_s
+      status, headers, body = @app.call(env)
+      headers['Content-Language'] = locale
+      I18n.locale = old_locale
+      [status, headers, body]
+    end
+  end
+end

data/world-flags.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "world-flags"
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/world_flags/helper/view/util.rb",
     "lib/world_flags/helpers.rb",
     "lib/world_flags/languages.rb",
+    "lib/world_flags/rack_locale.rb",
     "lib/world_flags/rails/engine.rb",
     "lib/world_flags/util.rb",
     "lib/world_flags/util/config.rb",
@@ -92,14 +93,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hashie>, [">= 0"])
+      s.add_runtime_dependency(%q<hashie>, ["~> 1.2"])
+      s.add_runtime_dependency(%q<i18n>, ["~> 0.6"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_development_dependency(%q<rdoc>, [">= 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0.5"])
     else
-      s.add_dependency(%q<hashie>, [">= 0"])
+      s.add_dependency(%q<hashie>, ["~> 1.2"])
+      s.add_dependency(%q<i18n>, ["~> 0.6"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
       s.add_dependency(%q<rdoc>, [">= 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -107,7 +110,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0.5"])
     end
   else
-    s.add_dependency(%q<hashie>, [">= 0"])
+    s.add_dependency(%q<hashie>, ["~> 1.2"])
+    s.add_dependency(%q<i18n>, ["~> 0.6"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])
     s.add_dependency(%q<rdoc>, [">= 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: world-flags
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -16,17 +16,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +156,7 @@ files:
 - lib/world_flags/helper/view/util.rb
 - lib/world_flags/helpers.rb
 - lib/world_flags/languages.rb
+- lib/world_flags/rack_locale.rb
 - lib/world_flags/rails/engine.rb
 - lib/world_flags/util.rb
 - lib/world_flags/util/config.rb
@@ -194,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3562672022854432421
+      hash: -3509101011673426845
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: