Fix Enumerator in Ruby 1.8.7 (#4)

Author: root

Diff for: app/controllers/git_http_controller.rb

@@ -83,6 +83,15 @@ def authenticate
   end
 
 
+  def get_enumerator
+    if RUBY_VERSION == '1.8.7'
+      Enumerable::Enumerator
+    else
+      Enumerator
+    end
+  end
+
+
   def service_rpc
     input = read_body
 
@@ -101,7 +110,7 @@ def service_rpc
         pipe.write(input)
         while !pipe.eof?
           block = pipe.read()
-          self.response_body = Enumerator.new do |y|
+          self.response_body = get_enumerator.new do |y|
             y << block.to_s
           end
         end
@@ -147,7 +156,7 @@ def get_info_refs
       hdr_nocache
 
       if Rails::VERSION::MAJOR >= 3
-        self.response_body = Enumerator.new do |y|
+        self.response_body = get_enumerator.new do |y|
           y << pkt_write("# service=git-#{service_name}\n")
           y << pkt_flush
           y << refs

Diff for: app/controllers/gitolite_hooks_controller.rb

@@ -1,5 +1,7 @@
 include ActionView::Helpers::TextHelper
 
+
+
 class GitoliteHooksController < ApplicationController
 
   skip_before_filter :verify_authenticity_token, :check_if_login_required, :except => :test
@@ -13,6 +15,14 @@ def stub
     render(:code => 404)
   end
 
+  def get_enumerator
+    if RUBY_VERSION == '1.8.7'
+      Enumerable::Enumerator
+    else
+      Enumerator
+    end
+  end
+
   def post_receive
     if not @repository.extra.validate_encoded_time(params[:clear_time], params[:encoded_time])
       render(:text => "The hook key provided is not valid. Please let your server admin know about it")
@@ -25,7 +35,7 @@ def post_receive
     if Rails::VERSION::MAJOR >= 3
       self.response.headers["Content-Type"] = "text/plain;"
 
-      self.response_body = Enumerator.new do |y|
+      self.response_body = get_enumerator.new do |y|
         # Fetch commits from the repository
         GitHosting.logger.info "[GitHosting] Fetching changesets for '#{@project.identifier}' repository"
         y << "Fetching changesets for '#{@project.identifier}' repository ... "