ixtlan 0.2.4 → 0.3.0

data/spec/phrase_spec.rb

@@ -0,0 +1,119 @@
+require 'pathname'
+require Pathname(__FILE__).dirname + 'spec_helper.rb'
+
+require Pathname(__FILE__).dirname  + '../lib/dm-serializer/to_xml'
+
+
+require 'ixtlan/controllers/texts_controller'
+
+require 'ixtlan/models/i18n_text'
+require 'ixtlan/models/word'
+require 'ixtlan/models/translation'
+require 'ixtlan/models/phrase'
+
+def setup(code)
+  len = 6
+  Controller.send(:include, Ixtlan::Controllers::TextsController)
+  Ixtlan::Models::I18nText.all.destroy!
+  Ixtlan::Models::Locale.all.destroy!
+  Ixtlan::Models::Locale.first_or_create(:id => 1, :code => "DEFAULT")
+  @controller2 = Controller.new
+  @en =  Ixtlan::Models::Locale.first_or_create(:id => 1000, :code => "en")
+  @en_in =  Ixtlan::Models::Locale.first_or_create(:id => 2000, :code => "en_IN")
+  (1..len).each do |j|
+    text = Ixtlan::Models::I18nText.create(:id => j,
+                                           :code => code,
+                                       :text => "text_#{j}",
+                                       :current_user => @controller2.current_user,
+                                       :locale => Ixtlan::Models::Locale.default,
+                                       :updated_at => DateTime.now,
+                                       :updated_by => @controller2.current_user)
+
+    text.approve(:current_user => @controller2.current_user)
+  end
+end
+
+#describe Ixtlan::Models::Phrase do
+
+
+describe "with default locale" do
+  before(:each) do
+    setup("cccc_1")
+  end
+  it "should xml-serialize" do
+    #Ixtlan::Models::I18nText.all.each {|t| p t}
+    Ixtlan::Models::Phrase.all(:code => "cccc_1").to_xml.cleanup.should == "<phrases><phrase><code>cccc_1</code><text>text_6</text><current_text>text_6</current_text><updated_at>date</updated_at><updated_by_id>1</updated_by_id><locale><id>1</id><code>DEFAULT</code><created_at>date</created_at></locale></phrase></phrases>"
+  end
+end
+
+describe "with default locale" do
+  before(:each) do
+    setup("cccc_2")
+  end
+  it "should xml-serialize with edited text" do
+    Ixtlan::Models::I18nText.create(:code => "cccc_2",
+                                :text => "text_edited",
+                                :current_user => @controller2.current_user,
+                                :locale => Ixtlan::Models::Locale.default,
+                                :updated_at => DateTime.now,
+                                :updated_by => @controller2.current_user)
+    # Ixtlan::Models::I18nText.all.each {|t| p t}
+    Ixtlan::Models::Phrase.all(:code => "cccc_2").to_xml.cleanup.should == "<phrases><phrase><code>cccc_2</code><text>text_edited</text><current_text>text_6</current_text><updated_at>date</updated_at><updated_by_id>1</updated_by_id><locale><id>1</id><code>DEFAULT</code><created_at>date</created_at></locale></phrase></phrases>"
+  end
+
+end
+describe "with default locale" do
+  before(:each) do
+    setup("cccc_3")
+    Ixtlan::Models::I18nText.all.destroy!
+  end
+
+  it "should xml-serialize with edited text and not approved" do
+    Ixtlan::Models::I18nText.create(:code => "cccc_3",
+                                :text => "text_edited",
+                                :current_user => @controller2.current_user,
+                                :locale => Ixtlan::Models::Locale.default,
+                                :updated_at => DateTime.now,
+                                :updated_by => @controller2.current_user)
+    #Ixtlan::Models::I18nText.all.each {|t| p t}
+    Ixtlan::Models::Phrase.all(:code => "cccc_3").to_xml.cleanup.should == "<phrases><phrase><code>cccc_3</code><text>text_edited</text><current_text>text_edited</current_text><updated_at>date</updated_at><updated_by_id>1</updated_by_id><locale><id>1</id><code>DEFAULT</code><created_at>date</created_at></locale></phrase></phrases>"
+  end
+end
+
+describe "with 'de' locale" do
+  before(:each) do
+    setup("de_code")
+  end
+  it "should xml-serialize" do
+    #Ixtlan::Models::I18nText.all.each {|t| p t}
+    Ixtlan::Models::Phrase.all(:code => "de_code", :locale => Ixtlan::Models::Locale.first_or_create(:id => 3000, :code => 'de')).to_xml.cleanup.should == "<phrases><phrase><code>de_code</code><text>text_6</text><current_text>text_6</current_text><updated_at>date</updated_at><updated_by_id>1</updated_by_id><default_translation><text>text_6</text><previous_text>text_5</previous_text><approved_at>date</approved_at><approved_by_id>1</approved_by_id></default_translation><locale><id>3000</id><code>de</code><created_at>date</created_at></locale></phrase></phrases>"
+  end
+end
+
+describe "with 'en' locale" do
+  before(:each) do
+    setup("en_code")
+
+  Ixtlan::Models::I18nText.create(:code => "en_code",
+                              :text => "en_text_edited",
+                              :current_user => @controller2.current_user,
+                              :locale => @en,
+                              :updated_at => DateTime.now,
+                              :updated_by => @controller2.current_user)
+  Ixtlan::Models::I18nText.create(:code => "en_code",
+                              :text => "en_in_text_edited",
+                              :current_user => @controller2.current_user,
+                              :locale => @en_in,
+                              :updated_at => DateTime.now,
+                              :updated_by => @controller2.current_user)
+  end
+
+  it "should xml-serialize with edited text" do
+    #Ixtlan::Models::I18nText.all(:code => "en_code").each {|t| puts "code=#{t.code} locale=#{t.locale.code} version=#{t.version} current=#{t.current} previous=#{t.previous}"}
+    Ixtlan::Models::Phrase.all(:code => "en_code", :locale => @en).to_xml.cleanup.should == "<phrases><phrase><code>en_code</code><text>en_text_edited</text><current_text>en_text_edited</current_text><updated_at>date</updated_at><updated_by_id>1</updated_by_id><default_translation><text>text_6</text><previous_text>text_5</previous_text><approved_at>date</approved_at><approved_by_id>1</approved_by_id></default_translation><locale><id>1000</id><code>en</code><created_at>date</created_at></locale></phrase></phrases>"
+  end
+
+end
+
+
+#end

