cuba-api 0.6.1 → 0.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 08d01480616570cd7a09d1f5da7a869037be9c2c
+  data.tar.gz: 6ef17555b198ffac42def04e185ad4033706d4aa
+SHA512:
+  metadata.gz: 5a71e0b5d9b846a001f6d8d74c723bc9eab62033e82ba7f19dbbb0073d6c8fd2ea2967994578679757db2ef76867cf8b2dfb5e57c078a49f5f20b774ec9243cd
+  data.tar.gz: 901b16bf0da46243f5007eae69178d4adb84862a17dd2b92654f56891d3ecd6a860b042e98c993439fad92f276e53f60fd35c87a8314375d5fc163a7038c59c7

data/lib/cuba_api.rb

@@ -21,23 +21,21 @@
 # -*- Coding: utf-8 -*-
 require "cuba"
 
-require 'cuba_api/write_aspect'
-require 'cuba_api/serializer'
-require 'cuba_api/current_user'
-require 'cuba_api/guard'
-require 'cuba_api/accept_content'
+require 'cuba_api/aspects'
+require 'cuba_api/aspects/serializer'
+require 'cuba_api/aspects/accept_content'
 require 'cuba_api/config'
+require 'cuba_api/loggers'
 require 'cuba_api/input_filter'
-require 'cuba_api/response_status'
+require 'cuba_api/aspects/response_status'
 
 class CubaAPI < Cuba
 
   plugin CubaApi::Config
-  plugin CubaApi::WriteAspect
+  plugin CubaApi::Loggers
+  plugin CubaApi::Aspects
   plugin CubaApi::Serializer
   plugin CubaApi::AcceptContent
-  plugin CubaApi::CurrentUser
-  plugin CubaApi::Guard
   plugin CubaApi::InputFilter
   plugin CubaApi::ResponseStatus
 

data/lib/cuba_api/aspects.rb

@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# -*- Coding: utf-8 -*-
+
+module CubaApi
+  module Aspects
+
+    module ClassMethods
+      def append_aspect( arg )
+        aspects << arg
+        aspects_logger.info { "Appended #{arg}" }
+      end
+
+      def prepend_aspect( arg )
+        aspects.insert( 0, arg )
+        aspects_logger.info { "Prepended #{arg}" }
+      end
+
+      def aspects
+        self[ :aspects ] ||= []
+      end
+
+      private
+
+      def aspects_logger
+        logger_factory.logger( 'CubaAPI::Aspects' )
+      end
+    end
+
+    def write( obj, options = {} )
+      self.res.status = options[:status] || 200
+      # make sure we inherit aspects and repsect the order
+      aspects = self.class[ :aspects ] # == CubaAPI ? [] : self.class.superclass[ :aspects ]
+      (aspects + self.class[ :aspects ]).uniq.each do |w|
+        obj = send( w, obj, options ) if obj
+      end
+      res.write obj.to_s
+    end
+  end
+end

data/lib/cuba_api/aspects/accept_content.rb

@@ -0,0 +1,68 @@
+#
+# Copyright (C) 2012 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# -*- Coding: utf-8 -*-
+module CubaApi
+  module AcceptContent
+
+    module ClassMethods
+
+      MIMES = { :yaml => ['application/x-yaml', 'text/yaml'],
+        :json => ['application/json'],
+        :xml => ['application/xml'] }
+
+      def accept( *args )
+        args.each do |arg|
+          (MIMES[ arg ] || []).each do |mime|
+            if arg == :yaml
+              require 'safe_yaml' unless defined?( YAML )
+            end
+            mimes[ mime ] = "to_#{arg}".to_sym
+          end
+        end
+        accept_logger.info { "Accept: #{mimes.keys.join(', ')}" }
+      end
+
+      def mimes
+        self[ :mimes ] ||= {}
+      end
+
+      def accept_logger
+        logger_factory.logger( "CubaApi::AcceptContent" )
+      end
+    end
+
+    def accept_content( obj, options = {} )
+      mime = env[ 'HTTP_ACCEPT' ]
+      if self.class.mimes.key?( mime )
+        res[ "Content-Type" ] = mime + "; charset=utf-8"
+        obj.send self.class[ :mimes ][ mime ]
+      else
+        self.class.accept_logger.debug { "'#{mime}' not in allowed list #{self.class[ :mimes ].keys.inspect}" }
+        no_body :not_found
+        nil
+      end
+    end
+
+    def self.included( base )
+      base.append_aspect :accept_content
+    end
+  end
+end

