cuba-api 0.1.0 → 0.2.0

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/lib/cuba_api.rb

@@ -27,6 +27,8 @@ require 'cuba_api/current_user'
 require 'cuba_api/guard'
 require 'cuba_api/accept_content'
 require 'cuba_api/config'
+require 'cuba_api/input_filter'
+require 'cuba_api/response_status'
 
 class CubaAPI < Cuba
 
@@ -36,5 +38,7 @@ class CubaAPI < Cuba
   plugin CubaApi::AcceptContent
   plugin CubaApi::CurrentUser
   plugin CubaApi::Guard
+  plugin CubaApi::InputFilter
+  plugin CubaApi::ResponseStatus
 
-end
+end

data/lib/cuba_api/accept_content.rb

@@ -31,6 +31,9 @@ module CubaApi
       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
@@ -68,4 +71,4 @@ module CubaApi
       base.append_aspect :accept_content
     end
   end
-end
+end

data/lib/cuba_api/current_user.rb

@@ -52,4 +52,4 @@ module CubaApi
       authenticated? ? current_user.login : "???"
     end
   end
-end
+end

data/lib/cuba_api/input_filter.rb

@@ -0,0 +1,46 @@
+require 'ixtlan/babel/factory'
+module CubaApi
+  module InputFilter
+
+    module ClassMethods
+      def factory
+        @_factory ||= Ixtlan::Babel::Factory.new
+      end
+    end
+
+    def new_instance( clazz, context = nil )
+      clazz.new( params( clazz, context ) )
+    end
+    
+    def params( clazz = nil, context = nil )
+      filter_params_and_keeps( clazz, context )
+      @_data[ 0 ] || {}
+    end
+
+    def keeps( clazz = nil, context = nil )
+      filter_params_and_keeps( clazz, context )
+      @_data[ 1 ] || {}
+    end
+
+    def filter_params_and_keeps( clazz, context )
+      if clazz
+        @_data ||= 
+          begin
+            filter = self.class.factory.new_filter( clazz ).use( context )
+            filter.filter_it( parse_request_body )
+          end
+      end
+      @_data ||= {}
+    end
+    private :filter_params_and_keeps
+
+    def parse_request_body
+      if env[ 'CONTENT_TYPE' ] == 'application/json'
+        JSON.parse( req.body.read )
+      else
+        {}
+      end
+    end
+    protected :parse_request_body
+  end
+end

data/lib/cuba_api/input_filter.rb~

@@ -0,0 +1,46 @@
+require 'ixtlan/babel/params_filter'
+module CubaApi
+  module InputFilter
+
+    module ClassMethods
+      def factory
+        @_factory ||= Ixtlan::Babel::Factory.new
+      end
+    end
+
+    def new_instance( clazz, context = nil )
+      filter = self.class.factory.new_params_filter( clazz ).use( context )
+      filter.new( parse_request_body )
+    end
+    
+    def params( clazz = nil, context = nil )
+      filter_params_and_keeps( clazz, context )
+      @_data[ 0 ] || {}
+    end
+
+    def keeps( clazz = nil, context = nil )
+      filter_params_and_keeps( clazz, context )
+      @_data[ 1 ] || {}
+    end
+
+    def filter_params_and_keeps( clazz, context )
+      if clazz
+        @_data ||= 
+          begin
+            filter = self.class.factory.new_filter( clazz ).use( context )
+            filter.filter_it( parse_request_body )
+          end
+      end
+    end
+    private :filter_params_and_keeps
+
+    def parse_request_body
+      if env[ 'CONTENT_TYPE' ] == 'application/json'
+        JSON.parse( req.body.read )
+      else
+        {}
+      end
+    end
+    protected :parse_request_body
+  end
+end

data/lib/cuba_api/reponse_status.rb~

