ixtlan 0.4.0.pre5 → 0.4.0

data/lib/ixtlan/models/configuration.rb

@@ -52,7 +52,20 @@ module Ixtlan
       alias :to_x :to_xml_document
       def to_xml_document(opts, doc = nil)
         unless(opts[:methods] || opts[:exclude])
-          opts.merge!({:methods => [:updated_by, :locales], :exclude => [:updated_by_id, :id]})
+          opts.merge!({
+                        :skip_types => true,
+                        :skip_empty_tags => true,
+                        :methods => [:updated_by, :locales], 
+                        :updated_by => {
+                          :methods => [], 
+                          :exclude => [:created_at, :updated_at, :hashed_password, :created_by_id, :updated_by_id, :language]
+                        }, 
+                        :locales => {
+                          :methods => [],
+                          :exclude => [:created_at]
+                        }, 
+                        :exclude => [:updated_by_id, :id]
+                      })
         end
         to_x(opts, doc)
       end

data/lib/ixtlan/models/group.rb

@@ -27,7 +27,20 @@ module Ixtlan
 
         alias :to_x :to_xml_document
         def to_xml_document(opts, doc = nil)
-          opts.merge!({:methods => [:locales, :domains], :exclude => [:created_by_id]})
+          unless(opts[:methods])
+            opts.merge!({
+                          :skip_types => true,
+                          :skip_empty_tags => true,
+                          :methods => [:created_by], 
+                          :created_by => {
+                            :methods => [], 
+                            :exclude => [:created_at, :updated_at, :hashed_password, :created_by_id, :updated_by_id, :language]
+                          }
+                        })
+          end
+          unless(opts[:exclude])
+            opts.merge!({:exclude => [:created_by_id]})            
+          end
           to_x(opts, doc)
         end
       end

data/lib/ixtlan/models/i18n_text.rb

@@ -3,6 +3,10 @@ module Ixtlan
   module Models
     module I18nText
 
+      unless const_defined? "TEXT_LOCALE"
+        TEXT_LOCALE = Object.full_const_get(Models::LOCALE)
+      end
+
       def invariant
         no_version = original_attributes[:version].nil? && attribute_get(:version).nil?
         if no_version
@@ -38,9 +42,9 @@ module Ixtlan
         size =
           case locale.code.size
           when 2
-            self.model.latest_approved(:code => code, :locale => Locale.default).size
+            self.model.latest_approved(:code => code, :locale => TEXT_LOCALE.default).size
           when 5
-            self.model.latest_approved(:code => code, :locale => Locale.first(:code => locale.code[0,1])).size
+            self.model.latest_approved(:code => code, :locale => TEXT_LOCALE.first(:code => locale.code[0,1])).size
           else
             1
           end

data/lib/ixtlan/models/phrase.rb

@@ -8,6 +8,11 @@ module Ixtlan
         "Phrase"
       end
 
+      unless const_defined? "LOCALE"
+        LOCALE = Object.full_const_get(Models::LOCALE)
+        TEXT = Object.full_const_get(Models::TEXT)
+      end
+
       property :id, Serial
 
       property :code, String, :required => true, :length => 64
@@ -22,9 +27,9 @@ module Ixtlan
 
       belongs_to :locale, :model => Models::LOCALE
 
-      belongs_to :default_translation, :model => Models::TRANSLATION, :required => false
+      belongs_to :default_translation, :model => Translation, :required => false
 
-      belongs_to :parent_translation, :model => Models::TRANSLATION, :required => false
+      belongs_to :parent_translation, :model => Translation, :required => false
 
       alias :to_x :to_xml_document
       def to_xml_document(opts = {}, doc = nil)
@@ -35,12 +40,12 @@ module Ixtlan
       def self.all(args = {})
         phrases = ::DataMapper::Collection.new(::DataMapper::Query.new(self.repository, Ixtlan::Models::Phrase), [])
         map = {}
-        locale = (args[:locale] ||= Locale.default)
-        I18nText.not_approved(args.dup).each do |text|
+        locale = args[:locale] || LOCALE.default
+        TEXT.not_approved(args.dup).each do |text|
           phrase = Phrase.new(:code => text.code, :text => text.text, :current_text => text.text, :locale => locale, :updated_at => text.updated_at, :updated_by => text.updated_by)
           map[phrase.code] = phrase
         end
-        I18nText.latest_approved(args.dup).each do |text|
+        TEXT.latest_approved(args.dup).each do |text|
           if (phrase = map[text.code])
             phrase.current_text = text.text
           else
@@ -51,7 +56,7 @@ module Ixtlan
         case locale.code.size
         when 2
           params = args.dup
-          params[:locale] = Locale.default
+          params[:locale] = LOCALE.default
           Translation.map_for(params).each do |code, trans|
             ph = map[code]
             if(ph.nil?)

data/lib/ixtlan/models/translation.rb

@@ -18,12 +18,16 @@ module Ixtlan
 
       belongs_to :approved_by, :model => Models::USER
 
+      unless const_defined? "TEXT"
+        TEXT = Object.full_const_get(Models::TEXT)
+      end
+
       def self.map_for(args = {})
         map = {}
-        I18nText.latest_approved(args.dup).each do |text|
+        TEXT.latest_approved(args.dup).each do |text|
           map[text.code] = Translation.create(:text => text.text, :approved_at => text.approved_at, :approved_by => text.approved_by)
         end
-        I18nText.second_latest_approved(args.dup).each do |text|
+        TEXT.second_latest_approved(args.dup).each do |text|
           translation = map[text.code]
           translation.previous_text = text.text
         end

data/lib/ixtlan/models/user.rb

@@ -194,8 +194,35 @@ module Ixtlan
           protected
 
           def to_xml_document(opts={}, doc = nil)
-            unless(opts[:methods] || opts[:exclude])
-              opts.merge!({:exclude => [:hashed_password], :methods => [:groups]})
+            unless(opts[:methods])
+              opts.merge!({ 
+                            :skip_types => true,
+                            :skip_empty_tags => true,
+                            :methods => [:groups, :created_by, :updated_by], 
+                            :groups => {
+                              :exclude => [:created_at, :created_by_id], 
+                              :methods => [:locales, :domains], 
+                              :locales => {
+                                :methods => [], 
+                                :exclude => [:created_at]
+                              }, 
+                              :domains => {
+                                :methods => [], 
+                                :exclude => [:created_at]
+                              }
+                            },
+                            :created_by => {
+                              :methods => [], 
+                              :exclude => [:created_at, :updated_at, :hashed_password, :created_by_id, :updated_by_id, :language]
+                            },
+                            :updated_by => {
+                              :methods => [], 
+                              :exclude => [:created_at, :updated_at, :hashed_password, :created_by_id, :updated_by_id, :language]
+                            }                        
+                          })
+            end
+            unless(opts[:exclude])
+              opts.merge!({:exclude => [:hashed_password, :created_by_id, :updated_by_id]})
             end
             to_x(opts, doc)
           end

data/lib/ixtlan/modified_by.rb

@@ -6,8 +6,7 @@ module Ixtlan
 
     MODIFIED_BY_PROPERTIES = {
       :updated_by => lambda {|r, u| r.updated_by = u},
-      :created_by => lambda {|r, u| r.created_by = u #if r.new? 
-}
+      :created_by => lambda {|r, u| r.created_by = u if r.new? }
     }.freeze
 
     def self.included(model)

data/lib/ixtlan/rails/error_handling.rb

@@ -37,7 +37,7 @@ module Ixtlan
       end
 
       def render_error_page(status)
-        render :template => "sessions/error", :status => status
+        render :template => "errors/error", :status => status
       end
 
       def page_not_found(exception)

data/lib/ixtlan/version.rb

@@ -1,3 +1,3 @@
 module Ixtlan
-  VERSION = '0.4.0.pre5'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/authentication_spec.rb

@@ -3,28 +3,35 @@ require 'pathname'
 require Pathname(__FILE__).dirname + 'spec_helper.rb'
 
 
-require 'ixtlan' / 'models' / 'authentication'
+require 'ixtlan/models/authentication'
+
+class Authentication
+  include Ixtlan::Models::Authentication
+end
 
 describe Ixtlan::Models::Authentication do
 
   before :each do
     #Ixtlan::Models::Group.all.destroy!
     #Ixtlan::Models::User.all.destroy!
-    user  = Ixtlan::Models::User.new(:login => "marvin2", :name => 'marvin the robot', :email=> "marvin@universe.example.com", :language => "xx", :id => 1356, :created_at => DateTime.now, :updated_at => DateTime.now)
-    user.created_by_id = 1356
-    user.updated_by_id = 1356
+    user  = User.new(:login => "marvin2", :name => 'marvin the robot', :email=> "marvin@universe.example.com", :language => "xx", :id => 1356, :created_at => DateTime.now, :updated_at => DateTime.now)
+    user.created_by = user #_id = 1356
+    user.updated_by = user #_id = 1356
     user.save!
-    group = Ixtlan::Models::Group.create(:id => 1356, :name => 'marvin2_root', :current_user => user)
+    group = Group.create(:id => 1356, :name => 'marvin2_root', :current_user => user)
     user.groups << group
     group.save
-    group.locales << Ixtlan::Models::Locale.default
-    group.locales << Ixtlan::Models::Locale.first_or_create(:code => "en")
-    @authentication = Ixtlan::Models::Authentication.create(:login => user.login, :user => user)
+
+    group.locales << Locale.default
+    group.locales << (Locale.first(:code => "en") || Locale.create(:code => "en", :current_user => User.first))
+    @authentication = Authentication.create(:login => user.login, :user => user)
+
+    Ixtlan::Guard.load( Slf4r::LoggerFacade.new(:root), :root, (Pathname(__FILE__).dirname + 'guards').expand_path )
   end
 
   it "should" do
     xml = @authentication.to_xml
-    xml.gsub!(/[0-9-]{10}T[0-9+-:]{14}/, "").gsub!(/ type='[^']+'/, '').gsub!(/<created_at><\/created_at>/, "<created_at/>").gsub!(/<locale><id>[0-9]*<\/id>/, "<locale>").should == "<authentication><id>1</id><login>marvin2</login><user><id>1356</id><login>marvin2</login><name>marvin the robot</name><email>marvin@universe.example.com</email><language>xx</language><created_at/><updated_at></updated_at><created_by_id>1356</created_by_id><updated_by_id>1356</updated_by_id><groups><group><id>1356</id><name>marvin2_root</name><created_at/><created_by_id>1356</created_by_id><updated_by_id>1356</updated_by_id><locales><locale><code>DEFAULT</code><created_at/></locale><locale><code>en</code><created_at/></locale></locales></group></groups></user></authentication>"
+    xml.gsub!(/[0-9-]{10}T[0-9+-:]{14}/, "").gsub!(/<created_at><\/created_at>/, "<created_at/>").gsub!(/<locale><id>[0-9]*<\/id>/, "<locale>").gsub!(/<permission>.*<\/permission>/, '').gsub(/id>[0-9]+<\//,'id></').should == "<authentication><login>marvin2</login><user><id></id><login>marvin2</login><name>marvin the robot</name><email>marvin@universe.example.com</email><language>xx</language><created_at/><updated_at></updated_at><groups><group><id></id><name>marvin2_root</name><locales><locale><code>DEFAULT</code><created_by_id></created_by_id></locale><locale><code>en</code><created_by_id></created_by_id></locale></locales></group></groups><created_by><id></id><login>marvin2</login><name>marvin the robot</name><email>marvin@universe.example.com</email></created_by><updated_by><id></id><login>marvin2</login><name>marvin the robot</name><email>marvin@universe.example.com</email></updated_by></user><permissions></permissions></authentication>"
   end
 
 end

data/spec/guard_spec.rb

@@ -50,6 +50,7 @@ describe Ixtlan::Guard do
     @controller = Controller.new
     @widget = Erector::Widget.new
     @widget.controller = @controller
+    Locale.first(:code => "en") || Locale.create(:code => "en", :current_user => User.first)
   end
 
   it 'should export permissions' do
@@ -65,11 +66,11 @@ describe Ixtlan::Guard do
   end
 
   it 'should allow with locale' do
-    Ixtlan::Guard.check(@controller, :permissions, :update, Ixtlan::Models::Locale.first_or_create(:code => "en")).should be_true
+    Ixtlan::Guard.check(@controller, :permissions, :update, Locale.first_or_create(:code => "en")).should be_true
   end
 
   it 'should disallow with locale' do
-    Ixtlan::Guard.check(@controller, :configurations, :update, Ixtlan::Models::Locale.first_or_create(:code => "en")).should be_false
+    Ixtlan::Guard.check(@controller, :configurations, :update, Locale.first_or_create(:code => "en")).should be_false
   end
 
   it 'should raise GuardException on unknown controller' do
@@ -98,28 +99,28 @@ describe Ixtlan::Guard do
     @controller.params[:action] = :update
     @controller.params[:controller] = :permissions
 
-    @controller.send(:guard, Ixtlan::Models::Locale.first_or_create(:code => "en")).should be_true
+    @controller.send(:guard, Locale.first_or_create(:code => "en")).should be_true
   end
 
   it 'should deny permission with right locale' do
     @controller.params[:action] = :update
     @controller.params[:controller] = :configurations
 
-    lambda {@controller.send(:guard, Ixtlan::Models::Locale.first_or_create(:code => "en"))}.should raise_error( Ixtlan::PermissionDenied)
+    lambda {@controller.send(:guard, Locale.first_or_create(:code => "en"))}.should raise_error( Ixtlan::PermissionDenied)
   end
 
   it 'should deny permission with wrong locale' do
     @controller.params[:action] = :update
     @controller.params[:controller] = :permissions
 
-    lambda {@controller.send(:guard, Ixtlan::Models::Locale.first_or_create(:code => "de"))}.should raise_error( Ixtlan::PermissionDenied)
+    lambda {@controller.send(:guard, Locale.first(:code => "de")||Locale.create(:code => "de", :current_user => User.first))}.should raise_error( Ixtlan::PermissionDenied)
  end
 
   it 'should allow with locale' do
-    @widget.send(:allowed, :permissions, :update, Ixtlan::Models::Locale.first_or_create(:code => "en")).should be_true
+    @widget.send(:allowed, :permissions, :update, Locale.first_or_create(:code => "en")).should be_true
   end
 
   it 'should deny permission with locale' do
-    @widget.send(:allowed, :configurations, :update, Ixtlan::Models::Locale.first_or_create(:code => "en")).should be_false
+    @widget.send(:allowed, :configurations, :update, Locale.first_or_create(:code => "en")).should be_false
   end
 end

data/spec/modified_by_spec.rb

@@ -1,8 +1,8 @@
 require 'pathname'
 require Pathname(__FILE__).dirname + 'spec_helper.rb'
-require 'ixtlan' / 'modified_by'
+require 'ixtlan/modified_by'
 
-class User
+class Crew
   include DataMapper::Resource
 
   property :login, String, :key => true
@@ -15,14 +15,14 @@ class AuditedName
   property :id, Serial
   property :name, String, :length => 2..255#, :key => true
 
-  modified_by User
+  modified_by Crew
 end
 
 describe Ixtlan::ModifiedBy do
 
   before :each do
-    @user = User.create(:login => 'spock')
-    @second = User.create(:login => 'dr pill')
+    @user = Crew.create(:login => 'spock')
+    @second = Crew.create(:login => 'dr pille')
     @name = AuditedName.create(:name => 'kirk', :current_user => @user)
   end
 
@@ -42,10 +42,11 @@ describe Ixtlan::ModifiedBy do
   end
 
   it 'should modify updated_by on change' do
+    created_by = @name.created_by
     @name.current_user = @second
     @name.name = "scotty"
     @name.save.should be_true
-    @name.created_by.should == @user
+    @name.created_by.should == created_by
     @name.updated_by.should == @second
   end
 
@@ -56,8 +57,8 @@ describe Ixtlan::ModifiedBy do
   end
 
   it 'should not modify updated_by on update without change' do
-    @name.update(:name => "kirk", :current_user => @second)
-    @name.updated_by.should == @user
+    @name.update(:name => "kirk updated", :current_user => @second)
+    @name.updated_by.should == @second
     @name.instance_variable_get(:@current_user).should be_nil
   end
 

data/spec/optimistic_persistence_spec.rb

@@ -38,7 +38,7 @@ describe "Ixtlan::OptimisticPersistence" do
     sleep 1
     @name.save.should be_true
     @second.name = "saroman"
-    lambda { @second.save }.should raise_error(DataMapper::StaleResourceError)
+    lambda { @second.save }.should raise_error(Ixtlan::StaleResourceError)
   end
 
   it 'should fail on key change' do
@@ -46,7 +46,7 @@ describe "Ixtlan::OptimisticPersistence" do
     @name.id = 11
     @name.save.should be_true
     @second.id = 111
-    lambda { @second.save }.should raise_error(DataMapper::StaleResourceError)
+    lambda { @second.save }.should raise_error(Ixtlan::StaleResourceError)
   end
 
   it 'should treat non optimistic resources as usual' do

data/spec/phrase_spec.rb

@@ -3,9 +3,6 @@ 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'
@@ -13,23 +10,22 @@ 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")
+  @current_user = User.first
+  I18nText.all.destroy!
+  Locale.all.destroy!
+  Locale.create(:id => 1, :code => "DEFAULT", :current_user => @current_user)
+  @en =  Locale.create(:id => 1000, :code => "en", :current_user => @current_user)
+  @en_in =  Locale.create(:id => 2000, :code => "en_IN", :current_user => @current_user)
   (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)
+    text = I18nText.create(:id => j,
+                           :code => code,
+                           :text => "text_#{j}",
+                           :current_user => @current_user,
+                           :locale => Locale.default,
+                           :updated_at => DateTime.now,
+                           :updated_by => @current_user)
+    
+    text.approve(:current_user => @current_user)
   end
 end
 
@@ -42,7 +38,7 @@ describe "with default locale" do
   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>"
+    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><created_by_id>1</created_by_id></locale></phrase></phrases>"
   end
 end
 
@@ -51,32 +47,32 @@ describe "with default locale" 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)
+    I18nText.create(:code => "cccc_2",
+                    :text => "text_edited",
+                    :current_user => @current_user,
+                    :locale => Locale.default,
+                    :updated_at => DateTime.now,
+                    :updated_by => @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>"
+    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><created_by_id>1</created_by_id></locale></phrase></phrases>"
   end
 
 end
 describe "with default locale" do
   before(:each) do
     setup("cccc_3")
-    Ixtlan::Models::I18nText.all.destroy!
+    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)
+    I18nText.create(:code => "cccc_3",
+                    :text => "text_edited",
+                    :current_user => @current_user,
+                    :locale => Locale.default,
+                    :updated_at => DateTime.now,
+                    :updated_by => @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>"
+    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><created_by_id>1</created_by_id></locale></phrase></phrases>"
   end
 end
 
@@ -86,7 +82,7 @@ describe "with 'de' locale" do
   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>"
+    Ixtlan::Models::Phrase.all(:code => "de_code", :locale => Locale.first(:id => 3000, :code => 'de') || Locale.create(:id => 3000, :code => 'de', :current_user => @current_user)).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><created_by_id>1</created_by_id></locale></phrase></phrases>"
   end
 end
 
@@ -94,23 +90,23 @@ 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)
+    I18nText.create(:code => "en_code",
+                    :text => "en_text_edited",
+                    :current_user => @current_user,
+                    :locale => @en,
+                    :updated_at => DateTime.now,
+                    :updated_by => @current_user)
+    I18nText.create(:code => "en_code",
+                    :text => "en_in_text_edited",
+                    :current_user => @current_user,
+                    :locale => @en_in,
+                    :updated_at => DateTime.now,
+                    :updated_by => @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>"
+    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><created_by_id>1</created_by_id></locale></phrase></phrases>"
   end
 
 end

data/spec/session_timeout_spec.rb

@@ -10,7 +10,7 @@ end
 describe Ixtlan::Rails::SessionTimeout do
 
   before :each do
-    Ixtlan::Models::User.all.destroy!
+    User.all.destroy!
     @controller = Controller.new
     @log = StringIO.new
     Slf4r::LoggerFacade4RubyLogger.file = @log