data/lib/cuba_api/aspects/response_status.rb

@@ -0,0 +1,54 @@
+module CubaApi
+  module ResponseStatus
+    def response_status( obj, options = {})
+      if options[ :response_status ] == false
+        obj
+      else
+        handle_status( obj )
+      end
+    end
+
+    def self.included( base )
+      base.prepend_aspect :response_status
+    end
+
+    private
+
+    def handle_status( obj )
+      if obj.respond_to?( :errors ) && obj.errors.size > 0
+        res.status = 412 # Precondition Failed
+        log_errors( obj.errors )
+        obj.errors
+      elsif req.post?
+        res.status = 201 # Created
+        set_location( obj )
+        obj
+      elsif req.delete?
+        res.status = 204 # No Content
+        ''
+      else
+        obj
+      end
+    end
+
+    def set_location( obj )
+      if obj.respond_to?( :id ) && ! res[ 'Location' ]
+        res[ 'Location' ] = env[ 'SCRIPT_NAME' ].to_s + "/#{obj.id}"
+      end
+    end
+    
+    def log_errors( errors )
+      status_logger.info do
+        if errors.respond_to? :to_hash
+          errors.to_hash.values.join( "\n" )
+        else
+          errors.inspect
+        end
+      end
+    end
+
+    def status_logger
+      logger_factory.logger( "CubaApi::ResponseStatus" )
+    end
+  end
+end

data/lib/cuba_api/aspects/response_status.rb~

@@ -0,0 +1,56 @@
+module CubaApi
+  module ResponseStatus
+    def response_statuss( obj, options = {})
+      if options[ :response_status ] == false
+puts 'asd'
+        obj
+      else
+puts 'dsa'
+        handle_status( obj )
+      end
+    end
+
+    def self.included( base )
+      base.prepend_aspect :response_status
+    end
+
+    private
+
+    def handle_status( obj )
+      if obj.respond_to?( :errors ) && obj.errors.size > 0
+        res.status = 412 # Precondition Failed
+        log_errors( obj.errors )
+        obj.errors
+      elsif req.post?
+        res.status = 201 # Created
+        set_location( obj )
+        obj
+      elsif req.delete?
+        res.status = 204 # No Content
+        ''
+      else
+        obj
+      end
+    end
+
+    def set_location( obj )
+      if obj.respond_to?( :id ) && ! res[ 'Location' ]
+        res[ 'Location' ] = env[ 'SCRIPT_NAME' ].to_s + "/#{obj.id}"
+      end
+    end
+    
+    def log_errors( errors )
+      status_logger.info do
+        if errors.respond_to? :to_hash
+          errors.to_hash.values.join( "\n" )
+        else
+          errors.inspect
+        end
+      end
+    end
+
+    def status_logger
+      logger_factory.logger( "CubaApi::ResponseStatus" )
+    end
+  end
+end

data/lib/cuba_api/config.rb

@@ -38,4 +38,4 @@ module CubaApi
       end
     end
   end
-end
+end

data/lib/cuba_api/cors.rb

@@ -163,6 +163,13 @@ module CubaApi
     end
 
     private
+    
+    def _cors_allowed?( cors, methods )
+      ( methods != nil && 
+        methods.detect { |m| send m.to_sym } != nil ) ||
+      ( env[ 'HTTP_ORIGIN' ] &&
+        cors.origins( env[ 'HTTP_ORIGIN' ] ) != nil )
+    end
 
     def _on_cors( methods = nil, *args )
       cors = ( self.class[ :cors ] ||= CORS.new( self.class ) )
@@ -172,16 +179,7 @@ module CubaApi
         on *args do
           cors.process( env, res, methods )
         end
-      else
-        unless methods.nil?
-          allowed = methods.detect do |m|
-            send m.to_sym
-          end
-          args.insert( 0, allowed != nil )
-        end
-        if env[ 'HTTP_ORIGIN' ]
-          args.insert( 0, cors.origins( env[ 'HTTP_ORIGIN' ] ) != nil )
-        end
+      elsif _cors_allowed?( cors, methods ) != false # could be true or nil
         on *args do |*vars|
           cors.allow_origin( env, res )
           yield( *vars )

data/lib/cuba_api/guard.rb

@@ -34,7 +34,7 @@ module CubaApi
       def guard( &block )
         self[ :guard ] ||= block ||
           begin
-            warn 'no guard configured. default guard denies eveythings !'
+            guard_logger.warn { 'no guard configured. default guard denies everything !' }
             guard = Ixtlan::UserManagement::Guard.new
             Proc.new do |groups|
               guard
@@ -42,6 +42,9 @@ module CubaApi
           end
       end
       
+      def guard_logger
+        logger_factory.logger( "CubaApi::Guard" )
+      end
     end
 
     def current_groups
@@ -53,11 +56,7 @@ module CubaApi
     end
 
     def on_context( name, &block )
-      perm = guard.permissions( name )
-      if perm && perm.parent &&
-          perm.parent.resource != guard_context
-        raise 'parent resource is not guarded'
-      end
+      guard.check_parent( name, guard_context )
       on name do
         begin
           old = guard_context
@@ -71,9 +70,7 @@ module CubaApi
 
     def on_association
       on :association do |association|
-        # TODO one method in guard
-        asso = guard.permissions( guard_context ).associations
-        if asso.empty? or asso.include?( association )
+        if allowed_associations && allowed_associations.include?( association )
           yield( association )
         else
           no_body :forbidden 
@@ -87,9 +84,11 @@ module CubaApi
         
         @_method = method
         
-        warn "[CubaApi::Guard] check #{method.to_s.upcase} #{guard_context}: #{guard.allow?( guard_context, method )}"
+        allowed = allowed( method )
+
+        guard_logger.debug { "check #{method.to_s.upcase} #{guard_context}: #{allowed}" }
         # TODO guard needs no association here
-        if guard.allow?( guard_context, method, (allowed_associations || []).first )
+        if allowed
           
           yield( *captures )
         else
@@ -100,9 +99,19 @@ module CubaApi
 
     private
 
+    def allowed( method )
+      if allowed_associations && !allowed_associations.empty?
+        allowed_associations.select do |asso|
+          guard.allow?( guard_context, method, asso )
+        end.size > 0
+      else
+        guard.allow?( guard_context, method )
+      end
+    end
+
     def guard_context( ctx = nil )
       if ctx
-        @_conetxt = (req.env[ 'guard_context' ] = ctx)
+        @_context = (req.env[ 'guard_context' ] = ctx)
       else
         @_context ||= req.env[ 'guard_context' ]
       end
@@ -112,5 +121,8 @@ module CubaApi
       self.class.guard.call( current_groups )
     end
 
+    def guard_logger
+      self.class.guard_logger
+    end
   end
 end

data/lib/cuba_api/logger.rb~

@@ -0,0 +1,24 @@
+module CubaApi
+  class Logger
+
+    private
+
+    def debug( msg = nil )
+      puts ( msg || yield )
+    end
+ 
+    def info( msg = nil )
+      puts ( msg || yield )
+    end
+ 
+    def warn( msg = nil )
+      warn ( msg || yield )
+    end
+
+    def error( msg = nil )
+      warn ( msg || yield )
+    end
+
+    
+  end
+end

data/lib/cuba_api/loggers.rb