data/spec/session_timeout_spec.rb

@@ -0,0 +1,59 @@
+require 'pathname'
+require Pathname(__FILE__).dirname + 'spec_helper.rb'
+
+require 'ixtlan/rails/session_timeout'
+
+class Controller
+  include Ixtlan::Rails::SessionTimeout
+end
+
+describe Ixtlan::Rails::SessionTimeout do
+
+  before :each do
+    Ixtlan::Models::User.all.destroy!
+    @controller = Controller.new
+    @log = StringIO.new
+    Slf4r::LoggerFacade4RubyLogger.file = @log
+  end
+
+  it 'should expire due to idle timeout' do
+    @controller.send(:check_session_expiry).should be_true
+    @controller.session.empty?.should be_false
+    @controller.rendered.should be_nil
+    @log.string.size.should == 0
+    sleep 1
+    @controller.send(:check_session_expiry).should be_false
+    @controller.session.empty?.should be_true
+    @controller.rendered.should be_true
+    @log.string.size.should_not == 0
+    @log.string.should =~ /session timeout/
+  end
+
+  it 'should expire due to IP change' do
+    @controller.request.headers['REMOTE_ADDR'] = "first.ip"
+    @controller.send(:check_session_ip_binding).should be_true
+    @controller.session.empty?.should be_false
+    @controller.rendered.should be_nil
+    @log.string.size.should == 0
+    @controller.request.headers['REMOTE_ADDR'] = "second.ip"
+    @controller.send(:check_session_ip_binding).should be_false
+    @controller.session.empty?.should be_true
+    @controller.rendered.should be_true
+    @log.string.size.should_not == 0
+    @log.string.should =~ /IP changed/
+  end
+
+  it 'should expire due to IP change' do
+    @controller.request.headers['HTTP_USER_AGENT'] = "mozilla"
+    @controller.send(:check_session_browser_signature).should be_true
+    @controller.session.empty?.should be_false
+    @controller.rendered.should be_nil
+    @log.string.size.should == 0
+    @controller.request.headers['HTTP_USER_AGENT'] = "iron"
+    @controller.send(:check_session_browser_signature).should be_false
+    @controller.session.empty?.should be_true
+    @controller.rendered.should be_true
+    @log.string.size.should_not == 0
+    @log.string.should =~ /browser signature changed/
+  end
+end

data/spec/spec_helper.rb

@@ -12,9 +12,10 @@ require 'slf4r'
 require 'ixtlan' / 'models'
 require 'ixtlan' / 'user_logger'
 require 'ixtlan' / 'modified_by'
-require 'ixtlan' / 'models' / 'user'
+require 'ixtlan' / 'models' / 'domain'
 require 'ixtlan' / 'models' / 'locale'
 require 'ixtlan' / 'models' / 'group'
+require 'ixtlan' / 'models' / 'user'
 require 'ixtlan' / 'models' / 'configuration'
 require 'ixtlan' / 'models' / 'group_user'
 require 'ixtlan' / 'models' / 'group_locale_user'
@@ -64,7 +65,7 @@ class Controller
   def initialize
     @params = {}
     u = Ixtlan::Models::User.first(:login => :marvin)
-    if u.nil? 
+    if u.nil?
       u = Ixtlan::Models::User.new(:login => :marvin, :name => 'marvin the robot', :email=> "marvin@universe.example.com", :language => "xx", :id => 1, :created_at => DateTime.now, :updated_at => DateTime.now)
       if(u.respond_to? :created_by_id)
         u.created_by_id = 1
@@ -132,15 +133,15 @@ if RUBY_PLATFORM =~ /java/
   module DataMapper
     module Validate
       class NumericValidator
-        
+
         def validate_with_comparison(value, cmp, expected, error_message_name, errors, negated = false)
           return if expected.nil?
-          if cmp == :=~ 
+          if cmp == :=~
               return value =~ expected
           end
           comparison = value.send(cmp, expected)
           return if negated ? !comparison : comparison
-          
+
           errors << ValidationErrors.default_error_message(error_message_name, field_name, expected)
         end
       end

data/spec/text_collection_spec.rb

@@ -0,0 +1,88 @@
+
+require 'pathname'
+require Pathname(__FILE__).dirname + 'spec_helper.rb'
+
+require 'ixtlan/controllers/texts_controller'
+
+require 'ixtlan/models/i18n_text'
+require 'ixtlan/models/word'
+require 'ixtlan/models/translation'
+
+describe "Ixtlan::Models::TextCollection" do
+
+  len = 6
+
+  before(:all) do
+    Controller.send(:include, Ixtlan::Controllers::TextsController)
+    @controller = Controller.new
+    Ixtlan::Models::Locale.all.destroy!
+    Ixtlan::Models::I18nText.all.destroy!
+    (1..len).each do |i|
+      locale = Ixtlan::Models::Locale.first_or_create(:id => 10 + len + i, :code => "c#{(96 +i).chr}")
+      text = Ixtlan::Models::I18nText.create(:code => "code_#{i}",
+                                             :text => "text_#{i}",
+                                             :current_user => @controller.current_user,
+                                             :locale => Ixtlan::Models::Locale.default,
+                                             :updated_at => DateTime.now,
+                                             :updated_by => @controller.current_user)
+      text.approve(:current_user => @controller.current_user)
+      (1..len).each do |j|
+        text = Ixtlan::Models::I18nText.create(:code => "code_#{i}", :text => "text_#{i}_#{j}",
+:current_user => @controller.current_user, :locale => locale, :updated_at => DateTime.now, :updated_by => @controller.current_user)
+        text.approve(:current_user => @controller.current_user) unless j == len
+      end
+    end
+  end
+
+  it "should have #{len} second latest approved" do
+    set = Ixtlan::Models::I18nText.second_latest_approved
+    set.size.should == len
+    set.each do |t|
+      t.version.should_not be_nil
+      t.current.should be_false
+      t.previous.should be_true
+    end
+  end
+
+  it "should have #{len * 2} latest approved" do
+    set = Ixtlan::Models::I18nText.latest_approved
+    set.size.should == len * 2
+    set.each do |t|
+      t.version.should_not be_nil
+      t.current.should be_true
+      t.previous.should be_false
+    end
+  end
+
+  it "should have #{len} not approved" do
+    set = Ixtlan::Models::I18nText.not_approved
+    set.size.should == len
+    set.each do |t|
+      t.version.should be_nil
+      t.current.should be_false
+      t.previous.should be_false
+    end
+  end
+
+  it "should have #{len * len} approved" do
+    Ixtlan::Models::I18nText.approved.size.should == len * len
+  end
+
+  it "should have #{len * (len - 3)} old approved" do
+    Ixtlan::Models::I18nText.all(:current => false, :previous => false, :version.not => nil).size.should == len * (len - 3)
+  end
+
+  it "should have right number of approved when filterd by locale " do
+    locale = Ixtlan::Models::Locale.first_or_create(:code => "cb")
+    Ixtlan::Models::I18nText.approved(:locale => locale).size.should == len - 1
+    Ixtlan::Models::I18nText.latest_approved(:locale => locale).size.should == 1
+    Ixtlan::Models::I18nText.not_approved(:locale => locale).size.should == 1
+  end
+
+  it 'should setup the translation map' do
+    locale = Ixtlan::Models::Locale.first_or_create(:code => "cb")
+    map = Ixtlan::Models::Translation.map_for(:locale => locale)
+    map.size.should == 1
+    map.values[0].to_xml.gsub(/ type='[a-z:]*'/, '').gsub(/[0-9-]+T[0-9:]+\+[0-9:]+/, 'date').should == "<translation><text>text_2_5</text><previous_text>text_2_4</previous_text><approved_at>date</approved_at><approved_by_id>1</approved_by_id></translation>"
+  end
+end

data/spec/text_spec.rb

@@ -0,0 +1,105 @@
+
+require 'pathname'
+require Pathname(__FILE__).dirname + 'spec_helper.rb'
+
+require 'ixtlan/controllers/texts_controller'
+
+require 'ixtlan/models/i18n_text'
+require 'ixtlan/models/word'
+require 'ixtlan/models/translation'
+
+describe Ixtlan::Models::I18nText do
+
+  before(:each) do
+    @controller = Controller.new
+    Ixtlan::Models::I18nText.all.destroy!
+    @approved = Ixtlan::Models::I18nText.create(:code => "code", :text => "other text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.default)
+    @approved.approve(:current_user => @controller.current_user)
+    @text = Ixtlan::Models::I18nText.create(:code => "code", :text => "text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.default)
+  end
+
+  it "should create default" do
+    @text.new?.should_not be_nil
+    @text.id.should_not be_nil
+    @text.updated_at.should_not be_nil
+    @text.updated_by.should == @controller.current_user
+    @text.version.should be_nil
+    @text.current.should be_false
+    @text.approved_at.should be_nil
+    @text.approved_by.should be_nil
+  end
+
+  it 'should create translation' do
+    Ixtlan::Models::I18nText.create(:code => "code", :text => "text_en", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.first_or_create(:code => 'en')).new?.should be_false
+  end
+
+  it 'should not create' do
+     Ixtlan::Models::I18nText.create(:code => "code2", :text => "text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.first_or_create(:code => 'en')).new?.should be_true
+  end
+
+  it 'should update' do
+    text = Ixtlan::Models::I18nText.create(:code => "update_code", :text => "text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.default)
+    text.update(:text => 'new text', :current_user => @controller.current_user)
+    text.should be_true
+    text.version.should be_nil
+    text.current.should be_false
+    text.approved_at.should be_nil
+    text.approved_by.should be_nil
+  end
+
+  it 'should approve' do
+    text = Ixtlan::Models::I18nText.create(:code => "apporved_code", :text => "text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.default)
+    text.approved?.should be_false
+    text.approve(:current_user => @controller.current_user).should be_true
+    text.version.should_not be_nil
+    text.approved?.should be_true
+    text.current.should be_true
+    text.approved_at.should_not be_nil
+    text.approved_by.should_not be_nil
+  end
+
+  it 'should not update unapproved when changing text and version' do
+    @text.attributes = {:text => 'new text', :version => 1, :current_user => @controller.current_user}
+    @text.save.should be_false
+    @text.errors[:invariant].first.should == 'can not approve and change text at the same time'
+  end
+
+  it 'should not update approved on text change' do
+
+    @approved.version.should_not be_nil
+    @approved.approved_at.should_not be_nil
+    @approved.approved_by.should_not be_nil
+
+    @approved.update(:text => 'new text', :current_user => @controller.current_user).should be_false
+    @approved.errors[:invariant].should_not be_nil
+  end
+
+  it 'should not update approved on version change' do
+    @approved.version.should_not be_nil
+    @approved.approved_at.should_not be_nil
+    @approved.approved_by.should_not be_nil
+
+    @approved.update(:version => 11, :current_user => @controller.current_user).should be_false
+    @approved.errors[:invariant].should_not be_nil
+  end
+
+  it 'should not update approved on code change' do
+    @approved.version.should_not be_nil
+    @approved.approved_at.should_not be_nil
+    @approved.approved_by.should_not be_nil
+
+    @approved.update(:code => "new code", :current_user => @controller.current_user).should be_false
+    @approved.errors[:invariant].should_not be_nil
+  end
+
+  it 'should not update on code change' do
+    @text.update(:code => "new code", :current_user => @controller.current_user).should be_false
+    @text.errors[:invariant].should_not be_nil
+  end
+
+  it 'should produce xml via the Word model' do
+    text = Ixtlan::Models::I18nText.create(:code => "word", :text => "word text", :current_user => @controller.current_user, :locale => Ixtlan::Models::Locale.default)
+    Ixtlan::Models::Word.first(:code => "word").to_xml.should == "<word><code>word</code><text>word text</text></word>"
+    Ixtlan::Models::Word.all(:id => @approved.id).to_xml(:collection_element_name => "words").should == "<words type='array'><word><code>code</code><text>other text</text></word></words>"
+  end
+end

data/spec/unrestful_authentication_spec.rb

@@ -0,0 +1,142 @@
+
+require 'pathname'
+require Pathname(__FILE__).dirname + 'spec_helper.rb'
+
+require 'ixtlan' / 'models' / 'authentication'
+require 'ixtlan' / 'rails' / 'unrestful_authentication'
+
+class Controller
+
+  include Ixtlan::Rails::UnrestfulAuthentication
+
+  attr_reader :rendered
+
+  def render_successful_login
+    @rendered = :login
+  end
+
+  def render_access_denied
+    @rendered = :access_denied
+  end
+
+  def render_login_page
+    @rendered = :login_page
+  end
+
+  def render_logout_page
+    @rendered = :logout_page
+  end
+
+  def reset
+    @params.clear
+    @rendered = nil
+  end
+end
+
+describe Ixtlan::Models::Authentication do
+
+  before :all do
+    @controller = Controller.new
+    @log = StringIO.new
+    Slf4r::LoggerFacade4RubyLogger.file = @log
+  end
+
+  describe "login" do
+
+    before :each do
+      @controller.reset
+      @log.reopen
+    end
+
+    it 'should show login page' do
+      @controller.send(:authenticate).should be_false
+      @controller.session.empty?.should be_true
+      @controller.rendered.should == :login_page
+    end
+
+    it 'should show access denied page - via put' do
+      @controller.request.method = :put
+      @controller.send(:authenticate).should be_false
+      @controller.session.empty?.should be_true
+      @controller.rendered.should == :access_denied
+    end
+
+    it 'should show access denied page - via delete' do
+      @controller.request.method = :delete
+      @controller.send(:authenticate).should be_false
+      @controller.session.empty?.should be_true
+      @controller.rendered.should == :access_denied
+    end
+
+    it 'should show access denied page - via post - no login - no password' do
+      @controller.request.method = :post
+      @controller.send(:authenticate).should be_false
+      @controller.session.empty?.should be_true
+      @controller.rendered.should == :access_denied
+    end
+
+    it 'should show access denied page - via post - no login' do
+      @controller.request.method = :post
+      @controller.params[:password] = @controller.password
+      @controller.send(:authenticate).should be_false
+      @log.string.should =~ /\[\?\?\?\] unknown login from IP/
+      @controller.session.empty?.should be_true
+      @controller.rendered.should == :access_denied
+    end
+
+    it 'should show access denied page - via post - no password' do
+      @controller.request.method = :post
+      @controller.params[:login] = @controller.user.login
+      @controller.send(:authenticate).should be_false
+      @log.string.should =~ /\[#{@controller.user.login}\] wrong password from IP/
+      @controller.session.empty?.should be_true
+      @controller.rendered.should == :access_denied
+    end
+
+    it 'should login' do
+      @controller.request.method = :post
+      @controller.params[:password] = @controller.password
+      @controller.params[:login] = @controller.user.login
+      @controller.send(:authenticate).should be_false
+      @log.string.should =~ /\[#{@controller.user.login}\] logged in/
+      @controller.session.empty?.should be_false
+      @controller.rendered.should == :login
+    end
+  end
+
+  describe 'logout' do
+
+    before :each do
+      @controller.request.method = :post
+      @controller.params[:password] = @controller.password
+      @controller.params[:login] = @controller.user.login
+      @controller.send :authenticate
+      @controller.reset
+      @log.reopen
+    end
+
+    it 'should do nothing' do
+      @controller.request.method = :get
+      @controller.send(:authenticate).should be_true
+      @log.string.should == ''
+      @controller.request.method = :post
+      @controller.send(:authenticate).should be_true
+      @log.string.should == ''
+      @controller.request.method = :put
+      @controller.send(:authenticate).should be_true
+      @log.string.should == ''
+      @controller.request.method = :delete
+      @controller.send(:authenticate).should be_true
+      @log.string.should == ''
+      @controller.rendered.should be_nil
+    end
+
+    it 'should logout' do
+      @controller.request.method = :delete
+      @controller.params[:login] = @controller.user.login
+      @controller.send(:authenticate).should be_false
+      @controller.rendered.should == :logout_page
+      @log.string.should =~ /\[#{@controller.user.login}\] logged out/
+    end
+  end
+end

data/spec/user_logger_spec.rb

@@ -0,0 +1,105 @@
+require 'pathname'
+require Pathname(__FILE__).dirname + 'spec_helper.rb'
+
+require 'ixtlan/rails/session_timeout'
+class Response
+  attr_accessor :content_type
+  def initialize
+    @content_type = ""
+  end
+end
+
+class Controller
+  def response
+    @response ||= Response.new
+  end
+end
+
+describe Ixtlan::UserLogger do
+
+  before :all do
+    @controller = Controller.new
+  end
+
+  before :each do
+    @controller.response.content_type = "text/html"
+    @log = StringIO.new
+    Slf4r::LoggerFacade4RubyLogger.file = @log
+    @logger = Ixtlan::UserLogger.new(:root)
+  end
+
+  it 'should log no user - no message - no block' do
+    @logger.log_user(nil)
+    @log.string.should =~ /\[\?\?\?\]\s*$/
+  end
+
+  it 'should log user - no message - no block' do
+    @logger.log_user("user")
+    @log.string.should =~ /\[user\]\s*$/
+  end
+
+  it 'should log user - message - no block' do
+    @logger.log_user("user", "message")
+    @log.string.should =~ /\[user\] message\s*$/
+  end
+
+  it 'should log user - no message - block' do
+    @logger.log_user("user") { "block" }
+    @log.string.should =~ /\[user\] block\s*$/
+  end
+
+  it 'should log - no message - block' do
+    @logger.log(@controller) { "block" }
+    @log.string.should =~ /\[marvin\] block\s*$/
+  end
+
+  it 'should log - message - no block' do
+    @logger.log(@controller, "message")
+    @log.string.should =~ /\[marvin\] message\s*$/
+  end
+
+  it 'should log - no message - no block' do
+    @logger.log(@controller)
+    @log.string.should =~ /\[marvin\] \s*$/
+  end
+
+  it 'should log - no controller - no message - no block' do
+    @logger.log(Object.new)
+    @log.string.should =~ /\[\?\?\?\] \s*$/
+  end
+
+  it 'should log action - no resource variable' do
+    @controller.params[:controller] = "resources"
+    @controller.params[:action] = "index"
+    @logger.log_action(@controller)
+    @log.string.should =~ /\[marvin\] resources#index\s*$/
+
+    @controller.response.content_type = "application/xml"
+    @logger.log_action(@controller)
+    @log.string.should =~ /\[marvin\] resources#index - xml\s*$/
+  end
+
+  it 'should log action - resource variable' do
+    @controller.params[:controller] = "resources"
+    @controller.params[:action] = "index"
+    @controller.instance_variable_set(:@resource, @controller.current_user.groups[0])
+    @logger.log_action(@controller)
+    @log.string.should =~ /\[marvin\] resources#index .*Group\([0-9]\)\s*$/
+    @controller.response.content_type = "application/xml"
+    @logger.log_action(@controller)
+    @log.string.should =~ /\[marvin\] resources#index .*Group\([0-9]\) - xml\s*$/
+  end
+
+  it 'should log action - resources variable' do
+    @controller.params[:controller] = "resources"
+    @controller.params[:action] = "index"
+    @controller.instance_variable_set(:@resources, @controller.current_user.groups)
+    size = @controller.current_user.groups.size
+    @logger.log_action(@controller)
+    @log.string.should =~ /\[marvin\] resources#index .*Groups\[#{size}\]\s*$/
+    @controller.response.content_type = "application/xml"
+    @logger.log_action(@controller)
+    @log.string.should =~ /\[marvin\] resources#index .*Groups\[#{size}\] - xml\s*$/
+  end
+
+end