sinatra-jsonp 0.1.1 → 0.2

data/README.md

@@ -1,39 +1,49 @@
 Sinatra::JSONP
 =================
 
-JSONP output for [Sinatra](http://sinatrarb.com). Automatically detects callback params
-and returns proper JSONP output. If no callback params where detected returns plain JSON.
-Works with [jQuery](http://jquery.com) [jQuery.getJSON](http://api.jquery.com/jQuery.getJSON/) function out of the box.
+JSONP output helper for [Sinatra](http://sinatrarb.com). Automatically detects callback params and returns proper JSONP output. 
+If no callback params where detected it returns plain JSON.
+Works with [jQuery](http://jquery.com) [jQuery.getJSON](http://api.jquery.com/jQuery.getJSON/) method out of the box.
+
 
 Installation
 ------------
-
-    gem install sinatra-jsonp
+<pre>
+sudo gem install sinatra-jsonp
+</pre>
 
 Usage
 -----
+<pre>
+require "sinatra"
+require "sinatra/jsonp"
+
+get '/hello' do
+  data = ["hello","hi","hallo"]
+  JSONP data      # JSONP is an alias for jsonp method
+end
+
+# define your own callback as second string param
+get '/hi' do
+  data = ["hello","hi","hallo"]
+  jsonp data, 'functionA'
+end
+
+# same with symbol param
+get '/hallo' do
+  data = ["hello","hi","hallo"]
+  jsonp data, :functionB
+end
+</pre>
+
+Links
+-----
 
-Simple example:
-
-    require "sinatra"
-    require "sinatra/jsonp"
-
-
-    get '/users/:user' do
-      user = User[params[:user]]
-      JSONP user
-    end
-
-    # or define your own callback as second param
+* [jQuery](http://jquery.com)
+* [Sinatra](http://www.sinatrarb.com)
 
-    get '/' do
-      data = ["hello","hi","hallo"]
-      jsonp data, 'functionA'
-    end
 
 License
 -------
 
 sinatra-jsonp is licensed under the MIT license.
-
-

data/lib/sinatra/jsonp.rb

@@ -3,19 +3,24 @@ require 'json'
 
 module Sinatra
   module Jsonp
-    # Format data according to request JSON/JSONP
-    def jsonp(obj, callback = nil) 
-      data = obj.to_json
-      ['callback','jscallback','jsonp'].each do |x| 
-        callback = params.delete(x) if not callback
+    def jsonp(*args) 
+      if args.size > 0
+        data = args[0].to_json
+        if args.size > 1
+          callback = args[1].to_s
+        else
+          ['callback','jscallback','jsonp'].each do |x| 
+            callback = params.delete(x) if not callback
+          end
+        end
+        if callback
+          content_type :js
+          response = "#{callback}(#{data})"
+        else
+          response = data
+        end
+        response
       end
-      if callback
-        content_type :js
-        response = "#{callback}(#{data})"
-      else
-        response = data
-      end
-      response
     end
     alias JSONP jsonp
   end

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Serg Podtynnyi
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 +04:00
+date: 2010-06-09 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency