panmind-http_accept_language 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/http_accept_language.rb

@@ -80,10 +80,14 @@ module HttpAcceptLanguage
       languages.map {|l| l.to_s.sub(/-\w{2}/, '')}.uniq
     end
 end
-if defined?(ActionDispatch::Request)
-  ActionDispatch::Request.send :include, HttpAcceptLanguage
-elsif defined?(ActionDispatch::AbstractRequest)
-  ActionDispatch::AbstractRequest.send :include, HttpAcceptLanguage
-elsif defined?(ActionDispatch::CgiRequest)
-  ActionDispatch::CgiRequest.send :include, HttpAcceptLanguage
+
+# ActionDispatch is for Rails >= 3, Action Controller for Rails < 3
+# Only the first class that matches gets the module included.
+if defined? Rails
+  base = defined?(ActionDispatch) ? ActionDispatch : ActionController
+  [:Request, :AbstractRequest, :CgiRequest].each do |c|
+    next unless base.const_defined?(c)
+    base.const_get(c).instance_eval { include HttpAcceptLanguage }
+    break
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: panmind-http_accept_language
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Iain Hecker