cuba-api 0.6.0 → 0.6.1

data/lib/cuba_api/guard.rb

@@ -49,27 +49,30 @@ module CubaApi
     end
 
     def allowed_associations
-      guard.associations( @_context, @_method )
+      guard.associations( guard_context, @_method )
     end
 
     def on_context( name, &block )
       perm = guard.permissions( name )
       if perm && perm.parent &&
-          perm.parent.resource !=  @_context
+          perm.parent.resource != guard_context
         raise 'parent resource is not guarded'
       end
       on name do
-        old = @_context
-        @_context = name
-        yield( *captures )
-        @_context = old
+        begin
+          old = guard_context
+          guard_context( name )
+          yield( *captures )
+        ensure
+          guard_context( old )
+        end
       end
     end
 
     def on_association
       on :association do |association|
         # TODO one method in guard
-        asso = guard.permissions( @_context ).associations
+        asso = guard.permissions( guard_context ).associations
         if asso.empty? or asso.include?( association )
           yield( association )
         else
@@ -84,9 +87,9 @@ module CubaApi
         
         @_method = method
         
-        warn "[CubaApi::Guard] check #{method.to_s.upcase} #{@_context}: #{guard.allow?( @_context, method )}"
+        warn "[CubaApi::Guard] check #{method.to_s.upcase} #{guard_context}: #{guard.allow?( guard_context, method )}"
         # TODO guard needs no association here
-        if guard.allow?( @_context, method, (allowed_associations || []).first )
+        if guard.allow?( guard_context, method, (allowed_associations || []).first )
           
           yield( *captures )
         else
@@ -97,6 +100,14 @@ module CubaApi
 
     private
 
+    def guard_context( ctx = nil )
+      if ctx
+        @_conetxt = (req.env[ 'guard_context' ] = ctx)
+      else
+        @_context ||= req.env[ 'guard_context' ]
+      end
+    end
+
     def guard
       self.class.guard.call( current_groups )
     end

data/lib/cuba_api/input_filter.rb

@@ -21,7 +21,8 @@ module CubaApi
 
     def parse_request_body
       if env[ 'CONTENT_TYPE' ] =~ /^application\/json/
-        MultiJson.load( req.body.read )
+        body = req.body.read
+        body.empty? ? {} : MultiJson.load( body )
       else
         {}
       end

data/lib/cuba_api/utils.rb

@@ -58,7 +58,10 @@ module CubaApi
     end
     
     def last_modified( last )
-      res[ 'Last-Modified' ] = rfc2616( last ) if last
+      if last
+        res[ 'Last-Modified' ] = rfc2616( last )
+        res[ 'Cache-Control' ] = "private, max-age=0, must-revalidate"
+      end
     end
 
     def modified_since

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba-api
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba