resty-generators 0.6.0 → 0.7.0

data/lib/generators/resty/base.rb

@@ -62,6 +62,10 @@ module Resty
         @restservices_package ||= base_package + ".restservices"
       end
 
+      def caches_package
+        @caches_package ||= base_package + ".caches"
+      end
+
       def action_map
         @action_map ||= {'index' => :get_all, 'show' => :get_single, 'create' => :post, 'update' => :put, 'destroy' => :delete}
       end

data/lib/generators/resty/scaffold/scaffold_generator.rb

@@ -19,6 +19,12 @@ module Resty
         template 'Model.java', File.join(java_root, models_package.gsub(/\./, "/"), class_path, "#{class_name}.java")
       end
 
+      def create_cache_file
+        if !options[:singleton] && !options[:read_only]
+          template 'Cache.java', File.join(java_root, caches_package.gsub(/\./, "/"), class_path, "#{class_name.pluralize}Cache.java")
+        end
+      end
+
       def create_event_files
         template 'Event.java', File.join(java_root, events_package.gsub(/\./, "/"), class_path, "#{class_name}Event.java")
         template 'EventHandler.java', File.join(java_root, events_package.gsub(/\./, "/"), class_path, "#{class_name}EventHandler.java")
@@ -82,13 +88,13 @@ end
         file = File.join(java_root, managed_package.gsub(/\./, "/"), class_path, "#{application_name}MenuPanel.java")
         if File.exists?(file)
           content = File.read(file)
-          if content =~ /#{class_name}Place\(RestfulActionEnum/
+          if content =~ /#{class_name}Place\(/
             log 'keep', file
           else
             # TODO non session case !!!
             t_name = options[:singleton] ? singular_table_name : table_name
-            content.sub! /super\(\s*sessionManager\s*\)\s*;/, "super(sessionManager);\n        addButton(\"#{t_name.underscore.humanize}\").addClickHandler(new ClickHandler() {\n            public void onClick(ClickEvent event) {\n                placeController.goTo(new #{places_package}.#{class_name}Place(RestfulActionEnum.#{options[:singleton] ? 'SHOW' : 'INDEX'}));\n            }\n        });"
-            content.sub! /super\(\s*\)\s*;/, "super();\n        addButton(\"#{t_name.underscore.humanize}\").addClickHandler(new ClickHandler() {\n            public void onClick(ClickEvent event) {\n                placeController.goTo(new #{places_package}.#{class_name}Place(RestfulActionEnum.#{options[:singleton] ? 'SHOW' : 'INDEX'}));\n            }\n        });"
+            content.sub! /super\(\s*sessionManager\s*,\s*placeController\s*\)\s*;/, "super(sessionManager, placeController);\n        addButton(\"#{t_name.underscore.humanize}\", new #{places_package}.#{class_name}Place(#{options[:singleton] ? 'SHOW' : 'INDEX'}));"
+            content.sub! /super\(\s*placeController\s*\)\s*;/, "super(placeController);\n        addButton(\"#{t_name.underscore.humanize}\", new #{places_package}.#{class_name}Place(#{options[:singleton] ? 'SHOW' : 'INDEX'}));"
             File.open(file, 'w') { |f| f.print content }
             log "added to", file
           end

data/lib/generators/resty/setup/setup_generator.rb

@@ -55,9 +55,9 @@ module Resty
 
       def create_scaffolded_files
         path = base_package.gsub(/\./, "/")
-        template 'ActivityPlace.java', 
-                        File.join(java_root, path, 
-                                  "ActivityPlace.java")
+        #template 'ActivityPlace.java', 
+        #                File.join(java_root, path, 
+        #                          "ActivityPlace.java")
         template 'ActivityPlaceActivityMapper.java', 
                         File.join(java_root, path, 
                                   "ActivityPlaceActivityMapper.java")

data/lib/generators/resty/setup/templates/ActivityPlaceActivityMapper.java

@@ -4,10 +4,12 @@ import <%= managed_package %>.ActivityFactory;
 
 import com.google.gwt.activity.shared.Activity;
 import com.google.gwt.activity.shared.ActivityMapper;
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.place.shared.Place;
 import com.google.inject.Inject;
 
-import de.mkristian.gwt.rails.Notice;
+import <%= gwt_rails_package %>.Notice;
+import <%= gwt_rails_package %>.places.RestfulPlace;
 
 public class ActivityPlaceActivityMapper implements ActivityMapper {
     protected final ActivityFactory factory;
@@ -19,10 +21,11 @@ public class ActivityPlaceActivityMapper implements ActivityMapper {
         this.factory = factory;
     }
 
-
+    @SuppressWarnings("unchecked")
     public Activity getActivity(Place place) {
-        if (place instanceof ActivityPlace<?>) {
-            return ((ActivityPlace<?>) place).create(factory);
+        if (place instanceof RestfulPlace<?, ?>) {
+            GWT.log(place.toString());
+            return ((RestfulPlace<?, ActivityFactory>) place).create(factory);
         }
         notice.setText("nothing to see");
         return null;

data/lib/generators/resty/setup/templates/LoginPlace.java

@@ -1,11 +1,12 @@
 package <%= places_package %>;
 
-import <%= base_package %>.ActivityPlace;
 import <%= managed_package %>.ActivityFactory;
 
+import <%= gwt_rails_package %>.places.RestfulPlace;
+
 import com.google.gwt.activity.shared.Activity;
 
-public class LoginPlace extends ActivityPlace<Void> {
+public class LoginPlace extends RestfulPlace<Void, ActivityFactory> {
 
     public static final LoginPlace LOGIN = new LoginPlace();
 

data/lib/generators/resty/setup/templates/Mavenfile

@@ -1,6 +1,6 @@
 #-*- mode: ruby -*-
 GWT_VERSION = '2.4.0'
-jar('de.mkristian.gwt:rails-gwt', '0.6.0').scope :provided
+jar('de.mkristian.gwt:rails-gwt', '0.7.0').scope :provided
 jar('org.fusesource.restygwt:restygwt', '1.2').scope :provided
 jar('javax.ws.rs:jsr311-api', '1.1').scope :provided
 jar('com.google.gwt:gwt-user', GWT_VERSION).scope :provided

data/lib/generators/resty/setup/templates/MenuPanel.java

@@ -11,7 +11,7 @@ import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.place.shared.PlaceController;
 
-import <%= gwt_rails_package %>.places.RestfulActionEnum;
+import static <%= gwt_rails_package %>.places.RestfulActionEnum.*;
 <% if options[:session] -%>
 import <%= gwt_rails_package %>.session.SessionManager;
 <% end -%>

data/lib/generators/resty/setup/templates/PlaceHistoryMapper.java

@@ -32,7 +32,7 @@ public class <%= application_name %>PlaceHistoryMapper extends RestfulPlaceHisto
 
     @Override
     public Place getPlace(String token) {
-        RestfulPlace<?> place = (RestfulPlace<?>) super.getPlace(token);
+        RestfulPlace<?, ?> place = (RestfulPlace<?, ?>) super.getPlace(token);
         // place needs to be different on the level of equals in order to trigger an activity
         place.hasSession = manager.hasSession(); 
         return place;

data/lib/generators/resty/setup/templates/SessionActivityPlaceActivityMapper.java

@@ -36,7 +36,7 @@ public class SessionActivityPlaceActivityMapper extends ActivityPlaceActivityMap
     protected Activity pessimisticGetActivity(Place place) {
         if (!(place instanceof NoAuthorization)) {
             if(manager.hasSession()){
-                if(!manager.isAllowed((RestfulPlace<?>)place)){
+                if(!manager.isAllowed((RestfulPlace<?,?>)place)){
                     notice.setText("nothing to see");
                     return null;
                 }
@@ -57,7 +57,7 @@ public class SessionActivityPlaceActivityMapper extends ActivityPlaceActivityMap
     protected Activity optimisticGetActivity(Place place) {
         if (place instanceof NeedsAuthorization) {
             if(manager.hasSession()){
-                if(!manager.isAllowed((RestfulPlace<?>)place)){
+                if(!manager.isAllowed((RestfulPlace<?,?>)place)){
                     notice.setText("nothing to see");
                     return null;
                 }

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

@@ -5,6 +5,12 @@ import java.util.List;
 <% end -%>
 
 import <%= events_package %>.<%= class_name %>Event;
+<% if !options[:singleton] && !options[:read_only] -%>
+import <%= events_package %>.<%= class_name %>EventHandler;
+<% end -%>
+<% if !options[:singleton] && !options[:read_only] -%>
+import <%= caches_package %>.<%= class_name.pluralize %>Cache;
+<% end -%>
 <% for attribute in attributes -%>
 <% if attribute.type == :belongs_to -%>
 import <%= models_package %>.<%= attribute.name.classify %>;
@@ -14,7 +20,9 @@ import <%= models_package %>.<%= class_name %>;
 import <%= places_package %>.<%= class_name %>Place;
 <% for attribute in attributes -%>
 <% if attribute.type == :belongs_to -%>
-import <%= restservices_package %>.<%= attribute.name.classify.to_s.pluralize %>RestService;
+import <%= caches_package %>.<%= attribute.name.classify.to_s.pluralize %>Cache;
+import <%= events_package %>.<%= attribute.name.classify %>Event;
+import <%= events_package %>.<%= attribute.name.classify %>EventHandler;
 <% end -%>
 <% end -%>
 import <%= restservices_package %>.<%= class_name.pluralize %>RestService;
@@ -32,6 +40,9 @@ import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import <%= gwt_rails_package %>.Notice;
+<% if !options[:singleton] && !options[:read_only] -%>
+import <%= gwt_rails_package %>.events.ModelEvent;
+<% end -%>
 import <%= gwt_rails_package %>.events.ModelEvent.Action;
 <% unless options[:singleton] -%>
 import <%= gwt_rails_package %>.places.RestfulActionEnum;
@@ -39,25 +50,46 @@ import <%= gwt_rails_package %>.places.RestfulActionEnum;
 
 public class <%= class_name %>Activity extends AbstractActivity implements <%= class_name %>View.Presenter{
 
+<% if !options[:singleton] -%>
     private final <%= class_name %>Place place;
+<% end -%>
     private final <%= class_name.pluralize %>RestService service;
     private final Notice notice;
     private final PlaceController placeController;
     private final <%= class_name %>View view;
+<% if !options[:singleton] && !options[:read_only] -%>
+    private final <%= class_name.pluralize %>Cache cache;
+<% end -%>
+<% attributes.select { |a| a.type == :belongs_to }.each do |attribute| -%>
+    private final <%= attribute.name.classify.to_s.pluralize %>Cache <%= attribute.name.pluralize %>Cache;
+<% end -%>
     private EventBus eventBus;
     
     @Inject
     public <%= class_name %>Activity(@Assisted <%= class_name %>Place place, final Notice notice, final <%= class_name %>View view,
-            <%= class_name.pluralize %>RestService service, PlaceController placeController<% for attribute in attributes -%>
+            <%= class_name.pluralize %>RestService service, PlaceController placeController<% if !options[:singleton] && !options[:read_only] -%>,
+            <%= class_name.pluralize %>Cache cache<% for attribute in attributes -%>
+<% end -%>
 <% if attribute.type == :belongs_to -%>
-, <%= attribute.name.classify.to_s.pluralize %>RestService <%= attribute.name %>RestService<% end -%><% end -%>) {
+, <%= attribute.name.classify.to_s.pluralize %>Cache <%= attribute.name.pluralize %>Cache<% end -%><% end -%>) {
+<% if !options[:singleton] -%>
         this.place = place;
+<% end -%>
         this.notice = notice;
         this.view = view;
         this.service = service;
         this.placeController = placeController;
+<% if !options[:singleton] && !options[:read_only] -%>
+        this.cache = cache;
+<% end -%>
+<% attributes.select { |a| a.type == :belongs_to }.each do |attribute| -%>
+        this.<%= attribute.name.pluralize %>Cache = <%= attribute.name.pluralize %>Cache;
+<% end -%>
+
+        notice.hide();
+        view.setup(this, place.action);
 <% for attribute in attributes -%>
-<% if attribute.type == :belongs_to -%>
+<% if attribute.type == :belongsss_to -%>
     
         view.reset<%= attribute.name.classify.to_s.pluralize %>(null);
         <%= attribute.name %>RestService.index(new MethodCallback<List<<%= attribute.name.classify %>>>() {
@@ -67,7 +99,7 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
             }
             
             public void onFailure(Method method, Throwable exception) {
-                notice.setText("failed to load <%= attribute.name.pluralize %>");
+                notice.error("failed to load <%= attribute.name.pluralize %>");
             }
         });
 <% end -%>
@@ -76,27 +108,57 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
 
     public void start(AcceptsOneWidget display, EventBus eventBus) {
         this.eventBus = eventBus;
+<% attributes.select { |a| a.type == :belongs_to }.each do |attribute| -%>
+
+        this.eventBus.addHandler(<%= attribute.name.classify %>Event.TYPE, new <%= attribute.name.classify %>EventHandler() {
+            
+            public void onModelEvent(ModelEvent<<%= attribute.name.classify %>> event) {
+                if(event.getModels() != null) {
+                    view.reset<%= attribute.name.classify.to_s.pluralize %>(event.getModels());
+                }
+            }
+        });
+        view.reset<%= attribute.name.classify.to_s.pluralize %>(<%= attribute.name.pluralize %>Cache.getOrLoadModels());
+<% end -%>
+<% if !options[:singleton] && !options[:read_only]-%>
+
+        this.eventBus.addHandler(<%= class_name %>Event.TYPE, new <%= class_name %>EventHandler() {
+
+            public void onModelEvent(ModelEvent<<%= class_name %>> event) {
+                notice.finishLoading();
+                if (event.getModels() != null) {
+                    view.reset(event.getModels());
+                } else if (event.getModel() == null) {
+                    // TODO maybe error message ?
+                    notice.error("error loading list of <%= class_name.underscore.humanize %>");
+                }
+            }
+        });
+<% end -%>
+
         display.setWidget(view.asWidget());
-        view.setPresenter(this);
+
 <% if options[:singleton] -%>
         load();
 <% else -%>
-        switch(RestfulActionEnum.valueOf(place.action.name())){
-            case EDIT: 
+        switch(RestfulActionEnum.valueOf(place.action)){
+<% unless options[:read_only] -%>
+            case EDIT:
+<% end -%>
             case SHOW:
-                load(place.model == null ? place.id : place.model.getId());
+                load(place.id);
                 break;
+<% unless options[:read_only] -%>
             case NEW:
-                notice.setText(null);
                 view.edit(new <%= class_name %>());
                 break;
+<% end -%>
             case INDEX:
             default:
                 load();
                 break;
         }
 <% end -%>
-        view.reset(place.action);
     }
 
     public void goTo(Place place) {
@@ -104,123 +166,129 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
     }
 <% unless options[:singleton] -%>
 
-    public void load(){  
-        view.setEnabled(false);
+    public void load(){
+<% if options[:read_only] -%>
         service.index(new MethodCallback<List<<%= class_name %>>>() {
 
             public void onFailure(Method method, Throwable exception) {
-                notice.setText("error loading list of <%= class_name.underscore.humanize %>: "
-                        + exception.getMessage());
-                view.reset(place.action);
+                notice.finishLoading();
+                notice.error("error loading list of <%= class_name.underscore.humanize %>", exception);
             }
 
             public void onSuccess(Method method, List<<%= class_name %>> response) {
+                notice.finishLoading();
                 eventBus.fireEvent(new <%= class_name %>Event(response, Action.LOAD));
-                notice.setText(null);
                 view.reset(response);
-                view.reset(place.action);
             }
         });
-        if(!notice.isVisible()){
-            notice.setText("loading list of <%= class_name.underscore.humanize %> . . .");
+        notice.loading();
+<% else -%>
+        List<<%= class_name %>> models = cache.getOrLoadModels();
+        if (models != null){
+            view.reset(models);
         }
+        else {
+            // loading the event callback fills the resets the models
+            notice.loading();
+        }
+<% end -%>
     }
 <% end -%>
-<% unless options[:singleton] -%>
+<% if !options[:singleton] && !options[:read_only] -%>
 
     public void create() {
         <%= class_name %> model = view.flush();
-        view.setEnabled(false);
         service.create(model<% if attributes.detect{|a| a.type == :belongs_to} -%>.minimalClone()<% end -%>, new MethodCallback<<%= class_name %>>() {
 
             public void onFailure(Method method, Throwable exception) {
-                notice.setText("error creating <%= class_name.underscore.humanize %>: "
-                        + exception.getMessage());
-                view.reset(place.action);
+                notice.finishLoading();
+                notice.error("error creating <%= class_name.underscore.humanize %>", exception);
             }
 
             public void onSuccess(Method method, <%= class_name %> response) {
+                notice.finishLoading();
                 eventBus.fireEvent(new <%= class_name %>Event(response, Action.CREATE));
-                notice.setText(null);
-                view.addToList(response);
                 goTo(new <%= class_name %>Place(response.getId(), RestfulActionEnum.EDIT));
             }
         });
-        notice.setText("creating <%= class_name.underscore.humanize %> . . .");
+        notice.loading();
     }
 <% end -%>
 
     public void load(<% unless options[:singleton] -%>int id<% end -%>) {
-        view.setEnabled(false);
-        service.show(<% unless options[:singleton] -%>id, <% end -%>new MethodCallback<<%= class_name %>>() {
+<% if !options[:singleton] && !options[:read_only] -%>
+        <%= class_name %> model = cache.getModel(id);
+        view.edit(model);
+<% elsif options[:read_only] -%>
+        view.edit(new <%= class_name %>()); // clear the form
+<% end -%>
+<% if !options[:singleton] && !options[:read_only] && (options[:timestamps] || options[:modified_by]) -%>
+        if (model == null || model.get<% if options[:timestamps] -%>CreatedAt()<% else -%>ModifiedBy()<% end -%> == null) {
+<% indent = '    ' -%>
+<% else -%>
+<% indent = '' -%>
+<% end -%>
+<%= indent %>        service.show(<% unless options[:singleton] -%>id, <% end -%>new MethodCallback<<%= class_name %>>() {
 
-            public void onFailure(Method method, Throwable exception) {
-                notice.setText("error loading <%= class_name.underscore.humanize %>: "
-                        + exception.getMessage());
-                view.reset(place.action);
-            }
+<%= indent %>            public void onFailure(Method method, Throwable exception) {
+<%= indent %>                notice.finishLoading();
+<%= indent %>                notice.error("error loading <%= class_name.underscore.humanize %>", exception);
+<%= indent %>            }
 
-            public void onSuccess(Method method, <%= class_name %> response) {
-                eventBus.fireEvent(new <%= class_name %>Event(response, Action.LOAD));
-                notice.setText(null);
-                view.edit(response);
-                view.reset(place.action);
-            }
-        });
-        if(!notice.isVisible()){
-            notice.setText("loading <%= class_name.underscore.humanize %> . . .");
+<%= indent %>            public void onSuccess(Method method, <%= class_name %> response) {
+<%= indent %>                notice.finishLoading();
+<%= indent %>                eventBus.fireEvent(new <%= class_name %>Event(response, Action.LOAD));
+<%= indent %>                view.edit(response);
+<%= indent %>            }
+<%= indent %>        });
+<%= indent %>        notice.loading();
+<% if !options[:singleton] && !options[:read_only] && (options[:timestamps] || options[:modified_by]) -%>
         }
+<% end -%>
     }
+<% unless options[:read_only] -%>
 
     public void save() {
         <%= class_name %> model = view.flush();
-        view.setEnabled(false);
         service.update(model<% if attributes.detect{|a| a.type == :belongs_to} -%>.minimalClone()<% end -%>, new MethodCallback<<%= class_name %>>() {
 
             public void onFailure(Method method, Throwable exception) {
-                notice.setText("error saving <%= class_name.underscore.humanize %>: "
-                        + exception.getMessage());
-                view.reset(place.action);
+                notice.finishLoading();
+                notice.error("error saving <%= class_name.underscore.humanize %>", exception);
             }
 
             public void onSuccess(Method method, <%= class_name %> response) {
+                notice.finishLoading();
                 eventBus.fireEvent(new <%= class_name %>Event(response, Action.UPDATE));
-                notice.setText(null);
-<% unless options[:singleton] -%>
-                view.updateInList(response);
-<% end -%>
                 view.edit(response);
-                view.reset(place.action);
             }
         });
-        notice.setText("saving <%= class_name.underscore.humanize %> . . .");
+        notice.loading();
     }
 <% unless options[:singleton] -%>
 
     public void delete(final <%= class_name %> model){
-        view.setEnabled(false);
         service.destroy(model, new MethodCallback<Void>() {
 
             public void onFailure(Method method, Throwable exception) {
-                notice.setText("error deleting <%= class_name.underscore.humanize %>: "
-                        + exception.getMessage());
-                view.reset(place.action);
+                notice.finishLoading();
+                notice.error("error deleting <%= class_name.underscore.humanize %>", exception);
             }
 
             public void onSuccess(Method method, Void response) {
+                notice.finishLoading();
                 eventBus.fireEvent(new <%= class_name %>Event(model, Action.DESTROY));
-                notice.setText(null);
-                view.removeFromList(model);
                 <%= class_name %>Place next = new <%= class_name %>Place(RestfulActionEnum.INDEX);
                 if(placeController.getWhere().equals(next)){
-                    view.reset(place.action);
+                    view.removeFromList(model);
                 }
                 else{
                     goTo(next);
                 }
             }
         });
-        notice.setText("deleting <%= class_name.underscore.humanize %> . . .");
+        notice.loading();
     }
 <% end -%>
+<% end -%>
 }

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

@@ -0,0 +1,51 @@
+package <%= caches_package %>;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import <%= events_package %>.<%= class_name %>Event;
+import <%= events_package %>.<%= class_name %>EventHandler;
+import <%= models_package %>.<%= class_name %>;
+import <%= models_package %>.User;
+import <%= restservices_package %>.<%= class_name.pluralize %>RestService;
+
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.event.shared.GwtEvent;
+
+import <%= gwt_rails_package %>.caches.AbstractModelCache;
+import <%= gwt_rails_package %>.events.ModelEvent;
+import <%= gwt_rails_package %>.events.ModelEvent.Action;
+import <%= gwt_rails_package %>.session.SessionManager;
+
+@Singleton
+public class <%= class_name.pluralize %>Cache extends AbstractModelCache<<%= class_name %>>{
+
+    private final <%= class_name.pluralize %>RestService restService;
+    
+    @Inject
+    <%= class_name.pluralize %>Cache(SessionManager<User> manager, EventBus eventBus, <%= class_name.pluralize %>RestService restService) {
+        super(manager, eventBus);
+        this.restService = restService;
+        eventBus.addHandler(<%= class_name %>Event.TYPE, new <%= class_name %>EventHandler() {
+            
+            public void onModelEvent(ModelEvent<<%= class_name %>> event) {
+                <%= class_name.pluralize %>Cache.this.onModelEvent(event);
+            }
+        });
+    }
+    
+    protected void loadModels() {
+        restService.index(newMethodCallback());
+    }
+
+    protected <%= class_name %> newModel() {
+        return new <%= class_name %>();
+    }
+
+    @Override
+    protected GwtEvent<?> newEvent(List<<%= class_name %>> response) {
+        return new <%= class_name %>Event(response, Action.LOAD);
+    }
+}

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

@@ -0,0 +1,34 @@
+package <%= places_package %>;
+
+import <%= gwt_rails_package %>.places.RestfulAction;
+import <%= gwt_rails_package %>.places.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 %>, ActivityFactory> {
+    
+    public static final String NAME = "<%= table_name %>";
+    
+    public Activity create(ActivityFactory factory){
+        return factory.create(this);
+    }
+    
+    public <%= class_name %>Place(RestfulAction restfulAction) {
+        super(restfulAction, NAME);
+    }
+
+    public <%= class_name %>Place(<%= class_name %> model, RestfulAction restfulAction) {
+        super(<% unless options[:singleton] -%>model.getId(), <% end -%>model, restfulAction, NAME);
+    }
+
+    public <%= class_name %>Place(int id, RestfulAction restfulAction) {
+        super(id, restfulAction, NAME);
+    }    
+    
+    public <%= class_name %>Place(String id, RestfulAction restfulAction) {
+        super(id, restfulAction, NAME);
+    }
+}

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

@@ -32,13 +32,25 @@ import com.google.gwt.user.client.ui.NumberLabel;
 <% end -%>
 import com.google.gwt.user.client.ui.*;
 import com.google.gwt.user.client.ui.Widget;
+<% if attributes.detect {|a| [:datetime, :date, :time].member? a.type } -%>
 import com.google.gwt.user.datepicker.client.DateBox;
+<% end -%>
 
+<% if options[:modified_by] -%>
 import de.mkristian.gwt.rails.editors.UserLabel;
+<% end -%>
+<% if attributes.detect {|a| a.type == :number } -%>
 import de.mkristian.gwt.rails.editors.DoubleBox;
+<% end -%>
+<% if attributes.detect {|a| a.type == :integer } -%>
 import de.mkristian.gwt.rails.editors.IntegerBox;
+<% end -%>
+<% if attributes.detect {|a| a.type == :number || a.type == :fixnum } -%>
 import de.mkristian.gwt.rails.editors.LongBox;
+<% end -%>
+<% if attributes.detect {|a| a.type == :belongs_to } -%>
 import de.mkristian.gwt.rails.editors.IdentifyableListBox;
+<% end -%>
 
 public class <%= class_name %>Editor extends Composite implements Editor<<%= class_name %>>{
     
@@ -70,6 +82,8 @@ public class <%= class_name %>Editor extends Composite implements Editor<<%= cla
   // TODO public java.util.List<<%= attribute.name.camelcase %>> <%= attribute.name %>;
 <% elsif attribute.type == :belongs_to -%>
     @UiField IdentifyableListBox<<%= attribute.name.classify %>> <%= attribute.name.camelcase.sub(/^(.)/){ $1.downcase } %>;
+<% elsif attribute.type == :text && options[:read_only] -%>
+    @UiField Label <%= attribute.name.camelcase.sub(/^(.)/){ $1.downcase } %>;
 <% else -%>
     @UiField <%= type_widget_map[attribute.type][2..-1] %> <%= attribute.name.camelcase.sub(/^(.)/){ $1.downcase } %>;
 <% end -%>
@@ -102,7 +116,7 @@ public class <%= class_name %>Editor extends Composite implements Editor<<%= cla
 
 <% end -%>
 <% end -%>
-    public void setEnabled(boolean enabled) {
+    public void resetVisibility() {
 <% if !options[:singleton] -%>
         this.signature.setVisible(id.getValue() != null && id.getValue() > 0);
 <% elsif options[:timestamps] -%>
@@ -110,14 +124,18 @@ public class <%= class_name %>Editor extends Composite implements Editor<<%= cla
 <% elsif options[:modified_by] -%>
        this.signature.setVisible(modifiedBy.getValue() != null);
 <% end -%>
+    }
+
+    public void setEnabled(boolean enabled) {
+        resetVisibility();
 <% 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 -%>
+<% elsif !(attribute.type == :text && options[:read_only]) -%>
         this.<%= attribute.name.camelcase.sub(/^(.)/){ $1.downcase } %>.setEnabled(enabled);
 <% end -%>
 <% end -%>
     }
-}
+}

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

@@ -30,7 +30,11 @@
 <%     name = attribute.name.camelcase.sub(/^(.)/){ $1.downcase } -%>
       <g:HTMLPanel>
         <label name="<%= name %>"><%= name.underscore.humanize %></label>
+<% if options[:read_only] && attribute.type == :text -%>
+        <pre><g:Label ui:field="<%= name %>"/></pre>
+<% else -%>
         <<%= type_widget_map[attribute.type] || 'r:IdentifyableListBox' %> ui:field="<%= name %>"/>
+<% end -%>
       </g:HTMLPanel>
 <%   end -%>
 <% end -%>

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

@@ -1,32 +1,34 @@
 package <%= places_package %>;
 
 import <%= gwt_rails_package %>.places.RestfulAction;
+import <%= gwt_rails_package %>.places.RestfulPlace;
 
 import <%= managed_package %>.ActivityFactory;
 import <%= models_package %>.<%= class_name %>;
-import <%= base_package %>.ActivityPlace;
 
 import com.google.gwt.activity.shared.Activity;
 
-public class <%= class_name %>Place extends ActivityPlace<<%= class_name %>> {
+public class <%= class_name %>Place extends RestfulPlace<<%= class_name %>, ActivityFactory> {
     
+    public static final String NAME = "<%= table_name %>";
+
     public Activity create(ActivityFactory factory){
         return factory.create(this);
     }
     
     public <%= class_name %>Place(RestfulAction restfulAction) {
-        super(restfulAction, "<%= table_name %>");
+        super(restfulAction, NAME);
     }
 
     public <%= class_name %>Place(<%= class_name %> model, RestfulAction restfulAction) {
-        super(<% unless options[:singleton] -%>model.getId(), <% end -%>model, restfulAction, "<%= table_name %>");
+        super(<% unless options[:singleton] -%>model.getId(), <% end -%>model, restfulAction, NAME);
     }
 
     public <%= class_name %>Place(int id, RestfulAction restfulAction) {
-        super(id, restfulAction, "<%= table_name %>");
+        super(id, restfulAction, NAME);
     }    
     
     public <%= class_name %>Place(String id, RestfulAction restfulAction) {
-        super(id, restfulAction, "<%= table_name %>");
+        super(id, restfulAction, NAME);
     }
 }

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

@@ -1,35 +1,42 @@
 package <%= restservices_package %>;
 
+<% if options[:singleton] -%>
 import <%= gwt_rails_package %>.dispatchers.RestfulDispatcherSingleton;
-<% unless options[:singleton] -%>
-<% if action_map.values.member? :get_all -%>
+<% else -%>
 import <%= gwt_rails_package %>.dispatchers.DefaultDispatcherSingleton;
+<% if action_map.values.member? :get_all -%>
+
 import java.util.List;
 <% end -%>
 <% end -%>
 
 import javax.ws.rs.*;
 
-import org.fusesource.restygwt.client.*;
+<% unless options[:singleton] -%>
+import org.fusesource.restygwt.client.Attribute;
+<% end -%>
+import org.fusesource.restygwt.client.MethodCallback;
+import org.fusesource.restygwt.client.Options;
+import org.fusesource.restygwt.client.RestService;
 
 <% if name -%>
+import <%= models_package %>.<%= class_name %>;
 import <%= models_package %>.*;
 <% end -%>
 
-<% if options[:singleton] -%>@Path("/<%= singular_table_name %>")<% end %>
+<% if options[:singleton] -%>@Path("/<%= singular_table_name %>")
 @Options(dispatcher = RestfulDispatcherSingleton.class)
+<% else -%>
+@Options(dispatcher = DefaultDispatcherSingleton.class)
+<% end -%>
 public interface <%= controller_class_name %>RestService extends RestService {
 
 <% actions.each do |action| 
      case action_map[action]
      when :get_all -%>
   @GET @Path("/<%= table_name %>")
-  @Options(dispatcher = DefaultDispatcherSingleton.class)
   void <%= action %>(MethodCallback<List<<%= class_name %>>> callback);
 
-//  @GET @Path("/<%= table_name %>")
-//  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}")<% end %>
   void <%= action %>(<% unless options[:singleton] -%>@PathParam("id") int id, <% end -%>MethodCallback<<%= class_name %>> callback);

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

@@ -21,40 +21,37 @@ import <%= gwt_rails_package %>.places.RestfulAction;
 public interface <%= class_name %>View extends IsWidget {
 
     public interface Presenter {
+<% unless options[:read_only] -%>
 <% unless options[:singleton] -%>
         void create();
-<% end -%>        
+<% end -%>
         void save();
 <% unless options[:singleton] -%>
         void delete(<%= class_name %> model);
+<% end -%>
 <% end -%>
         void goTo(Place place);
     }
-    void setPresenter(Presenter presenter);
 
-    void edit(<%= class_name %> model);
-
-    <%= class_name %> flush();
+    void setup(Presenter presenter, RestfulAction action);
 <% unless options[:singleton] -%>
 
     void reset(List<<%= class_name %>> models);
 <% end -%>
-
-    void reset(RestfulAction action);
-    
-    void setEnabled(boolean enabled);
-<% unless options[:singleton] -%>
-
-    void updateInList(<%= class_name %> model);
-
-    void removeFromList(<%= class_name %> model);
-
-    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 -%>
+
+    void edit(<%= class_name %> model);
+<% unless options[:read_only] -%>
+
+    <%= class_name %> flush();
+<% end -%>
+<% if !options[:singleton] && !options[:read_only] -%>
+
+    void removeFromList(<%= class_name %> model);
 <% end -%>
 }

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

@@ -4,10 +4,11 @@
   xmlns:g="urn:import:com.google.gwt.user.client.ui"
   xmlns:t="urn:import:<%= editors_package %>">
 
-  <g:FlowPanel styleName="gwt-rails-display">
+  <g:FlowPanel styleName="gwt-rails-display <%= application_name.downcase %>-<%= table_name %>">
 
     <g:Label><%if options[:singleton] -%><%= class_name.underscore.singularize.humanize %><% else -%><%= class_name.underscore.pluralize.humanize %><% end -%></g:Label>
 
+<% unless options[:read_only] -%>
     <g:FlowPanel styleName="gwt-rails-buttons">
 <% unless options[:singleton] -%>
       <g:Button ui:field="newButton">New</g:Button>
@@ -16,10 +17,12 @@
       <g:Button ui:field="showButton">Show</g:Button>
     </g:FlowPanel>
 
+<% end -%>
     <g:FlowPanel ui:field="model" styleName="gwt-rails-model">
 
       <t:<%= class_name %>Editor ui:field="editor" styleName="gwt-rails-model-editor" />
 
+<% unless options[:read_only] -%>
       <g:FlowPanel styleName="gwt-rails-buttons">
 <% unless options[:singleton] -%>
         <g:Button ui:field="createButton">Create</g:Button>
@@ -30,6 +33,7 @@
 <% end -%>
       </g:FlowPanel>
 
+<% end -%>
     </g:FlowPanel>
 <% unless options[:singleton] -%>
     

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

@@ -4,12 +4,21 @@ package <%= views_package %>;
 import java.util.List;
 
 <% end -%>
+<% unless options[:read_only] -%>
+import javax.inject.Inject;
+<% end -%>
+
 import <%= editors_package %>.<%= class_name %>Editor;
 <% for attribute in attributes -%>
 <% if attribute.type == :belongs_to -%>
 import <%= models_package %>.<%= attribute.name.classify %>;
 <% end -%>
 <% end -%>
+<% unless options[:read_only] -%>
+<% unless class_name == 'User' -%>
+import <%= models_package %>.User;
+<% end -%>
+<% end -%>
 import <%= models_package %>.<%= class_name %>;
 import <%= places_package %>.<%= class_name %>Place;
 
@@ -21,7 +30,9 @@ import com.google.gwt.event.dom.client.ClickHandler;
 <% end -%>
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
+<% unless options[:read_only] -%>
 import com.google.gwt.uibinder.client.UiHandler;
+<% end -%>
 import com.google.gwt.uibinder.client.UiTemplate;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
@@ -34,6 +45,10 @@ import com.google.inject.Singleton;
 
 import <%= gwt_rails_package %>.places.RestfulAction;
 import <%= gwt_rails_package %>.places.RestfulActionEnum;
+import static <%= gwt_rails_package %>.places.RestfulActionEnum.*;
+<% unless options[:read_only] -%>
+import <%= gwt_rails_package %>.session.SessionManager;
+<% end -%>
 <% unless options[:singleton] -%>
 import <%= gwt_rails_package %>.views.ModelButton;
 <% end -%>
@@ -50,15 +65,13 @@ public class <%= class_name %>ViewImpl extends Composite implements <%= class_na
 
     private final EditorDriver editorDriver = GWT.create(EditorDriver.class);
 
-<% unless options[:readonly] -%>
+<% unless options[:read_only] -%>
 <% unless options[:singleton] -%>
     @UiField Button newButton;
 <% end -%>
     @UiField Button editButton;
-<% end -%>
     @UiField Button showButton;
 
-<% unless options[:readonly] -%>
 <% unless options[:singleton] -%>
     @UiField Button createButton;
 <% end -%>
@@ -76,12 +89,32 @@ public class <%= class_name %>ViewImpl extends Composite implements <%= class_na
     @UiField <%= class_name %>Editor editor;
 
     private Presenter presenter;
+<% unless options[:read_only] -%>
+
+    private final SessionManager<User> session;
+<% end -%>
 
     public <%= class_name %>ViewImpl() {
+<% unless options[:read_only] -%>
+        this(null);
+    }
+
+    @Inject
+    public <%= class_name %>ViewImpl(SessionManager<User> session) {
+<% end -%>
         initWidget(BINDER.createAndBindUi(this));
         editorDriver.initialize(editor);
+<% unless options[:read_only] -%>
+        this.session = session;
+<% end -%>
+    }
+<% unless options[:read_only] -%>
+
+    private boolean isAllowed(RestfulActionEnum action){
+        return session == null || session.isAllowed(<%= class_name %>Place.NAME, action);
     }
-<% unless options[:readonly] -%>
+<% end -%>
+<% unless options[:read_only] -%>
 <% unless options[:singleton] -%>
 
     @UiHandler("newButton")
@@ -117,56 +150,52 @@ public class <%= class_name %>ViewImpl extends Composite implements <%= class_na
     void onClickDelete(ClickEvent e) {
         presenter.delete(flush());
     }
-
 <% end -%>
 <% end -%>
-    public void setPresenter(Presenter presenter) {
-        this.presenter = presenter;
-    }
-
-    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) {
+    public void setup(Presenter presenter, RestfulAction a) {
+        RestfulActionEnum action = RestfulActionEnum.valueOf(a);
+        this.presenter = presenter;
 <% if options[:singleton] -%>
-        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());
+        editButton.setVisible((action == SHOW || action == INDEX) && isAllowed(EDIT));
+        saveButton.setVisible(action == EDIT);
+        showButton.setVisible(action == EDIT);
+        editor.setEnabled(!action.viewOnly());
 <% else -%>
-        newButton.setVisible(!action.name().equals(RestfulActionEnum.NEW.name()));
-        if(action.name().equals(RestfulActionEnum.INDEX.name())){
+<% unless options[:read_only] -%>
+        newButton.setVisible(action != NEW && isAllowed(NEW));
+<% end -%>
+        if(action == INDEX){
+<% unless options[:read_only] -%>
             editButton.setVisible(false);
             showButton.setVisible(false);
+<% end -%>
             list.setVisible(true);
             model.setVisible(false);
         }
         else {
-<% if options[:readonly] -%>
-            setEnabled(false);
-<% 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()));
+<% unless options[:read_only] -%>
+            createButton.setVisible(action == NEW);
+            editButton.setVisible(action == SHOW && isAllowed(EDIT));
+            showButton.setVisible(action == EDIT);
+            saveButton.setVisible(action == EDIT);
+            deleteButton.setVisible(action == EDIT && isAllowed(DESTROY));
 <% end -%>
-            setEnabled(!action.viewOnly());
             list.setVisible(false);
             model.setVisible(true);
         }
+        editor.setEnabled(!action.viewOnly());
 <% end -%>
     }
+
+    public void edit(<%= class_name %> model) {
+        this.editorDriver.edit(model);
+        this.editor.resetVisibility();
+    }
+
+    public <%= class_name %> flush() {
+        return editorDriver.flush();
+    }
 <% unless options[:singleton] -%>
 
     private final ClickHandler clickHandler = new ClickHandler() {
@@ -175,9 +204,11 @@ public class <%= class_name %>ViewImpl extends Composite implements <%= class_na
         public void onClick(ClickEvent event) {
             ModelButton<<%= class_name %>> button = (ModelButton<<%= class_name %>>)event.getSource();
             switch(button.action){
+<% unless options[:read_only] -%>
                 case DESTROY:
                     presenter.delete(button.model);
                     break;
+<% end -%>
                 default:
                     presenter.goTo(new <%= class_name %>Place(button.model, button.action));
             }
@@ -193,10 +224,14 @@ public class <%= class_name %>ViewImpl extends Composite implements <%= class_na
     public void reset(List<<%= class_name %>> models) {
         list.removeAllRows();
         list.setText(0, 0, "Id");
-<% attributes.each_with_index do |attribute, index| -%>
-        list.setText(0, <%= index + 1 %>, "<%= attribute.name.humanize -%>");
+<% index = 0 -%>
+<% attributes.each do |attribute| -%>
+<%   if !(attribute.type == :text && options[:read_only]) -%>
+<%     index = index + 1 -%>
+        list.setText(0, <%= index %>, "<%= attribute.name.humanize -%>");
+<%   end -%>
 <% end -%>
-        list.getRowFormatter().addStyleName(0, "model-list-header");
+        list.getRowFormatter().addStyleName(0, "gwt-rails-model-list-header");
         int row = 1;
         for(<%= class_name %> model: models){
             setRow(row, model);
@@ -206,27 +241,24 @@ public class <%= class_name %>ViewImpl extends Composite implements <%= class_na
 
     private void setRow(int row, <%= class_name %> model) {
         list.setText(row, 0, model.getId() + "");
-<% attributes.each_with_index do |attribute, index| -%>
+<% index = 0 -%>
+<% attributes.each do |attribute| -%>
 <%   if attribute.type != :has_one && attribute.type != :has_many -%>
 <%     name = attribute.name.camelcase.sub(/^(.)/){ $1.downcase } -%>
-        list.setText(row, <%= index + 1 %>, model.get<%= name.camelcase %>()<%= attribute.type == :has_one || attribute.type == :belongs_to ? ' == null ? "-" : model.get' + name.camelcase + '().toDisplay()' : ' + ""' %>);
+<%     if !(attribute.type == :text && options[:read_only]) -%>
+<%       index = index + 1 -%>
+        list.setText(row, <%= index %>, model.get<%= name.camelcase %>()<%= attribute.type == :has_one || attribute.type == :belongs_to ? ' == null ? "-" : model.get' + name.camelcase + '().toDisplay()' : ' + ""' %>);
+<%     end -%>
 <%   end -%>
-
 <% end -%>
-        list.setWidget(row, <%= attributes.size + 1 %>, newButton(RestfulActionEnum.SHOW, model));
-        list.setWidget(row, <%= attributes.size + 2 %>, newButton(RestfulActionEnum.EDIT, model));
-        list.setWidget(row, <%= attributes.size + 3 %>, newButton(RestfulActionEnum.DESTROY, model));
-    }
 
-    public void updateInList(<%= class_name %> model) {
-        String id = model.getId() + "";
-        for(int i = 0; i < list.getRowCount(); i++){
-            if(list.getText(i, 0).equals(id)){
-                setRow(i, model);
-                return;
-            }
-        }
+        list.setWidget(row, <%= index + 1 %>, newButton(RestfulActionEnum.SHOW, model));
+<% unless options[:read_only] -%>
+        list.setWidget(row, <%= index + 2 %>, newButton(RestfulActionEnum.EDIT, model));
+        list.setWidget(row, <%= index + 3 %>, newButton(RestfulActionEnum.DESTROY, model));
+<% end -%>
     }
+<% unless options[:read_only] -%>
 
     public void removeFromList(<%= class_name %> model) {
         String id = model.getId() + "";
@@ -237,10 +269,7 @@ public class <%= class_name %>ViewImpl extends Composite implements <%= class_na
             }
         }
     }
-
-    public void addToList(<%= class_name %> model) {
-        setRow(list.getRowCount(), model);
-    }
+<% end -%>
 <% end -%>
 <% for attribute in attributes -%>
 <% if attribute.type == :belongs_to -%>

metadata

@@ -2,7 +2,7 @@
 name: resty-generators
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
   - mkristian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-15 00:00:00 +05:30
+date: 2011-11-04 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 0.1.2
+            version: 0.1.3
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -150,6 +150,7 @@ files:
   - lib/generators/resty/setup/templates/empty.css~
   - lib/generators/resty/scaffold/scaffold_generator.rb
   - lib/generators/resty/templates/PlaceTokenizer.java
+  - lib/generators/resty/templates/Cache.java~
   - lib/generators/resty/templates/ViewImpl.java~
   - lib/generators/resty/templates/EventHandler.java~
   - lib/generators/resty/templates/Model.java
@@ -164,6 +165,7 @@ files:
   - lib/generators/resty/templates/ActivityPlace.java~
   - lib/generators/resty/templates/Controller.java~
   - lib/generators/resty/templates/RestService.java
+  - lib/generators/resty/templates/Cache.java
   - lib/generators/resty/templates/Activity.java
   - lib/generators/resty/templates/RestService.java~
   - lib/generators/resty/templates/Editor.ui.xml~