@@ -0,0 +1,77 @@
+module CubaApi
+  
+  module Loggers
+    module ClassMethods
+
+      def logger_factory
+        self[ :loggers ] ||=  CubaApi::LoggerFactory.new
+      end
+
+    end
+
+    def logger_factory
+      self.class.logger_factory
+    end
+  end
+
+  class LoggerFactory
+
+    def self.level=( level )
+      @level = level
+    end
+
+    def self.logger( cat )
+      loggers[ cat ] ||= Logger.new( cat, @level )
+    end
+
+    def logger( cat )
+      self.class.logger( cat )
+    end
+
+    private
+
+    def self.loggers
+      @loggers ||= {}
+    end
+  end
+
+  class Logger
+
+    private
+
+    def do_puts( level, &block )
+      if level >= @level
+        puts( "[#{@cat}] #{block.call}" )
+      end
+    end
+
+    def do_warn( level, &block )
+      if level >= @level
+        puts( "[#{@cat}] #{block.call}" )
+      end
+    end
+
+    public
+
+    def initialize( cat = 'ROOT', level = 1 )
+      @level = ( level || 1 ).to_i
+      @cat = cat
+    end
+
+    def debug( &block )
+      do_puts( 0, &block )
+    end
+ 
+    def info( &block )
+      do_puts( 1, &block )
+    end
+ 
+    def warn( &block )
+      do_warn( 2, &block )
+    end
+
+    def error( &block )
+      do_warn( 3, &block )
+    end
+  end
+end

data/lib/cuba_api/loggers.rb~

@@ -0,0 +1,73 @@
+module CubaApi
+  
+  module Loggers
+    module ClassMethods
+
+      def logger_factory
+        self[ :loggers ] ||=  CubaApi::LoggerFactory.new
+      end
+
+    end
+
+    def logger_factory
+      self.class.logger_factory
+    end
+  end
+
+  class LoggerFactory
+
+    def self.level=( level )
+      @level = level
+    end
+
+    def self.logger( cat )
+      loggers[ cat ] ||= Logger.new( cat, @level )
+    end
+
+    private
+
+    def self.loggers
+      @loggers ||= {}
+    end
+  end
+
+  class Logger
+
+    private
+
+    def puts( level, &block )
+      if level >= @level
+        Kernel.puts( "#{@cat} #{block.call}" )
+      end
+    end
+
+    def warn( level, &block )
+      if level >= @level
+        Kernel.puts( "#{@cat} #{block.call}" )
+      end
+    end
+
+    public
+
+    def initialize( cat = 'ROOT', level = 1 )
+      @level = ( level || 1 ).to_i
+      @cat = cat
+    end
+
+    def debug( &block )
+      puts ( 0, &block )
+    end
+ 
+    def info( &block )
+      puts ( 1, &block )
+    end
+ 
+    def warn( &block )
+      warn ( 2, &block )
+    end
+
+    def error( &block )
+      warn ( 3, &block )
+    end
+  end
+end

data/lib/cuba_api/rack/allow_session_rack.rb

@@ -0,0 +1,18 @@
+module CubaApi
+  module Rack
+    class AllowSessionRack
+      def initialize( app, *not_pattern )
+        @app = app
+        @regexp = /^\/#{not_pattern.join( '|^\/' )}/
+      end
+      
+      def call( env )
+        status, headers, resp = @app.call( env )
+        if not( env[ 'PATH_INFO' ].match @regexp )
+          headers.delete( 'Set-Cookie' )
+        end
+        [ status, headers, resp ]
+      end
+    end
+  end
+end

data/lib/cuba_api/rack/ext2mime_rack.rb

@@ -0,0 +1,21 @@
+module CubaApi
+  module Rack
+    class Ext2MimeRack
+      def initialize( app, *allowed)
+        @app = app
+        @allowed = allowed
+      end
+      
+      def call(env)
+        ext = env[ 'PATH_INFO' ].sub( /.*\./, '' )
+        if ext && @allowed.member?( ext )
+          mime = ::Rack::Mime.mime_type( '.' + ext )
+          env[ 'PATH_INFO_ORIG' ] = env[ 'PATH_INFO' ].dup
+          env[ 'HTTP_ACCEPT' ] = mime
+          env[ 'PATH_INFO' ].sub!( /\..*/, '' )
+        end
+        status, headers, body = @app.call(env)
+      end
+    end
+  end
+end

