flexible_api_server 0.0.11 → 0.0.12

data/lib/flexible_api_server/version.rb

@@ -1,5 +1,5 @@
 module FlexibleApiServer
 
- VERSION = '0.0.11'
+  VERSION = '0.0.12'
 
 end

data/lib/flexible_api_server.rb

@@ -18,6 +18,10 @@ module FlexibleApiServer
   class App < Sinatra::Base
 
     register Sinatra::RespondTo
+    mime_type :jsonp, 'application/javascript'
+    mime_type :js, 'application/json'
+    mime_type :xml, 'application/xml'
+
     set :assume_xhr_is_js, true
     set :default_content, :js
     set :raise_errors, false
@@ -25,7 +29,7 @@ module FlexibleApiServer
     set :views, File.dirname(__FILE__) + '/../views'
 
     FILTERED_COLUMNS = [:password, :password_confirmation]
-    ALLOWED_FORMATS = [:js, :xml]
+    ALLOWED_FORMATS = [:js, :xml, :jsonp]
 
     def assign(k, v)
       @assign ||= {}
@@ -33,9 +37,6 @@ module FlexibleApiServer
       nil
     end
 
-    JSON_CONTENT_TYPE = 'application/json;charset=utf-8'
-    XML_CONTENT_TYPE  = 'application/xml;charset=utf-8'
-
     def free_render(code, hash = '') # blank by default, not nil
       status code
       # Filter some things out
@@ -43,14 +44,16 @@ module FlexibleApiServer
         hash[column] = '[filtered]' if hash.has_key?(column)
       end if hash.is_a?(Hash)
       # and respond
+      charset 'utf-8'
       format :js unless ALLOWED_FORMATS.include? format
       respond_to do |wants|
+        wants.jsonp do
+          (params[:callback] || 'callback') + "(#{hash.to_json});"
+        end
         wants.js do
-          headers['Content-type'] = JSON_CONTENT_TYPE
           hash.to_json
         end
         wants.xml do
-          headers['Content-type'] = XML_CONTENT_TYPE
           hash.to_xml
         end
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flexible_api_server
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - John Crepezzi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +01:00
+date: 2011-04-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,12 +68,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 17
         segments: 
         - 0
         - 0
-        - 4
-        version: 0.0.4
+        - 7
+        version: 0.0.7
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency