lib/ruby_app/request.rb in RubyApp-0.6.60 vs lib/ruby_app/request.rb in RubyApp-0.6.61

@@ -10,35 +10,35 @@
     extend RubyApp::Mixins::DelegateMixin
 
     attr_reader :environment
 
     def language
-      self.fullpath =~ /^\/([^\/\?]+)/
+      self.path.gsub(/^#{RubyApp.root.nil_if('/')}/,'') =~ /^\/([^\/\?]+)/
       return $1
     end
 
     def query
-      ::Rack::Utils.parse_query(self.query_string)
+      return ::Rack::Utils.parse_query(self.query_string)
     end
 
     def parameters
-      self.params
+      return self.params
     end
 
     def self.get
-      Thread.current[:_request]
+      return Thread.current[:_request]
     end
 
     def self.exists?
       return Thread.current[:_request]
     end
 
     def self.create!(environment = RubyApp::Application.environment)
-      Thread.current[:_request] = RubyApp::Request.new(environment)
+      return Thread.current[:_request] = RubyApp::Request.new(environment)
     end
 
     def self.destroy!
-      Thread.current[:_request] = nil
+      return Thread.current[:_request] = nil
     end
 
     def self.create_context!
       unless RubyApp::Request.exists?
         RubyApp::Request.create!