data/lib/cuba_api/rack/reloader_rack.rb

@@ -0,0 +1,52 @@
+module CubaApi
+  module Rack
+    class Reloader
+
+      def self.parse( basedir, baseconstant )
+        Dir[ File.join( basedir, '**', '*.rb' ) ].each do |f| 
+          last_modified = File.mtime( f ).to_f
+          if ! File.directory?( f ) && last_modified > @max_last_modified.to_f
+            @max_last_modified = last_modified
+            yield f
+          end
+        end
+      end
+      
+      def self.maybe_remove_constant( f, basedir, baseconstant )
+        c = baseconstant
+        cname = nil
+        f.sub( /#{basedir}/, '' ).split( /\/|\./ ).each do |name|
+          if name != 'rb'
+            ( c = c.const_get( cname ) ) rescue nil
+            cname = name.split('_').each { |a| a.capitalize! }.join.to_sym
+          end
+        end
+        c.send( :remove_const, cname ) rescue nil
+      end
+      
+      def self.doit( basedir, baseconstant )
+        if @max_last_modified
+          parse( basedir, baseconstant ) do |f|
+            maybe_remove_constant( f, basedir, baseconstant )
+            puts "[CubaAPI::Reloader] #{f}: #{load f}"
+          end
+        else
+          parse( basedir, baseconstant ) {}
+        end
+      end
+    end
+
+    class ReloaderRack
+      def initialize( app, basedir, baseconstant)
+        @app = app
+        @basedir = basedir
+        @baseconstant = baseconstant
+      end
+      
+      def call(env)
+        Reloader.doit( @basedir, @baseconstant )
+        status, headers, body = @app.call(env)
+      end
+    end
+  end
+end

data/lib/cuba_api/utils.rb

@@ -17,8 +17,8 @@ module CubaApi
 
     # convenient method for status only responses
     def no_body( status )
-      res.status = Rack::Utils.status_code( status )
-      res.write Rack::Utils::HTTP_STATUS_CODES[ res.status ]
+      res.status = ::Rack::Utils.status_code( status )
+      res.write ::Rack::Utils::HTTP_STATUS_CODES[ res.status ]
       res['Content-Type' ] = 'text/plain'
     end
 

data/spec/accept_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
 require 'cuba_api/config'
+require 'cuba_api/loggers'
 require 'cuba_api/utils'
-require 'cuba_api/write_aspect'
-require 'cuba_api/accept_content'
+require 'cuba_api/aspects'
+require 'cuba_api/aspects/accept_content'
 require 'yaml'
 
 class B
@@ -16,9 +17,10 @@ describe CubaApi::AcceptContent do
   before do
     Cuba.reset!
     Cuba.plugin CubaApi::Config
+    Cuba.plugin CubaApi::Loggers
     Cuba.plugin CubaApi::Utils
     Cuba[ :aspects ] = []
-    Cuba.plugin CubaApi::WriteAspect
+    Cuba.plugin CubaApi::Aspects
     Cuba.plugin CubaApi::AcceptContent
     Cuba.accept :yaml
     Cuba.define do

data/spec/allow_session_rack_spec.rb

@@ -1,11 +1,12 @@
-require 'spec_helper'
-require 'cuba_api/allow_session_rack'
+# -*- coding: utf-8 -*-
+require File.expand_path( File.join( File.dirname( __FILE__), 'spec_helper' ) )
+require 'cuba_api/rack/allow_session_rack'
 
-describe CubaApi::AllowSessionRack do
+describe CubaApi::Rack::AllowSessionRack do
 
   before do
     Cuba.reset!
-    Cuba.use CubaApi::AllowSessionRack, 'session', 'system'
+    Cuba.use CubaApi::Rack::AllowSessionRack, 'session', 'system'
     Cuba.use Rack::Session::Cookie, :secret => 'secret'
     Cuba.define do
       on 'session' do

data/spec/aspects_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'cuba_api/config'
-require 'cuba_api/write_aspect'
+require 'cuba_api/loggers'
+require 'cuba_api/aspects'
 
 module Plugin
   def one( obj, opts )
@@ -14,13 +15,14 @@ module Plugin
   end
 end
 
-describe CubaApi::WriteAspect do
+describe CubaApi::Aspects do
 
   before do
     Cuba.reset!
     Cuba.plugin CubaApi::Config
     Cuba[ :aspects ] = []
-    Cuba.plugin CubaApi::WriteAspect
+    Cuba.plugin CubaApi::Loggers
+    Cuba.plugin CubaApi::Aspects
     Cuba.plugin Plugin
     Cuba.append_aspect :one
     Cuba.prepend_aspect :two

data/spec/cors_spec.rb

@@ -11,6 +11,10 @@ describe CubaApi::Cors do
     Cuba.plugin CubaApi::Cors
     Cuba.define do
 
+      on_cors 'no' do |who|
+        res.write "no"
+      end
+
       on_cors 'path/to/:who' do |who|
         on post do
           res.write "post from #{who}"
@@ -115,4 +119,14 @@ describe CubaApi::Cors do
     _, _, resp = Cuba.call( env )
     resp.join.must.eq 'frodo posted'
   end
+
+  it 'should pass through on no cors' do
+    env[ 'HTTP_ORIGIN' ] = nil
+    env[ 'PATH_INFO' ] = '/no/frodo'
+    env[ 'SCRIPT_NAME' ] = '/no/frodo'
+    env[ 'REQUEST_METHOD' ] = 'GET'
+
+    _, _, resp = Cuba.call( env )
+    resp.join.must.eq 'no'
+  end
 end

data/spec/guard_spec.rb

@@ -1,5 +1,6 @@
 require File.expand_path( File.join( File.dirname( __FILE__ ),
                                      'spec_helper.rb' ) )
+require 'cuba_api/loggers'
 require 'cuba_api/config'
 require 'cuba_api/utils'
 require 'cuba_api/guard'
@@ -12,6 +13,7 @@ describe CubaApi::Guard do
   before do
     Cuba.reset!
     Cuba.plugin CubaApi::Config
+    Cuba.plugin CubaApi::Loggers
     Cuba.plugin CubaApi::Utils
     Cuba.plugin CubaApi::Guard
     Cuba.define do
@@ -51,7 +53,7 @@ describe CubaApi::Guard do
           res.write "post"
         end
         on_guard :get do
-          res.write "get#{allowed_associations ? allowed_associations.inspect : nil}"
+          res.write "get#{allowed_associations.inspect.gsub( /nil/, '' )}"
         end
         on_guard :put do
           res.write "put"
@@ -83,10 +85,10 @@ describe CubaApi::Guard do
       env = { 'PATH_INFO' => '/users/accounts',
            'SCRIPT_NAME' => '/users/accounts' }
 
-      user = guard.permission( 'users' ) do |u|
+      user = guard.permission_for( 'users' ) do |u|
         u.allow_all
       end
-      guard.permission( 'admins' ) do |a|
+      guard.permission_for( 'admins' ) do |a|
         a.parent = user
         a.allow_all
       end
@@ -98,10 +100,10 @@ describe CubaApi::Guard do
     it 'allow all' do
       env = { 'PATH_INFO' => '/users/accounts',
            'SCRIPT_NAME' => '/users/accounts' }
-      user = guard.permission( 'users' ) do |u|
+      user = guard.permission_for( 'users' ) do |u|
         u.allow_all
       end
-      guard.permission( 'accounts' ) do |a|
+      guard.permission_for( 'accounts' ) do |a|
         a.parent = user
         a.allow_all
       end
@@ -129,8 +131,8 @@ describe CubaApi::Guard do
     end
 
     it 'denies all requests without associated id' do
-      guard.permission( 'users' ) do |u|
-        u.allow_all
+      guard.permission_for( 'users' ) do |u|
+        u.allow_all( 42 )
       end
 
       ['GET', 'POST','PUT', 'DELETE' ].each do |m|
@@ -141,7 +143,7 @@ describe CubaApi::Guard do
     end
 
     it 'denies all requests with wrong associated id' do
-      guard.permission( 'users', 13 ) do |u|
+      guard.permission_for( 'users', 13 ) do |u|
         u.allow_all
       end
 
@@ -159,7 +161,7 @@ describe CubaApi::Guard do
     end
 
     it 'allows all requests with associated id' do
-      guard.permission( 'users', 42 ) do |u|
+      guard.permission_for( 'users', 42 ) do |u|
         u.allow_all
       end
 
@@ -188,7 +190,7 @@ describe CubaApi::Guard do
     end
 
     it 'allows all request' do
-      guard.permission( 'users' ) do |u|
+      guard.permission_for( 'users' ) do |u|
         u.allow_all
       end
 
@@ -200,7 +202,7 @@ describe CubaApi::Guard do
     end
 
     it 'allows retrieve' do
-      guard.permission( 'users' ) do |u|
+      guard.permission_for( 'users' ) do |u|
         u.allow_retrieve
       end
       
@@ -217,7 +219,7 @@ describe CubaApi::Guard do
     end
     
     it 'allows retrieve and create' do
-      guard.permission( 'users' ) do |u|
+      guard.permission_for( 'users' ) do |u|
         u.allow_retrieve
         u.allow_create
       end
@@ -234,7 +236,7 @@ describe CubaApi::Guard do
     end
 
     it 'allows retrieve and create and update' do
-      guard.permission( 'users' ) do |u|
+      guard.permission_for( 'users' ) do |u|
         u.allow_mutate
       end
       ['GET', 'POST','PUT' ].each do |m|
@@ -248,7 +250,7 @@ describe CubaApi::Guard do
     end
 
     it 'allows retrieve and create and update and delete' do
-      guard.permission( 'users' ) do |u|
+      guard.permission_for( 'users' ) do |u|
         u.allow_mutate
         u.allow_delete
       end

data/spec/response_status_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
-require 'cuba_api/write_aspect'
+require 'cuba_api/aspects'
 require 'cuba_api/config'
-require 'cuba_api/response_status'
+require 'cuba_api/loggers'
+require 'cuba_api/aspects/response_status'
 
 class E
 
@@ -37,7 +38,9 @@ describe CubaApi::ResponseStatus do
   before do
     Cuba.reset!
     Cuba.plugin CubaApi::Config
-    Cuba.plugin CubaApi::WriteAspect
+    Cuba.plugin CubaApi::Loggers
+    Cuba.plugin CubaApi::Aspects
+    Cuba.aspects.clear
     Cuba.plugin CubaApi::ResponseStatus
     Cuba.define do
       on get do

data/spec/serializer_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 require 'cuba_api/config'
-require 'cuba_api/write_aspect'
-require 'cuba_api/serializer'
+require 'cuba_api/loggers'
+require 'cuba_api/aspects'
+require 'cuba_api/aspects/serializer'
 require 'yaml'
 require 'ixtlan/babel/serializer'
 
@@ -24,7 +25,8 @@ describe CubaApi::Serializer do
     Cuba.reset!
     Cuba.plugin CubaApi::Config
     Cuba[ :aspects ] = []
-    Cuba.plugin CubaApi::WriteAspect
+    Cuba.plugin CubaApi::Loggers
+    Cuba.plugin CubaApi::Aspects
     Cuba.plugin CubaApi::Serializer
     Cuba.plugin ToYaml
     Cuba.append_aspect :to_yaml

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 # single spec setup
 $LOAD_PATH.unshift File.join( File.dirname( File.expand_path( File.dirname( __FILE__ ) ) ),
                               'lib' )
+
+gem 'minitest'
 require 'minitest/autorun'
 
 require 'cuba'

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuba-api
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease:
+  version: 0.6.2
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -18,13 +17,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -34,13 +31,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -50,13 +45,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -66,13 +59,11 @@ dependencies:
     - - ~>
       - !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
@@ -82,13 +73,11 @@ dependencies:
     - - ~>
       - !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: :development
 - !ruby/object:Gem::Dependency
@@ -98,13 +87,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -114,13 +101,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -130,13 +115,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -146,13 +129,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
-    none: false
   prerelease: false
   type: :development
 description: add content negogiation, serialization of objects (their attributes map), and some helpers for authentication + authorization to the cuba framework
@@ -168,33 +149,42 @@ files:
 - lib/cuba_api.rb~
 - lib/cuba_api/write_aspect.rb~
 - lib/cuba_api/config.rb~
-- lib/cuba_api/reloader_rack.rb
 - lib/cuba_api/utils.rb
-- lib/cuba_api/allow_session_rack.rb
+- lib/cuba_api/aspects.rb~
 - lib/cuba_api/cors.rb~
 - lib/cuba_api/input_filter.rb~
 - lib/cuba_api/response_status.rb~
+- lib/cuba_api/aspects.rb
 - lib/cuba_api/reponse_status.rb~
-- lib/cuba_api/write_aspect.rb
 - lib/cuba_api/write_aspects.rb~
 - lib/cuba_api/serializer.rb~
 - lib/cuba_api/ext2mime_rack.rb~
-- lib/cuba_api/response_status.rb
 - lib/cuba_api/cors.rb
+- lib/cuba_api/logger.rb~
 - lib/cuba_api/utils.rb~
 - lib/cuba_api/guard.rb
 - lib/cuba_api/current_user.rb~
 - lib/cuba_api/allow_session_rack.rb~
 - lib/cuba_api/config.rb
-- lib/cuba_api/accept_content.rb
-- lib/cuba_api/ext2mime_rack.rb
 - lib/cuba_api/input_filter.rb
+- lib/cuba_api/loggers.rb~
 - lib/cuba_api/accept_content.rb~
 - lib/cuba_api/reloader_rack.rb~
 - lib/cuba_api/no_session_rack.rb~
-- lib/cuba_api/serializer.rb
+- lib/cuba_api/loggers.rb
 - lib/cuba_api/guard.rb~
 - lib/cuba_api/current_user.rb
+- lib/cuba_api/rack/reloader_rack.rb
+- lib/cuba_api/rack/allow_session_rack.rb
+- lib/cuba_api/rack/ext2mime_rack.rb~
+- lib/cuba_api/rack/allow_session_rack.rb~
+- lib/cuba_api/rack/ext2mime_rack.rb
+- lib/cuba_api/rack/reloader_rack.rb~
+- lib/cuba_api/aspects/response_status.rb~
+- lib/cuba_api/aspects/response_status.rb
+- lib/cuba_api/aspects/accept_content.rb
+- lib/cuba_api/aspects/accept_content.rb~
+- lib/cuba_api/aspects/serializer.rb
 - spec/serializer_spec.rb
 - spec/cors_with_config_spec.rb~
 - spec/accept_spec.rb
@@ -223,6 +213,7 @@ files:
 homepage: http://github.com/mkristian/cuba-api
 licenses:
 - MIT
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -232,18 +223,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: set of plugins for using cuba as API server
 test_files:
 - spec/serializer_spec.rb

data/lib/cuba_api/response_status.rb

@@ -1,30 +0,0 @@
-module CubaApi
-  module ResponseStatus
-    def response_status( obj, options = {})
-      if options[:response_status] != false
-        if obj.respond_to?( :errors ) && obj.errors.size > 0
-          res.status = 412 # Precondition Failed
-          obj = obj.errors
-          if obj.respond_to? :to_hash
-            warn "[CubaApi::ResponseStatus] #{obj.to_hash.values.join( "\n" )}"
-          else
-            warn "[CubaApi::ResponseStatus] #{obj.inspect}"
-          end
-        elsif req.post?
-          res.status = 201 # Created
-          if obj.respond_to?( :id ) && ! res[ 'Location' ]
-            res[ 'Location' ] = env[ 'SCRIPT_NAME' ].to_s + "/#{obj.id}"
-          end
-        elsif req.delete?
-          res.status = 204 # No Content
-          obj = ''
-        end
-      end
-      obj
-    end
-
-    def self.included( base )
-      base.prepend_aspect :response_status
-    end
-  end
-end