ixtlan 0.4.0.pre2 → 0.4.0.pre3

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/gwt_ixtlan_datamapper_rspec_scaffold_generator.rb

@@ -129,7 +129,7 @@ module Rails
                 "#{match}\n\nimport #{java_package}.models.#{class_name}Factory;\nimport #{java_package}.models.#{class_name};\nimport #{java_package}.views.#{plural_name}.#{class_name}Screen;"
               end
               gsub_file application_file, /(screenController = [a-zA-Z.]+;)/mi do |match|
-                "#{match}\n\n        #{class_name}Factory #{variable}Factory = new #{class_name}Factory(container.repository,\n                container.notifications,\n                container.userFactory);\n        #{class_name}Screen #{variable}Screen = new #{class_name}Screen(container.loadingNotice,\n                 container.getTextController,\n                 #{variable}Factory,\n                 container.session,\n                 new ResourceBindings<#{class_name}>(),\n                 container.notifications);\n        screenController.addScreen(#{variable}Screen, \"#{plural_name}\");"
+                "#{match}\n\n        #{class_name}Factory #{variable}Factory = new #{class_name}Factory(container.repository,\n                container.notifications,\n                container.userFactory);\n        #{class_name}Screen #{variable}Screen = new #{class_name}Screen(container.loadingNotice,\n                 container.getTextController,\n                 #{variable}Factory,\n                 container.session,\n                 new ResourceBindings<#{class_name}>(),\n                 container.listeners,\n                 container.hyperlinkFactory);\n        screenController.addScreen(#{variable}Screen, \"#{plural_name}\");"
               end
             end
           end

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Fields.java

@@ -5,12 +5,21 @@ package <%= package %>.views.<%= plural_name %>;
 
 import <%= package %>.models.<%= class_name %>;
 
+<% if Array(attributes).detect { |a| a.type == :boolean } -%>
+import de.saumya.gwt.persistence.client.TimestampFactory;
+<% end -%>
 import de.saumya.gwt.translation.common.client.GetTextController;
 import de.saumya.gwt.translation.common.client.widget.ResourceBindings;
 import de.saumya.gwt.translation.common.client.widget.ResourceFields;
+<% if Array(attributes).detect { |a| a.type == :boolean } -%>
 import de.saumya.gwt.translation.gui.client.bindings.CheckBoxBinding;
+<% end -%>
+<% if Array(attributes).detect { |a| a.type == :integer } -%>
 import de.saumya.gwt.translation.gui.client.bindings.IntegerTextBoxBinding;
+<% end -%>
+<% if Array(attributes).detect { |a| a.type == :string || a.type == :text || a.type == :slug } -%>
 import de.saumya.gwt.translation.gui.client.bindings.TextBoxBinding;
+<% end -%>
 
 public class <%= class_name %>Fields extends ResourceFields<<%= class_name %>> {
 
@@ -24,6 +33,8 @@ public class <%= class_name %>Fields extends ResourceFields<<%= class_name %>> {
             public void pullFrom(final <%= class_name %> resource) {
 <% if attribute.type == :boolean -%>
                 setValue(resource.<%= attribute.name.javanize %>);
+<% elsif attribute.type == :date -%>
+                setValue(resource.<%= attribute.name.javanize %>.toString());
 <% else -%>
                 setText(resource.<%= attribute.name.javanize %>);
 <% end -%>
@@ -33,6 +44,8 @@ public class <%= class_name %>Fields extends ResourceFields<<%= class_name %>> {
             public void pushInto(final <%= class_name %> resource) {
 <% if attribute.type == :boolean -%>
                 resource.<%= attribute.name.javanize %> = getValue();
+<% elsif attribute.type == :date -%>
+                resource.<%= attribute.name.javanize %> = new TimestampFactory(getText()).toDate();
 <% else -%>
                 resource.<%= attribute.name.javanize %> = getText<% if attribute.type == :integer %>AsInt<% end -%>();
 <% end -%>

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Model.java

@@ -13,21 +13,21 @@ import java.sql.Timestamp;
 import com.google.gwt.xml.client.Element;
 
 import de.saumya.gwt.persistence.client.Repository;
-import de.saumya.gwt.persistence.client.ResourceWithID;
+import de.saumya.gwt.persistence.client.Resource;
 <% unless options[:skip_modified_by] -%>
 import de.saumya.gwt.session.client.models.User;
 import de.saumya.gwt.session.client.models.UserFactory;
 <% end -%>
 
-public class <%= class_name %> extends ResourceWithID<<%= class_name %>> {
+public class <%= class_name %> extends Resource<<%= class_name %>> {
 
 <% unless options[:skip_modified_by] -%>
     private final UserFactory userFactory;
 
 <% end -%>
     protected <%= class_name %>(final Repository repository, final <%= class_name %>Factory factory<% unless options[:skip_modified_by] -%>,
-            final UserFactory userFactory<% end -%>) {
-        super(repository, factory);
+				final UserFactory userFactory<% end -%>, final int id) {
+        super(repository, factory, id);
 <% unless options[:skip_modified_by] -%>
         this.userFactory = userFactory;
 <% end -%>
@@ -47,7 +47,6 @@ public class <%= class_name %> extends ResourceWithID<<%= class_name %>> {
 
     @Override
     protected void appendXml(final StringBuilder buf) {
-        super.appendXml(buf);
 <% Array(attributes).each do |attribute| -%>
         appendXml(buf, "<%= attribute.name %>", this.<%= attribute.name.javanize %>);
 <% end -%>
@@ -62,8 +61,7 @@ public class <%= class_name %> extends ResourceWithID<<%= class_name %>> {
     }
 
     @Override
-    protected void fromXml(final Element root) {
-        super.fromXml(root);
+    protected void fromElement(final Element root) {
 <% Array(attributes).each do |attribute| -%>
         this.<%= attribute.name.javanize %> = get<% if attribute.type == :date %>Date<% elsif attribute.type == :integer %>Int<% elsif attribute.type == :boolean %>Boolean<% else %>String<% end -%>(root, "<%= attribute.name %>");
 <% end -%>
@@ -78,18 +76,17 @@ public class <%= class_name %> extends ResourceWithID<<%= class_name %>> {
     }
 
     @Override
-    public void toString(final StringBuilder buf) {
-        super.toString(buf);
+    public void toString(final String indent, final StringBuilder buf) {
 <% Array(attributes).each do |attribute| -%>
-        toString(buf, "<%= attribute.name %>", this.<%= attribute.name.javanize %>);
+        toString(indent, buf, "<%= attribute.name %>", this.<%= attribute.name.javanize %>);
 <% end -%>
 <% unless options[:skip_timestamps] -%>
-        toString(buf, "created_at", this.createdAt);
-        toString(buf, "updated_at", this.updatedAt);
+        toString(indent, buf, "created_at", this.createdAt);
+        toString(indent, buf, "updated_at", this.updatedAt);
 <% end -%>
 <% unless options[:skip_modified_by] -%>
-        toString(buf, "created_by", this.createdBy);
-        toString(buf, "updated_by", this.updatedBy);
+        toString(indent, buf, "created_by", this.createdBy);
+        toString(indent, buf, "updated_by", this.updatedBy);
 <% end -%>
     }
 

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/ModelFactory.java

@@ -28,13 +28,8 @@ public class <%= class_name %>Factory extends ResourceFactory<<%= class_name %>>
     }
 
     @Override
-    public String keyName() {
-        return "id";
-    }
-
-    @Override
-    public <%= class_name %> newResource() {
-        return new <%= class_name %>(this.repository, this<% unless options[:skip_modified_by] -%>, this.userFactory<% end -%>);
+    public <%= class_name %> newResource(final int id) {
+        return new <%= class_name %>(this.repository, this<% unless options[:skip_modified_by] -%>, this.userFactory<% end -%>, id);
     }
 
     @Override

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Screen.java

@@ -6,11 +6,12 @@ package <%= package %>.views.<%= plural_name %>;
 import <%= package %>.models.<%= class_name %>;
 import <%= package %>.models.<%= class_name %>Factory;
 
-import de.saumya.gwt.persistence.client.ResourceNotifications;
 import de.saumya.gwt.session.client.Session;
 import de.saumya.gwt.translation.common.client.GetTextController;
-import de.saumya.gwt.translation.common.client.widget.DefaultResourceActionPanel;
+import de.saumya.gwt.translation.common.client.widget.HyperlinkFactory;
 import de.saumya.gwt.translation.common.client.widget.LoadingNotice;
+import de.saumya.gwt.translation.common.client.widget.NotificationListeners;
+import de.saumya.gwt.translation.common.client.widget.ResourceActionPanel;
 import de.saumya.gwt.translation.common.client.widget.ResourceBindings;
 import de.saumya.gwt.translation.common.client.widget.ResourceCollectionListing;
 import de.saumya.gwt.translation.common.client.widget.ResourceCollectionNavigation;
@@ -36,7 +37,8 @@ public class <%= class_name %>Screen extends ResourceScreen<<%= class_name %>> {
             final GetTextController getTextController,
             final <%= class_name %>Factory factory, final Session session,
             final ResourceBindings<<%= class_name %>> bindings,
-            final ResourceNotifications notifications) {
+            final NotificationListeners listeners,
+            final HyperlinkFactory hyperlinkFactory) {
         super(loadingNotice,
                 factory,
                 session,
@@ -48,13 +50,18 @@ public class <%= class_name %>Screen extends ResourceScreen<<%= class_name %>> {
                                 getTextController),
                         new ResourceCollectionListing<<%= class_name %>>(session,
                                 factory,
-                                getTextController)),
-                new DefaultResourceActionPanel<<%= class_name %>>(getTextController,
+                                getTextController,
+                                hyperlinkFactory)),
+                new ResourceActionPanel<<%= class_name %>>(getTextController,
                         bindings,
                         session,
                         factory,
-                        notifications),
-                notifications);
+                        listeners,
+                        hyperlinkFactory,
+                        true,
+                        true),
+                listeners,
+                hyperlinkFactory);
     }
 
 }

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/TestGwt.java

@@ -11,7 +11,7 @@ import de.saumya.gwt.persistence.client.ResourceFactory;
  */
 public class <%= class_name %>TestGwt extends AbstractApplicationResourceTestGwt<<%= class_name %>> {
 
-
+    <% first = attributes.detect {|a| a.type == :string } || attributes.first -%>
     private <%= class_name %> resource;
 
     private static final String RESOURCE_XML = "<<%= singular_name%>>"
@@ -53,10 +53,12 @@ public class <%= class_name %>TestGwt extends AbstractApplicationResourceTestGwt
 
     @Override
     protected Resource<<%= class_name %>> resourceSetUp() {
-        this.resource = this.factory.newResource();
+        this.resource = this.factory.newResource(idValue());
 
         this.resource.id = 1;
-        this.resource.<%= attributes.first.name.javanize %> = <% if [:date, :time, :date_time].member? attributes.first.type  %>new de.saumya.gwt.persistence.client.TimestampFactory("<%= attributes.first.sample_value %>").toDate()<% else %>"<%= attributes.first.sample_value %>"<% end -%>;
+<% Array(attributes).each do |attribute| -%>
+				  this.resource.<%= attribute.name.javanize %> = <% if [:date, :time, :date_time].member? attribute.type  %>new de.saumya.gwt.persistence.client.TimestampFactory("<%= attribute.sample_value %>").to<%= attribute.type == :date_time ? "Timestamp" : attribute.type.to_s.constantize %>()<% elsif [:integer, :float, :decimal, :big_decimal, :boolean].member? attribute.type  %><%= attribute.sample_value %><% else %>"<%= attribute.sample_value %>"<% end -%>;
+<% end -%>
 
         this.repository.addXmlResponse(RESOURCE_XML);
 
@@ -67,14 +69,14 @@ public class <%= class_name %>TestGwt extends AbstractApplicationResourceTestGwt
 
     @Override
     public void doTestCreate() {
-        assertEquals("<%= attributes.first.sample_value %>", this.resource.<%= attributes.first.name.javanize %><% if [:date, :time, :date_time].member? attributes.first.type  %>.toString()<% end -%>);
+        assertEquals("<%= first.sample_value %>", this.resource.<%= first.name.javanize %><% if [:date, :time, :date_time].member? first.type  %>.toString()<% end -%>);
     }
 
     @Override
     public void doTestUpdate() {
-        this.resource.<%= attributes.first.name.javanize %> = <% if [:date, :time, :date_time].member? attributes.first.type  %>new de.saumya.gwt.persistence.client.TimestampFactory(changedValue()).toDate()<% else %>changedValue()<% end -%>;
+        this.resource.<%= first.name.javanize %> = <% if [:date, :time, :date_time].member? first.type  %>new de.saumya.gwt.persistence.client.TimestampFactory(changedValue()).toDate()<% else %>changedValue()<% end -%>;
         this.resource.save();
-        assertEquals(this.resource.<%= attributes.first.name.javanize %><% if [:date, :time, :date_time].member? attributes.first.type  %>.toString()<% end -%>, changedValue());
+        assertEquals(this.resource.<%= first.name.javanize %><% if [:date, :time, :date_time].member? first.type  %>.toString()<% end -%>, changedValue());
     }
 
     private final static String XML = "<<%= singular_name%>>"
@@ -90,12 +92,12 @@ public class <%= class_name %>TestGwt extends AbstractApplicationResourceTestGwt
 
     @Override
     protected String changedValue() {
-        return "<%= attributes.first.sample_value(false) %>";
+        return "<%= first.sample_value(false) %>";
     }
 
     @Override
-    protected String keyValue() {
-        return "1";
+    protected int idValue() {
+        return 1;
     }
 
     @Override
@@ -105,6 +107,6 @@ public class <%= class_name %>TestGwt extends AbstractApplicationResourceTestGwt
 
     @Override
     protected String value() {
-        return "<%= attributes.first.sample_value %>";
+        return "<%= first.sample_value %>";
     }
 }

data/generators/ixtlan_datamapper_model/templates/migration.rb

@@ -0,0 +1,22 @@
+migration <%= Time.now.utc.strftime("%Y%m%d%H%M%S") %>, :<%= migration_name.underscore %> do
+  up do
+    create_table :<%= table_name %> do
+      column :id, Integer, :serial => true
+<% Array(attributes).each do |attribute| -%>
+      column :<%= attribute.name if attribute %>, <%= attribute.type == :boolean ? "::DataMapper::Types::Boolean" : attribute.type.to_s.capitalize %>, :nullable => false<% if attribute.type == :string %>, :length => 255<% end %>
+<% end -%>
+<% unless options[:skip_timestamps] -%>
+      column :created_at, DateTime, :nullable => false
+      column :updated_at, DateTime, :nullable => false
+<% end -%>
+<% unless options[:skip_modified_by] -%>
+      column :created_by_id, Integer, :nullable => false
+      column :updated_by_id, Integer, :nullable => false
+<% end -%>
+    end
+  end
+
+  down do
+    drop_table :<%= table_name %>
+  end
+end

data/generators/ixtlan_datamapper_model/templates/model.rb

@@ -3,7 +3,7 @@ class <%= class_name %>
 
   property :id, Serial
 <% Array(attributes).each do |attribute| -%>
-  property :<%= attribute.name %>, <%= attribute.type.to_s.capitalize %>, :nullable => false <% if attribute.type == :string or attribute.type == :text or attribute.type == :slug -%>, :format => /^[^<'&">]*$/<% if attribute.type == :string or attribute.type == :slug %>, :length => 255<% end -%><% end -%>
+  property :<%= attribute.name %>, <%= attribute.type == :boolean ? "::DataMapper::Types::Boolean" : attribute.type.to_s.capitalize %>, :required => true<% if attribute.type == :string or attribute.type == :text or attribute.type == :slug -%>, :format => /^[^<'&">]*$/<% if attribute.type == :string or attribute.type == :slug %>, :length => 255<% end -%><% end -%>
 
 <% end -%>
 <% unless options[:skip_timestamps] -%>
@@ -11,7 +11,7 @@ class <%= class_name %>
 <% end -%>
 
 <% unless options[:skip_modified_by] -%>
-  modified_by "Ixtlan::Models::User"
+  modified_by Ixtlan::Models::USER
 
   require 'dm-serializer'
   alias :to_x :to_xml_document

data/generators/ixtlan_datamapper_rspec_model/ixtlan_datamapper_rspec_model_generator.rb

@@ -16,5 +16,7 @@ class IxtlanDatamapperRspecModelGenerator < DatamapperRspecModelGenerator
            "Don't add timestamps for this model") { |v| options[:skip_timestamps] = v }
     opt.on("--skip-modified-by",
            "Don't add modified_by references for this model") { |v| options[:skip_modified_by] = v }
+    opt.on("--add-current-user",
+           "set current user before invoking a method on the model") { |v| options[:current_user] = v }
   end
 end

data/generators/ixtlan_datamapper_rspec_model/templates/model_spec.rb

@@ -1,18 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
-
+<% if !options[:skip_modified_by] || options[:current_user] -%>
+USER = Object.full_const_get(Ixtlan::Models::USER) unless Object.const_defined? "USER"
+<% end -%>
 describe <%= class_name %> do
   before(:each) do
-<% unless options[:skip_modified_by] -%>
-    user = Ixtlan::Models::User.first
+<% if !options[:skip_modified_by] || options[:current_user] -%>
+    user = USER.first
     unless user
-      user = Ixtlan::Models::User.new(:login => 'root', :email => 'root@exmple.com', :name => 'Superuser', :language => 'en', :id => 1, :created_at => DateTime.now, :updated_at => DateTime.now)
+      user = USER.new(:login => 'root', :email => 'root@exmple.com', :name => 'Superuser', :language => 'en', :id => 1, :created_at => DateTime.now, :updated_at => DateTime.now)
       user.created_by_id = 1
       user.updated_by_id = 1
       user.save!
     end
 <% end -%>
     @valid_attributes = {
-<% unless options[:skip_modified_by] -%>
+<% if !options[:skip_modified_by] || options[:current_user]  -%>
       :current_user => user,
 <% end -%>
 <% attributes.each_with_index do |attribute, attribute_index| -%>
@@ -22,6 +24,7 @@ describe <%= class_name %> do
   end
 
   it "should create a new instance given valid attributes" do
+    <%= class_name %>.all(:<%= attributes.first.name %> => <%= attributes.first.default_value %>).destroy!
     <%= singular_name %> = <%= class_name %>.create(@valid_attributes)
     <%= singular_name %>.valid?.should be_true
   end

data/generators/ixtlan_datamapper_rspec_scaffold/ixtlan_datamapper_rspec_scaffold_generator.rb

@@ -29,6 +29,8 @@ class IxtlanDatamapperRspecScaffoldGenerator < DatamapperRspecScaffoldGenerator
            "Don't add timestamps for this model") { |v| options[:skip_timestamps] = v }
     opt.on("--skip-modified-by",
            "Don't add modified_by references for this model") { |v| options[:skip_modified_by] = v }
+    opt.on("--add-current-user",
+           "set current user before invoking a method on the model") { |v| options[:current_user] = v }
     opt.on("--skip-guard",
            "Don't add guards for the actions on this model") { |v| options[:add_guard] = v }
     opt.on("--i18n",

data/generators/ixtlan_datamapper_rspec_scaffold/templates/controller_spec.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper')
-
+<% if !options[:skip_modified_by] || options[:current_user] -%>
+CONFIGURATION = Object.full_const_get(Ixtlan::Models::CONFIGURATION) unless Object.const_defined? "CONFIGURATION"
+<% end -%>
 describe <%= controller_class_name %>Controller do
 
   def mock_<%= file_name %>(stubs={})
@@ -16,8 +18,8 @@ describe <%= controller_class_name %>Controller do
 
   def mock_arguments(merge = {})
     args = merge
-<% unless options[:skip_modified_by] -%>
-    args.merge!(:current_user= => nil)
+<% if !options[:skip_modified_by] || options[:current_user] -%>
+    args.merge!(:current_user= => nil, :errors => {})
 <% end -%>
 <% unless options[:skip_audit] -%>
     args.merge!(:model => <%= class_name %>, :key => 12)
@@ -27,13 +29,17 @@ describe <%= controller_class_name %>Controller do
 
 <% unless options[:skip_guard] -%>
   before(:each) do
-    user = Ixtlan::Models::User.new(:id => 1, :login => 'root')
+    user = Object.new
+    def user.id; 1; end
+    def user.login; "root"; end
     def user.groups
-      [Ixtlan::Models::Group.new(:name => "root")]
+      g = Object.new
+      def g.name; "root"; end
+      [g]
     end
     controller.send(:current_user=, user)
-    mock_configuration = mock_model(Ixtlan::Models::Configuration,{})
-    Ixtlan::Models::Configuration.should_receive(:instance).any_number_of_times.and_return(mock_configuration)
+    mock_configuration = mock_model(CONFIGURATION,{})
+    CONFIGURATION.should_receive(:instance).any_number_of_times.and_return(mock_configuration)
     mock_configuration.should_receive(:session_idle_timeout).any_number_of_times.and_return(1)
   end
 <% end -%>

data/lib/dm-serializer/to_xml.rb

@@ -26,8 +26,8 @@ module DataMapper
       root = xml.root_node(doc, opts[:element_name] || default_xml_element_name[])
       properties_to_serialize(opts).each do |property|
         value = __send__(property.name)
-        attrs = (property.type == String) ? {} : {'type' => property.type.to_s.downcase}
-        value = value.to_s(:xml) if property.type == DateTime rescue value
+        attrs = (property.class == DataMapper::Property::String) ? {} : {'type' => property.class.to_s.downcase}
+        value = value.to_s(:xml) if property.class == DataMapper::Property::DateTime rescue value
         xml.add_node(root, property.name.to_s, value.frozen? ? value.to_s.dup: value, attrs)
       end
 

data/lib/ixtlan/controllers/authentications_controller.rb

@@ -19,7 +19,7 @@ module Ixtlan
       end
 
       def destroy
-        authentication_logger.log_user(current_user.nil? ? nil : current_user.login, "already logged out")
+        authentication_logger.log_user(current_user.nil? ? nil : current_user.login, "logged out")
         session.clear
         head :ok
       end

data/lib/ixtlan/controllers/locales_controller.rb

@@ -4,6 +4,7 @@ module Ixtlan
 
       def self.included(base)
         base.send(:include, Ixtlan::Controllers::SearchQuery)
+        base.skip_before_filter :authenticate, :guard, :only => [:index,:show]
       end
 
       public

data/lib/ixtlan/controllers/users_controller.rb

@@ -9,9 +9,11 @@ module Ixtlan
       USER = Object.full_const_get(::Ixtlan::Models::USER)
 
       def adjust_params(user_params)
-        lang = user_params.delete(:preferred_language)
-        user_params[:language] = lang.nil? ? nil : lang[:code][0..1]
-        user_params.delete(:groups)
+        if user_params
+          lang = user_params.delete(:preferred_language)
+          user_params[:language] = lang[:code][0..1] if lang
+          user_params.delete(:groups)
+        end
       end
 
       public

data/lib/ixtlan/models/authentication.rb

@@ -12,8 +12,6 @@ module Ixtlan
 
         model.property :password, String,:format => /^[a-zA-Z0-9_.]*$/
 
-        model.send :attr_accessor, :token
-
         model.belongs_to :user, :model => ::Ixtlan::Models::USER
 
         model.class_eval <<-EOS, __FILE__, __LINE__
@@ -23,7 +21,7 @@ module Ixtlan
 
             alias :to_x :to_xml_document
             def to_xml_document(opts, doc = nil)
-              opts.merge!({:exclude => [:password,:user_id], :methods => [:token, :user]})
+              opts.merge!({:exclude => [:password,:user_id], :methods => [:user]})
               to_x(opts, doc)
             end
           end

data/lib/ixtlan/models/i18n_text.rb

@@ -62,14 +62,14 @@ module Ixtlan
         params[:approved_at] = attribute_get(:updated_at)
         params[:approved_by] = params[:current_user] || current_user
 
-        p = (previous.nil? ? true : previous.update(:previous => false,
+        prev = (previous.nil? ? true : previous.update(:previous => false,
                                                     :current_user => params[:current_user] || current_user))
-        l = (latest.nil? ? true : latest.update(:current => false,
+        lat = (latest.nil? ? true : latest.update(:current => false,
                                                 :previous => true,
                                                 :current_user => params[:current_user] || current_user))
-        u = update(params)
+        upd = update(params)
 
-        u && l && p
+        upd && lat && prev
       end
 
       def approved?

data/lib/ixtlan/models/user.rb

@@ -1,6 +1,8 @@
 require 'digest/sha1'
 require 'base64'
 require 'ixtlan/modified_by'
+require 'ixtlan/passwords'
+require 'ixtlan/digest'
 require 'dm-serializer'
 require 'ixtlan/models/update_children'
 module Ixtlan

data/lib/ixtlan/models/word.rb

@@ -1,7 +1,9 @@
 require 'dm-serializer'
 module Ixtlan
   module Models
-    class Word < Ixtlan::Models::I18nText
+    class Word 
+
+      include Ixtlan::Models::I18nText
 
       alias :to_x :to_xml_document
       def to_xml_document(opts, doc = nil)

data/lib/ixtlan/modified_by.rb

@@ -59,7 +59,7 @@ module Ixtlan
     module ClassMethods
       def modified_by(type, names = nil, options = {})
         if(names.nil?)
-          modified_by(type, [:created_by, :updated_by])
+          modified_by(type, [:created_by, :updated_by], options)
         else
           names = [names] unless names.is_a?(Enumerable)
           names.each do |name|

data/lib/ixtlan/optimistic_persistence.rb

@@ -1,18 +1,15 @@
 require 'ixtlan/optimistic_persistence_module'
 require 'dm-core'
-module DataMapper
+module Ixtlan
 
   class StaleResourceError < StandardError; end
 
-end
-
-module Ixtlan
   module OptimisticPersistence
 
     def self.included(base)
       base.send(:include, ::Ixtlan::OptimisticPersistenceModule)
       base.before :valid? do
-        raise ::DataMapper::StaleResourceError.new(model.name + "(#{key}) was stale") if stale?
+        raise StaleResourceError.new(model.name + "(#{key}) was stale") if stale?
       end
     end
     ::DataMapper::Model.append_inclusions self

data/lib/ixtlan/rails/migrations.rb

@@ -3,27 +3,33 @@ module Ixtlan
     class Migrations
 
       # assume no namespaces !!!
-      USER = Object.const_get(Ixtlan::Models::USER)
-      GROUP = Object.const_get(Ixtlan::Models::GROUP)
-      LOCALE = Object.const_get(Ixtlan::Models::LOCALE)
-      DOMAIN = Object.const_get(Ixtlan::Models::DOMAIN)
-      CONFIGURATION = Object.const_get(Ixtlan::Models::CONFIGURATION)
+      USER = Object.const_get(Ixtlan::Models::USER.sub(/^::/, ''))
+      GROUP = Object.const_get(Ixtlan::Models::GROUP.sub(/^::/, ''))
+      LOCALE = Object.const_get(Ixtlan::Models::LOCALE.sub(/^::/, ''))
+      DOMAIN = Object.const_get(Ixtlan::Models::DOMAIN.sub(/^::/, ''))
+      CONFIGURATION = Object.const_get(Ixtlan::Models::CONFIGURATION.sub(/^::/, ''))
+      TEXT = Object.const_get(Ixtlan::Models::TEXT.sub(/^::/, ''))
 
       def self.create_user
-        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
-        u.updated_at = u.created_at
-        u.created_by_id = 1
-        u.updated_by_id = 1
+        USER.auto_migrate!
+        LOCALE.auto_migrate!
+        GROUP.auto_migrate!
+        Ixtlan::Models::GroupUser.auto_migrate!
+        Ixtlan::Models::GroupLocaleUser.auto_migrate!
+        Ixtlan::Models::DomainGroupUser.auto_migrate!
+
+        u = USER.first
+        if u.nil?
+          u = USER.new(:login => 'root', :email => 'root@example.com', :name => 'Superuser', :id => 1)
+          u.created_at = DateTime.now
+          u.updated_at = u.created_at
+          u.created_by_id = 1
+          u.updated_by_id = 1
+          u.save!
+        end
         u.reset_password
-        u.save!
+        u.current_user = u
+        u.save
 
         g = GROUP.create(:name => 'root', :current_user => u)
         u.groups << g
@@ -38,18 +44,17 @@ module Ixtlan
         users = GROUP.create(:name => 'users', :current_user => u)
         locales = GROUP.create(:name => 'locales', :current_user => u)
         domains = GROUP.create(:name => 'domains', :current_user => u)
-        
-        File.open("root", 'w') { |f| f.puts "root\n#{u.password}\n\nadmin\n#{a.password}\n\n" }
+        File.open("root_#{RAILS_ENV}", 'w') { |f| f.puts "root\n#{u.password}\n\nadmin\n#{a.password}\n\n" }
       end
 
       def self.create_configuration
-        Ixtlan::Models::ConfigurationLocale.auto_upgrade!
-        CONFIGURATION.auto_upgrade!
+        Ixtlan::Models::ConfigurationLocale.auto_migrate!
+        CONFIGURATION.auto_migrate!
         CONFIGURATION.create(:session_idle_timeout => 10, :keep_audit_logs => 3, :current_user => USER.first)
       end
 
       def self.create_locale
-        LOCALE.auto_upgrade!
+        LOCALE.auto_migrate!
         # get/create default locale
         LOCALE.create(:code => LOCALE::DEFAULT, :current_user => USER.first)
         # get/create "every" locale
@@ -60,7 +65,7 @@ module Ixtlan
       end
 
       def self.create_domain
-        DOMAIN.auto_upgrade!
+        DOMAIN.auto_migrate!
         # get/create "every" domain
         DOMAIN.create(:name => DOMAIN::ALL, :current_user => User.first)
         
@@ -68,7 +73,7 @@ module Ixtlan
       end
 
       def self.create_text
-        I18nText.auto_upgrade!
+        TEXT.auto_migrate!
       end
     end
   end

data/lib/ixtlan/rails/unrestful_authentication.rb

@@ -97,7 +97,7 @@ module Rails
           authentication = AUTHENTICATION.new
           authentication.login = self.current_user.login
           authentication.user = self.current_user
-          authentication.token = form_authenticity_token
+          response.headers["authentication-token"] = form_authenticity_token
           render :xml => authentication.to_xml
         end
       end