resty-generators 0.5.3 → 0.6.0

data/lib/generators/resty/setup/templates/sessions_controller.rb

@@ -2,16 +2,22 @@ class SessionsController < ApplicationController
 
   skip_before_filter :authorization
 
+  skip_before_filter :check_session, :only => :destroy
+
   prepend_after_filter :reset_session, :only => :destroy
 
   public
 
   def create
-    @session = Session.create(params[:authentication] || params)
-
-    if @session
-      current_user @session.user
-      @session.permissions = guard.permissions(@session.user.groups.collect {|g| g.name.to_s })
+    auth = params[:authentication] || params
+    method = Rails.application.config.respond_to?(:remote_sso_url) ? :create_remote : :create
+    @session = Session.send(method, auth[:login] || auth[:email], 
+                              auth[:password])
+    
+    if @session.valid?
+      current_user(@session.user)
+      @session.idle_session_timeout = Rails.application.config.idle_session_timeout
+      @session.permissions = guard.permissions(groups_for_current_user)
 
       # TODO make html login
       respond_to do |format|
@@ -20,16 +26,29 @@ class SessionsController < ApplicationController
         format.json  { render :json => @session.to_json }
       end
     else
-      head :not_found
+      head :unauthorized
     end
   end
 
   def reset_password
-    warn "not implemented"
-    head :ok
+    authentication = params[:authentication] || []
+    user = User.reset_password(authentication[:email] || authentication[:login])
+
+    if user
+
+      # for the log
+      @session = user
+      
+      head :ok
+    else
+      head :not_found
+    end
   end
 
   def destroy
+    # for the log
+    @session = current_user
+
     # reset session happens in the after filter which allows for 
     # audit log with username which happens in another after filter
     head :ok

data/lib/generators/resty/setup/templates/sessions_controller.rb~

@@ -0,0 +1,27 @@
+class SessionsController < ApplicationController
+
+  skip_before_filter :authorization
+
+  prepend_after_filter :reset_session, :only => :destroy
+
+  public
+
+  def create
+    @session = Session.create(params[:session])
+
+    if @session
+      current_user @session.user
+      @session.permissions = guard.permissions(self)
+
+      render :json => @session.to_json(:excludes => :groups)
+    else
+      head :not_found
+    end
+  end
+
+  def destroy
+    # reset session happens in the after filter which allows for 
+    # audit log with username which happens in another after filter
+    head :ok
+  end
+end

data/lib/generators/resty/setup/templates/user.rb

@@ -15,12 +15,44 @@ class User
   end
 
   def self.authenticate(login, password)
-    if login.size > 0 && password == "behappy"
-      u = User.new
-      u.login = login
-      u.name = login.humanize
-      u.groups = [Group.new('name' => login)]
-      u
+    result = User.new
+    if password.blank?
+      result.log = "no password given with login: #{login}"
+    elsif login.blank?
+      result.log = "no login given"
+    elsif password == "behappy"
+      result.login = login
+      result.name = login.humanize
+      result.groups = [Group.new('name' => login)]
+    else
+      result.log = "wrong password for login: #{login}"
     end
+    result
   end
+
+  def self.reset_password(login)
+    Authentication.post(:reset_password, :login=> login)
+  end
+
+  def log=(msg)
+    @log = msg
+  end
+
+  def to_log
+    if @log
+      @log
+    else
+      "User(#{id})"
+    end
+  end
+
+  def valid?
+    @log.nil?
+  end
+
+  def new_record?
+    false
+  end
+  alias :destroyed? :new_record?
+
 end

data/lib/generators/resty/setup/templates/user.rb~

@@ -0,0 +1,27 @@
+class User
+  include ActiveModel::Serializers::JSON
+  
+  attr_accessor :login, :name, :groups
+
+  def attributes
+    {'login' => login, 'name' => name, 'groups' => groups.collect { |g| g.attributes } }
+  end
+
+  def initialize(attributes = {})
+    @login = attributes['login']
+    @name = attributes['name']
+    @groups = (attributes['groups'] || []).collect {|g| Group.new g }
+  end
+
+  def self.authenticate(login, password)
+    if login =~ /^oldstudent$|^dhammaworker$/ && password == "behappy"
+      u = User.new
+      u.login = login
+      u.name = login.humanize
+      u.groups = [Group.new('name' => login)]
+      u
+    end
+  end
+end
+User.include_root_in_json = false
+User

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

@@ -1,11 +1,22 @@
 package <%= activities_package %>;
