sinatra-jsonp 0.2.1 → 0.3

data/README.md

@@ -1,5 +1,5 @@
-Sinatra::Jsonp
-=================
+Sinatra::Jsonp ![Project status](http://stillmaintained.com/shtirlic/sinatra-jsonp.png)
+==============
 
 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.
@@ -9,13 +9,16 @@ Works with [jQuery](http://jquery.com) [jQuery.getJSON](http://api.jquery.com/jQ
 Installation
 ------------
 
-    gem install sinatra-jsonp
+```bash
+gem install sinatra-jsonp
+```
 
 Usage
 -----
 
 Classic:
 
+```ruby
     require "sinatra"
     require "sinatra/jsonp"
 
@@ -35,9 +38,10 @@ Classic:
       data = ["hello","hi","hallo"]
       jsonp data, :functionB
     end
-
+```
 Modular:
 
+```ruby
     require "sinatra/base"
     require "sinatra/jsonp"
 
@@ -49,7 +53,7 @@ Modular:
         jsonp data
       end
     end
-
+```
 
 Links
 -----

data/lib/sinatra/jsonp.rb

@@ -3,14 +3,14 @@ require 'json'
 
 module Sinatra
   module Jsonp
-    def jsonp(*args) 
+    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','jsoncallback'].each do |x|
-            callback = params.delete(x) if not callback
+            callback = params.delete(x) unless callback
           end
         end
         if callback

data/spec/jsonp_spec.rb

@@ -0,0 +1,36 @@
+require_relative 'spec_helper'
+require 'sinatra/jsonp'
+
+describe Sinatra::Jsonp do
+  before do
+    mock_app do
+      helpers Sinatra::Jsonp
+
+      get '/method' do
+        data = ["hello","hi","hallo"]
+        jsonp data
+      end
+      get '/method_with_params' do
+        data = ["hello","hi","hallo"]
+        jsonp data, :functionA
+      end
+    end
+  end
+
+  it "should return 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
+    get '/method?callback=functionA'
+    body.should == 'functionA(["hello","hi","hallo"])'
+  end
+  it "should return 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
+    get '/method_with_params?callback=functionB'
+    body.should == 'functionA(["hello","hi","hallo"])'
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'sinatra/contrib'
+
+
+RSpec.configure do |config|
+  config.expect_with :rspec, :stdlib
+  config.include Sinatra::TestHelpers
+end
+
+

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-jsonp
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+  prerelease: 
+  version: "0.3"
 platform: ruby
 authors: 
 - Serg Podtynnyi
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +04:00
+date: 2011-04-25 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,9 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id001
@@ -39,12 +32,31 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
         version: "1.4"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.3"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: JSONP output helper for Sinatra
 email: serg.podtynnyi@gmail.com
 executables: []
@@ -54,6 +66,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- spec/jsonp_spec.rb
+- spec/spec_helper.rb
 - lib/sinatra/jsonp.rb
 - README.md
 has_rdoc: true
@@ -70,21 +84,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: JSONP output helper for Sinatra