harukizaemon-acts_as_teapot 1.0.1 → 1.0.2

data/CHANGELOG.rdoc

@@ -1,4 +1,10 @@
-== 1.0.1 released 2009-01-07
+== 1.0.2 released 2009-01-11
+
+* Respond to ALL BREW and HTCPCP requests irrespective of routing.
+
+* Ensure old-style plugin works.
+
+== 1.0.1 released 2009-01-10
 
 * Changed copyright and fixed documentation.
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Acts As Teapot
+Copyright (c) 2009 Simon Harris
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,9 +1,10 @@
 = Acts As Teapot
 
-Acts As Teapot is a Ruby on Rails plugin that ensures your Ruby on Rails applications conform to RFC2324. Our assumption
-here is that your application is not a coffee pot and does not understand the Hyper Text Coffee Pot Control Protocol
-(HTCPCP/1.0). Thus, if ever a BREW request or any other request with the Content-Type set to
-"application/coffee-pot-command" is received, the server will respond with 418 I’m a teapot. 
+Acts As Teapot is a Ruby on Rails plugin that ensures your Ruby on Rails applications conform to
+http://www.ietf.org/rfc/rfc2324.txt. Our assumption here is that your application is not a coffee
+pot and does not understand the Hyper Text Coffee Pot Control Protocol (HTCPCP/1.0). Thus, if ever a BREW request or any
+other request with the Content-Type set to "application/coffee-pot-command" is received, the server will respond with
+418 I’m a teapot. 
 
 == Installation
 

data/acts_as_teapot.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name     = "acts_as_teapot"
-  s.version  = "1.0.1"
+  s.version  = "1.0.2"
   s.date     = "2009-01-11"
   s.summary  = "Ensure your Ruby on Rails applications conform to RFC2324."
-  s.email    = "simon.harris@cogentconsulting.com.au"
+  s.email    = "haruki.zaemon@gmail.com"
   s.homepage = "http://github.com/harukizaemon/acts_as_teapot"
   s.description = "Ensure your Ruby on Rails applications conform to RFC2324."
   s.has_rdoc = true
@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
                 "README.rdoc",
                 "acts_as_teapot.gemspec",
                 "lib/acts_as_teapot.rb",
-                "lib/acts_as_teapot/application_controller.rb",
-                "lib/acts_as_teapot/action_controller/abstract_request.rb",
-                "lib/acts_as_teapot/action_controller/routing.rb",
-                "lib/acts_as_teapot/action_controller/status_codes.rb"]
+                "lib/haruki_zaemon/acts_as_teapot/action_controller/abstract_request.rb",
+                "lib/haruki_zaemon/acts_as_teapot/action_controller/dispatcher.rb",
+                "lib/haruki_zaemon/acts_as_teapot/action_controller/routing.rb",
+                "lib/haruki_zaemon/acts_as_teapot/action_controller/status_codes.rb"]
   s.rdoc_options = ["--main", "README.rdoc"]
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc"]
 end

data/lib/acts_as_teapot.rb

@@ -1,5 +1,6 @@
-ApplicationController.send(:include, ApplicationController::Base)
-ActionController::AbstractRequest.send(:include, ActsAsTeapot::ActionController::AbstractRequest)
-ActionController::Routing.send(:include, ActsAsTeapot::ActionController::Routing)
-ActionController::StatusCodes.send(:include, ActsAsTeapot::ActionController::StatusCodes)
+require 'action_controller/dispatcher' unless defined?(ActionController::Dispatcher)
+ActionController::Dispatcher.send(:include, HarukiZaemon::ActsAsTeapot::ActionController::Dispatcher)
+ActionController::AbstractRequest.send(:include, HarukiZaemon::ActsAsTeapot::ActionController::AbstractRequest)
+ActionController::Routing.send(:include, HarukiZaemon::ActsAsTeapot::ActionController::Routing)
+ActionController::StatusCodes.send(:include, HarukiZaemon::ActsAsTeapot::ActionController::StatusCodes)
 Mime::Type.register("application/coffee-pot-command", :htcpcp)

data/lib/haruki_zaemon/acts_as_teapot/action_controller/abstract_request.rb

@@ -0,0 +1,12 @@
+module HarukiZaemon
+  module ActsAsTeapot
+    module ActionController
+      module AbstractRequest
+        def self.included(base)
+          base::HTTP_METHODS << "brew"
+          base::HTTP_METHOD_LOOKUP["BREW"] = :brew
+        end
+      end
+    end
+  end
+end