-<% unless options[:singleton] -%>
+<% if !options[:singleton] || attributes.detect { |a| a.type == :belongs_to} -%>
 
 import java.util.List;
 <% end -%>
 
+import <%= events_package %>.<%= class_name %>Event;
+<% for attribute in attributes -%>
+<% if attribute.type == :belongs_to -%>
+import <%= models_package %>.<%= attribute.name.classify %>;
+<% end -%>
+<% end -%>
 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;
+<% end -%>
+<% end -%>
 import <%= restservices_package %>.<%= class_name.pluralize %>RestService;
 import <%= views_package %>.<%= class_name %>View;
 
@@ -21,6 +32,7 @@ import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
 import <%= gwt_rails_package %>.Notice;
+import <%= gwt_rails_package %>.events.ModelEvent.Action;
 <% unless options[:singleton] -%>
 import <%= gwt_rails_package %>.places.RestfulActionEnum;
 <% end -%>
@@ -32,18 +44,38 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
     private final Notice notice;
     private final PlaceController placeController;
     private final <%= class_name %>View view;
+    private EventBus eventBus;
     
     @Inject
-    public <%= class_name %>Activity(@Assisted <%= class_name %>Place place, Notice notice, <%= class_name %>View view,
-            <%= class_name.pluralize %>RestService service, PlaceController placeController) {
+    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 -%>
+<% if attribute.type == :belongs_to -%>
+, <%= attribute.name.classify.to_s.pluralize %>RestService <%= attribute.name %>RestService<% end -%><% end -%>) {
         this.place = place;
         this.notice = notice;
         this.view = view;
         this.service = service;
         this.placeController = placeController;
+<% for attribute in attributes -%>
+<% if attribute.type == :belongs_to -%>
+    
+        view.reset<%= attribute.name.classify.to_s.pluralize %>(null);
+        <%= attribute.name %>RestService.index(new MethodCallback<List<<%= attribute.name.classify %>>>() {
+            
+            public void onSuccess(Method method, List<<%= attribute.name.classify %>> response) {
+                view.reset<%= attribute.name.classify.to_s.pluralize %>(response);
+            }
+            
+            public void onFailure(Method method, Throwable exception) {
+                notice.setText("failed to load <%= attribute.name.pluralize %>");
+            }
+        });
+<% end -%>
+<% end -%>
     }
 
     public void start(AcceptsOneWidget display, EventBus eventBus) {
+        this.eventBus = eventBus;
         display.setWidget(view.asWidget());
         view.setPresenter(this);
 <% if options[:singleton] -%>
@@ -52,11 +84,11 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
         switch(RestfulActionEnum.valueOf(place.action.name())){
             case EDIT: 
             case SHOW:
-                load(place.model == null ? place.id : place.model.id);
+                load(place.model == null ? place.id : place.model.getId());
                 break;
             case NEW:
                 notice.setText(null);
-                view.reset(new <%= class_name %>());
+                view.edit(new <%= class_name %>());
                 break;
             case INDEX:
             default:
@@ -83,8 +115,9 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
             }
 
             public void onSuccess(Method method, List<<%= class_name %>> response) {
-                view.reset(response);
+                eventBus.fireEvent(new <%= class_name %>Event(response, Action.LOAD));
                 notice.setText(null);
+                view.reset(response);
                 view.reset(place.action);
             }
         });
@@ -93,6 +126,29 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
         }
     }
 <% end -%>
+<% unless options[:singleton] -%>
+
+    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);
+            }
+
+            public void onSuccess(Method method, <%= class_name %> response) {
+                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 %> . . .");
+    }
+<% end -%>
 
     public void load(<% unless options[:singleton] -%>int id<% end -%>) {
         view.setEnabled(false);
@@ -105,8 +161,9 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
             }
 
             public void onSuccess(Method method, <%= class_name %> response) {
+                eventBus.fireEvent(new <%= class_name %>Event(response, Action.LOAD));
                 notice.setText(null);
-                view.reset(response);
+                view.edit(response);
                 view.reset(place.action);
             }
         });
@@ -114,27 +171,31 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
             notice.setText("loading <%= class_name.underscore.humanize %> . . .");
         }
     }