@@ -0,0 +1,142 @@
+require 'cuba_api'
+require 'ixtlan/configuration/resource'
+require 'ixtlan/configuration/serializer'
+require 'ixtlan/babel/params_filter'
+class 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
+        elsif req.post?
+          res.status = 201 # Created
+          res[ 'Location' ] = env[ 'SCRIPT_NAME' ] + "/#{obj.id}" if obj.respond_to? :id
+        elsif req.delete?
+          res.status = 204 # No Content
+          obj = ''
+        end
+      end
+      obj
+    end
+
+    def self.included( base )
+      base.prepend_aspect :response_status
+    end
+  end
+
+  module InputFilter
+
+    module ClassMethods
+      def factory
+        @_factory ||= Ixtlan::Babel::Factory.new
+      end
+    end
+
+    def new_instance( clazz, context = nil )
+      filter = self.class.factory.new_params_filter( clazz ).use( context )
+      filter.new( parse_request_body )
+    end
+    
+    def params( clazz = nil, context = nil )
+      filter_params_and_keeps( clazz, context )
+      @_data[ 0 ] || {}
+    end
+
+    def keeps( clazz = nil, context = nil )
+      filter_params_and_keeps( clazz, context )
+      @_data[ 1 ] || {}
+    end
+
+    def filter_params_and_keeps( clazz, context )
+      if clazz
+        @_data ||= 
+          begin
+            filter = self.class.factory.new_filter( clazz ).use( context )
+            filter.filter_it( parse_request_body )
+          end
+      end
+    end
+    private :filter_params_and_keeps
+
+    def parse_request_body
+      if env[ 'CONTENT_TYPE' ] == 'application/json'
+        JSON.parse( req.body.read )
+      else
+        {}
+      end
+    end
+    private :parse_request_body
+
+  end
+end
+
+CubaAPI.plugin CubaAPI::InputFilter
+CubaAPI.plugin CubaAPI::ResponseStatus
+module Ixtlan
+  module Configuration
+    class ConfigurationFilter < Ixtlan::Babel::ParamsFilter
+
+      root 'configuration'
+
+      add_context( :single,
+                   :keep => [ :updated_at ],
+                   :except => [:id, :created_at, :updated_at, :modified_by_id] )
+    end
+
+    class Cuba < ::CubaAPI
+
+      define do
+        on get do
+          write Configuration.instance
+        end
+
+        on post do
+          updated_at = keeps( Configuration )[ :updated_at ]
+p keeps
+puts req.request_method
+          config = Configuration.optimistic_get!( updated_at,
+                                                  Configuration.instance.id )
+          #config = Configuration.instance
+          config.attributes = params
+          config.modified_by = current_user if config.dirty?
+          config.save
+          write config
+        end
+
+        # on get, :id do |id|
+        #   write Configuration.get!( id )
+        # end
+
+        # on get do
+        #   write Configuration.all
+        # end
+
+        # on post do
+        #   config = new_instance( Configuration )
+        #   config.save
+        #   write config
+        # end
+
+        # on put, :id do |id|
+        #   updated_at = keeps( Configuration )[ :updated_at ]
+        #   config = Configuration.optimistic_get!( updated_at,
+        #                                           id )
+        #   config.attributes = params
+        #   config.modified_by = current_user if config.dirty?
+        #   config.save
+        #   write config
+        # end
+
+        # on delete, :id do |id|
+        #   updated_at = keeps( Configuration )[ :updated_at ]
+        #   config = Configuration.optimistic_get( updated_at,
+        #                                          id )
+        #   config.destroy
+        #   head 200
+        # end
+
+      end
+    end
+  end
+end

data/lib/cuba_api/response_status.rb

@@ -0,0 +1,25 @@
+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
+        elsif req.post?
+          res.status = 201 # Created
+          if obj.respond_to?( :id )
+            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

data/lib/cuba_api/response_status.rb~

@@ -0,0 +1,23 @@
+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
+        elsif req.post?
+          res.status = 201 # Created
+          res[ 'Location' ] = env[ 'SCRIPT_NAME' ] + "/#{obj.id}" if obj.respond_to? :id
+        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

data/lib/cuba_api/serializer.rb

@@ -34,7 +34,7 @@ module CubaApi
       if options[:serializer] == false || obj.is_a?( String )
         obj
       else
-        s = self.class.serializer_factory.new( obj )
+        s = self.class.serializer_factory.new_serializer( obj )
         s.use( options[ :use ] ) if options[ :use ]
         s
       end
@@ -44,4 +44,4 @@ module CubaApi
       base.append_aspect :serializer
     end
   end
-end
+end

data/lib/cuba_api/write_aspect.rb

@@ -54,4 +54,4 @@ module CubaApi
       res.write obj.to_s
     end
   end
-end
+end

data/spec/accept_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
+require 'cuba_api/config'
 require 'cuba_api/write_aspect'
 require 'cuba_api/accept_content'
+require 'yaml'
 
 class B
   def method_missing( method, *args )
@@ -25,6 +27,8 @@ describe CubaApi::AcceptContent do
   end
 
   it 'creates yaml' do
+    skip("to_yaml add extra line with ...") if defined?( JRUBY_VERSION ) and (( JRUBY_VERSION =~ /^1.6./ ) == 0 ) and ( nil == (RUBY_VERSION =~ /^1.8/) )
+
      _, _, resp = Cuba.call({"SCRIPT_NAME" => "/bla.yaml"})
     resp[ 0 ] = resp[ 0 ].sub(/.*!/, "---!").sub( /\n\n/, "\n")
     resp.join.must.eq "---!ruby/object:B {}\n"
@@ -47,6 +51,8 @@ describe CubaApi::AcceptContent do
   end
 
   it 'gives preference to script extension' do
+    skip("to_yaml add extra line with ...") if defined?( JRUBY_VERSION ) and (( JRUBY_VERSION =~ /^1.6./ ) == 0 ) and ( nil == (RUBY_VERSION =~ /^1.8/) )
+
     _, _, resp = Cuba.call({"SCRIPT_NAME" => "/bla.yaml", "HTTP_ACCEPT" => "application/xml"})
     resp[ 0 ] = resp[ 0 ].sub(/.*!/, "---!").sub( /\n\n/, "\n")
     resp.join.must.eq "---!ruby/object:B {}\n"

data/spec/accept_spec.rb~

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'cuba_api/write_aspect'
+require 'cuba_api/serializer'
+require 'yaml'
+require 'ixtlan/babel/serializer'
+
+class A
+  def attributes
+    { :name => 'me and the corner' }
+  end
+end
+class ASerializer < Ixtlan::Babel::Serializer
+end
+module ToYaml
+  def to_yaml( obj, opts )
+    obj.to_yaml
+  end
+end
+
+describe CubaApi::Serializer do
+
+  before do
+    Cuba.reset!
+    Cuba[ :aspects ] = []
+    Cuba.plugin CubaApi::WriteAspect
+    Cuba.plugin CubaApi::Serializer
+    Cuba.plugin ToYaml
+    Cuba.append_aspect :to_yaml
+    Cuba.define do
+      on default do
+        write A.new
+      end
+    end
+  end
+
+  it 'should write out yaml' do
+     _, _, resp = Cuba.call({})
+    
+    resp.must.eq ["---\nname: me and the corner\n"]
+  end
+end

data/spec/aspects_spec.rb

@@ -18,8 +18,8 @@ describe CubaApi::WriteAspect do
 
   before do
     Cuba.reset!
-    Cuba[ :aspects ] = []
     Cuba.plugin CubaApi::Config
+    Cuba[ :aspects ] = []
     Cuba.plugin CubaApi::WriteAspect
     Cuba.plugin Plugin
     Cuba.append_aspect :one

data/spec/aspects_spec.rb~

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'cuba_api/config'
+require 'cuba_api/write_aspect'
+
+module Plugin
+  def one( obj, opts )
+    obj + "-one"
+  end
+  def two( obj, opts )
+    obj + "-two"
+  end
+  def three( obj, opts )
+    obj + "-three"
+  end
+end
+
+describe CubaApi::WriteAspect do
+
+  before do
+    Cuba.plugin CubaApi::Config
+    Cuba.plugin CubaApi::WriteAspect
+    Cuba.plugin Plugin
+    Cuba.append_aspect :one
+    Cuba.prepend_aspect :two
+    Cuba.append_aspect :three
+    Cuba.define do
+      on true do
+        write 'start'
+      end
+    end
+  end
+
+  
+  it 'should execute aspects in the right order' do
+     _, _, resp = Cuba.call({})
+    
+    resp.must.eq ["start-two-one-three"]
+  end
+end

