resty-generators 0.5.3 → 0.6.0

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

@@ -0,0 +1,8 @@
+package <%= events_package %>;
+
+import <%= models_package %>.<%= class_name %>;
+
+import <%= gwt_rails_package %>.events.ModelEventHandler;
+
+public interface <%= class_name %>EventHandler extends ModelEventHandler<<%= class_name %>> {
+}

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

@@ -0,0 +1,30 @@
+package <%= events_package %>;
+<% unless options[:singleton] -%>
+
+import java.util.List;
+<% end -%>
+
+import <%= models_package %>.<%= class_name %>;
+
+import <%= gwt_rails_package %>.events.ModelEvent;
+import <%= gwt_rails_package %>.events.ModelEventHandler;
+
+public class <%= class_name %>Event extends ModelEvent<<%= class_name %>> {
+
+    public static final Type<ModelEventHandler<<%= class_name %>>> TYPE = new Type<ModelEventHandler<<%= class_name %>>>();
+    
+    public <%= class_name %>Event(<%= class_name %> model, ModelEvent.Action action) {
+        super(model, action);
+    }
+<% unless options[:singleton] -%>
+
+    public <%= class_name %>Event(List<<%= class_name %>> models, ModelEvent.Action action) {
+        super(models, action);
+    }
+<% end -%>
+
+    @Override
+    public Type<ModelEventHandler<<%= class_name %>>> getAssociatedType() {
+        return TYPE;
+    }
+}

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

@@ -4,39 +4,168 @@ package <%= models_package %>;
 import java.util.Date;
 <% end -%>
 
+<% if !options[:singleton] || options[:timestamps] || options[:modified_by] -%>
+import org.codehaus.jackson.annotate.JsonCreator;
+import org.codehaus.jackson.annotate.JsonProperty;
+<% end -%>
 import org.fusesource.restygwt.client.Json;
 import org.fusesource.restygwt.client.Json.Style;
 
+import de.mkristian.gwt.rails.models.HasToDisplay;
+<% unless options[:singleton] -%>
+import de.mkristian.gwt.rails.models.Identifyable;
+<% end -%>
+
 @Json(style = Style.RAILS<% if class_name.downcase == class_name.underscore -%>)<% else -%>, name = "<%= class_name.underscore %>")<% end %>
-public class <%= class_name %> {
+public class <%= class_name %> implements HasToDisplay<% unless options[:singleton] %>, Identifyable<% end -%> {
 
 <% unless options[:singleton] -%>
-  public int id;
+  public final int id;
+<% end -%>
+<% if options[:timestamps] -%>
+
+  @Json(name = "created_at")
+  private final Date createdAt;
+
+  @Json(name = "updated_at")
+  private final Date updatedAt;
+<% end -%>
+<% if options[:modified_by] -%>
+
+  @Json(name = "modified_by")
+  private final User modifiedBy;
 <% end -%>
 <% for attribute in attributes -%>
 <% name = attribute.name.camelcase.sub(/^(.)/) {$1.downcase} -%>
 
+<% if attribute.type == :belongs_to -%>
+  @Json(name = "<%= name.underscore %>_id")
+  private int <%= name %>Id;
+<% end -%>
 <% if name != name.underscore -%>  @Json(name = "<%= name.underscore %>")
 <% end -%>
-<% if attribute.type == :has_one -%>
-  public <%= attribute.name.camelcase %> <%= name %>;
+<% if attribute.type == :has_one || attribute.type == :belongs_to -%>
+  private <%= attribute.name.classify %> <%= name %>;
 <% elsif attribute.type == :has_many -%>
-  public java.util.List<<%= attribute.name.classify %>> <%= name %>;
+  private java.util.List<<%= attribute.name.classify %>> <%= name %>;
 <% else -%>
-  public <%= type_map[attribute.type] || attribute.type.to_s.classify %> <%= name %>;
+  private <%= type_map[attribute.type] || attribute.type.to_s.classify %> <%= name %>;
 <% end -%>
 <% end -%>
-<% if options[:timestamps] %>
+<% if !options[:singleton] || options[:timestamps] || options[:modified_by] -%>
 
-  @Json(name = "created_at")
-  public Date createdAt;
+  public <%= class_name %>(){
+    this(<% unless options[:singleton] -%>0<% if options[:timestamps] -%>, null, null<% if options[:modified_by] -%>, null<% end -%><% end -%><% else -%><% if options[:timestamps] -%>null, null<% if options[:modified_by] -%>, null<% end -%><% else -%><% if options[:modified_by] -%>null<% end -%><% end -%><% end -%><% for attribute in attributes -%><% if attribute.type == :belongs_to -%>, 0<% end -%><% end -%>);
+  }
+  
+  @JsonCreator
+  public <%= class_name %>(<% unless options[:singleton] -%>@JsonProperty("id") int id<% if options[:timestamps] -%>, 
+          @JsonProperty("createdAt") Date createdAt, 
+          @JsonProperty("updatedAt") Date updatedAt<% if options[:modified_by] -%>,
+          @JsonProperty("modifiedBy") User modifiedBy<% end -%><% end -%><% else -%><% if options[:timestamps] -%>@JsonProperty("createdAt") Date createdAt, 
+          @JsonProperty("updatedAt") Date updatedAt<% if options[:modified_by] -%>,
+          @JsonProperty("modifiedBy") User modifiedBy<% end -%><% else -%><% if options[:modified_by] -%>@JsonProperty("modifiedBy") Date modifiedBy<% end -%><% end -%><% end -%><% for attribute in attributes -%><% if attribute.type == :belongs_to -%>,
+<% name = attribute.name.camelcase.sub(/^(.)/) {$1.downcase} -%>
+          @JsonProperty("<%= name %>Id") int <%= name %>Id<% end -%><% end -%>){
+<% unless options[:singleton] -%>
+    this.id = id;
+<% end -%>
+<% if options[:timestamps] -%>
+    this.createdAt = createdAt;
+    this.updatedAt = updatedAt;
+<% end -%>
+<% if options[:modified_by] -%>
+    this.modifiedBy = modifiedBy;
+<% end -%>
+<% for attribute in attributes -%>
+<% if attribute.type == :belongs_to -%>
+<% name = attribute.name.camelcase.sub(/^(.)/) {$1.downcase} -%>
+    this.<%= name %>Id = <%= name %>Id;
+<% end -%>
+<% end -%>
+  }
+<% end -%>
+<% unless options[:singleton] -%>
 
-  @Json(name = "updated_at")
-  public Date updatedAt;
+  public int getId(){
+    return id;
+  }
 <% end -%>
-<% if options[:modified_by] %>
+<% if options[:timestamps] -%>
 
-  @Json(name = "modified_by")
-  public options[:modified_by].classify.underscore modifiedBy
+  public Date getCreatedAt(){
+    return createdAt;
+  }
+
+  public Date getUpdatedAt(){
+    return updatedAt;
+  }
+<% end -%>
+<% if options[:modified_by] -%>
+
+  public User getModifiedBy(){
+    return modifiedBy;
+  }
+<% end -%>
+<% for attribute in attributes -%>
+<% name = attribute.name.camelcase.sub(/^(.)/) {$1.downcase} -%>
+
+<% if attribute.type == :has_one || attribute.type == :belongs_to -%>
+  public <%= attribute.name.classify %> get<%= attribute.name.camelcase %>(){
+    return <%= name %>;
+  }
+
+  public void set<%= attribute.name.camelcase %>(<%= attribute.name.classify %> value){
+    <%= name %> = value;
+<% if attribute.type == :belongs_to -%>
+    <%= name %>Id = value == null ? 0 : value.getId();
+<% end -%>
+  }
+<% if attribute.type == :belongs_to -%>
+
+  public int get<%= attribute.name.camelcase %>Id(){
+    return <%= name %>Id;
+  }
+<% end -%>
+<% elsif attribute.type == :has_many -%>
+       //TODO  private java.util.List<<%= attribute.name.classify %>> <%= name %>;
+<% else -%>
+  public <%= type_map[attribute.type] || attribute.type.to_s.classify %> get<%= name.camelcase %>(){
+    return <%= name %>;
+  }
+
+  public void set<%= attribute.name.camelcase %>(<%= type_map[attribute.type] || attribute.type.to_s.classify %> value){
+    <%= name %> = value;
+  }
+<% end -%>
+<% end -%>
+<% if attributes.detect {|a| a.type == :belongs_to } -%>
+
+  public <%= class_name %> minimalClone() {
+      <%= class_name %> clone = new <%= class_name %>(<% unless options[:singleton] -%>id, <% end -%><% if options[:timestamps] -%>null, updatedAt, <% end -%><% if options[:modified_by] -%>null, <% end -%><%= attributes.select {|a| a.type == :belongs_to }.collect do |attribute|
+  name = attribute.name.camelcase.sub(/^(.)/) {$1.downcase}
+  "#{name}Id"
+end.join ',' -%>);
+<% attributes.select {|attr| ![:belongs_to, :has_one, :has_many].include?(attr.type) }.each do |attribute| -%>
+<% name = attribute.name.camelcase.sub(/^(.)/) {$1.downcase} -%>
+      clone.set<%= attribute.name.camelcase %>(this.<%= name %>);
 <% end -%>
-}
+      return clone;
+  }
+<% end -%>
+<% unless options[:singleton] -%>
+
+  public int hashCode(){
+    return id;
+  }
+
+  public boolean equals(Object other){
+    return (other instanceof <%= class_name %>) && 
+        ((<%= class_name %>)other).id == id;
+  }
+<% end -%>
+
+  public String toDisplay() {
+    return <%= attributes.first.name.camelcase.sub(/^(.)/) {$1.downcase} %><% unless attributes.first.type == :string %> + ""<% end -%>;
+  }
+}

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

@@ -0,0 +1,23 @@
+package <%= models_base_package %>;
+
+public class <%= class_name %> {
+
+<% for attribute in attributes -%>
+<% if attribute.type == :has_one -%>
+  <%= attribute.name.classify %> <%= attribute.name %>;
+<% elsif attribute.type == :has_many -%>
+  java.util.List<<%= attribute.name.classify %>> <%= attribute.name %>;
+<% else -%>
+  <%= type_map[attribute.type] || attribute.type.to_s.classify %> <%= attribute.name %>;
+<% end -%>
+
+<% end -%>
+<% if options[:timestamps] %>
+  //TODO timestamps
+
+<% end -%>
+<% if options[:timestamps] %>
+  //TODO modified_by
+
+<% end -%>
+}

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

@@ -19,7 +19,7 @@ public class <%= class_name %>Place extends ActivityPlace<<%= class_name %>> {
     }
 
     public <%= class_name %>Place(<%= class_name %> model, RestfulAction restfulAction) {
-        super(model, restfulAction, "<%= table_name %>");
+        super(<% unless options[:singleton] -%>model.getId(), <% end -%>model, restfulAction, "<%= table_name %>");
     }
 
     public <%= class_name %>Place(int id, RestfulAction restfulAction) {

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

@@ -0,0 +1,21 @@
+package <%= places_package %>;
+
+import <%= gwt_rails_package %>.RestfulAction;
+
+import <%= managed_package %>.RestfulPlace;
+import <%= managed_package %>.ActivityFactory;
+
+import <%= models_package %>.<%= class_name %>;
+
+import com.google.gwt.activity.shared.Activity;
+
+public class <%= class_name %>Place extends RestfulPlace<<%= class_name %>>{
+    
+    public Activity create(ActivityFactory factory){
+        return factory.create(this);
+    }
+    
+    public <%= class_name %>Place(RestfulAction restfulAction) {
+        super(restfulAction);
+    }
+}

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

@@ -13,7 +13,7 @@ public class <%= class_name %>PlaceTokenizer extends RestfulPlaceTokenizer<<%= c
             return new <%= class_name %>Place(t.action);
         }
         else {
-            return new <%= class_name %>Place(t.identifier, t.action);
+            return new <%= class_name %>Place(t.id, t.action);
         }
 <% end -%>
     }

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

@@ -0,0 +1,19 @@
+package <%= places_package %>;
+
+import <%= gwt_rails_package %>.RestfulActionEnum;
+
+import com.google.gwt.place.shared.PlaceTokenizer;
+import com.google.gwt.place.shared.Prefix;
+
+@Prefix("<%= table_name %>") 
+public class <%= class_name %>PlaceTokenizer implements PlaceTokenizer<<%= class_name %>Place> {
+    
+    public <%= class_name %>Place getPlace(String token) {
+        return new <%= class_name %>Place(RestfulActionEnum.toRestfulAction(token));
+    }
+
+    public String getToken(<%= class_name %>Place place) {
+        return place.action.token();
+    }
+
+}

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

@@ -0,0 +1,51 @@
+package <%= restservices_package %>;
+
+<% if action_map.values.member? :get_all -%>
+import java.util.List;
+<% end -%>
+
+import javax.ws.rs.*;
+
+import org.fusesource.restygwt.client.*;
+
+<% if name -%>
+import <%= models_package %>.*;
+<% end -%>
+
+@Path("/<%= table_name %><%= options[:singleton] ? '.json' : '' %>")
+//@Options(dispatcher = RestfulRetryingDispatcher.class)
+public interface <%= controller_class_name %>RestService extends RestService {
+
+<% actions.each do |action| 
+     case action_map[action]
+     when :get_all -%>
+  @GET @Path("/<%= table_name %>.json")
+  //@Options(dispatcher = RetryingDispatcher.class)
+  void <%= action %>(MethodCallback<List<<%= class_name %>>> callback);
+
+//  @GET @Path("/<%= table_name %>.json")
+//  void <%= action %>(MethodCallback<List<<%= class_name %>>> callback, @QueryParam("limit") int limit, @QueryParam("offset") int offset);
+//
+<%   when :get_single -%>
+  @GET<% unless options[:singleton] -%> @Path("/<%= table_name %>/{id}.json")<% end %>
+  void <%= action %>(<% unless options[:singleton] -%>@PathParam("id") int id, <% end -%>MethodCallback<<%= class_name %>> callback);
+
+<%   when :post -%>
+  @POST @Path("/<%= table_name %>.json")
+  void <%= action %>(<%= class_name %> value, MethodCallback<<%= class_name %>> callback);
+
+<%   when :put -%>
+  @PUT<% unless options[:singleton] -%> @Path("/<%= table_name %>/{id}.json")<% end %>
+  void <%= action %>(<% unless options[:singleton] -%>@PathParam("id") @Attribute("id") <% end -%><%= class_name %> value, MethodCallback<<%= class_name %>> callback);
+
+<%   when :delete -%>
+  @DELETE @Path("/<%= table_name %>/{id}.json")
+  void <%= action %>(@PathParam("id") @Attribute("id") <%= class_name %> value, MethodCallback<Void> callback);
+
+<%   else -%>
+  @GET @Path("/<%= table_name %>/<%= action %>.json")
+  void <%= action %>(MethodCallback<Void> callback);
+
+<% end
+end -%>
+}

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

@@ -1,8 +1,13 @@
 package <%= views_package %>;
 
-<% unless options[:singleton] -%>
+<% if !options[:singleton] || attributes.detect { |a| a.type == :belongs_to} -%>
 import java.util.List;
 
+<% end -%>
+<% for attribute in attributes -%>
+<% if attribute.type == :belongs_to -%>
+import <%= models_package %>.<%= attribute.name.classify %>;
+<% end -%>
 <% end -%>
 import <%= models_package %>.<%= class_name %>;
 
@@ -27,7 +32,9 @@ public interface <%= class_name %>View extends IsWidget {
     }
     void setPresenter(Presenter presenter);
 
-    void reset(<%= class_name %> model);
+    void edit(<%= class_name %> model);
+
+    <%= class_name %> flush();
 <% unless options[:singleton] -%>
 
     void reset(List<<%= class_name %>> models);
@@ -36,8 +43,6 @@ public interface <%= class_name %>View extends IsWidget {
     void reset(RestfulAction action);
     
     void setEnabled(boolean enabled);
-
-    <%= class_name %> retrieve<%= class_name %>();
 <% unless options[:singleton] -%>
 
     void updateInList(<%= class_name %> model);
@@ -46,4 +51,10 @@ public interface <%= class_name %>View extends IsWidget {
 
     void addToList(<%= class_name %> model);
 <% end -%>
+<% for attribute in attributes -%>
+<% if attribute.type == :belongs_to -%>
+
+    void reset<%= attribute.name.classify.to_s.pluralize %>(List<<%= attribute.name.classify %>> list);
+<% end -%>
+<% end -%>
 }

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

@@ -0,0 +1,23 @@
+package <%= views_package %>;
+
+import java.util.List;
+
+import <%= models_package %>.<%= class_name %>;
+
+import com.google.gwt.place.shared.Place;
+import com.google.gwt.user.client.ui.IsWidget;
+import com.google.inject.ImplementedBy;
+
+@ImplementedBy(<%= class_name %>ViewImpl.class)
+public interface <%= class_name %>View extends IsWidget {
+    void setPresenter(Presenter presenter);
+
+    public interface Presenter {
+     
+        void goTo(Place place);
+
+        void onItemClicked(<%= class_name %> model);
+    }
+    void reset(<%= class_name %> model);
+    void reset(List<<%= class_name %>> models);
+}

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

@@ -1,48 +1,26 @@
 <!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>
-     .buttons {}
-     .signature { float: left; }
-     .signature * { display: inline; margin-right: 1em; font-size: 0.8em;}
-     .fields { clear: both;}
-     .field { }
-  </ui:style>
-
-  <g:FlowPanel styleName="display">
-    <g:FlowPanel styleName="{style.buttons}">
+  xmlns:g="urn:import:com.google.gwt.user.client.ui"
+  xmlns:t="urn:import:<%= editors_package %>">
+
+  <g:FlowPanel styleName="gwt-rails-display">
+
+    <g:Label><%if options[:singleton] -%><%= class_name.underscore.singularize.humanize %><% else -%><%= class_name.underscore.pluralize.humanize %><% end -%></g:Label>
+
+    <g:FlowPanel styleName="gwt-rails-buttons">
 <% unless options[:singleton] -%>
       <g:Button ui:field="newButton">New</g:Button>
 <% end -%>
       <g:Button ui:field="editButton">Edit</g:Button>
+      <g:Button ui:field="showButton">Show</g:Button>
     </g:FlowPanel>
-    <g:FlowPanel ui:field="form" styleName="form">
-      <g:FlowPanel styleName="{style.signature}" ui:field="signature">
-<% unless options[:singleton] -%>
-        <g:Label>id: </g:Label>
-	<g:NumberLabel ui:field="id" />
-<% end -%>
-<% if options[:timestamps] %>
-        <g:Label>created at: </g:Label>
-	<g:DateLabel ui:field="createdAt" predefinedFormat="DATE_TIME_MEDIUM"/>
-	<g:Label>updated at: </g:Label>
-	<g:DateLabel ui:field="updatedAt" predefinedFormat="DATE_TIME_MEDIUM" />
-<% end -%>
-      </g:FlowPanel>
-      <g:FlowPanel styleName="{style.fields}">
-<% for attribute in attributes -%>
-<%   if attribute.type != :has_one && attribute.type != :has_many -%>
-<%     name = attribute.name.camelcase.sub(/^(.)/){ $1.downcase } -%>
-        <g:FlowPanel styleName="{style.field}">
-          <g:HTML><label name="<%= name %>"><%= name.underscore.humanize %></label></g:HTML>
-	  <g:TextBox ui:field="<%= name %>" name="<%= name %>"/>
-	</g:FlowPanel>
-<%   end -%>
-<% end -%>
-      </g:FlowPanel>
-      <g:FlowPanel styleName="{style.buttons}">
+
+    <g:FlowPanel ui:field="model" styleName="gwt-rails-model">
+
+      <t:<%= class_name %>Editor ui:field="editor" styleName="gwt-rails-model-editor" />
+
+      <g:FlowPanel styleName="gwt-rails-buttons">
 <% unless options[:singleton] -%>
         <g:Button ui:field="createButton">Create</g:Button>
 <% end -%>
@@ -51,9 +29,15 @@
         <g:Button ui:field="deleteButton">Delete</g:Button>
 <% end -%>
       </g:FlowPanel>
+
     </g:FlowPanel>
 <% unless options[:singleton] -%>
-    <g:FlexTable ui:field="list" styleName="list"/>
+    
+    <g:FlowPanel styleName="gwt-rails-model-list">
+      <g:FlexTable ui:field="list"/>
+    </g:FlowPanel>
 <% end -%>
+
   </g:FlowPanel>
+
 </ui:UiBinder>