ixtlan 0.3.0 → 0.4.0.pre

data/lib/ixtlan/logger_config.rb

@@ -49,7 +49,7 @@ module Ixtlan
     DataObjects::Sqlite3.logger = logger([appender,rails_appender], DataObjects)
 
     # configure audit logger
-    Ixtlan::AuditConfig.configure(Ixtlan::Models::Configuration.instance.keep_audit_logs,
+    Ixtlan::AuditConfig.configure(Object.full_const_get(Ixtlan::Models::CONFIGURATION).instance.keep_audit_logs,
                                   log_filebase('audit'),
                                   [
                                    Ixtlan::Models::User,

data/lib/ixtlan/models/authentication.rb

@@ -1,32 +1,33 @@
 require 'dm-serializer'
 module Ixtlan
   module Models
-    class Authentication
-      include DataMapper::Resource
+    module Authentication
 
-      def self.name
-        "Authentication"
-      end
+      def self.included(model)
+        model.send(:include, DataMapper::Resource)
 
-      property :id, Serial, :default => 1
+        model.property :id, ::DataMapper::Types::Serial, :default => 1
 
-      property :login, String,:format => /^[a-zA-Z0-9\-!=+$%^&*\(\){}|\[\]<>_.]*$/
+        model.property :login, String,:format => /^[a-zA-Z0-9\-!=+$%^&*\(\){}|\[\]<>_.]*$/
 
-      property :password, String,:format => /^[a-zA-Z0-9_.]*$/
+        model.property :password, String,:format => /^[a-zA-Z0-9_.]*$/
 
-      attr_accessor :token
+        model.send :attr_accessor, :token
 
-      belongs_to :user, :model => ::Ixtlan::Models::USER
+        model.belongs_to :user, :model => ::Ixtlan::Models::USER
 
-      if protected_instance_methods.find {|m| m == 'to_x'}.nil?
+        model.class_eval <<-EOS, __FILE__, __LINE__
+          if protected_instance_methods.find {|m| m == 'to_x'}.nil?
 
-        protected
+            protected
 
-        alias :to_x :to_xml_document
-        def to_xml_document(opts, doc = nil)
-          opts.merge!({:exclude => [:password,:user_id], :methods => [:token, :user]})
-          to_x(opts, doc)
-        end
+            alias :to_x :to_xml_document
+            def to_xml_document(opts, doc = nil)
+              opts.merge!({:exclude => [:password,:user_id], :methods => [:token, :user]})
+              to_x(opts, doc)
+            end
+          end
+EOS
       end
     end
   end

data/lib/ixtlan/models/configuration.rb

@@ -4,37 +4,38 @@ require 'dm-serializer'
 require 'ixtlan/models/update_children'
 module Ixtlan
   module Models
-    class Configuration
-      include DataMapper::Resource
-      include UpdateChildren
+    module Configuration
 
-      LOCALE = Object.full_const_get(Models::LOCALE)
-
-      def self.default_storage_name
-        "Configuration"
+      unless const_defined? "LOCALE"
+        LOCALE = Object.full_const_get(Models::LOCALE)
       end
 
-      property :id, Serial
+      def self.included(model)
+        model.send(:include, DataMapper::Resource)
+        model.send(:include, UpdateChildren)
+
+        model.property :id, ::DataMapper::Types::Serial
 
-      property :session_idle_timeout, Integer, :required => true
+        model.property :session_idle_timeout, Integer, :required => true
 
-      property :keep_audit_logs, Integer, :required => true
+        model.property :keep_audit_logs, Integer, :required => true
 
-      property :password_sender_email, String, :format => :email_address, :required => false, :length => 64
+        model.property :password_sender_email, String, :format => :email_address, :required => false, :length => 64
 
-      property :notification_sender_email, String, :format => :email_address, :required => false, :length => 64
+        model.property :notification_sender_email, String, :format => :email_address, :required => false, :length => 64
 
-      property :notification_recipient_emails, String, :format => Proc.new { |email| emails = email.split(','); emails.find_all { |e| e =~ DataMapper::Validate::Format::Email::EmailAddress }.size == emails.size}, :required => false, :length => 254 #honour mysql max varchar length
+        model.property :notification_recipient_emails, String, :format => Proc.new { |email| emails = email.split(','); emails.find_all { |e| e =~ DataMapper::Validate::Format::Email::EmailAddress }.size == emails.size}, :required => false, :length => 254 #honour mysql max varchar length
 
-      property :errors_dump_directory, String, :required => false, :length => 192
-      property :logfiles_directory, String, :required => false, :length => 192
+        model.property :errors_dump_directory, String, :required => false, :length => 192
+        model.property :logfiles_directory, String, :required => false, :length => 192
 
-      timestamps :updated_at
+        model.timestamps :updated_at
 
-      modified_by ::Ixtlan::Models::USER, :updated_by
+        model.modified_by ::Ixtlan::Models::USER, :updated_by
 
-      has n, :locales, :model => ::Ixtlan::Models::LOCALE, :through => Resource
+        model.has model.n, :locales, :model => ::Ixtlan::Models::LOCALE, :through => DataMapper::Resource
 
+        model.class_eval <<-EOS, __FILE__, __LINE__
       def self.instance
         # HACK: return a new object in case there is none in the database
         # to allow rails rake tasks to work with an empty database
@@ -53,6 +54,8 @@ module Ixtlan
         end
         to_x(opts, doc)
       end
+EOS
+      end
     end
   end
 end

data/lib/ixtlan/models/domain.rb

@@ -1,24 +1,24 @@
 require 'dm-serializer'
 module Ixtlan
   module Models
-    class Domain
-      include DataMapper::Resource
-
-      def self.default_storage_name
-        "Domain"
-      end
+    module Domain
 
       unless const_defined? "ALL"
         ALL = "ALL"
       end
 
-      property :id, Serial
-      property :name, String, :required => true , :format => /^[a-z]+$|^#{ALL}$/, :length => 32, :unique_index => true
+      def self.included(model)
+        model.send(:include, DataMapper::Resource)
+
+        model.property :id, ::DataMapper::Types::Serial
+
+        model.property :name, String, :required => true , :format => /^[a-z]+$|^#{ALL}$/, :length => 32, :unique_index => true
 
-      timestamps :created_at
+        model.timestamps :created_at
 
-      modified_by Models::USER, :created_by
+        model.modified_by Models::USER, :created_by
 
+        model.class_eval <<-EOS, __FILE__, __LINE__
       def self.every
         first(:name => ALL)
       end
@@ -30,15 +30,16 @@ module Ixtlan
       def self.first_or_get(id_or_name)
         first(:name => id_or_name) || get(id_or_name)
       end
+EOS
+    end
+    def hash
+      attribute_get(:name).hash
+    end
 
-      def hash
-        attribute_get(:name).hash
-      end
-
-      alias :eql? :==
-        def ==(other)
-          attribute_get(:name).eql?(other.attribute_get(:name))
-        end
+    alias :eql? :==
+      def ==(other)
+        attribute_get(:name).eql?(other.attribute_get(:name))
       end
     end
+  end
 end

data/lib/ixtlan/models/group.rb

@@ -2,29 +2,35 @@ require 'dm-serializer'
 require 'ixtlan/models/update_children'
 module Ixtlan
   module Models
-    class Group
-      include DataMapper::Resource
-      include UpdateChildren
-
-      #p LOCALE
-      # TODO where is LOCALE defined and remove the double defintion
-
+    module Group
       unless const_defined? "LOCALE"
         LOCALE = Object.full_const_get(Models::LOCALE)
         DOMAIN = Object.full_const_get(Models::DOMAIN)
       end
 
-      def self.default_storage_name
-        "Group"
-      end
+      def self.included(model)
+        model.send(:include, DataMapper::Resource)
+        model.send(:include, UpdateChildren)
+
+        model.property :id, ::DataMapper::Types::Serial, :field => "gidnumber"
 
-      property :id, Serial, :field => "gidnumber"
+        model.property :name, String, :required => true , :format => /^[^<'&">]*$/, :length => 32, :field => "cn", :unique_index => true
 
-      property :name, String, :required => true , :format => /^[^<'&">]*$/, :length => 32, :field => "cn", :unique_index => true
+        model.timestamps :created_at
 
-      timestamps :created_at
+        model.modified_by Ixtlan::Models::USER, :created_by
 
-      modified_by Ixtlan::Models::USER, :created_by
+        model.class_eval <<-EOS, __FILE__, __LINE__
+      if protected_instance_methods.find {|m| m == 'to_x'}.nil?
+
+        protected
+
+        alias :to_x :to_xml_document
+        def to_xml_document(opts, doc = nil)
+          opts.merge!({:methods => [:locales, :domains], :exclude => [:created_by_id]})
+          to_x(opts, doc)
+        end
+      end
 
       def self.first_or_get!(id_or_name)
         first(:name => id_or_name) || get!(id_or_name)
@@ -33,103 +39,94 @@ module Ixtlan
       def self.first_or_get(id_or_name)
         first(:name => id_or_name) || get(id_or_name)
       end
+EOS
+    end
 
-      def locales(user = nil)
-        if @locales.nil? or not user.nil?
+    def locales(user = nil)
+      if @locales.nil? or not user.nil?
 
-          # TODO spec the empty array to make sure new relations are stored
-          # in the database or the locales collection is empty before filling it
-          @locales = ::DataMapper::Collection.new(::DataMapper::Query.new(self.repository, LOCALE), [])
+        # TODO spec the empty array to make sure new relations are stored
+        # in the database or the locales collection is empty before filling it
+        @locales = ::DataMapper::Collection.new(::DataMapper::Query.new(self.repository, LOCALE), [])
 
-          return @locales if user.nil?
+        return @locales if user.nil?
 
-          GroupLocaleUser.all(:group_id => id, :user_id => user.id).each{ |glu| @locales << glu.locale }
-          def @locales.group=(group)
-            @group = group
-          end
-          @locales.group = self
-          def @locales.user=(user)
-            @user = user
-          end
-          @locales.user = user
-          def @locales.<<(locale)
-            unless member? locale
-              GroupLocaleUser.create(:group_id => @group.id, :user_id => @user.id, :locale_id => locale.id)
-              super
-            end
-
-            self
-          end
-          def @locales.delete(locale)
-            glu = GroupLocaleUser.first(:group_id => @group.id, :user_id => @user.id, :locale_id => locale.id)
-            if glu
-              glu.destroy
-            end
+        GroupLocaleUser.all(:group_id => id, :user_id => user.id).each{ |glu| @locales << glu.locale }
+        def @locales.group=(group)
+          @group = group
+        end
+        @locales.group = self
+        def @locales.user=(user)
+          @user = user
+        end
+        @locales.user = user
+        def @locales.<<(locale)
+          unless member? locale
+            GroupLocaleUser.create(:group_id => @group.id, :user_id => @user.id, :locale_id => locale.id)
             super
           end
+
+          self
+        end
+        def @locales.delete(locale)
+          glu = GroupLocaleUser.first(:group_id => @group.id, :user_id => @user.id, :locale_id => locale.id)
+          if glu
+            glu.destroy
+          end
+          super
         end
-        @locales
       end
+      @locales
+    end
 
-      def domains(user = nil)
-        if @domains.nil? or not user.nil?
+    def domains(user = nil)
+      if @domains.nil? or not user.nil?
 
-          # TODO spec the empty array to make sure new relations are stored
-          # in the database or the domains collection is empty before filling it
-          @domains = ::DataMapper::Collection.new(::DataMapper::Query.new(self.repository, DOMAIN), [])
+        # TODO spec the empty array to make sure new relations are stored
+        # in the database or the domains collection is empty before filling it
+        @domains = ::DataMapper::Collection.new(::DataMapper::Query.new(self.repository, DOMAIN), [])
 
-          return @domains if user.nil?
+        return @domains if user.nil?
 
-          DomainGroupUser.all(:group_id => id, :user_id => user.id).each{ |glu| @domains << glu.domain }
-          def @domains.group=(group)
-            @group = group
-          end
-          @domains.group = self
-          def @domains.user=(user)
-            @user = user
-          end
-          @domains.user = user
-          def @domains.<<(domain)
-            unless member? domain
-              DomainGroupUser.create(:group_id => @group.id, :user_id => @user.id, :domain_id => domain.id)
-              super
-            end
-
-            self
-          end
-          def @domains.delete(domain)
-            glu = DomainGroupUser.first(:group_id => @group.id, :user_id => @user.id, :domain_id => domain.id)
-            if glu
-              glu.destroy
-            end
+        DomainGroupUser.all(:group_id => id, :user_id => user.id).each{ |glu| @domains << glu.domain }
+        def @domains.group=(group)
+          @group = group
+        end
+        @domains.group = self
+        def @domains.user=(user)
+          @user = user
+        end
+        @domains.user = user
+        def @domains.<<(domain)
+          unless member? domain
+            DomainGroupUser.create(:group_id => @group.id, :user_id => @user.id, :domain_id => domain.id)
             super
           end
-        end
-        @domains
-      end
 
-      def root?
-        attribute_get(:name) == 'root'
-      end
-
-      def locales_admin?
-        attribute_get(:name) == 'locales'
-      end
-
-      def domains_admin?
-        attribute_get(:name) == 'domains'
+          self
+        end
+        def @domains.delete(domain)
+          glu = DomainGroupUser.first(:group_id => @group.id, :user_id => @user.id, :domain_id => domain.id)
+          if glu
+            glu.destroy
+          end
+          super
+        end
       end
+      @domains
+    end
 
-      if protected_instance_methods.find {|m| m == 'to_x'}.nil?
+    def root?
+      attribute_get(:name) == 'root'
+    end
 
-        protected
+    def locales_admin?
+      attribute_get(:name) == 'locales'
+    end
 
-        alias :to_x :to_xml_document
-        def to_xml_document(opts, doc = nil)
-          opts.merge!({:methods => [:locales, :domains], :exclude => [:created_by_id]})
-          to_x(opts, doc)
-        end
-      end
+    def domains_admin?
+      attribute_get(:name) == 'domains'
     end
   end
 end
+end

data/lib/ixtlan/models/i18n_text.rb

@@ -1,36 +1,7 @@
 require 'dm-serializer'
 module Ixtlan
   module Models
-    class I18nText
-      include DataMapper::Resource
-
-      def self.default_storage_name
-        "Text"
-      end
-
-      property :id, Serial
-
-      property :code, String, :required => true, :length => 64
-
-      property :text, String, :required => true, :length => 256
-
-      property :version, Integer, :required => false
-
-      property :current, Boolean, :required => true, :auto_validation => false
-
-      property :previous, Boolean, :required => true, :auto_validation => false
-
-      property :updated_at, DateTime, :required => true, :auto_validation => false
-
-      belongs_to :updated_by, :model => Models::USER
-
-      property :approved_at, DateTime, :required => false
-
-      belongs_to :approved_by, :model => Models::USER, :required => false
-
-      belongs_to :locale, :model => Models::LOCALE
-
-      validates_with_method :invariant
+    module I18nText
 
       def invariant
         no_version = original_attributes[:version].nil? && attribute_get(:version).nil?
@@ -63,8 +34,6 @@ module Ixtlan
         end
       end
 
-      validates_with_method :cascade
-
       def cascade
         size =
           case locale.code.size
@@ -82,16 +51,6 @@ module Ixtlan
         end
       end
 
-      before :save do
-        if(new? or attribute_get(:version).nil?)
-          attribute_set(:version, nil)
-          attribute_set(:current, false)
-          attribute_set(:previous, false)
-          attribute_set(:approved_at, nil)
-          approved_by = nil
-        end
-      end
-
       def approve(params = {})
         latest = self.class.latest_approved(:code => attribute_get(:code),
                                             :locale => locale).first
@@ -99,7 +58,7 @@ module Ixtlan
                                                      :locale => locale).first
         params[:version] = latest.nil? ? 1 : latest.version + 1
         params[:current] = true
-# TODO approved is not need since after approval the resource is inmutable !!!
+        # TODO approved is not need since after approval the resource is inmutable !!!
         params[:approved_at] = attribute_get(:updated_at)
         params[:approved_by] = params[:current_user] || current_user
 
@@ -117,25 +76,70 @@ module Ixtlan
         !attribute_get(:version).nil?
       end
 
-      def self.latest_approved(args = {})
-        args[:current] = true
-        all(args)
-      end
+      def self.included(model)
+        model.send(:include, DataMapper::Resource)
+        model.send(:include, UpdateChildren)
 
-      def self.second_latest_approved(args = {})
-        args[:previous] = true
-        all(args)
-      end
+        model.property :id, ::DataMapper::Types::Serial
 
-      def self.approved(args = {})
-        args[:version.not] = nil
-        all(args)
-      end
+        model.property :code, String, :required => true, :length => 64
+
+        model.property :text, String, :required => true, :length => 256
 
-      def self.not_approved(args = {})
-        args[:version] = nil
-        all(args)
+        model.property :version, Integer, :required => false
+
+        model.property :current, Boolean, :required => true, :auto_validation => false
+
+        model.property :previous, Boolean, :required => true, :auto_validation => false
+
+        model.property :updated_at, DateTime, :required => true, :auto_validation => false
+
+        model.belongs_to :updated_by, :model => Models::USER
+
+        model.property :approved_at, DateTime, :required => false
+
+        model.belongs_to :approved_by, :model => Models::USER, :required => false
+
+        model.belongs_to :locale, :model => Models::LOCALE
+
+        model.validates_with_method :invariant
+
+        model.validates_with_method :cascade
+        model.before :save do
+          if(new? or attribute_get(:version).nil?)
+            attribute_set(:version, nil)
+            attribute_set(:current, false)
+            attribute_set(:previous, false)
+            attribute_set(:approved_at, nil)
+            approved_by = nil
+          end
+        end
+
+        model.class_eval <<-EOS, __FILE__, __LINE__
+        def self.default_storage_name
+          "Text"
+        end
+
+        def self.latest_approved(args = {})
+          args[:current] = true
+          all(args)
+        end
+
+        def self.second_latest_approved(args = {})
+          args[:previous] = true
+          all(args)
+        end
+
+        def self.approved(args = {})
+          args[:version.not] = nil
+          all(args)
+        end
+
+        def self.not_approved(args = {})
+          args[:version] = nil
+          all(args)
+        end
+EOS
       end
     end
   end
-end

data/lib/ixtlan/models/locale.rb

@@ -1,37 +1,25 @@
 require 'dm-serializer'
 module Ixtlan
   module Models
-    class Locale
-      include DataMapper::Resource
-
-      def self.default_storage_name
-        "Locale"
-      end
+    module Locale
 
       unless const_defined? "DEFAULT"
         DEFAULT = "DEFAULT"
         ALL = "ALL"
       end
 
-      property :id, Serial
-      property :code, String, :required => true , :format => /^[a-z][a-z](_[A-Z][A-Z])?$|^#{DEFAULT}$|^#{ALL}$/, :length => 7, :unique_index => true
+      def self.included(model)
+        model.send(:include, DataMapper::Resource)
 
-      timestamps :created_at
+        model.property :id, ::DataMapper::Types::Serial
 
-      modified_by Models::USER, :created_by
+        model.property :code, String, :required => true , :format => /^[a-z][a-z](_[A-Z][A-Z])?$|^#{DEFAULT}$|^#{ALL}$/, :length => 7, :unique_index => true
 
-      def parent
-        c = attribute_get(:code)
-        case c.size
-        when 2
-          self.model.default
-        when 5
-          self.model.get!(code[0,2])
-        else
-          nil
-        end
-      end
+        model.timestamps :created_at
+
+        model.modified_by Models::USER, :created_by
 
+        model.class_eval <<-EOS, __FILE__, __LINE__
       def self.default
         first(:code => DEFAULT)
       end
@@ -47,15 +35,29 @@ module Ixtlan
       def self.first_or_get(id_or_code)
         first(:code => id_or_code) || get(id_or_code)
       end
+EOS
+    end
 
-      def hash
-        attribute_get(:code).hash
+    def parent
+      c = attribute_get(:code)
+      case c.size
+      when 2
+        self.model.default
+      when 5
+        self.model.get!(code[0,2])
+      else
+        nil
       end
+    end
+
+    def hash
+      attribute_get(:code).hash
+    end
 
-      alias :eql? :==
-        def ==(other)
-          attribute_get(:code).eql?(other.attribute_get(:code))
-        end
+    alias :eql? :==
+      def ==(other)
+        attribute_get(:code).eql?(other.attribute_get(:code))
       end
     end
+  end
 end

data/lib/ixtlan/models/user.rb

@@ -5,37 +5,25 @@ require 'dm-serializer'
 require 'ixtlan/models/update_children'
 module Ixtlan
   module Models
-    class User
-      include DataMapper::Resource
-      include UpdateChildren
+    module User
 
       GROUP = Object.full_const_get(Models::GROUP)
 
-      def self.default_storage_name
-        "User"
+      def root?
+        groups.detect { |g| g.root? } || false
       end
 
-      property :id, Serial, :field => "uidnumber"
-
-      property :login, String, :required => true, :field => "uid", :length => 4..32, :unique_index => true, :format => /^[a-zA-Z0-9]*$/, :writer => :private
-
-      property :name, String, :required => true, :format => /^[^<">]*$/, :length => 2..64, :field => "cn"
-
-      property :email, String, :required => true, :format => :email_address, :required => true, :length => 8..64, :unique_index => true, :field => "mail"
-
-      property :language, String, :required => false, :format => /[a-z][a-z]/, :length => 2, :field => "preferredlanguage"
-
-      property :hashed_password, String, :required => false, :length => 128, :accessor => :private, :field => "userpassword"
-
-      timestamps :at
-
-      modified_by ::Ixtlan::Models::USER
+      def locales_admin?
+        groups.detect { |g| g.locales_admin? } || false
+      end
 
-      # Virtual attribute for the plaintext password
-      attr_reader :password
+      def domains_admin?
+        groups.detect { |g| g.domains_admin? } || false
+      end
 
-      #validates_is_unique  :login
-      #validates_is_unique  :email
+      def password
+        @password
+      end
 
       def reset_password(len = 12)
         @password = Ixtlan::Passwords.generate(len)
@@ -46,30 +34,6 @@ module Ixtlan
       def digest
         ::Base64.decode64(@hashed_password[6,200])
       end
-
-      def self.authenticate(login, password)
-        user = first(:login => login) # need to get the salt
-        if user
-          digest = user.digest
-          salt = digest[20,147]
-          if ::Digest::SHA1.digest("#{password}" + salt) == digest[0,20]
-            user
-          else
-            "wrong password"
-          end
-        else
-          "unknown login"
-        end
-      end
-
-      def self.first_or_get!(id_or_login)
-        first(:login => id_or_login) || get!(id_or_login)
-      end
-
-      def self.first_or_get(id_or_login)
-        first(:login => id_or_login) || get(id_or_login)
-      end
-
       def groups
         if @groups.nil?
           # TODO spec the empty array to make sure new relations are stored
@@ -108,23 +72,6 @@ module Ixtlan
         @groups
       end
 
-      # make sure login is immutable
-      def login=(new_login)
-        attribute_set(:login, new_login) if login.nil?
-      end
-
-      def root?
-        groups.detect { |g| g.root? } || false
-      end
-
-      def locales_admin?
-        groups.detect { |g| g.locales_admin? } || false
-      end
-
-      def domains_admin?
-        groups.detect { |g| g.domains_admin? } || false
-      end
-
       def update_all_children(new_groups)
         if current_user.root?
           # root has no restrictions
@@ -154,10 +101,10 @@ module Ixtlan
 
           # for each new groups update the locales/domains respectively
           new_groups.each do |group|
-             if user_groups_map.key?(group[:id])
-               user_groups_map[group[:id]].update_children(group[:locales], :locales) if current_user.locales_admin? || current_user.root?
-               user_groups_map[group[:id]].update_children(group[:domains], :domains) if current_user.domains_admin? || current_user.root?
-             end
+            if user_groups_map.key?(group[:id])
+              user_groups_map[group[:id]].update_children(group[:locales], :locales) if current_user.locales_admin? || current_user.root?
+              user_groups_map[group[:id]].update_children(group[:domains], :domains) if current_user.domains_admin? || current_user.root?
+            end
           end
         end
       end
@@ -187,17 +134,71 @@ module Ixtlan
         end
       end
 
-      if protected_instance_methods.find {|m| m == 'to_x'}.nil?
-        alias :to_x :to_xml_document
+      def self.included(model)
+        model.send(:include, DataMapper::Resource)
+        model.send(:include, UpdateChildren)
+
+        model.property :id, ::DataMapper::Types::Serial, :field => "uidnumber"
+
+        model.property :login, String, :required => true, :field => "uid", :length => 4..32, :unique_index => true, :format => /^[a-zA-Z0-9]*$/, :writer => :private
+
+        model.property :name, String, :required => true, :format => /^[^<">]*$/, :length => 2..64, :field => "cn"
+
+        model.property :email, String, :required => true, :format => :email_address, :required => true, :length => 8..64, :unique_index => true, :field => "mail"
+
+        model.property :language, String, :required => false, :format => /[a-z][a-z]/, :length => 2, :field => "preferredlanguage"
+
+        model.property :hashed_password, String, :required => false, :length => 128, :accessor => :private, :field => "userpassword"
 
-        protected
+        model.timestamps :at
 
-        def to_xml_document(opts={}, doc = nil)
-          unless(opts[:methods] || opts[:exclude])
-            opts.merge!({:exclude => [:hashed_password], :methods => [:groups]})
+        model.modified_by ::Ixtlan::Models::USER
+
+        #validates_is_unique  :login
+        #validates_is_unique  :email
+
+        model.class_eval <<-EOS, __FILE__, __LINE__
+        # make sure login is immutable
+        def login=(new_login)
+          attribute_set(:login, new_login) if login.nil?
+        end
+
+        def self.authenticate(login, password)
+          user = first(:login => login) # need to get the salt
+          if user
+            digest = user.digest
+            salt = digest[20,147]
+            if ::Digest::SHA1.digest("\#{password}" + salt) == digest[0,20]
+              user
+            else
+              "wrong password"
+            end
+          else
+            "unknown login"
+          end
+        end
+
+        def self.first_or_get!(id_or_login)
+          first(:login => id_or_login) || get!(id_or_login)
+        end
+
+        def self.first_or_get(id_or_login)
+          first(:login => id_or_login) || get(id_or_login)
+        end
+
+        if protected_instance_methods.find {|m| m == 'to_x'}.nil?
+          alias :to_x :to_xml_document
+
+          protected
+
+          def to_xml_document(opts={}, doc = nil)
+            unless(opts[:methods] || opts[:exclude])
+              opts.merge!({:exclude => [:hashed_password], :methods => [:groups]})
+            end
+            to_x(opts, doc)
           end
-          to_x(opts, doc)
         end
+EOS
       end
     end
   end

data/lib/ixtlan/rails/migrations.rb

@@ -10,12 +10,12 @@ module Ixtlan
       CONFIGURATION = Object.const_get(Ixtlan::Models::CONFIGURATION)
 
       def self.create_user
-        USER.auto_migrate!
-        LOCALE.auto_migrate!
-        GROUP.auto_migrate!
-        Ixtlan::Models::GroupUser.auto_migrate!
-        Ixtlan::Models::GroupLocaleUser.auto_migrate!
-        Ixtlan::Models::DomainGroupUser.auto_migrate!
+        USER.auto_upgrade!
+        LOCALE.auto_upgrade!
+        GROUP.auto_upgrade!
+        Ixtlan::Models::GroupUser.auto_upgrade!
+        Ixtlan::Models::GroupLocaleUser.auto_upgrade!
+        Ixtlan::Models::DomainGroupUser.auto_upgrade!
         
         u = USER.new(:login => 'root', :email => 'root@example.com', :name => 'Superuser', :id => 1)
         u.created_at = DateTime.now
@@ -43,13 +43,13 @@ module Ixtlan
       end
 
       def self.create_configuration
-        Ixtlan::Models::ConfigurationLocale.auto_migrate!
-        CONFIGURATION.auto_migrate!
+        Ixtlan::Models::ConfigurationLocale.auto_upgrade!
+        CONFIGURATION.auto_upgrade!
         CONFIGURATION.create(:session_idle_timeout => 10, :keep_audit_logs => 3, :current_user => USER.first)
       end
 
       def self.create_locale
-        LOCALE.auto_migrate!
+        LOCALE.auto_upgrade!
         # get/create default locale
         LOCALE.create(:code => LOCALE::DEFAULT, :current_user => USER.first)
         # get/create "every" locale
@@ -60,7 +60,7 @@ module Ixtlan
       end
 
       def self.create_domain
-        DOMAIN.auto_migrate!
+        DOMAIN.auto_upgrade!
         # get/create "every" domain
         DOMAIN.create(:name => DOMAIN::ALL, :current_user => User.first)
         
@@ -68,7 +68,7 @@ module Ixtlan
       end
 
       def self.create_text
-        I18nText.auto_migrate!
+        I18nText.auto_upgrade!
       end
     end
   end

data/lib/ixtlan/version.rb

@@ -1,3 +1,3 @@
 class Ixtlan
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0.pre'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ixtlan
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0.pre
 platform: ruby
 authors: 
 - mkristian
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 +05:30
+date: 2010-05-28 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -235,9 +235,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []