sinatra-jsonp 0.3.2 → 0.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2010 by Serg Podtynnyi
+Copyright (C) 2012 by Serg Podtynnyi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,4 @@
-Sinatra::Jsonp ![Project status](http://stillmaintained.com/shtirlic/sinatra-jsonp.png)
+Sinatra::Jsonp [![Build Status](https://travis-ci.org/shtirlic/sinatra-jsonp.png)](https://travis-ci.org/shtirlic/sinatra-jsonp)
 ==============
 
 JSONP output helper for [Sinatra](http://sinatrarb.com). Automatically detects callback params and returns proper JSONP output.

data/lib/sinatra/jsonp.rb

@@ -1,11 +1,11 @@
 require 'sinatra/base'
-require 'json'
+require 'multi_json'
 
 module Sinatra
   module Jsonp
     def jsonp(*args)
       if args.size > 0
-        data = args[0].to_json
+        data = MultiJson.dump args[0]
         if args.size > 1
           callback = args[1].to_s
         else
@@ -14,6 +14,7 @@ module Sinatra
           end
         end
         if callback
+          callback.tr!('^a-zA-Z0-9_$\.', '')
           content_type :js
           response = "#{callback}(#{data})"
         else

data/spec/jsonp_spec.rb

@@ -1,5 +1,5 @@
 require 'backports'
-require_relative 'spec_helper'
+require 'spec_helper'
 
 describe Sinatra::Jsonp do
   before do
@@ -17,19 +17,25 @@ describe Sinatra::Jsonp do
     end
   end
 
-  it "should return JSON if no callback passed" do
+  it "returns JSON if no callback passed" do
     get '/method'
     body.should == '["hello","hi","hallo"]'
   end
-  it "should return JSONP if callback passed via GET param" do
+  it "returns JSONP if callback passed via request params" do
     get '/method?callback=functionA'
     body.should == 'functionA(["hello","hi","hallo"])'
   end
-  it "should return JSONP if callback passed via method param" do
+
+  it "returns JSONP with sanitized callback" do
+    get '/method', { :callback=>'foo<script>alert(1)</script>' }
+    body.should == 'fooscriptalert1script(["hello","hi","hallo"])'
+  end
+
+  it "returns JSONP if callback passed via method param" do
     get '/method_with_params'
     body.should == 'functionA(["hello","hi","hallo"])'
   end
-  it "should return JSONP with callback passed via method params even if it passed via GET param" do
+  it "returns JSONP with callback passed via method params even if it passed via request param" do
     get '/method_with_params?callback=functionB'
     body.should == 'functionA(["hello","hi","hallo"])'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-jsonp
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &82328930 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *82328930
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: &82328400 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.3.7
   type: :runtime
   prerelease: false
-  version_requirements: *82328400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82327530 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *82327530
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &83330550 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83330550
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &83330280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,16 +85,21 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *83330280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: JSONP output helper for Sinatra
 email: serg.podtynnyi@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/sinatra/jsonp.rb
 - spec/jsonp_spec.rb
 - spec/spec_helper.rb
-- lib/sinatra/jsonp.rb
 - README.md
 - Rakefile
 - LICENSE
@@ -98,8 +123,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: JSONP output helper for Sinatra
 test_files: []
+has_rdoc: