From a7d72beefc5e49a0719174709e9515a22079ed12 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 9 Oct 2012 20:51:09 +0200
Subject: [PATCH] move responders out of helpers

---
 lib/travis/api/app/helpers/responders.rb            | 13 -------------
 lib/travis/api/app/responders.rb                    | 11 +++++++++++
 lib/travis/api/app/{helpers => }/responders/base.rb |  2 +-
 .../api/app/{helpers => }/responders/image.rb       |  2 +-
 lib/travis/api/app/{helpers => }/responders/json.rb |  2 +-
 .../api/app/{helpers => }/responders/service.rb     |  2 +-
 lib/travis/api/app/{helpers => }/responders/xml.rb  |  2 +-
 7 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 lib/travis/api/app/helpers/responders.rb
 create mode 100644 lib/travis/api/app/responders.rb
 rename lib/travis/api/app/{helpers => }/responders/base.rb (90%)
 rename lib/travis/api/app/{helpers => }/responders/image.rb (92%)
 rename lib/travis/api/app/{helpers => }/responders/json.rb (92%)
 rename lib/travis/api/app/{helpers => }/responders/service.rb (94%)
 rename lib/travis/api/app/{helpers => }/responders/xml.rb (96%)

diff --git a/lib/travis/api/app/helpers/responders.rb b/lib/travis/api/app/helpers/responders.rb
deleted file mode 100644
index 0bc1be25..00000000
--- a/lib/travis/api/app/helpers/responders.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'travis/api/app'
-
-class Travis::Api::App
-  module Helpers
-    module Responders
-      autoload :Base,    'travis/api/app/helpers/responders/base'
-      autoload :Image,   'travis/api/app/helpers/responders/image'
-      autoload :Json,    'travis/api/app/helpers/responders/json'
-      autoload :Service, 'travis/api/app/helpers/responders/service'
-      autoload :Xml,     'travis/api/app/helpers/responders/xml'
-    end
-  end
-end
diff --git a/lib/travis/api/app/responders.rb b/lib/travis/api/app/responders.rb
new file mode 100644
index 00000000..f8994685
--- /dev/null
+++ b/lib/travis/api/app/responders.rb
@@ -0,0 +1,11 @@
+require 'travis/api/app'
+
+class Travis::Api::App
+  module Responders
+    autoload :Base,    'travis/api/app/responders/base'
+    autoload :Image,   'travis/api/app/responders/image'
+    autoload :Json,    'travis/api/app/responders/json'
+    autoload :Service, 'travis/api/app/responders/service'
+    autoload :Xml,     'travis/api/app/responders/xml'
+  end
+end
diff --git a/lib/travis/api/app/helpers/responders/base.rb b/lib/travis/api/app/responders/base.rb
similarity index 90%
rename from lib/travis/api/app/helpers/responders/base.rb
rename to lib/travis/api/app/responders/base.rb
index e487b3c3..ba65c664 100644
--- a/lib/travis/api/app/helpers/responders/base.rb
+++ b/lib/travis/api/app/responders/base.rb
@@ -1,4 +1,4 @@
-module Travis::Api::App::Helpers::Responders
+module Travis::Api::App::Responders
   class Base
     attr_reader :endpoint, :resource, :options
 
diff --git a/lib/travis/api/app/helpers/responders/image.rb b/lib/travis/api/app/responders/image.rb
similarity index 92%
rename from lib/travis/api/app/helpers/responders/image.rb
rename to lib/travis/api/app/responders/image.rb
index d3efe381..8f825063 100644
--- a/lib/travis/api/app/helpers/responders/image.rb
+++ b/lib/travis/api/app/responders/image.rb
@@ -1,4 +1,4 @@
-module Travis::Api::App::Helpers::Responders
+module Travis::Api::App::Responders
   class Image < Base
     NAMES = { nil => 'unknown', 0 => 'passing', 1 => 'failing' }
 
diff --git a/lib/travis/api/app/helpers/responders/json.rb b/lib/travis/api/app/responders/json.rb
similarity index 92%
rename from lib/travis/api/app/helpers/responders/json.rb
rename to lib/travis/api/app/responders/json.rb
index 0a34459e..ff32852e 100644
--- a/lib/travis/api/app/helpers/responders/json.rb
+++ b/lib/travis/api/app/responders/json.rb
@@ -1,4 +1,4 @@
-module Travis::Api::App::Helpers::Responders
+module Travis::Api::App::Responders
   class Json < Base
     ACCEPT_VERSION  = /vnd\.travis-ci\.(\d+)\+/
     DEFAULT_VERSION = 'v2'
diff --git a/lib/travis/api/app/helpers/responders/service.rb b/lib/travis/api/app/responders/service.rb
similarity index 94%
rename from lib/travis/api/app/helpers/responders/service.rb
rename to lib/travis/api/app/responders/service.rb
index c1c97d2e..2f19bd75 100644
--- a/lib/travis/api/app/helpers/responders/service.rb
+++ b/lib/travis/api/app/responders/service.rb
@@ -1,4 +1,4 @@
-module Travis::Api::App::Helpers::Responders
+module Travis::Api::App::Responders
   class Service < Base
     def apply?
       resource.respond_to?(:run)
diff --git a/lib/travis/api/app/helpers/responders/xml.rb b/lib/travis/api/app/responders/xml.rb
similarity index 96%
rename from lib/travis/api/app/helpers/responders/xml.rb
rename to lib/travis/api/app/responders/xml.rb
index d87dd563..b9191852 100644
--- a/lib/travis/api/app/helpers/responders/xml.rb
+++ b/lib/travis/api/app/responders/xml.rb
@@ -1,4 +1,4 @@
-module Travis::Api::App::Helpers::Responders
+module Travis::Api::App::Responders
   class Xml < Base
     TEMPLATE = File.read(__FILE__).split("__END__").last.strip