cuba-api 0.3.0 → 0.3.1

data/lib/cuba_api/current_user.rb

@@ -33,10 +33,10 @@ module CubaApi
 
     def current_user( user = nil )
       if user
-        session['user'] =  self.class.sessions.to_session( user )
+        session[ 'user' ] =  self.class.sessions.to_session( user )
         @_current_user = user
-      else
-        @_current_user ||= self.class.sessions.from_session( session['user'] )
+      elsif env[ 'rack.session' ]
+        @_current_user ||= self.class.sessions.from_session( session[ 'user' ] )
       end
     end
 

data/lib/cuba_api/input_filter.rb

@@ -1,4 +1,5 @@
 require 'ixtlan/babel/factory'
+require 'multi_json'
 module CubaApi
   module InputFilter
 
@@ -36,7 +37,7 @@ module CubaApi
 
     def parse_request_body
       if env[ 'CONTENT_TYPE' ] == 'application/json'
-        JSON.parse( req.body.read )
+        MultiJson.load( req.body.read )
       else
         {}
       end

data/lib/cuba_api/utils.rb

@@ -39,9 +39,33 @@ module CubaApi
 
     def expires_in( minutes )
       now = DateTime.now
+      res[ 'Date' ] = now.rfc2822
       res[ 'Expires' ] = ( now + minutes / 1440.0 ).rfc2822
     end
 
+    def browser_only_cache
+      res[ 'Date' ] = DateTime.now.rfc2822
+      res[ 'Expires' ] = "Fri, 01 Jan 1990 00:00:00 GMT"
+      res[ 'Cache-Control' ] = "private, max-age=0, must-revalidate"
+    end
+
+    def browser_only_cache_no_store
+      browser_only_cache
+      res[ 'Cache-Control' ] += ", no-store"
+    end
+
+    def no_cache_no_store
+      no_cache
+      res["Cache-Control"] += ", no-store"
+    end
+
+    def no_cache
+      res["Date"] = Time.now.rfc2822
+      res["Expires"] = "Fri, 01 Jan 1990 00:00:00 GMT"
+      res["Pragma"] = "no-cache"
+      res["Cache-Control"] = "no-cache, must-revalidate"
+    end
+
     def content_type( mime )
       res[ 'Content-Type' ] = mime if mime
     end

metadata

@@ -2,14 +2,14 @@
 name: cuba-api
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -59,19 +59,35 @@ dependencies:
     none: false
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: '1.6'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: '1.6'
     none: false
   prerelease: false
   type: :development