sinatra-jsonp 0.4 → 0.4.1

data/README.md

@@ -1,13 +1,12 @@
-Sinatra::Jsonp [![Build Status](https://travis-ci.org/shtirlic/sinatra-jsonp.png)](https://travis-ci.org/shtirlic/sinatra-jsonp)
-==============
+# 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.
 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
-------------
+## Installation
+
 
 System install
 
@@ -18,11 +17,11 @@ gem install sinatra-jsonp
 Gemfile
 
 ```ruby
-gem 'sinatra-jsonp', :require => 'sinatra/jsonp'
+gem 'sinatra-jsonp'
 ```
 
-Usage
------
+## Usage
+
 
 Classic:
 
@@ -56,6 +55,9 @@ require "sinatra/jsonp"
 class Foo < Sinatra::Base
   helpers Sinatra::Jsonp
 
+  # Enable JSON pretty output
+  #enable :json_pretty
+
   get '/' do
     data = ["hello","hi","hallo"]
     jsonp data
@@ -63,14 +65,14 @@ class Foo < Sinatra::Base
 end
 ```
 
-Links
------
+## Links
+
 
 * [jQuery](http://jquery.com)
 * [Sinatra](http://www.sinatrarb.com)
 
 
-License
--------
+## License
+
 
 See LICENSE for details.

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/lib/sinatra/jsonp.rb

@@ -5,7 +5,7 @@ module Sinatra
   module Jsonp
     def jsonp(*args)
       if args.size > 0
-        data = MultiJson.dump args[0]
+        data = MultiJson.dump args[0], :pretty => settings.respond_to?(:json_pretty) && settings.json_pretty
         if args.size > 1
           callback = args[1].to_s
         else

data/spec/jsonp_spec.rb

@@ -39,4 +39,17 @@ describe Sinatra::Jsonp do
     get '/method_with_params?callback=functionB'
     body.should == 'functionA(["hello","hi","hallo"])'
   end
+
+  it "return pretty JSON if :json_pretty enabled" do
+    mock_app do
+      helpers Sinatra::Jsonp
+      enable :json_pretty
+      get '/method' do
+        data = ["hello","hi","hallo"]
+        jsonp data
+      end
+    end
+    get '/method'
+    body.should == "[\n  \"hello\",\n  \"hi\",\n  \"hallo\"\n]"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-jsonp
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -115,12 +115,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3994309697278529484
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3994309697278529484
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -128,4 +134,3 @@ signing_key:
 specification_version: 3
 summary: JSONP output helper for Sinatra
 test_files: []
-has_rdoc: