ixtlan 0.2.1 → 0.2.2

data/Manifest.txt

@@ -7,6 +7,14 @@ generators/ixtlan_datamapper_rspec_scaffold/templates/controller.rb
 generators/ixtlan_datamapper_rspec_scaffold/templates/controller_spec.rb
 generators/ixtlan_datamapper_rspec_scaffold/templates/guard.rb
 generators/ixtlan_datamapper_rspec_scaffold/templates/i18n.rb
+generators/gwt_ixtlan_datamapper_rspec_scaffold/gwt_ixtlan_datamapper_rspec_scaffold_generator.rb
+generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Model.java
+generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/ModelFactory.java
+generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Fields.java
+generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Screen.java
+generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/TestGwt.java
+generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/GwtTestSuite.java
+generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/AbstractApplicationResourceTestGwt.java
 lib/models.rb
 lib/ixtlan.rb
 lib/dm-serializer.rb
@@ -27,11 +35,12 @@ lib/ixtlan/models/configuration_locale.rb
 lib/ixtlan/models/word.rb
 lib/ixtlan/models/configuration.rb
 lib/ixtlan/models/authentication.rb
-lib/ixtlan/models/text.rb
+lib/ixtlan/models/i18n_text.rb
 lib/ixtlan/models/group_user.rb
 lib/ixtlan/models/group.rb
 lib/ixtlan/rolling_file.rb
 lib/ixtlan/cms_script.rb
+lib/ixtlan/child_path.rb
 lib/ixtlan/logger_config.rb
 lib/ixtlan/models.rb
 lib/ixtlan/audit_config.rb
@@ -43,6 +52,7 @@ lib/ixtlan/optimistic_persistence_module.rb
 lib/ixtlan/optimistic_persistence_validation.rb
 lib/ixtlan/error_notifier/error_notification.rhtml
 lib/ixtlan/controllers/texts_controller.rb
+lib/ixtlan/controllers/phrases_controller.rb
 lib/ixtlan/controllers/permissions_controller.rb
 lib/ixtlan/controllers/authentications_controller.rb
 lib/ixtlan/controllers/configurations_controller.rb

data/Rakefile

@@ -24,15 +24,32 @@ end
 desc 'generate rails using all generators and run the specs'
 task :integration_tests => [:spec, :install] do
   require 'datamapper4rails/integration_test'
-  Datamapper4Rails::IntegrationTest.new do |t|
+  tests = Datamapper4Rails::IntegrationTest.new do |t|
     t.directory = 'temp'
+    ENV['GWT'] = "true"
     t.rails_template = 'ixtlan_rails_templates.rb'
     t.generate "ixtlan_datamapper_model name name:string"
     t.generate "ixtlan_datamapper_rspec_model domain name:string"
-    t.generate "ixtlan_datamapper_rspec_scaffold word name:string"
-  end
+    t.generate "ixtlan_datamapper_rspec_scaffold player name:string"
+    t.generate "gwt_ixtlan_datamapper_rspec_scaffold word name:string"
+   end
+   tests.command("mvn clean integration-test")
 end
 
 YARD::Rake::YardocTask.new
 
+module Datamapper4Rails
+  class IntegrationTest
+    def command(command) 
+      FileUtils.cd(@directory) do
+      unless system("#{command}")
+        puts
+        puts "error in: #{command}"
+        exit 1
+      end
+    end
+    end
+  end
+end
+
 # vim: syntax=Ruby

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/gwt_ixtlan_datamapper_rspec_scaffold_generator.rb

@@ -0,0 +1,157 @@
+require 'datamapper4rails/overlay'
+require 'datamapper4rails/rspec_default_values'
+
+class String
+  def javanize
+    s = camelize
+    s[0,1].downcase! + s[1,1000]
+  end
+end
+
+class GwtIxtlanDatamapperRspecScaffoldGenerator < IxtlanDatamapperRspecScaffoldGenerator
+
+  attr_reader :package
+
+  def find_client_dir(dir)
+    dir.entries.each do |entry|
+      path = File.join(dir.path, entry)
+      if File.directory? path 
+        if entry == "client"
+          return path
+        elsif entry != ".." && entry != "."
+          return find_client_dir(Dir.new(path))
+        end
+      end
+    end
+    nil
+  end
+
+  def manifest
+    overlay_dirs.add_generator("ixtlan_datamapper_rspec_scaffold")
+
+    m = super
+
+    base = "src/main/java/"
+      
+    basedir = find_client_dir(Dir.new(base))
+    basedir_test = basedir.sub(/main/, 'test')
+
+    @package = basedir.sub(/#{base}/, "").gsub(/\//, ".")
+
+    m.directory(File.join(basedir, 'models', controller_class_path))
+    m.template 'Model.java', File.join(basedir, 'models', controller_class_path, "#{class_name}.java")
+    m.template 'ModelFactory.java', File.join(basedir, 'models', controller_class_path, "#{class_name}Factory.java")
+
+    m.directory(File.join(basedir, 'views', controller_class_path, controller_file_name))
+
+    m.template 'Fields.java', File.join(basedir, 'views', controller_class_path, controller_file_name, "#{class_name}Fields.java")
+    m.template 'Screen.java', File.join(basedir, 'views', controller_class_path, controller_file_name, "#{class_name}Screen.java")
+
+    m.directory(File.join(basedir_test, 'models', controller_class_path))
+    m.template 'AbstractApplicationResourceTestGwt.java', File.join(basedir_test, 'models', controller_class_path, "AbstractApplicationResourceTestGwt.java")
+    m.template 'TestGwt.java', File.join(basedir_test, 'models', controller_class_path, "#{class_name}TestGwt.java")
+    suiteFile = File.join(basedir_test, controller_class_path, "GwtTestSuite.java")
+    unless File.exists?(suiteFile)
+      m.template 'GwtTestSuite.java', suiteFile
+    end
+    m.add_testcase @package, suiteFile, class_name
+    m.add_screen File.join(basedir, "Application.java"), @package, class_name, singular_name, plural_name
+
+    m
+  end
+
+end
+
+module Rails
+  module Generator
+    module Commands
+      class Create < Base
+
+        def route_resources(*resources)
+          unless options[:pretend]
+            resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
+            skip_route = false
+            gsub_file 'config/routes.rb', /(map.resources #{resource_list})/mi do |match|
+              skip_route = true
+              "#{match}"
+            end
+            sentinel = 'ActionController::Routing::Routes.draw do |map|'
+            
+            logger.route "map.resources #{resource_list}" +  (skip_route ? " - skipped" : " - added")
+            unless skip_route
+              gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+                "#{match}\n  map.resources #{resource_list}\n"
+              end
+            end
+          end
+        end
+
+        def add_testcase(package, suite_file, class_name)
+          unless options[:pretend]
+            skip_testcase = false
+            gsub_file suite_file, /(import #{package}.models.#{class_name}TestGwt;)/mi do |match|
+              skip_testcase = true
+              "#{match}"
+            end
+            logger.testcase(class_name + "TestGwt" + (skip_testcase ? " - skipped" : " - added"))
+            unless skip_testcase
+              gsub_file suite_file, /(^package\s+[a-z.]*;)/mi do |match|
+                "#{match}\n\nimport #{package}.models.#{class_name}TestGwt;"
+              end
+              gsub_file suite_file, /(^\s+return suite;)/mi do |match|
+                "        suite.addTestSuite(#{class_name}TestGwt.class);\n#{match}"
+              end
+            end
+          end
+        end
+
+        def add_screen(application_file, java_package, class_name, singular_name, plural_name)
+          unless options[:pretend]
+            variable = "#{class_name[0,1].downcase}#{class_name[1,100]}"
+            skip_screen = false
+            gsub_file application_file, /(import #{java_package}.models.#{class_name}Factory;)/mi do |match|
+              skip_screen = true
+              "#{match}"
+            end
+            logger.screen(class_name + "Screen" + (skip_screen ? " - skipped" : " - added"))
+            unless skip_screen
+              skip_binding = false
+              gsub_file application_file, /(import de.saumya.gwt.translation.common.client.widget.ResourceBindings;)/mi do |match|
+                skip_binding = true
+                "#{match}"
+              end
+              unless skip_binding
+                gsub_file application_file, /(^package\s+[a-z.]*;)/mi do |match|
+                  "#{match}\n\nimport de.saumya.gwt.translation.common.client.widget.ResourceBindings;"
+                end
+              end
+              gsub_file application_file, /(^package\s+[a-z.]*;)/mi do |match|
+                "#{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}\");"
+              end
+            end
+          end
+        end
+      end
+    end
+    class GeneratedAttribute
+      def sample_value(first = true)
+        value = (first ? @first_value : @second_value)
+        value ||= case type
+          when :int, :integer               then first ? "1" :  "2"
+          when :float                       then first ? "1.5" : "2.5"
+          when :decimal, :big_decimal       then first ? "9.99" : "3.33"
+          when :date_time, :datetime,
+                          :timestamp, :time then first ? "2009-09-09 09:09:09.0" : "2010-10-10 10:10:10.0"
+          when :date                        then first ? "2009-09-09" : "2010-10-10"
+          when :string, :text               then first ? "first valule of #{@name}" : "second value of #{name}"
+          when :boolean                     then first ? "false" : "true"
+          else
+            ""
+        end
+      end
+    end
+  end
+end

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/AbstractApplicationResourceTestGwt.java

@@ -0,0 +1,13 @@
+package <%= package %>.models;
+
+import de.saumya.gwt.persistence.client.Resource;
+import de.saumya.gwt.session.client.AbstractUserResourceTestGwt;
+
+abstract class AbstractApplicationResourceTestGwt<E extends Resource<E>>
+        extends AbstractUserResourceTestGwt<E> {
+
+    @Override
+    public String getModuleName() {
+        return "<%= package.sub(/\.client/, '') %>.Application";
+    }
+}

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Fields.java

@@ -0,0 +1,43 @@
+/**
+ *
+ */
+package <%= package %>.views.<%= plural_name %>;
+
+import <%= package %>.models.<%= class_name %>;
+
+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;
+import de.saumya.gwt.translation.gui.client.bindings.CheckBoxBinding;
+import de.saumya.gwt.translation.gui.client.bindings.IntegerTextBoxBinding;
+import de.saumya.gwt.translation.gui.client.bindings.TextBoxBinding;
+
+public class <%= class_name %>Fields extends ResourceFields<<%= class_name %>> {
+
+    public <%= class_name %>Fields(final GetTextController getTextController,
+            final ResourceBindings<<%= class_name %>> bindings) {
+        super(getTextController, bindings);
+<% Array(attributes).each do |attribute| -%>
+        add("<%= attribute.name %>", new <% if attribute.type == :integer %>IntegerText<% elsif attribute.type == :boolean %>Check<% else %>Text<% end -%>BoxBinding<<%= class_name %>>() {
+
+            @Override
+            public void pullFrom(final <%= class_name %> resource) {
+<% if attribute.type == :boolean -%>
+                setValue(resource.<%= attribute.name.javanize %>);
+<% else -%>
+                setText(resource.<%= attribute.name.javanize %>);
+<% end -%>
+            }
+
+            @Override
+            public void pushInto(final <%= class_name %> resource) {
+<% if attribute.type == :boolean -%>
+                resource.<%= attribute.name.javanize %> = getValue();
+<% else -%>
+                resource.<%= attribute.name.javanize %> = getText<% if attribute.type == :integer %>AsInt<% end -%>();
+<% end -%>
+            }
+        }<% if attribute.type == :integer %>, 0, 123456<% elsif attribute.type == :boolean %><% else %>, true, 64<% end -%>);
+<% end -%>
+    }
+}

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/GwtTestSuite.java

@@ -0,0 +1,14 @@
+package <%= package %>;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import com.google.gwt.junit.tools.GWTTestSuite;
+
+public class GwtTestSuite extends GWTTestSuite {
+
+    public static Test suite() {
+        final TestSuite suite = new TestSuite("Test for GWT Application");
+        return suite;
+    }
+}

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Model.java

@@ -0,0 +1,103 @@
+/**
+ * 
+ */
+package <%= package %>.models;
+
+<% if Array(attributes).find { |attr| attr.type == :date } -%>
+import java.sql.Date;
+<% end -%>
+<% if Array(attributes).find { |attr| attr.type == :timestamp } || ! options[:skip_timestamps] -%>
+import java.sql.Timestamp;
+<% end -%>
+
+import com.google.gwt.xml.client.Element;
+
+import de.saumya.gwt.persistence.client.Repository;
+import de.saumya.gwt.persistence.client.ResourceWithID;
+<% 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 %>> {
+
+<% 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);
+<% unless options[:skip_modified_by] -%>
+        this.userFactory = userFactory;
+<% end -%>
+    }
+
+<% Array(attributes).each do |attribute| -%>
+    public <% if attribute.type == :date %>Date     <% elsif attribute.type == :integer %>int      <% elsif attribute.type == :boolean %>boolean  <% else %>String   <% end -%> <%= attribute.name.javanize %>;
+<% end -%>
+<% unless options[:skip_timestamps] -%>
+    public Timestamp createdAt;
+    public Timestamp updatedAt;
+<% end -%>
+<% unless options[:skip_modified_by] -%>
+    public User      createdBy;
+    public User      updatedBy;
+<% end -%>
+
+    @Override
+    protected void appendXml(final StringBuilder buf) {
+        super.appendXml(buf);
+<% Array(attributes).each do |attribute| -%>
+        appendXml(buf, "<%= attribute.name %>", this.<%= attribute.name.javanize %>);
+<% end -%>
+<% unless options[:skip_timestamps] -%>
+        appendXml(buf, "created_at", this.createdAt);
+        appendXml(buf, "updated_at", this.updatedAt);
+<% end -%>
+<% unless options[:skip_modified_by] -%>
+        appendXml(buf, "created_by", this.createdBy);
+        appendXml(buf, "updated_by", this.updatedBy);
+<% end -%>
+    }
+
+    @Override
+    protected void fromXml(final Element root) {
+        super.fromXml(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 -%>
+<% unless options[:skip_timestamps] -%>
+        this.createdAt = getTimestamp(root, "created_at");
+        this.updatedAt = getTimestamp(root, "updated_at");
+<% end -%>
+<% unless options[:skip_modified_by] -%>
+        this.createdBy = this.userFactory.getChildResource(root, "created_by");
+        this.updatedBy = this.userFactory.getChildResource(root, "updated_by");
+<% end -%>
+    }
+
+    @Override
+    public void toString(final StringBuilder buf) {
+        super.toString(buf);
+<% Array(attributes).each do |attribute| -%>
+        toString(buf, "<%= attribute.name %>", this.<%= attribute.name.javanize %>);
+<% end -%>
+<% unless options[:skip_timestamps] -%>
+        toString(buf, "created_at", this.createdAt);
+        toString(buf, "updated_at", this.updatedAt);
+<% end -%>
+<% unless options[:skip_modified_by] -%>
+        toString(buf, "created_by", this.createdBy);
+        toString(buf, "updated_by", this.updatedBy);
+<% end -%>
+    }
+
+    @Override
+    public String display() {
+        final StringBuilder builder = new StringBuilder("<%= class_name %>");
+        builder.append("(").append(this.id).append(")");
+        return builder.toString();
+    }
+
+}

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/ModelFactory.java

@@ -0,0 +1,50 @@
+/**
+ * 
+ */
+package <%= package %>.models;
+
+
+import de.saumya.gwt.persistence.client.Repository;
+import de.saumya.gwt.persistence.client.ResourceFactory;
+import de.saumya.gwt.persistence.client.ResourceNotifications;
+
+<% unless options[:skip_modified_by] -%>
+import de.saumya.gwt.session.client.models.UserFactory;
+<% end -%>
+
+public class <%= class_name %>Factory extends ResourceFactory<<%= class_name %>> {
+
+<% unless options[:skip_modified_by] -%>
+    private final UserFactory userFactory;
+
+<% end -%>
+    public <%= class_name %>Factory(final Repository repository,
+            final ResourceNotifications notifications<% unless options[:skip_modified_by] -%>,
+            final UserFactory userFactory<% end -%>) {
+        super(repository, notifications);
+<% unless options[:skip_modified_by] -%>
+        this.userFactory = userFactory;
+<% end -%>
+    }
+
+    @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 -%>);
+    }
+
+    @Override
+    public String storageName() {
+        return "<%= singular_name %>";
+    }
+
+    @Override
+    public String defaultSearchParameterName() {
+        return null;
+    }
+
+}

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Screen.java

@@ -0,0 +1,60 @@
+/**
+ * 
+ */
+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.LoadingNotice;
+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;
+import de.saumya.gwt.translation.common.client.widget.ResourceCollectionPanel;
+import de.saumya.gwt.translation.common.client.widget.ResourceHeaderPanel;
+import de.saumya.gwt.translation.common.client.widget.ResourcePanel;
+import de.saumya.gwt.translation.common.client.widget.ResourceScreen;
+
+public class <%= class_name %>Screen extends ResourceScreen<<%= class_name %>> {
+
+    private static class <%= class_name %>Headers extends ResourceHeaderPanel<<%= class_name %>> {
+
+        public <%= class_name %>Headers(final GetTextController getTextController) {
+            super(getTextController);
+        }
+
+        public void reset(final <%= class_name %> resource) {
+            reset(resource, <% if options[:skip_timestamps] %>null<% else %>resource.updatedAt<% end -%>, <% if options[:skip_modified_by] %>null<% else %>resource.updatedBy<% end -%>);
+        }
+    }
+
+    public <%= class_name %>Screen(final LoadingNotice loadingNotice,
+            final GetTextController getTextController,
+            final <%= class_name %>Factory factory, final Session session,
+            final ResourceBindings<<%= class_name %>> bindings,
+            final ResourceNotifications notifications) {
+        super(loadingNotice,
+                factory,
+                session,
+               new ResourcePanel<<%= class_name %>>(new <%= class_name %>Headers(getTextController),
+                       new <%= class_name %>Fields(getTextController, bindings)),
+                new ResourceCollectionPanel<<%= class_name %>>(loadingNotice,
+                        new ResourceCollectionNavigation<<%= class_name %>>(loadingNotice,
+                                factory,
+                                getTextController),
+                        new ResourceCollectionListing<<%= class_name %>>(session,
+                                factory,
+                                getTextController)),
+                new DefaultResourceActionPanel<<%= class_name %>>(getTextController,
+                        bindings,
+                        session,
+                        factory,
+                        notifications),
+                notifications);
+    }
+
+}

data/generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/TestGwt.java

@@ -0,0 +1,110 @@
+/**
+ * 
+ */
+package <%= package %>.models;
+
+import de.saumya.gwt.persistence.client.Resource;
+import de.saumya.gwt.persistence.client.ResourceFactory;
+
+/**
+ * GWT JUnit tests must extend GWTTestCase.
+ */
+public class <%= class_name %>TestGwt extends AbstractApplicationResourceTestGwt<<%= class_name %>> {
+
+
+    private <%= class_name %> resource;
+
+    private static final String RESOURCE_XML = "<<%= singular_name%>>"
+                                                     + "<id>1</id>"
+<% Array(attributes).each do |attribute| -%>
+                                                     + "<<%= attribute.name %>><%= attribute.sample_value %></<%= attribute.name %>>"
+<% end -%>
+<% unless options[:skip_timestamps] -%>
+                                                     + "<created_at>2009-07-09 17:14:48.0</created_at>"
+                                                     + "<updated_at>2009-07-09 17:14:48.0</updated_at>"
+<% end -%>
+                                                     + "</<%= singular_name%>>";
+
+    @Override
+    protected String resourceNewXml() {
+        return RESOURCE_XML<% unless options[:skip_timestamps] -%>.replaceFirst("<created_at>[0-9-:. ]*</created_at>", "").replaceFirst("<updated_at>[0-9-:. ]*</updated_at>", "")<% end -%>.replace("<id>1</id>", "");
+    }
+
+    @Override
+    protected String resource1Xml() {
+        return RESOURCE_XML;
+    }
+
+    @Override
+    protected String resource2Xml() {
+        return RESOURCE_XML.replace(">1<", ">2<");
+    }
+
+    @Override
+    protected String resourcesXml() {
+        return "<<%= plural_name %>>" + resource1Xml() + resource2Xml() + "</<%= plural_name %>>";
+    }
+
+    @Override
+    protected ResourceFactory<<%= class_name %>> factorySetUp() {
+        return new <%= class_name %>Factory(this.repository,
+					    this.notifications<% unless options[:skip_modified_by] -%>, this.userFactory<% end -%>);
+    }
+
+    @Override
+    protected Resource<<%= class_name %>> resourceSetUp() {
+        this.resource = this.factory.newResource();
+
+        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 -%>;
+
+        this.repository.addXmlResponse(RESOURCE_XML);
+
+        this.resource.save();
+
+        return this.resource;
+    }
+
+    @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 -%>);
+    }
+
+    @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.save();
+        assertEquals(this.resource.<%= attributes.first.name.javanize %><% if [:date, :time, :date_time].member? attributes.first.type  %>.toString()<% end -%>, changedValue());
+    }
+
+    private final static String XML = "<<%= singular_name%>>"
+                                            + "<id>1</id>"
+<% Array(attributes).each do |attribute| -%>
+                                            + "<<%= attribute.name %>><%= attribute.sample_value %></<%= attribute.name %>>"
+<% end -%>
+<% unless options[:skip_timestamps] -%>
+                                            + "<created_at>2009-07-09 17:14:48.0</created_at>"
+                                            + "<updated_at>2007-07-09 17:14:48.0</updated_at>"
+<% end -%>
+                                            + "</<%= singular_name%>>";
+
+    @Override
+    protected String changedValue() {
+        return "<%= attributes.first.sample_value(false) %>";
+    }
+
+    @Override
+    protected String keyValue() {
+        return "1";
+    }
+
+    @Override
+    protected String marshallingXml() {
+        return XML;
+    }
+
+    @Override
+    protected String value() {
+        return "<%= attributes.first.sample_value %>";
+    }
+}

data/generators/ixtlan_datamapper_model/templates/model.rb

@@ -12,6 +12,15 @@ class <%= class_name %>
 
 <% unless options[:skip_modified_by] -%>
   modified_by "Ixtlan::Models::User"
+
+  require 'dm-serializer'
+  alias :to_x :to_xml_document
+  def to_xml_document(opts = {}, doc = nil)
+    unless(opts[:methods])
+      opts.merge!({:methods => [:updated_by], :updated_by => {:methods => [], :exclude => [:created_at, :updated_at]}})
+    end
+    to_x(opts, doc)
+  end
 <% end -%>
 
 end

data/lib/dm-serializer/to_xml.rb

@@ -37,7 +37,9 @@ module DataMapper
           value = __send__(meth)
           unless value.nil?
             if value.respond_to?(:to_xml_document)
-              xml.add_xml(root, value.__send__(:to_xml_document, value.is_a?(DataMapper::Collection) ? {:collection_element_name => xml_name} : {:element_name => xml_name}))
+              options = value.is_a?(DataMapper::Collection) ? {:collection_element_name => xml_name} : {:element_name => xml_name}
+              options.merge!(opts[meth] || {})
+              xml.add_xml(root, value.__send__(:to_xml_document, options))
             else
               xml.add_node(root, xml_name, value.to_s)
             end

data/lib/ixtlan/child_path.rb

@@ -0,0 +1,18 @@
+module Ixtlan
+  class ChildPath
+    def initialize(app, rootpath)
+      @app = app
+      @rootpath = rootpath
+    end
+    
+    def call(env)
+      ['REQUEST_PATH','PATH_INFO','REQUEST_URI','SCRIPT_NAME'].each do |key|
+        if(env[key] =~ /[.]xml$/)
+          env[key].gsub!(/^\/#{@rootpath}/, "")
+        end
+      end
+      @app.call(env)
+    end
+  
+  end
+end

data/lib/ixtlan/controllers/phrases_controller.rb

@@ -0,0 +1,149 @@
+module Ixtlan
+  module Controllers
+    module PhrasesController
+      
+      LOCALE = Object.full_const_get(::Ixtlan::Models::LOCALE)
+      TEXT = Object.full_const_get(::Ixtlan::Models::TEXT)
+      
+      def index
+        version = params[:version]
+        
+        locale = if params[:locale] 
+                   LOCALE.get!(params[:locale]) 
+                 else
+                   LOCALE.default
+                 end
+
+        phraseMap = {}
+        Ixtlan::Models::Word.not_approved(:locale => Locale.default).each do |word|
+          phraseMap[word.code] = word_to_phrase(word, :text)
+        end
+        Ixtlan::Models::Word.latest_approved(:locale => Locale.default).each do |word|
+          phrase = phraseMap[word.code]
+          if phrase
+            merge_word_into_phrase(word, phrase)
+          else
+            phraseMap[word.code] = word_to_phrase(word, :current_text)
+          end
+        end
+        phrases = ::DataMapper::Collection.new(::DataMapper::Query.new(repository, ::Ixtlan::Models::Phrase), [])
+        phraseMap.each { |k,v| phrases << v }
+        render :xml => phrases.to_xml
+      end
+
+      
+      def show
+        word = Ixtlan::Models::Word.not_approved(:locale => Locale.default, :code => params[:id]).first
+        if word
+          phrase = word_to_phrase(word, :text) 
+          word = Ixtlan::Models::Word.latest_approved(:locale => Locale.default, :code => params[:id]).first
+          merge_word_into_phrase(word, phrase) if word
+        else
+          word = Ixtlan::Models::Word.latest_approved(:locale => Locale.default, :code => params[:id]).first
+          phrase = word_to_phrase(word, :current_text) 
+        end
+        render :xml => phrase.to_xml
+      end
+
+      def create
+        phrase = params[:phrase]
+        
+        # load the locale and delete the locale parameter array
+        locale = LOCALE.get!(phrase.delete(:locale)[:code])
+        
+        if(TEXT.count(:version => nil, :code => phrase[:code], :locale => locale) == 1)
+          logger.warn "precondition failed: " + phrase.inspect
+          # mimic created action by just loading it
+          render :xml => TEXT.first(:version => nil, :code => phrase[:code], :locale => locale).to_xml, :status => :created
+          return
+        end
+        
+        phrase[:text] ||= phrase.delete(:current_text)
+        
+        @text = TEXT.new(phrase)
+        if(TEXT.count(:code => phrase[:code], :locale => locale) == 0)
+          approve_it = true
+        end
+        
+        # set the missing attributes
+        @text.locale = locale
+        @text.current_user = current_user
+        
+        respond_to do |format|
+          success = @text.save 
+          if success && approve_it
+            @text.current_user = current_user
+            success = @text.approve
+          end
+          if success
+            flash[:notice] = 'Text was successfully created.'
+            format.html { redirect_to(text_url(@text.id)) }
+            format.xml  { render :xml => @text, :status => :created }
+          else
+            format.html { render :action => "new" }
+            format.xml  { render :xml => @text.errors, :status => :unprocessable_entity }
+          end
+        end
+      end
+      
+      def update
+        new_text = params[:phrase][:text]
+        word = Ixtlan::Models::Text.not_approved(:locale => Locale.default, :code => params[:id]).first
+        if word
+          phrase = word_to_phrase(word, :text) 
+          word_approved = Ixtlan::Models::Word.latest_approved(:locale => Locale.default, :code => params[:id]).first
+          merge_word_into_phrase(word_approved, phrase) if word_approved
+        else
+          # take the latest approved text for the given code and create a new
+          # text without version (!= not_approved text) for the given code
+          word = Ixtlan::Models::Text.latest_approved(:locale => Locale.default, :code => params[:id]).first
+          phrase = word_to_phrase(word, :current_text) 
+          word = Ixtlan::Models::Text.new(:code => params[:id], :locale => Locale.default)
+        end
+
+        phrase.text = new_text
+
+        word.text = new_text
+        word.current_user = current_user
+        if word.save
+          render :xml => phrase, :status => :ok
+        else
+          render :xml => word.errors, :status => :unprocessable_entity
+        end
+        
+      end
+
+      def approve
+        word = Ixtlan::Models::Text.not_approved(:locale => Locale.default, :code => params[:id]).first
+        if word
+          word.current_user = current_user
+          if word.approve
+            word = nil
+          else
+            render :xml => word.errors, :status => :unprocessable_entity
+          end
+        end
+        
+        # if there was no unapproved word or approval succeeded render 
+        # the latest approved word
+        unless word
+          word = Ixtlan::Models::Word.latest_approved(:locale => Locale.default, :code => params[:id]).first
+          phrase = word_to_phrase(word, :current_text) 
+          render :xml => phrase.to_xml, :status => :ok
+        end
+      end
+
+      private
+
+      def merge_word_into_phrase(word, phrase)
+        phrase.current_text = word.text
+        #    phrase.approved_by = word.updated_by
+        #    phrase.approved_at = word.updated_at
+      end
+
+      def word_to_phrase(word, text_field)
+        Ixtlan::Models::Phrase.new(:code => word.code, text_field => word.text, :updated_by => word.updated_by, :updated_at => word.updated_at, :locale => LOCALE.default)
+      end
+    end
+  end
+end

data/lib/ixtlan/controllers/texts_controller.rb

@@ -27,7 +27,7 @@ module Ixtlan
 
         if(TEXT.count(:version => nil, :code => phrase[:code], :locale => locale) == 1)
           logger.warn "precondition failed: " + phrase.inspect
-          # mimic created action
+          # mimic created action by just loading it
           render :xml => TEXT.first(:version => nil, :code => phrase[:code], :locale => locale).to_xml, :status => :created
           return
         end
@@ -35,13 +35,21 @@ module Ixtlan
         phrase[:text] ||= phrase.delete(:current_text)
 
         @text = TEXT.new(phrase)
+        if(TEXT.count(:code => phrase[:code], :locale => locale) == 0)
+          approve_it = true
+        end
 
         # set the missing attributes
         @text.locale = locale
         @text.current_user = current_user
 
         respond_to do |format|
-          if @text.save
+          success = @text.save 
+          if success && approve_it
+            @text.current_user = current_user
+            success = @text.approve
+          end
+          if success
             flash[:notice] = 'Text was successfully created.'
             format.html { redirect_to(text_url(@text.id)) }
             format.xml  { render :xml => @text, :status => :created }

data/lib/ixtlan/guard.rb

@@ -63,11 +63,27 @@ module Ixtlan
         logger.warn("guard directory #{guard_dir} not found, skip loading")
       end
     end
+
+    def self.symbolize(h)
+      result = {}
+      
+      h.each do |k, v|
+        if v.is_a?(Hash)
+          result[k.to_sym] = symbolize_keys(v) unless v.size == 0
+        elsif v.is_a?(Array)
+          val = []
+          v.each {|vv| val << vv.to_sym }
+          result[k.to_sym] = val
+        end
+      end
+      
+      result
+    end
     
     def self.initialize(controller, map)
       msg = map.collect{ |k,v| "\n\t#{k} => [#{v.join(',')}]"}
       @@logger.debug("#{controller} guard: #{msg}")
-      @@map[controller] = map
+      @@map[controller.to_sym] = symbolize(map)
     end
 
     def self.export_xml

data/lib/ixtlan/logger_config.rb

@@ -2,6 +2,7 @@
 require 'slf4r/logging_logger'
 
 require 'ixtlan/rolling_file'
+require 'ixtlan/audit_config'
 
 module Ixtlan
   class LoggerConfig

data/lib/ixtlan/models/{text.rb → i18n_text.rb}

@@ -1,6 +1,6 @@
 module Ixtlan
   module Models
-    class Text
+    class I18nText
       include DataMapper::Resource
 
       def self.default_storage_name
@@ -98,14 +98,15 @@ 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 !!!
         params[:approved_at] = attribute_get(:updated_at)
-        params[:approved_by] = params[:current_user]
+        params[:approved_by] = params[:current_user] || current_user
         
         p = (previous.nil? ? true : previous.update(:previous => false,
-                                                    :current_user => params[:current_user]))
+                                                    :current_user => params[:current_user] || current_user))
         l = (latest.nil? ? true : latest.update(:current => false, 
                                                 :previous => true,
-                                                :current_user => params[:current_user]))
+                                                :current_user => params[:current_user] || current_user))
         u = update(params)
         
         u && l && p

data/lib/ixtlan/models/phrase.rb

@@ -35,11 +35,11 @@ module Ixtlan
         phrases = ::DataMapper::Collection.new(::DataMapper::Query.new(self.repository, Ixtlan::Models::Phrase), [])
         map = {}
         locale = (args[:locale] ||= Locale.default)
-        Text.not_approved(args.dup).each do |text|
+        I18nText.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
-        Text.latest_approved(args.dup).each do |text|
+        I18nText.latest_approved(args.dup).each do |text|
           if (phrase = map[text.code])
             phrase.current_text = text.text
           else

data/lib/ixtlan/models/translation.rb

@@ -19,10 +19,10 @@ module Ixtlan
       
       def self.map_for(args = {})
         map = {}
-        Text.latest_approved(args.dup).each do |text|
+        I18nText.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
-        Text.second_latest_approved(args.dup).each do |text|
+        I18nText.second_latest_approved(args.dup).each do |text|
           translation = map[text.code]
           translation.previous_text = text.text
         end

data/lib/ixtlan/models/user.rb

@@ -1,4 +1,4 @@
-require 'digest'
+require 'digest/sha1'
 require 'base64'
 require 'ixtlan/modified_by'
 require 'dm-serializer'

data/lib/ixtlan/models/word.rb

@@ -1,6 +1,6 @@
 module Ixtlan
   module Models
-    class Word < Text
+    class Word < Ixtlan::Models::I18nText
 
       alias :to_x :to_xml_document
       def to_xml_document(opts, doc = nil)

data/lib/ixtlan/models.rb

@@ -8,6 +8,6 @@ module Ixtlan
     LOCALE = "::Ixtlan::Models::Locale" unless const_defined? "LOCALE"
     CONFIGURATION = "::Ixtlan::Models::Configuration" unless const_defined? "CONFIGURATION"
     TRANSLATION = "::Ixtlan::Models::Translation" unless const_defined? "TRANSLATION"
-    TEXT = "::Ixtlan::Models::Text" unless const_defined? "TEXT"
+    TEXT = "::Ixtlan::Models::I18nText" unless const_defined? "TEXT"
   end
 end

data/lib/ixtlan/rails/error_handling.rb

@@ -1,9 +1,10 @@
+require 'ixtlan/user_logger'
 module Ixtlan
   module Rails
     module ErrorHandling
 
       def log_user_error(exception)
-        UserLogger.new(Ixtlan::Rails::ErrorHandling).log_action(self, " - #{exception.class} - #{exception.message}")
+        Ixtlan::UserLogger.new(Ixtlan::Rails::ErrorHandling).log_action(self, " - #{exception.class} - #{exception.message}")
         log_error(exception)
       end
 