data/spec/config_spec.rb~

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'cuba_api/config'
+require 'cuba_api/write_aspect'
+
+module Plugin
+  def one( obj, opts )
+    obj + "-one"
+  end
+  def two( obj, opts )
+    obj + "-two"
+  end
+  def three( obj, opts )
+    obj + "-three"
+  end
+end
+
+describe CubaApi::WriteAspect do
+
+  before do
+    Cuba.plugin CubaApi::Config
+    Cuba.plugin CubaApi::WriteAspect
+    Cuba.plugin Plugin
+    Cuba.append_aspect :one
+    Cuba.prepend_aspect :two
+    Cuba.append_aspect :three
+    Cuba.define do
+      on true do
+        write 'start'
+      end
+    end
+  end
+
+  
+  it 'should execute aspects in the right order' do
+     _, _, resp = Cuba.call({})
+    
+    resp.must.eq ["start-two-one-three"]
+  end
+end

data/spec/current_user_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'cuba_api/config'
 require 'cuba_api/current_user'
 
 class SessionManager
@@ -16,8 +17,9 @@ describe CubaApi::CurrentUser do
 
   before do
     Cuba.reset!
+    Cuba.plugin CubaApi::Config
     Cuba.plugin CubaApi::CurrentUser
-    Cuba.use Rack::Session::Cookie
+    Cuba.use Rack::Session::Cookie, :secret => 'asd'
     Cuba[ :sessions ] = SessionManager.new
     Cuba.define do
       on authenticated? do

data/spec/current_user_spec.rb~

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'cuba_api/config'
+
+describe CubaApi::Config do
+
+  before do
+    Cuba.reset!
+    Cuba.plugin CubaApi::Config
+    Cuba[ :main ] = Cuba.method( :define )
+    Cuba[ :name ] = :root
+    class Other < Cuba; end
+  end
+
+  after { Cuba.config.clear }
+
+  it 'should overwrite super-cuba' do
+    Other[ :main ] = :other
+
+    Cuba[ :main ].class.must.eq Method
+    Other[ :main ].must.eq :other
+  end
+
+  it 'should inherit super-cuba on new attributes' do
+    Cuba[ :more ] = :more
+
+    Cuba[ :more ].must.eq :more
+    Other[ :more ].must.eq :more
+  end
+
+  it 'should see config from super-cuba' do
+    Cuba[ :name ].must.eq :root
+    Other[ :name ].must.eq :root
+  end
+end

data/spec/input_filter_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+require 'cuba_api/input_filter'
+require 'ixtlan/babel/params_filter'
+require 'json'
+require 'stringio'
+
+class D
+
+  attr_accessor :attributes
+
+  def initialize( args )
+    @attributes = args
+  end
+end
+
+class DFilter < Ixtlan::Babel::ParamsFilter
+
+  add_context( :single, :only => [:name], :keep => [:age] )
+  add_context( :update, :only => [:message], :keep => [:age] )
+
+end
+
+describe CubaApi::InputFilter do
+
+  before do
+    Cuba.reset!
+    Cuba.plugin CubaApi::InputFilter
+    Cuba.define do
+      on post do
+        attr = new_instance( D ).attributes
+        # whether hash is ordered-hash should not matter
+        res.write attr.keys.sort.collect {|k| attr[k] }.join
+      end
+      on default do
+        res.write params( D, :update )['message'].to_s + keeps['age'].to_s
+      end
+    end
+  end
+
+  it 'no json input' do
+     _, _, resp = Cuba.call({})
+    resp.join.must_be :empty?
+  end
+
+  it 'json input with attr and without keep' do
+     _, _, resp = Cuba.call( 'CONTENT_TYPE' => 'application/json',
+                             'rack.input' => StringIO.new( '{"name":"me","message":"be happy"}' ) )
+    resp.join.must.eq 'be happy'
+  end
+
+  it 'json input with attr and  with keep' do
+     _, _, resp = Cuba.call( 'CONTENT_TYPE' => 'application/json',
+                             'rack.input' => StringIO.new( '{"name":"me","message":"be happy","age":45}' ) )
+    resp.join.must.eq 'be happy' + "45"
+  end
+
+  it 'json input without attr and without keep' do
+     _, _, resp = Cuba.call( 'CONTENT_TYPE' => 'application/json',
+                             'rack.input' => StringIO.new( '{"something":"else"}' ) )
+    resp.join.must_be :empty?
+  end
+
+  it 'json input without attr and with keep' do
+     _, _, resp = Cuba.call( 'CONTENT_TYPE' => 'application/json',
+                             'rack.input' => StringIO.new( '{"something":"else","age":45}' ) )
+    resp.join.must.eq "45"
+  end
+
+  it 'create new instance with json input' do
+     _, _, resp = Cuba.call( 'CONTENT_TYPE' => 'application/json',
+                             'REQUEST_METHOD' => 'POST',
+                             'rack.input' => StringIO.new( '{"name":"me","message":"be happy","age":45}' ) )
+    resp.join.must.eq 'me'
+  end
+
+end

data/spec/input_filter_spec.rb~

@@ -0,0 +1,57 @@
+require 'spec_helper'
+require 'cuba_api/write_aspect'
+require 'cuba_api/accept_content'
+
+class B
+  def method_missing( method, *args )
+    method.to_s
+  end
+end
+
+describe CubaApi::AcceptContent do
+
+  before do
+    Cuba.reset!
+    Cuba.plugin CubaApi::Config
+    Cuba[ :aspects ] = []
+    Cuba.plugin CubaApi::WriteAspect
+    Cuba.plugin CubaApi::AcceptContent
+    Cuba.accept :yaml
+    Cuba.define do
+      on default do
+        write B.new
+      end
+    end
+  end
+
+  it 'creates yaml' do
+     _, _, resp = Cuba.call({"SCRIPT_NAME" => "/bla.yaml"})
+    resp[ 0 ] = resp[ 0 ].sub(/.*!/, "---!").sub( /\n\n/, "\n")
+    resp.join.must.eq "---!ruby/object:B {}\n"
+
+    _, _, resp = Cuba.call({"HTTP_ACCEPT" => "application/x-yaml"})
+    resp[ 0 ] = resp[ 0 ].sub(/.*!/, "---!").sub( /\n\n/, "\n")
+    resp.join.must.eq "---!ruby/object:B {}\n"
+
+    _, _, resp = Cuba.call({"HTTP_ACCEPT" => "text/yaml"})
+    resp[ 0 ] = resp[ 0 ].sub(/.*!/, "---!").sub( /\n\n/, "\n")
+    resp.join.must.eq "---!ruby/object:B {}\n"
+  end
+
+  it 'gives not found for not configured xml' do
+    status, _, _ = Cuba.call({"SCRIPT_NAME" => "/bla.xml"})
+    status.must.eq 404
+
+    status, _, _ = Cuba.call({"HTTP_ACCEPT" => "application/xml"})
+    status.must.eq 404
+  end
+
+  it 'gives preference to script extension' do
+    _, _, resp = Cuba.call({"SCRIPT_NAME" => "/bla.yaml", "HTTP_ACCEPT" => "application/xml"})
+    resp[ 0 ] = resp[ 0 ].sub(/.*!/, "---!").sub( /\n\n/, "\n")
+    resp.join.must.eq "---!ruby/object:B {}\n"
+
+    status, _, _ = Cuba.call({"SCRIPT_NAME" => "/bla.xml", "HTTP_ACCEPT" => "application/x-yaml"})
+    status.must.eq 404
+  end
+end

