resty-generators 0.5.3 → 0.6.0

data/lib/generators/resty/templates/View.ui.xml~

@@ -0,0 +1,17 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder
+  xmlns:ui="urn:ui:com.google.gwt.uibinder"
+  xmlns:g="urn:import:com.google.gwt.user.client.ui">
+
+  <ui:style>
+  </ui:style>
+
+  <g:SimplePanel>
+    <g:VerticalPanel>
+      <g:HorizontalPanel>
+        <g:Button ui:field="showButton">Show</g:Button>
+      </g:HorizontalPanel>
+      <g:HTML ui:field="modelsTable"/>
+    </g:VerticalPanel>
+  </g:SimplePanel>
+</ui:UiBinder>

data/lib/generators/resty/templates/ViewImpl.java

@@ -1,23 +1,20 @@
 package <%= views_package %>;
 
-<% unless options[:singleton] -%>
+<% if !options[:singleton] || attributes.detect { |a| a.type == :belongs_to} -%>
 import java.util.List;
 
 <% end -%>
-<% if options[:timestamps] -%>
-import <%= gwt_rails_package %>.views.<% unless options[:singleton] -%>Identifyable<% end -%>TimestampedView;<% else -%><% unless options[:singleton] -%>
-import <%= gwt_rails_package %>.views.IdentifyableView;<% end -%><% end -%>
-
-<% unless options[:singleton] -%>
-import <%= gwt_rails_package %>.views.ModelButton;
+import <%= editors_package %>.<%= class_name %>Editor;
+<% for attribute in attributes -%>
+<% if attribute.type == :belongs_to -%>
+import <%= models_package %>.<%= attribute.name.classify %>;
+<% end -%>
 <% end -%>
-import <%= gwt_rails_package %>.places.RestfulAction;
-import <%= gwt_rails_package %>.places.RestfulActionEnum;
-
 import <%= models_package %>.<%= class_name %>;
 import <%= places_package %>.<%= class_name %>Place;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.editor.client.SimpleBeanEditorDriver;
 import com.google.gwt.event.dom.client.ClickEvent;
 <% unless options[:singleton] -%>
 import com.google.gwt.event.dom.client.ClickHandler;
@@ -26,88 +23,99 @@ import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.uibinder.client.UiTemplate;
-import com.google.gwt.user.client.ui.*;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.Composite;
+<% unless options[:singleton] -%>
+import com.google.gwt.user.client.ui.FlexTable;
+<% end -%>
+import com.google.gwt.user.client.ui.Panel;
+import com.google.gwt.user.client.ui.Widget;
 import com.google.inject.Singleton;
 
+import <%= gwt_rails_package %>.places.RestfulAction;
+import <%= gwt_rails_package %>.places.RestfulActionEnum;
+<% unless options[:singleton] -%>
+import <%= gwt_rails_package %>.views.ModelButton;
+<% end -%>
+
 @Singleton
-public class <%= class_name %>ViewImpl extends <% if options[:timestamps] -%><% unless options[:singleton] -%>Identifyable<% end -%>TimestampedView<% else -%><% unless options[:singleton] -%>IdentifyableView<% else -%>Composite<% end -%><% end %>
-        implements <%= class_name %>View {
+public class <%= class_name %>ViewImpl extends Composite implements <%= class_name %>View {
 
     @UiTemplate("<%= class_name %>View.ui.xml")
-    interface <%= class_name %>ViewUiBinder extends UiBinder<Widget, <%= class_name %>ViewImpl> {}
+    interface Binder extends UiBinder<Widget, <%= class_name %>ViewImpl> {}
     
-    private static <%= class_name %>ViewUiBinder uiBinder = GWT.create(<%= class_name %>ViewUiBinder.class);
+    private static Binder BINDER = GWT.create(Binder.class);
+
+    interface EditorDriver extends SimpleBeanEditorDriver<<%= class_name %>, <%= class_name %>Editor> {}
+
+    private final EditorDriver editorDriver = GWT.create(EditorDriver.class);
 
 <% unless options[:readonly] -%>
 <% unless options[:singleton] -%>
-    @UiField
-    Button newButton;
-    
-    @UiField
-    Button createButton;
-<% end -%>    
-    @UiField
-    Button editButton;
-
-    @UiField
-    Button saveButton;
-<% unless options[:singleton] -%>
-    @UiField
-    Button deleteButton;
+    @UiField Button newButton;
+<% end -%>
+    @UiField Button editButton;
+<% end -%>
+    @UiField Button showButton;
 
+<% unless options[:readonly] -%>
+<% unless options[:singleton] -%>
+    @UiField Button createButton;
 <% end -%>
+    @UiField Button saveButton;
+<% unless options[:singleton] -%>
+    @UiField Button deleteButton;
 <% end -%>
-<% for attribute in attributes -%>
-<% if attribute.type == :has_one -%>
-  // TODO <%= attribute.name.camelcase %> <%= attribute.name %>;
-<% elsif attribute.type == :has_many -%>
-  // TODO public java.util.List<<%= attribute.name.camelcase %>> <%= attribute.name %>;
-<% else -%>
-    @UiField
-    TextBox <%= attribute.name.camelcase.sub(/^(.)/){ $1.downcase } %>;
 <% end -%>
 
+    @UiField Panel model;
+<% unless options[:singleton] -%>
+    @UiField FlexTable list;
 <% end -%>
-<% unless options[:singleton] -%>    
-    @UiField
-    Panel form;
 
-    @UiField
-    FlexTable list;
-<% end -%>
+    @UiField <%= class_name %>Editor editor;
 
     private Presenter presenter;
 
     public <%= class_name %>ViewImpl() {
-        initWidget(uiBinder.createAndBindUi(this));
+        initWidget(BINDER.createAndBindUi(this));
+        editorDriver.initialize(editor);
     }
-<% unless options[:readonly] %>
+<% unless options[:readonly] -%>
 <% unless options[:singleton] -%>
+
     @UiHandler("newButton")
     void onClickNew(ClickEvent e) {
         presenter.goTo(new <%= class_name %>Place(RestfulActionEnum.NEW));
     }
+<% end -%>
 
-    @UiHandler("createButton")
-    void onClickCreate(ClickEvent e) {
-        presenter.create();
+    @UiHandler("showButton")
+    void onClickShow(ClickEvent e) {
+        presenter.goTo(new <%= class_name %>Place(<% unless options[:singleton] -%>editor.id.getValue(), <% end -%>RestfulActionEnum.SHOW));
     }
 
-<% end -%>
     @UiHandler("editButton")
     void onClickEdit(ClickEvent e) {
-        presenter.goTo(new <%= class_name %>Place(<% unless options[:singleton] -%>id.getValue(), <% end -%>RestfulActionEnum.EDIT));
+        presenter.goTo(new <%= class_name %>Place(<% unless options[:singleton] -%>editor.id.getValue(), <% end -%>RestfulActionEnum.EDIT));
     }
+<% unless options[:singleton] -%>
+
+    @UiHandler("createButton")
+    void onClickCreate(ClickEvent e) {
+        presenter.create();
+    }
+<% end -%>
 
     @UiHandler("saveButton")
     void onClickSave(ClickEvent e) {
         presenter.save();
     }
-
 <% unless options[:singleton] -%>
+
     @UiHandler("deleteButton")
     void onClickDelete(ClickEvent e) {
-        presenter.delete(retrieve<%= class_name %>());
+        presenter.delete(flush());
     }
 
 <% end -%>
@@ -116,22 +124,16 @@ public class <%= class_name %>ViewImpl extends <% if options[:timestamps] -%><%
         this.presenter = presenter;
     }
 
-    public void reset(<%= class_name %> model) {
-<% if options[:singleton] && options[:timestamps] -%>
-        resetSignature(model.createdAt, model.updatedAt);
-<% else -%>
-<% if options[:timestamps] %>
-        resetSignature(model.id, model.createdAt, model.updatedAt);
-<% else -%>
-        resetSignature(model.id);
-<% end -%>
-<% end -%>
-<% for attribute in attributes -%>
-<%   if attribute.type != :has_one && attribute.type != :has_many -%>
-<%     name = attribute.name.camelcase.sub(/^(.)/){ $1.downcase } -%>
-        <%= name %>.setText(model.<%= name %><% if type_conversion_map[attribute.type] -%> + ""<% end -%>);
-<%   end -%>
-<% end -%>
+    public void edit(<%= class_name %> model) {
+        this.editorDriver.edit(model);
+    }
+
+    public <%= class_name %> flush() {
+        return editorDriver.flush();
+    }
+
+    public void setEnabled(boolean enabled) {
+        editor.setEnabled(enabled);
     }
 
     public void reset(RestfulAction action) {
@@ -139,13 +141,15 @@ public class <%= class_name %>ViewImpl extends <% if options[:timestamps] -%><%
         editButton.setVisible(action.name().equals(RestfulActionEnum.SHOW.name()) || 
                 action.name().equals(RestfulActionEnum.INDEX.name()));
         saveButton.setVisible(action.name().equals(RestfulActionEnum.EDIT.name()));
+        showButton.setVisible(action.name().equals(RestfulActionEnum.EDIT.name()));
         setEnabled(!action.viewOnly());
 <% else -%>
         newButton.setVisible(!action.name().equals(RestfulActionEnum.NEW.name()));
         if(action.name().equals(RestfulActionEnum.INDEX.name())){
             editButton.setVisible(false);
+            showButton.setVisible(false);
             list.setVisible(true);
-            form.setVisible(false);
+            model.setVisible(false);
         }
         else {
 <% if options[:readonly] -%>
@@ -153,42 +157,14 @@ public class <%= class_name %>ViewImpl extends <% if options[:timestamps] -%><%
 <% else -%>
             createButton.setVisible(action.name().equals(RestfulActionEnum.NEW.name()));
             editButton.setVisible(action.name().equals(RestfulActionEnum.SHOW.name()));
+            showButton.setVisible(action.name().equals(RestfulActionEnum.EDIT.name()));
             saveButton.setVisible(action.name().equals(RestfulActionEnum.EDIT.name()));
             deleteButton.setVisible(action.name().equals(RestfulActionEnum.EDIT.name()));
 <% end -%>
             setEnabled(!action.viewOnly());
             list.setVisible(false);
-            form.setVisible(true);
+            model.setVisible(true);
         }
-<% end -%>
-    }
-
-    public <%= class_name %> retrieve<%= class_name %>() {
-        <%= class_name %> model = new <%= class_name %>();
-<% unless options[:singleton] -%>
-        model.id = id.getValue() == null ? 0 : id.getValue();
-<% end -%>
-<% if options[:timestamps] %>
-        model.createdAt = createdAt.getValue();
-        model.updatedAt = updatedAt.getValue();
-<% end -%>
-
-<% for attribute in attributes -%>
-<%   if attribute.type != :has_one && attribute.type != :has_many -%>
-<%     name = attribute.name.camelcase.sub(/^(.)/){ $1.downcase } -%>
-        model.<%= name %> = <% if (conv = type_conversion_map[attribute.type]).nil? -%><%= name %>.getText()<% else -%><%= conv %>(<%= name %>.getText())<% end -%>;
-<%   end -%>
-
-<% end -%>
-        return model;
-    }
-
-    public void setEnabled(boolean enabled) {
-<% for attribute in attributes -%>
-<%   if attribute.type != :has_one && attribute.type != :has_many -%>
-<%     name = attribute.name.camelcase.sub(/^(.)/){ $1.downcase } -%>
-         <%= name %>.setEnabled(enabled);
-<%   end -%>
 <% end -%>
     }
 <% unless options[:singleton] -%>
@@ -229,11 +205,11 @@ public class <%= class_name %>ViewImpl extends <% if options[:timestamps] -%><%
     }
 
     private void setRow(int row, <%= class_name %> model) {
-        list.setText(row, 0, model.id + "");
+        list.setText(row, 0, model.getId() + "");
 <% attributes.each_with_index do |attribute, index| -%>
 <%   if attribute.type != :has_one && attribute.type != :has_many -%>
 <%     name = attribute.name.camelcase.sub(/^(.)/){ $1.downcase } -%>
-        list.setText(row, <%= index + 1 %>, model.<%= name %> + "");
+        list.setText(row, <%= index + 1 %>, model.get<%= name.camelcase %>()<%= attribute.type == :has_one || attribute.type == :belongs_to ? ' == null ? "-" : model.get' + name.camelcase + '().toDisplay()' : ' + ""' %>);
 <%   end -%>
 
 <% end -%>
@@ -243,7 +219,7 @@ public class <%= class_name %>ViewImpl extends <% if options[:timestamps] -%><%
     }
 
     public void updateInList(<%= class_name %> model) {
-        String id = model.id + "";
+        String id = model.getId() + "";
         for(int i = 0; i < list.getRowCount(); i++){
             if(list.getText(i, 0).equals(id)){
                 setRow(i, model);
@@ -253,7 +229,7 @@ public class <%= class_name %>ViewImpl extends <% if options[:timestamps] -%><%
     }
 
     public void removeFromList(<%= class_name %> model) {
-        String id = model.id + "";
+        String id = model.getId() + "";
         for(int i = 0; i < list.getRowCount(); i++){
             if(list.getText(i, 0).equals(id)){
                 list.removeRow(i);
@@ -266,4 +242,13 @@ public class <%= class_name %>ViewImpl extends <% if options[:timestamps] -%><%
         setRow(list.getRowCount(), model);
     }
 <% end -%>
+<% for attribute in attributes -%>
+<% if attribute.type == :belongs_to -%>
+<% clazz = attribute.name.classify -%>
+
+    public void reset<%= clazz.to_s.pluralize %>(List<<%= clazz %>> list){
+        editor.reset<%= clazz.to_s.pluralize %>(list);
+    }
+<% end -%>
+<% end -%>
 }

data/lib/generators/resty/templates/ViewImpl.java~

@@ -0,0 +1,153 @@
+package <%= views_package %>;
+
+import java.util.List;
+
+import <%= gwt_rails_package %>.ColumnDefinition;
+import <%= gwt_rails_package %>.RestfulActionEnum;
+
+import <%= models_package %>.<%= class_name %>;
+import <%= places_package %>.<%= class_name %>Place;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.Document;
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.dom.client.EventTarget;
+import com.google.gwt.dom.client.Node;
+import com.google.gwt.dom.client.TableCellElement;
+import com.google.gwt.dom.client.TableElement;
+import com.google.gwt.dom.client.TableRowElement;
+import com.google.gwt.dom.client.TableSectionElement;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.uibinder.client.UiTemplate;
+import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.Widget;
+import com.google.inject.Singleton;
+
+@Singleton
+public class <%= class_name %>ViewImpl extends Composite
+        implements <%= class_name %>View {
+
+    @UiTemplate("<%= class_name %>View.ui.xml")
+    interface <%= class_name %>ViewUiBinder extends UiBinder<Widget, <%= class_name %>ViewImpl> {}
+    
+    private static <%= class_name %>ViewUiBinder uiBinder = GWT.create(<%= class_name %>ViewUiBinder.class);
+
+    @UiField
+    Button showButton;
+    //    @UiField
+    // TextBox login;
+    
+    @UiField
+    HTML modelsTable;
+    
+    private Presenter presenter;
+
+    private List<ColumnDefinition<<%= class_name %>>> columnDefinitions = new <%= class_name.pluralize %>ColumnDefinitionsImpl();
+
+    private List<<%= class_name %>> models;
+
+    public <%= class_name %>ViewImpl() {
+        initWidget(uiBinder.createAndBindUi(this));
+    }
+
+    @UiHandler("showButton")
+    void onClickEdit(ClickEvent e) {
+        presenter.goTo(new <%= class_name %>Place(RestfulActionEnum.EDIT));
+    }
+
+    public void setPresenter(Presenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void reset(<%= class_name %> model) {
+        // TODO
+    }
+
+    public void reset(List<<%= class_name %>> models) {
+        this.models = models;
+
+        TableElement table = Document.get().createTableElement();
+        TableSectionElement tbody;
+        table.appendChild(tbody = Document.get().createTBodyElement());
+
+        for (int i = 0; i < models.size(); ++i) {
+            TableRowElement row = tbody.insertRow(-1);
+            <%= class_name %> t = models.get(i);
+
+            for (int j = 0; j < columnDefinitions.size(); ++j) {
+                TableCellElement cell = row.insertCell(-1);
+                StringBuilder sb = new StringBuilder();
+                columnDefinitions.get(j).render(t, sb);
+                cell.setInnerHTML(sb.toString());
+
+                // TODO: Really total hack! There's gotta be a better way...
+                Element child = cell.getFirstChildElement();
+                if (child != null) {
+                    Event.sinkEvents(child, Event.ONFOCUS | Event.ONBLUR);
+                }
+            }
+        }
+
+        modelsTable.setHTML(table.getInnerHTML());
+    }
+
+    private TableCellElement findNearestParentCell(Node node) {
+      while ((node != null)) {
+        if (Element.is(node)) {
+          Element elem = Element.as(node);
+
+          String tagName = elem.getTagName();
+          if ("td".equalsIgnoreCase(tagName) || "th".equalsIgnoreCase(tagName)) {
+            return elem.cast();
+          }
+        }
+        node = node.getParentNode();
+      }
+      return null;
+    }
+
+
+    @UiHandler("modelsTable")
+    void onTableClicked(ClickEvent event) {
+      if (presenter != null) {
+        EventTarget target = event.getNativeEvent().getEventTarget();
+        Node node = Node.as(target);
+        TableCellElement cell = findNearestParentCell(node);
+        if (cell == null) {
+          return;
+        }
+
+        TableRowElement tr = TableRowElement.as(cell.getParentElement());
+        int row = tr.getSectionRowIndex();
+        
+        if (cell != null) {
+          if (shouldFireClickEvent(cell)) {
+            presenter.onItemClicked(models.get(row));
+          }
+        }
+      }
+    }
+
+    private boolean shouldFireClickEvent(TableCellElement cell) {
+      boolean shouldFireClickEvent = false;
+      
+      if (cell != null) {
+        ColumnDefinition<<%= class_name %>> columnDefinition = 
+          columnDefinitions.get(cell.getCellIndex());
+        
+        if (columnDefinition != null) {
+          shouldFireClickEvent = columnDefinition.isClickable();
+        }
+      }
+
+      return shouldFireClickEvent;
+    }
+    
+}