data/lib/ixtlan/rails/unrestful_authentication.rb

@@ -9,7 +9,7 @@ module Rails
     AUTHENTICATION = Object.full_const_get(Ixtlan::Models::AUTHENTICATION)
 
     def authentication_logger
-      @authentication_logger ||= UserLogger.new(Ixtlan::Rails::UnrestfulAuthentication)
+      @authentication_logger ||= Ixtlan::UserLogger.new(Ixtlan::Rails::UnrestfulAuthentication)
     end
 
     protected

data/lib/ixtlan/version.rb

@@ -1,3 +1,3 @@
 class Ixtlan
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/lib/models.rb

@@ -3,12 +3,17 @@ require 'dm-timestamps'
 require 'dm-validations'
 require 'dm-serializer'
 require 'ixtlan/models'
+load 'ixtlan/models/authentication.rb'
 load 'ixtlan/models/user.rb'
 load 'ixtlan/models/group_locale_user.rb'
 load 'ixtlan/models/group.rb'
 load 'ixtlan/models/group_user.rb'
 load 'ixtlan/models/locale.rb'
 load 'ixtlan/models/permission.rb'
+load 'ixtlan/models/i18n_text.rb'
+load 'ixtlan/models/word.rb'
+load 'ixtlan/models/phrase.rb'
+load 'ixtlan/models/translation.rb'
 load 'ixtlan/models/role.rb'
 load 'ixtlan/models/configuration.rb'
 load 'ixtlan/models/configuration_locale.rb'

data/spec/spec_helper.rb

@@ -20,7 +20,7 @@ require 'ixtlan' / 'models' / 'group_user'
 require 'ixtlan' / 'models' / 'group_locale_user'
 require 'ixtlan' / 'models' / 'permission'
 require 'ixtlan' / 'models' / 'role'
-require 'ixtlan' / 'models' / 'text'
+require 'ixtlan' / 'models' / 'i18n_text'
 require 'ixtlan' / 'passwords'
 require 'ixtlan' / 'digest'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ixtlan
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - mkristian
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-18 00:00:00 +05:30
+date: 2010-02-03 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,6 +122,14 @@ files:
 - generators/ixtlan_datamapper_rspec_scaffold/templates/controller_spec.rb
 - generators/ixtlan_datamapper_rspec_scaffold/templates/guard.rb
 - generators/ixtlan_datamapper_rspec_scaffold/templates/i18n.rb
+- generators/gwt_ixtlan_datamapper_rspec_scaffold/gwt_ixtlan_datamapper_rspec_scaffold_generator.rb
+- generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Model.java
+- generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/ModelFactory.java
+- generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Fields.java
+- generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/Screen.java
+- generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/TestGwt.java
+- generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/GwtTestSuite.java
+- generators/gwt_ixtlan_datamapper_rspec_scaffold/templates/AbstractApplicationResourceTestGwt.java
 - lib/models.rb
 - lib/ixtlan.rb
 - lib/dm-serializer.rb
@@ -142,11 +150,12 @@ files:
 - lib/ixtlan/models/word.rb
 - lib/ixtlan/models/configuration.rb
 - lib/ixtlan/models/authentication.rb
-- lib/ixtlan/models/text.rb
+- lib/ixtlan/models/i18n_text.rb
 - lib/ixtlan/models/group_user.rb
 - lib/ixtlan/models/group.rb
 - lib/ixtlan/rolling_file.rb
 - lib/ixtlan/cms_script.rb
+- lib/ixtlan/child_path.rb
 - lib/ixtlan/logger_config.rb
 - lib/ixtlan/models.rb
 - lib/ixtlan/audit_config.rb
@@ -158,6 +167,7 @@ files:
 - lib/ixtlan/optimistic_persistence_validation.rb
 - lib/ixtlan/error_notifier/error_notification.rhtml
 - lib/ixtlan/controllers/texts_controller.rb
+- lib/ixtlan/controllers/phrases_controller.rb
 - lib/ixtlan/controllers/permissions_controller.rb
 - lib/ixtlan/controllers/authentications_controller.rb
 - lib/ixtlan/controllers/configurations_controller.rb