data/spec/response_status_spec.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+require 'cuba_api/write_aspect'
+require 'cuba_api/config'
+require 'cuba_api/response_status'
+
+class E
+
+  def id
+    4711
+  end
+
+  def initialize( args = nil )
+    @errors = (args || {}).delete( :errors ) || {}
+    # ruby18 workaround
+    def @errors.to_s
+      inspect
+    end
+    @attributes = args
+  end
+    
+  def deleted?
+    @attrbutes.nil?
+  end
+
+  def errors
+    @errors
+  end
+
+  def to_s
+    @attributes.inspect + @errors.inspect
+  end
+end
+
+
+describe CubaApi::ResponseStatus do
+
+  before do
+    Cuba.reset!
+    Cuba.plugin CubaApi::Config
+    Cuba.plugin CubaApi::WriteAspect
+    Cuba.plugin CubaApi::ResponseStatus
+    Cuba.define do
+      on get do
+        write E.new :errors => { :name => 'missing name' }
+      end
+      on post do
+        write E.new :message => 'be happy' 
+      end
+      on put do
+        write E.new :message => 'be happy' 
+      end
+      on delete do
+        write E.new
+      end
+    end
+  end
+
+  it 'status 200' do
+    status, _, resp = Cuba.call({'REQUEST_METHOD' => 'PUT'})
+    status.must.eq 200
+    resp.join.must.eq "{:message=>\"be happy\"}{}"
+  end
+
+  it 'status 201' do
+    status, _, resp = Cuba.call({'REQUEST_METHOD' => 'POST'})
+    status.must.eq 201
+    resp.join.must.eq "{:message=>\"be happy\"}{}"
+  end
+
+  it 'status 204' do
+    status, _, resp = Cuba.call({'REQUEST_METHOD' => 'DELETE'})
+    status.must.eq 204
+    resp.join.must_be :empty?
+  end
+
+  it 'status 412' do
+    status, _, resp = Cuba.call({'REQUEST_METHOD' => 'GET'})
+    status.must.eq 412
+    resp.join.must.eq "{:name=>\"missing name\"}"
+  end
+
+end

data/spec/response_status_spec.rb~

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'cuba_api/response_status'
+
+class E
+  def initialize( args = nil )
+    @errors = args.delete( :errors ) || {}
+    @attributes = args
+  end
+    
+  def deleted?
+    @attrbutes.nil?
+  end
+
+  def errrors
+    @errors
+  end
+end
+
+
+describe CubaApi::ResponseStatus do
+
+  before do
+    Cuba.reset!
+    Cuba.plugin CubaApi::ResponseStatus
+    Cuba.plugin CubaApi::WriteAspect
+    Cuba.define do
+      on get do
+        write E.new :errors => { :name => 'missing name' }
+      end
+      on post do
+        write E.new :message => 'be happy' 
+      end
+      on put do
+        write E.new :message => 'be happy' 
+      end
+      on delete do
+        write E.new
+      end
+    end
+  end
+
+  it 'status 200' do
+     _, _, resp = Cuba.call({'REQUEST_METHOD' => 'GET'})
+    resp.join.must.eq ""
+  end
+
+end

data/spec/serializer_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'cuba_api/config'
 require 'cuba_api/write_aspect'
 require 'cuba_api/serializer'
 require 'yaml'
@@ -21,6 +22,7 @@ describe CubaApi::Serializer do
 
   before do
     Cuba.reset!
+    Cuba.plugin CubaApi::Config
     Cuba[ :aspects ] = []
     Cuba.plugin CubaApi::WriteAspect
     Cuba.plugin CubaApi::Serializer
@@ -34,8 +36,9 @@ describe CubaApi::Serializer do
   end
 
   it 'should write out yaml' do
+    skip("to_yaml add extra line with ...") if defined?( JRUBY_VERSION ) and (( JRUBY_VERSION =~ /^1.6./ ) == 0 ) and ( nil == (RUBY_VERSION =~ /^1.8/) )
      _, _, resp = Cuba.call({})
-    
+
     resp[ 0 ] = resp[ 0 ].sub(/.*\n/, "---\n")
     resp.must_equal ["---\nname: me and the corner\n"]
   end

data/spec/serializer_spec.rb~

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'cuba_api/current_user'
+
+class SessionManager
+  def to_session( user )
+    @u ||= user
+  end
+  def from_session( data )
+    u = @u.dup unless @u.nil?
+    def u.login; self;end
+    u
+  end
+end
+
+describe CubaApi::CurrentUser do
+
+  before do
+    Cuba.reset!
+    Cuba.plugin CubaApi::CurrentUser
+    Cuba.use Rack::Session::Cookie
+    Cuba[ :sessions ] = SessionManager.new
+    Cuba.define do
+      on authenticated? do
+        res.write current_user
+      end
+      on default do
+        name = current_user_name
+        current_user "user1"
+        res.write "logged in - #{name}"
+      end
+    end
+  end
+
+  it 'should authenticate' do
+     _, _, resp = Cuba.call({})
+    
+    resp.must.eq ["logged in - ???"]
+
+     _, _, resp = Cuba.call({})
+    
+    resp.must.eq ["user1"]
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require 'cuba'
+ENV["MT_NO_EXPECTATIONS"] = "true"
+
+require 'mustard'

