rack-jsonp-tools 0.1.0 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/rack/jsonp/callback.rb

@@ -1,5 +1,3 @@
-require "rack/jsonp/utils"
-
 module Rack
   module JSONP
   
@@ -14,48 +12,32 @@ module Rack
         if callback = request.params[@callback_param]
           # Save for underlying middlewares
           env["jsonp.callback"] = callback
-        
-          # Remove callback param and value from query string
-          Utils.remove_param(env, @callback_param)
-          
 
           # Call original app
-          status, headers, body = @app.call(env)
+          status, headers, @body = @app.call(env)
 
-          # Wrap body with callback
-          pre, post = "#{callback}(", ")" 
-          body = Wrapper.new(pre, body, post)
+          # Callback
+          @pre, @post = "#{callback}(", ")" 
 
           # Fix content length if present
           if content_length = headers["Content-Length"]
-            headers["Content-Length"] = (pre.size + content_length.to_i + post.size).to_s
+            headers["Content-Length"] = (@pre.size + content_length.to_i + @post.size).to_s
           end
 
           # Set proper content type as per RFC4329
           headers["Content-Type"] = "application/javascript"
 
-          [status, headers, body]
+          [status, headers, self]
         else
           @app.call(env)
         end
       end
-
-      private
-
-      class Wrapper
-        def initialize(pre, body, post)
-          @pre, @body, @post = pre, body, post
-        end
-
-        def each(&block)
-          block.call(@pre)
-          @body.each(&block)
-          block.call(@post)
-        end
+      
+      def each(&block)
+        block.call(@pre)
+        @body.each(&block)
+        block.call(@post)
       end
-    
     end
-
-
   end
 end

data/lib/rack/jsonp/method_override.rb

@@ -1,5 +1,3 @@
-require "rack/jsonp/utils"
-
 module Rack
   module JSONP
 
@@ -10,7 +8,6 @@ module Rack
 
       def call(env)
         if env["jsonp.callback"] && method = Rack::Request.new(env).params[@method_param]
-          Utils.remove_param(env, @method_param)
           method.upcase!
           env["REQUEST_METHOD"] = %w(GET HEAD PUT POST DELETE OPTIONS).include?(method) ? method : "GET"
         end

data/rack-jsonp-tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-jsonp-tools}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]
-  s.date = %q{2010-01-14}
+  s.date = %q{2010-06-21}
   s.description = %q{A collection of rack middlewares helping you add JSONP to your app}
   s.email = %q{jacek.becela@gmail.com}
   s.files = [
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
      "lib/rack/jsonp/callback.rb",
      "lib/rack/jsonp/method_override.rb",
      "lib/rack/jsonp/status_wrapper.rb",
-     "lib/rack/jsonp/utils.rb",
      "rack-jsonp-tools.gemspec",
      "test/callback_test.rb",
      "test/method_override_test.rb",
@@ -29,7 +28,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ncr/rack-jsonp-tools}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Add JSONP support to your app in less than 3 minutes! Method Override included for free!}
   s.test_files = [
     "test/callback_test.rb",

data/test/callback_test.rb

@@ -2,7 +2,6 @@ require "test_helper"
 require "rack/jsonp/callback"
  
 class CallbackTest < Test::Unit::TestCase
-  
   def setup
     @status  = 200
     @headers = { "Content-Type" => "application/json", "Content-Length" => "2" }
@@ -36,7 +35,5 @@ class CallbackTest < Test::Unit::TestCase
       "Content-Length" => expected_body.size.to_s 
     }
     assert_equal expected_body, body
-
   end
-  
 end

data/test/method_override_test.rb

@@ -2,7 +2,6 @@ require "test_helper"
 require "rack/jsonp/method_override"
  
 class CallbackTest < Test::Unit::TestCase
-  
   test "doesn't change anything when method is missing" do
     env = Rack::MockRequest.env_for("/?_method=post", :method => "GET", "jsonp.callback" => true)
     app = Rack::JSONP::MethodOverride.new(lambda { |env| Rack::Request.new(env) })

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 require "rubygems"
 
-gem "test-unit"
+gem "test-unit", ">=2.0.0"
 
 require "test/unit"
 require "rack"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rack-jsonp-tools
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jacek Becela
@@ -9,39 +14,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-14 00:00:00 +01:00
+date: 2010-06-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: test-unit
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
         version: "2.0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: A collection of rack middlewares helping you add JSONP to your app
 email: jacek.becela@gmail.com
 executables: []
@@ -58,7 +70,6 @@ files:
 - lib/rack/jsonp/callback.rb
 - lib/rack/jsonp/method_override.rb
 - lib/rack/jsonp/status_wrapper.rb
-- lib/rack/jsonp/utils.rb
 - rack-jsonp-tools.gemspec
 - test/callback_test.rb
 - test/method_override_test.rb
@@ -76,18 +87,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Add JSONP support to your app in less than 3 minutes! Method Override included for free!

data/lib/rack/jsonp/utils.rb

@@ -1,12 +0,0 @@
-module Rack
-  module JSONP
-    module Utils
-      
-      def remove_param(env, param)
-        env["QUERY_STRING"].gsub!(/#{Regexp.escape(param)}=[^&;]*/, "")
-      end
-      module_function :remove_param
-      
-    end
-  end
-end