cryx-g5k 0.2.0 → 0.2.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 0
+:patch: 1
 :major: 0

data/lib/g5k/rack/accept_format.rb

@@ -1,46 +1,44 @@
-module G5K
-  module Rack
-    #
-    # A Rack middleware for automatically adding a <tt>format</tt> token at the end of the request path
-    # when there is none. It can detect formats passed in the HTTP_ACCEPT header to populate this token.
-    # 
-    # e.g.:
-    #   GET /some/resource HTTP/1.1
-    #   Accept: application/json
-    # -> 
-    #   GET /some/resource.json HTTP/1.1
-    #   Accept: application/json
-    # 
-    # You can add custom types with this kind of function (taken from sinatra):
-    #   def mime(ext, type)
-    #     ext = ".#{ext}" unless ext.to_s[0] == ?.
-    #     Rack::Mime::MIME_TYPES[ext.to_s] = type
-    #   end
-    # and then:
-    #   mime :json, 'application/json'
-    #
-    # Note: it does not take into account multiple media types in the Accept header.
-    # The first media type takes precedence over all the others.
-    #
-    # MIT-License - Cyril Rohr
-    #
-    class AcceptFormat
-      # Constants
-      DEFAULT_EXTENSION = ".html"
+module Rack
+  #
+  # A Rack middleware for automatically adding a <tt>format</tt> token at the end of the request path
+  # when there is none. It can detect formats passed in the HTTP_ACCEPT header to populate this token.
+  # 
+  # e.g.:
+  #   GET /some/resource HTTP/1.1
+  #   Accept: application/json
+  # -> 
+  #   GET /some/resource.json HTTP/1.1
+  #   Accept: application/json
+  # 
+  # You can add custom types with this kind of function (taken from sinatra):
+  #   def mime(ext, type)
+  #     ext = ".#{ext}" unless ext.to_s[0] == ?.
+  #     Rack::Mime::MIME_TYPES[ext.to_s] = type
+  #   end
+  # and then:
+  #   mime :json, 'application/json'
+  #
+  # Note: it does not take into account multiple media types in the Accept header.
+  # The first media type takes precedence over all the others.
+  #
+  # MIT-License - Cyril Rohr
+  #
+  class AcceptFormat
+    # Constants
+    DEFAULT_EXTENSION = ".html"
 
-      def initialize(app)
-        @app = app
-      end
-    
-      def call(env)
-        req = Rack::Request.new(env)
-        unless req.path_info =~ /(.*)\.(.+)/
-          accept = env['HTTP_ACCEPT'].scan(/[^;,\s]*\/[^;,\s]*/)[0] rescue ""
-          extension =  Rack::Mime::MIME_TYPES.invert[accept] || DEFAULT_EXTENSION
-          req.path_info = req.path_info+"#{extension}"
-        end
-        @app.call(env)
-      end    
+    def initialize(app)
+      @app = app
     end
+  
+    def call(env)
+      req = Rack::Request.new(env)
+      unless req.path_info =~ /(.*)\.(.+)/
+        accept = env['HTTP_ACCEPT'].scan(/[^;,\s]*\/[^;,\s]*/)[0] rescue ""
+        extension =  Rack::Mime::MIME_TYPES.invert[accept] || DEFAULT_EXTENSION
+        req.path_info = req.path_info+"#{extension}"
+      end
+      @app.call(env)
+    end    
   end
 end

data/lib/g5k/rack/jsonp.rb

@@ -1,43 +1,41 @@
-module G5K
-  module Rack
+module Rack
+
+  # A Rack middleware for providing JSON-P support.
+  # 
+  # Full credit to Flinn Mueller (http://actsasflinn.com/) for this contribution.
+  # 
+  class JSONP
   
-    # A Rack middleware for providing JSON-P support.
+    def initialize(app)
+      @app = app
+    end
+  
+    # Proxies the request to the application, stripping out the JSON-P callback
+    # method and padding the response with the appropriate callback format.
     # 
-    # Full credit to Flinn Mueller (http://actsasflinn.com/) for this contribution.
+    # Changes nothing if no <tt>callback</tt> param is specified.
     # 
-    class JSONP
-    
-      def initialize(app)
-        @app = app
-      end
-    
-      # Proxies the request to the application, stripping out the JSON-P callback
-      # method and padding the response with the appropriate callback format.
-      # 
-      # Changes nothing if no <tt>callback</tt> param is specified.
-      # 
-      def call(env)
-        status, headers, response = @app.call(env)
-        request = Rack::Request.new(env)
-        if request.params.include?('callback')
-          response = pad(request.params.delete('callback'), response)
-          headers['Content-Length'] = response.length.to_s
-        end
-        [status, headers, response]
+    def call(env)
+      status, headers, response = @app.call(env)
+      request = Rack::Request.new(env)
+      if request.params.include?('callback')
+        response = pad(request.params.delete('callback'), response)
+        headers['Content-Length'] = response.length.to_s
       end
-    
-      # Pads the response with the appropriate callback format according to the
-      # JSON-P spec/requirements.
-      # 
-      # The Rack response spec indicates that it should be enumerable. The method
-      # of combining all of the data into a single string makes sense since JSON
-      # is returned as a full string.
-      # 
-      def pad(callback, response, body = "")
-        response.each{ |s| body << s }
-        "#{callback}(#{body})"
-      end
-    
+      [status, headers, response]
     end
+  
+    # Pads the response with the appropriate callback format according to the
+    # JSON-P spec/requirements.
+    # 
+    # The Rack response spec indicates that it should be enumerable. The method
+    # of combining all of the data into a single string makes sense since JSON
+    # is returned as a full string.
+    # 
+    def pad(callback, response, body = "")
+      response.each{ |s| body << s }
+      "#{callback}(#{body})"
+    end
+  
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cryx-g5k
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Cyril Rohr