Changeset 807

Timestamp:

10/31/07 22:06:10 (1 year ago)

Author:

e.@brainspl.at

Message:

use class << self block instead of def self.foo when there are a bunch of class methods being defined. use block form of class_eval instead of string form

Files:

• trunk/lib/merb/mixins/render.rb (modified) (1 diff)
• trunk/lib/merb/mixins/responder.rb (modified) (2 diffs)
• trunk/lib/merb/view_context.rb (modified) (1 diff)

trunk/lib/merb/mixins/render.rb

@@ -113 +113 @@
-    #     end
-    #   end
-
+ 
-    #  This will first check to see if a index.xml.* template extists, if not
-    #  it will call @people.to_xml (as defined in the add_mime_type method) on the passed

trunk/lib/merb/mixins/responder.rb

@@ -1 @@
-
+  
-
-module Merb
+  class << self
+    # Provides the currently implemented mime types as a hash
+    def available_mime_types
+      ResponderMixin::Rest::TYPES
+    end
+    
+    # Any specific outgoing headers should be included here.  These are not
+    # the content-type header but anything in addition to it.
+    # +tranform_method+ should be set to a symbol of the method used to
+    # transform a resource into this mime type.
+    # For example for the :xml mime type an object might be transformed by
+    # calling :to_xml, or for the :js mime type, :to_json.
+    # If there is no transform method, use nil.
+    def add_mime_type(key,transform_method, values,new_response_headers = {})
+      raise ArgumentError unless key.is_a?(Symbol) && values.is_a?(Array)
+      ResponderMixin::Rest::TYPES.update(key => values)
+      add_response_headers!(key, new_response_headers)   
+      ResponderMixin::Rest::TRANSFORM_METHODS.merge!(key => transform_method) 
+    end    
+    
+    def remove_mime_type(key)
+      key == :all ? false : ResponderMixin::Rest::TYPES.delete(key)
+    end
+    
+    def mime_transform_method(key)
+      ResponderMixin::Rest::TRANSFORM_METHODS[key]
+    end
+    
+    
+    # Adds outgoing headers to a mime type.  This can be done with the Merb.add_mime_type method
+    # or directly here.  
+    # ===Example
+    # {{[
+    #   Merb.outgoing_headers!(:xml => { :Encoding => "UTF-8" })
+    # ]}}
+    #
+    # This method is destructive on any already defined outgoing headers
+    def add_response_headers!(key, values = {})
+      raise ArgumentError unless key.is_a?(Symbol) && values.is_a?(Hash)
+      response_headers[key] = values
+    end
+    
+    def response_headers
+      ResponderMixin::Rest::RESPONSE_HEADERS
+    end
+    
+    # Completely removes any headers set that are additional to the content-type header.
+    def remove_response_headers!(key)
+      raise ArgumentError unless key.is_a?(Symbol)
+      response_headers[key] = {}
+    end
+    
+    # Sets the mime types and outgoing headers to their original states
+    def reset_default_mime_types!
+      available_mime_types.clear
+      response_headers.clear
+      Merb.add_mime_type(:all,nil,%w[*/*])
+      Merb.add_mime_type(:yaml,:to_yaml,%w[application/x-yaml text/yaml])
+      Merb.add_mime_type(:text,:to_text,%w[text/plain])
+      Merb.add_mime_type(:html,nil,%w[text/html application/xhtml+xml application/html])
+      Merb.add_mime_type(:xml,:to_xml,%w[application/xml text/xml application/x-xml], :Encoding => "UTF-8")
+      Merb.add_mime_type(:js,:to_json,%w[ text/javascript  application/javascript application/x-javascript])
+      Merb.add_mime_type(:json,:to_json,%w[application/json  text/x-json  ])
+    end
-  
-  # Provides the currently implemented mime types as a hash
-  def self.available_mime_types
-    ResponderMixin::Rest::TYPES
-  end
-  
-  # Any specific outgoing headers should be included here.  These are not
-  # the content-type header but anything in addition to it.
-  # +tranform_method+ should be set to a symbol of the method used to
-  # transform a resource into this mime type.
-  # For example for the :xml mime type an object might be transformed by
-  # calling :to_xml, or for the :js mime type, :to_json.
-  # If there is no transform method, use nil.
-  def self.add_mime_type(key,transform_method, values,new_response_headers = {})
-    raise ArgumentError unless key.is_a?(Symbol) && values.is_a?(Array)
-    ResponderMixin::Rest::TYPES.update(key => values)
-    add_response_headers!(key, new_response_headers)   
-    ResponderMixin::Rest::TRANSFORM_METHODS.merge!(key => transform_method) 
-  end    
-  
-  def self.remove_mime_type(key)
-    key == :all ? false : ResponderMixin::Rest::TYPES.delete(key)
-  end
-  
-  def self.mime_transform_method(key)
-    ResponderMixin::Rest::TRANSFORM_METHODS[key]
-  end
-  
-  
-  # Adds outgoing headers to a mime type.  This can be done with the Merb.add_mime_type method
-  # or directly here.  
-  # ===Example
-  # {{[
-  #   Merb.outgoing_headers!(:xml => { :Encoding => "UTF-8" })
-  # ]}}
-  #
-  # This method is destructive on any already defined outgoing headers
-  def self.add_response_headers!(key, values = {})
-    raise ArgumentError unless key.is_a?(Symbol) && values.is_a?(Hash)
-    response_headers[key] = values
-  end
-  
-  def self.response_headers
-    ResponderMixin::Rest::RESPONSE_HEADERS
-  end
-  
-  # Completely removes any headers set that are additional to the content-type header.
-  def self.remove_response_headers!(key)
-    raise ArgumentError unless key.is_a?(Symbol)
-    response_headers[key] = {}
-  end
-  
-  # Sets the mime types and outgoing headers to their original states
-  def self.reset_default_mime_types!
-    available_mime_types.clear
-    response_headers.clear
-    Merb.add_mime_type(:all,nil,%w[*/*])
-    Merb.add_mime_type(:yaml,:to_yaml,%w[application/x-yaml text/yaml])
-    Merb.add_mime_type(:text,:to_text,%w[text/plain])
-    Merb.add_mime_type(:html,nil,%w[text/html application/xhtml+xml application/html])
-    Merb.add_mime_type(:xml,:to_xml,%w[application/xml text/xml application/x-xml], :Encoding => "UTF-8")
-    Merb.add_mime_type(:js,:to_json,%w[ text/javascript  application/javascript application/x-javascript])
-    Merb.add_mime_type(:json,:to_json,%w[application/json  text/x-json  ])
-  end
-  
-
-  # The ResponderMixin adds methods that help you manage what
@@ -165 +166 @@
-    def self.included(base) # :nodoc:
-      base.extend(ClassMethods)
-"class_inheritable_accessor :class_provided_formats"
+{ class_inheritable_accessor :class_provided_formats }
-      base.class_provided_formats = [:html]
-    end

trunk/lib/merb/view_context.rb

@@ -18 +18 @@
-                       @thrown_content
-                       @_route
-
+
+
+
+
+
+
+
+
-
-