-<% unless options[:singleton] -%>
-    public void create() {
-        <%= class_name %> model = view.retrieve<%= class_name %>();
+
+    public void save() {
+        <%= class_name %> model = view.flush();
         view.setEnabled(false);
-        service.create(model, new MethodCallback<<%= class_name %>>() {
+        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 creating <%= class_name.underscore.humanize %>: "
+                notice.setText("error saving <%= class_name.underscore.humanize %>: "
                         + exception.getMessage());
                 view.reset(place.action);
             }
 
             public void onSuccess(Method method, <%= class_name %> response) {
+                eventBus.fireEvent(new <%= class_name %>Event(response, Action.UPDATE));
                 notice.setText(null);
-                view.addToList(response);
-                goTo(new <%= class_name %>Place(response.id, 
-                        RestfulActionEnum.EDIT));
+<% unless options[:singleton] -%>
+                view.updateInList(response);
+<% end -%>
+                view.edit(response);
+                view.reset(place.action);
             }
         });
-        notice.setText("creating <%= class_name.underscore.humanize %> . . .");
+        notice.setText("saving <%= class_name.underscore.humanize %> . . .");
     }
+<% unless options[:singleton] -%>
 
     public void delete(final <%= class_name %> model){
         view.setEnabled(false);
@@ -147,6 +208,7 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
             }
 
             public void onSuccess(Method method, Void response) {
+                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);
@@ -161,27 +223,4 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
         notice.setText("deleting <%= class_name.underscore.humanize %> . . .");
     }
 <% end -%>
-
-    public void save() {
-        <%= class_name %> model = view.retrieve<%= class_name %>();
-        view.setEnabled(false);
-        service.update(model, 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);
-            }
-
-            public void onSuccess(Method method, <%= class_name %> response) {
-                notice.setText(null);
-<% unless options[:singleton] -%>
-                view.updateInList(response);
-<% end -%>
-                view.reset(response);
-                view.reset(place.action);
-            }
-        });
-        notice.setText("saving <%= class_name.underscore.humanize %> . . .");
-    }
 }

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

@@ -0,0 +1,67 @@
+package <%= activities_package %>;
+
+import java.util.List;
+
+import <%= models_package %>.<%= class_name %>;
+import <%= places_package %>.<%= class_name %>Place;
+import <%= restservices_package %>.<%= class_name.pluralize %>RestService;
+import <%= views_package %>.<%= class_name %>View;
+
+import <%= gwt_rails_package %>.Notice;
+
+import org.fusesource.restygwt.client.Method;
+import org.fusesource.restygwt.client.MethodCallback;
+
+import com.google.gwt.activity.shared.AbstractActivity;
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.place.shared.Place;
+import com.google.gwt.place.shared.PlaceController;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.inject.Inject;
+import com.google.inject.assistedinject.Assisted;
+
+public class <%= class_name %>Activity extends AbstractActivity implements <%= class_name %>View.Presenter{
+
+    private final <%= class_name %>Place place;
+    private final <%= class_name.pluralize %>RestService service;
+    private final Notice notice;
+    private final PlaceController placeController;
+    private final <%= class_name %>View view;
+    
+    @Inject
+    public <%= class_name %>Activity(@Assisted <%= class_name %>Place place, Notice notice, <%= class_name %>View view,
+            <%= class_name.pluralize %>RestService service, PlaceController placeController) {
+	this.place = place;
+        this.notice = notice;
+        this.view = view;
+        this.service = service;
+        this.placeController = placeController;
+    }
+
+    public void start(AcceptsOneWidget display, EventBus eventBus) {
+        display.setWidget(view.asWidget());
+        view.setPresenter(this);
+        notice.setText("loading <%= table_name %> . . .");
+        service.index(new MethodCallback<List<<%= class_name %>>>() {
+
+            public void onFailure(Method method, Throwable exception) {
+                notice.setText("error loading <%= table_name %>: "
+                        + exception.getMessage());
+            }
+
+            public void onSuccess(Method method, List<<%= class_name %>> response) {
+                notice.setText(null);
+                view.reset(response);
+            }
+        });
+    }
+
+    public void goTo(Place place) {
+        placeController.goTo(place);
+    }
+
+    public void onItemClicked(<%= class_name %> model) {
+        Window.alert("TODO");
+    }
+}

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

@@ -0,0 +1,11 @@
+package org.dhamma.schedules.client.lib;
+
+import org.dhamma.schedules.client.managed.ActivityFactory;
+
+import com.google.gwt.activity.shared.Activity;
+import com.google.gwt.place.shared.Place;
+
+public abstract class ActivityPlace extends Place {
+
+    public abstract Activity create(ActivityFactory factory);
+}