data/spec/spec_helper.rb~

@@ -0,0 +1 @@
+ENV["MT_NO_EXPECTATIONS"] = "true"

metadata

@@ -1,95 +1,161 @@
 --- !ruby/object:Gem::Specification
 name: cuba-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  prerelease:
+  version: 0.2.0
 platform: ruby
 authors:
 - Christian Meier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
-  requirement: &18852600 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :runtime
+    none: false
   prerelease: false
-  version_requirements: *18852600
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: ixtlan-babel
-  requirement: &18850840 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.3'
+    none: false
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    none: false
   prerelease: false
-  version_requirements: *18850840
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.6
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.6
+    none: false
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: copyright-header
-  requirement: &18849320 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.7
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.7
-  type: :development
+    none: false
   prerelease: false
-  version_requirements: *18849320
+  type: :development
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &18845760 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
-  type: :development
+        version: '4.3'
+    none: false
   prerelease: false
-  version_requirements: *18845760
+  type: :development
 - !ruby/object:Gem::Dependency
   name: mustard
-  requirement: &18844760 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: *18844760
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &18843280 !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
-  type: :development
+        version: '0.1'
+    none: false
   prerelease: false
-  version_requirements: *18843280
+  type: :development
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &18792320 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
-  type: :development
+        version: '2.6'
+    none: false
   prerelease: false
-  version_requirements: *18792320
-description: add content negogiation, serialization of objects (their attributes map),
-  and some helpers for authentication + authorization to the cuba framework
+  type: :development
+description: add content negogiation, serialization of objects (their attributes map), and some helpers for authentication + authorization to the cuba framework
 email:
 - m.kristian@web.de
 executables: []
@@ -98,49 +164,68 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
+- lib/cuba_api.rb
+- lib/cuba_api.rb~
+- lib/cuba_api/input_filter.rb~
 - lib/cuba_api/write_aspects.rb~
 - lib/cuba_api/guard.rb
 - lib/cuba_api/serializer.rb~
 - lib/cuba_api/accept_content.rb~
 - lib/cuba_api/current_user.rb
 - lib/cuba_api/write_aspect.rb
+- lib/cuba_api/input_filter.rb
+- lib/cuba_api/reponse_status.rb~
 - lib/cuba_api/write_aspect.rb~
 - lib/cuba_api/current_user.rb~
 - lib/cuba_api/config.rb
+- lib/cuba_api/response_status.rb~
 - lib/cuba_api/guard.rb~
 - lib/cuba_api/accept_content.rb
 - lib/cuba_api/config.rb~
 - lib/cuba_api/serializer.rb
-- lib/cuba_api.rb
-- lib/cuba_api.rb~
+- lib/cuba_api/response_status.rb
 - spec/serializer_spec.rb
+- spec/input_filter_spec.rb~
+- spec/config_spec.rb~
+- spec/spec_helper.rb~
 - spec/aspects_spec.rb
+- spec/accept_spec.rb~
+- spec/spec_helper.rb
+- spec/response_status_spec.rb~
 - spec/config_spec.rb
 - spec/accept_spec.rb
+- spec/serializer_spec.rb~
 - spec/current_user_spec.rb
+- spec/aspects_spec.rb~
+- spec/current_user_spec.rb~
+- spec/input_filter_spec.rb
+- spec/response_status_spec.rb
+- Gemfile
 homepage: http://github.com/mkristian/cuba-api
 licenses:
 - MIT
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.11
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: set of plugins for using cuba as API server
 test_files:
@@ -149,4 +234,5 @@ test_files:
 - spec/config_spec.rb
 - spec/accept_spec.rb
 - spec/current_user_spec.rb
-has_rdoc: 
+- spec/input_filter_spec.rb
+- spec/response_status_spec.rb