data/lib/haruki_zaemon/acts_as_teapot/action_controller/dispatcher.rb

@@ -0,0 +1,40 @@
+module HarukiZaemon
+  module ActsAsTeapot
+    module ActionController
+      module Dispatcher
+        include ::ActionController::StatusCodes
+
+        def self.included(base)
+          base.alias_method_chain :handle_request, :acts_as_teapot
+        end
+
+        protected
+
+          def handle_request_with_acts_as_teapot
+            if brew_request? || htcpcp_request?
+              process
+            else
+              handle_request_without_acts_as_teapot
+            end
+          end
+
+        private
+
+          def process
+            @response.headers['Status'] = interpret_status(:im_a_teapot)
+            @response.body = "Short and Stout"
+            @response.prepare!
+            @response.out(@output)
+          end
+
+          def brew_request?
+            @request.method == :brew
+          end
+          
+          def htcpcp_request?
+            @request.content_type && @request.content_type == Mime::HTCPCP
+          end
+      end
+    end
+  end
+end

data/lib/haruki_zaemon/acts_as_teapot/action_controller/routing.rb

@@ -0,0 +1,11 @@
+module HarukiZaemon
+  module ActsAsTeapot
+    module ActionController
+      module Routing
+        def self.included(base)
+          base::HTTP_METHODS << :brew
+        end
+      end
+    end
+  end
+end

data/lib/haruki_zaemon/acts_as_teapot/action_controller/status_codes.rb

@@ -0,0 +1,12 @@
+module HarukiZaemon
+  module ActsAsTeapot
+    module ActionController
+      module StatusCodes
+        def self.included(base)
+          base::STATUS_CODES[418] = "I'm a teapot"
+          base::SYMBOL_TO_STATUS_CODE[:im_a_teapot] = 418
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: harukizaemon-acts_as_teapot
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Simon Harris
@@ -14,7 +14,7 @@ default_executable:
 dependencies: []
 
 description: Ensure your Ruby on Rails applications conform to RFC2324.
-email: simon.harris@cogentconsulting.com.au
+email: haruki.zaemon@gmail.com
 executables: []
 
 extensions: []
@@ -28,10 +28,10 @@ files:
 - README.rdoc
 - acts_as_teapot.gemspec
 - lib/acts_as_teapot.rb
-- lib/acts_as_teapot/application_controller.rb
-- lib/acts_as_teapot/action_controller/abstract_request.rb
-- lib/acts_as_teapot/action_controller/routing.rb
-- lib/acts_as_teapot/action_controller/status_codes.rb
+- lib/haruki_zaemon/acts_as_teapot/action_controller/abstract_request.rb
+- lib/haruki_zaemon/acts_as_teapot/action_controller/dispatcher.rb
+- lib/haruki_zaemon/acts_as_teapot/action_controller/routing.rb
+- lib/haruki_zaemon/acts_as_teapot/action_controller/status_codes.rb
 has_rdoc: true
 homepage: http://github.com/harukizaemon/acts_as_teapot
 post_install_message: 

data/lib/acts_as_teapot/action_controller/abstract_request.rb

@@ -1,10 +0,0 @@
-module ActsAsTeapot
-  module ActionController
-    module AbstractRequest
-      def self.included(base)
-        base::HTTP_METHODS << "brew"
-        base::HTTP_METHOD_LOOKUP["BREW"] = :brew
-      end
-    end
-  end
-end

data/lib/acts_as_teapot/action_controller/routing.rb

@@ -1,9 +0,0 @@
-module ActsAsTeapot
-  module ActionController
-    module Routing
-      def self.included(base)
-        base::HTTP_METHODS << :brew
-      end
-    end
-  end
-end

data/lib/acts_as_teapot/action_controller/status_codes.rb

@@ -1,10 +0,0 @@
-module ActsAsTeapot
-  module ActionController
-    module StatusCodes
-      def self.included(base)
-        base.STATUS_CODES[418] = "I'm a teapot"
-        base.SYMBOL_TO_STATUS_CODE[:im_a_teapot] = 418
-      end
-    end
-  end
-end

data/lib/acts_as_teapot/application_controller.rb

@@ -1,12 +0,0 @@
-module ActsAsTeapot
-  module ApplicationController
-    def self.included(base)
-      base.prepend_before_filter :rfc2324_check
-    end
-
-    private  
-      def rfc2324_check
-        head(:im_a_teapot) if request.method == :brew || (request.content_type && request.content_type == Mime::HTCPCP)
-      end
-  end
-end