restrack 1.5.1 → 1.6.0

data/lib/restrack/response.rb

@@ -83,6 +83,8 @@ module RESTRack
     def package(data)
       if mime_type.like?( RESTRack.mime_type_for( :JSON ) )
         output = data.to_json
+      elsif mime_type.like?( RESTRack.mime_type_for( :JS ) ) and !@request.get_params['callback'].nil?
+        output = @request.get_params['callback'] + "(#{data.to_json});"
       elsif mime_type.like?( RESTRack.mime_type_for( :XML ) )
         if File.exists? builder_file
           output = builder_up(data)

data/lib/restrack/version.rb

@@ -1,3 +1,3 @@
 module RESTRack
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/test/sample_app_1/test/test_callback.rb

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'test/unit'
+require 'rack/test'
+require File.expand_path(File.join(File.dirname(__FILE__),'..','loader'))
+require 'pp'
+
+class SampleApp::TestCallback < Test::Unit::TestCase
+
+  def setup
+    @ws = SampleApp::WebService.new
+  end
+
+  def test_show
+    env = Rack::MockRequest.env_for('/foo_bar/144.js?callback=my_function', {
+      :method => 'GET'
+    })
+    output = ''
+    assert_nothing_raised do
+      output = @ws.call(env)
+    end
+    test_val = 'my_function('+ { :foo => 'bar', :baz => 123 }.to_json + ');'
+    assert_equal test_val, output[2][0]
+  end
+
+end

data/test/sample_app_1/test/test_resource_request.rb

@@ -105,7 +105,7 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal 204, output[0]
+    assert_equal 200, output[0]
 
     RESTRack::CONFIG[:ROOT_RESOURCE_DENY] = nil
     env = Rack::MockRequest.env_for('/foo_bar/144', {
@@ -115,7 +115,7 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal 204, output[0]
+    assert_equal 200, output[0]
 
     RESTRack::CONFIG[:ROOT_RESOURCE_DENY] = ['']
     # it should handle this, although it is incorrect
@@ -126,7 +126,7 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal 204, output[0]
+    assert_equal 200, output[0]
 
     RESTRack::CONFIG[:ROOT_RESOURCE_DENY] = [ 'baz' ]
   end
@@ -207,7 +207,7 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal 204, output[0]
+    assert_equal 200, output[0]
   end
 
   def test_force_encoding_defined
@@ -241,7 +241,7 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal 204, output[0]
+    assert_equal 200, output[0]
   end
 
   def test_force_encoding_not_defined
@@ -274,7 +274,7 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal 204, output[0]
+    assert_equal 200, output[0]
   end
 
 end

data/test/sample_app_2/test/test_resource_request.rb

@@ -66,7 +66,7 @@ class SampleApp::TestResourceRequest < Test::Unit::TestCase
     assert_nothing_raised do
       output = @ws.call(env)
     end
-    assert_equal 204, output[0]
+    assert_equal 200, output[0]
 
     # the following request should hit the default controller's index method (BazuController)
     env = Rack::MockRequest.env_for('', {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restrack
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -189,6 +189,7 @@ files:
 - test/sample_app_1/controllers/errors_controller.rb
 - test/sample_app_1/controllers/foo_bar_controller.rb
 - test/sample_app_1/loader.rb
+- test/sample_app_1/test/test_callback.rb
 - test/sample_app_1/test/test_controller_actions.rb
 - test/sample_app_1/test/test_controller_inputs.rb
 - test/sample_app_1/test/test_controller_modifiers.rb