sinatra-jsonp 0.2 → 0.2.1

data/README.md

@@ -1,4 +1,4 @@
-Sinatra::JSONP
+Sinatra::Jsonp
 =================
 
 JSONP output helper for [Sinatra](http://sinatrarb.com). Automatically detects callback params and returns proper JSONP output. 
@@ -8,33 +8,48 @@ Works with [jQuery](http://jquery.com) [jQuery.getJSON](http://api.jquery.com/jQ
 
 Installation
 ------------
-<pre>
-sudo gem install sinatra-jsonp
-</pre>
+
+    gem install sinatra-jsonp
 
 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>
+
+Classic:
+
+    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
+
+Modular:
+
+    require "sinatra/base"
+    require "sinatra/jsonp"
+
+    class Foo < Sinatra::Base
+      helpers Sinatra::Jsonp
+
+      get '/' do
+        data = ["hello","hi","hallo"]
+        jsonp data
+      end
+    end
+
 
 Links
 -----

data/lib/sinatra/jsonp.rb

@@ -9,7 +9,7 @@ module Sinatra
         if args.size > 1
           callback = args[1].to_s
         else
-          ['callback','jscallback','jsonp'].each do |x| 
+          ['callback','jscallback','jsonp','jsoncallback'].each do |x|
             callback = params.delete(x) if not callback
           end
         end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Serg Podtynnyi
@@ -13,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +04:00
+date: 2010-10-12 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -33,6 +35,7 @@ dependencies:
   name: json_pure
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -63,6 +66,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -70,6 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -79,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: JSONP output helper for Sinatra