resty-generators 0.7.2 → 0.7.3

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

@@ -33,7 +33,7 @@ public class BreadCrumbsPanel extends FlowPanel {
         sessionManager.addSessionHandler(new SessionHandler<User>() {
 
             public void timeout() {
-                notice.setText("timeout");
+                notice.info("timeout");
                 logout();
             }
 
@@ -52,7 +52,7 @@ public class BreadCrumbsPanel extends FlowPanel {
             }
 
             public void accessDenied() {
-                notice.setText("access denied");
+                notice.error("access denied");
             }
         });
         logout = new Button("logout");

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

@@ -39,6 +39,9 @@ public class <%= application_name %>EntryPoint implements EntryPoint {
 <% end -%>
 <% if options[:menu] -%>
         private final <%= application_name %>MenuPanel menu;
+<% end -%>
+<% if options[:remote_users] -%>
+        private final ApplicationLinksPanel links;
 <% end -%>
         private RootPanel root;
 
@@ -50,18 +53,22 @@ public class <%= application_name %>EntryPoint implements EntryPoint {
 <% if options[:menu] -%>
                                            final <%= application_name %>MenuPanel menu,
 <% end -%>
-                                           final ActivityManager activityManager){
+                                           final ActivityManager activityManager<% if options[:remote_users] -%>,
+                                           final ApplicationLinksPanel links<% end -%>){
             super(activityManager);
             this.notice = notice;
 <% if options[:session] -%>
             this.breadCrumbs = breadCrumbs;
 <% end -%>
 <% if options[:menu] -%>
-	    this.menu = menu;
+            this.menu = menu;
+<% end -%>
+<% if options[:remote_users] -%>
+            this.links = links;
 <% end -%>
         }
 
-        protected Panel getApplicationPanel(){
+        protected void initApplicationPanel(Panel panel) {
             if (this.root == null) {
                 this.root = RootPanel.get();
                 this.root.add(notice);
@@ -70,9 +77,12 @@ public class <%= application_name %>EntryPoint implements EntryPoint {
 <% end -%>
 <% if options[:menu] -%>
                 this.root.add(menu);
+<% end -%>
+                this.root.add(panel);
+<% if options[:remote_users] -%>
+                this.root.add(links);
 <% end -%>
             }
-            return this.root;
         }
     }
 

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

@@ -66,11 +66,11 @@ public class LoginActivity extends AbstractActivity implements LoginView.Present
         service.resetPassword(authentication, new MethodCallback<Void>() {
 
             public void onSuccess(Method method, Void result) {
-                notice.setText("new password was sent to your email address");
+                notice.info("new password was sent to your email address");
             }
 
             public void onFailure(Method method, Throwable exception) {
-                notice.setText("could not reset password - username/email unknown");
+                notice.error("could not reset password - username/email unknown");
             }
         });
     }

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

@@ -1,7 +1,7 @@
 #-*- mode: ruby -*-
 GWT_VERSION = '2.4.0'
-jar('de.mkristian.gwt:rails-gwt', '0.7.0').scope :provided
-jar('org.fusesource.restygwt:restygwt', '1.2').scope :provided
+jar('de.mkristian.gwt:rails-gwt', '0.7.1-SNAPSHOT').scope :provided
+jar('org.fusesource.restygwt:restygwt', '1.3-SNAPSHOT').scope :provided
 jar('javax.ws.rs:jsr311-api', '1.1').scope :provided
 jar('com.google.gwt:gwt-user', GWT_VERSION).scope :provided
 jar('com.google.gwt.inject:gin', '1.5.0').scope :provided
@@ -30,4 +30,12 @@ profile("mac") do |mac|
   mac.activation.os.family "mac"
   mac.plugin('org.codehaus.mojo:gwt-maven-plugin').with(:extraJvmArgs => "-d32 -XstartOnFirstThread -Xmx512m")
 end
+
+# to get the restygwt and rails-gwt snapshots
+repository("snapshots") do |snapshot|
+  snapshots.url "http://"
+  snapshots.releases(:enabled => false)
+  snapshots.snapshots(:enabled => true)
+end
+
 # vim: syntax=Ruby

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

@@ -37,11 +37,11 @@ public class SessionActivityPlaceActivityMapper extends ActivityPlaceActivityMap
         if (!(place instanceof NoAuthorization)) {
             if(manager.hasSession()){
                 if(!manager.isAllowed((RestfulPlace<?,?>)place)){
-                    notice.setText("nothing to see");
+                    notice.warn("nothing to see");
                     return null;
                 }
                 //TODO move into a dispatch filter or callback filter
-                manager.resetTimer();
+                manager.resetCountDown();
             }
             else {
                 return LoginPlace.LOGIN.create(factory);
@@ -58,7 +58,7 @@ public class SessionActivityPlaceActivityMapper extends ActivityPlaceActivityMap
         if (place instanceof NeedsAuthorization) {
             if(manager.hasSession()){
                 if(!manager.isAllowed((RestfulPlace<?,?>)place)){
-                    notice.setText("nothing to see");
+                    notice.warn("nothing to see");
                     return null;
                 }
             }

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

@@ -1,4 +1,9 @@
 package <%= models_package %>;
+<% if options[:remote_users] -%>
+
+import java.util.Collections;
+import java.util.List;
+<% end -%>
 
 import org.codehaus.jackson.annotate.JsonCreator;
 import org.codehaus.jackson.annotate.JsonProperty;
@@ -14,12 +19,20 @@ public class User implements IsUser {
   private String login;
 
   private String name;
+<% if options[:remote_users] -%>
+
+  public final List<Application> applications;
+<% end -%>
 
   @JsonCreator
   public User(@JsonProperty("login") String login,
-          @JsonProperty("name") String name){
+          @JsonProperty("name") String name<% if options[:remote_users] -%>, 
+          @JsonProperty("applications") List<Application> applications<% end -%>){
     this.login = login;
     this.name = name;
+<% if options[:remote_users] -%>
+    this.applications = applications == null ? null : Collections.unmodifiableList(applications);
+<% end -%>
   }
   
   public String getLogin(){

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

@@ -0,0 +1,15 @@
+class Application
+  include ActiveModel::Serializers::JSON
+  include ActiveModel::Serializers::Xml
+
+  attr_accessor :name, :url
+
+  def initialize(attributes = {})
+    @name = attributes['name']
+    @url = attributes['url']
+  end
+
+  def attributes
+    { 'name' => name, 'url' => url }
+  end
+end

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

@@ -1,4 +1,4 @@
 class Authentication < ActiveResource::Base
-  self.site = Rails.application.config.respond_to?(:remote_sso_url) ? Rails.application.config.remote_sso_url : "http://localhost:3000"
-  self.headers['X-SERVICE-TOKEN'] = Rails.application.config.respond_to?(:remote_sso_token) ? Rails.application.config.remote_sso_token : 'be happy'
+  self.site = Rails.application.config.respond_to?(:remote_service_url) ? Rails.application.config.remote_service_url : "http://localhost:3000"
+  self.headers['X-SERVICE-TOKEN'] = Rails.application.config.respond_to?(:remote_service_token) ? Rails.application.config.remote_service_token : 'be happy'
 end

data/lib/generators/resty/setup/templates/gwt.css

@@ -59,4 +59,16 @@
 .gwt-rails-model-fields .gwt-TextArea
 {
   height: 6em;
-}
+}
+
+.gwt-rails-application-links > div
+{
+  display: inline;
+  border-left: solid darkblue 1px;
+  border-right: solid darkblue 1px;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+  margin: 0;
+  margin-left: -1px;
+  font-size: 0.9em;
+}

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

@@ -1,5 +1,5 @@
 class RemoteUser < ActiveResource::Base
-  self.site = Rails.application.config.respond_to?(:remote_sso_url) ? Rails.application.config.remote_sso_url : "http://localhost:3000"
+  self.site = Rails.application.config.respond_to?(:remote_service_url) ? Rails.application.config.remote_service_url : "http://localhost:3000"
   self.element_name = "user"
   self.headers['X-SERVICE-TOKEN'] =  Rails.application.config.respond_to?(:remote_service_token) ? Rails.application.config.remote_service_token : 'be happy'
 end

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

@@ -1,5 +1,5 @@
 class RemoteUser < ActiveResource::Base
   self.site = Rails.application.config.respond_to?(:remote_sso_url) ? Rails.application.config.remote_sso_url : "http://localhost:3000"
   self.element_name = "user"
-  self.headers['X-SERVICE-TOKEN'] =  Rails.application.config.respond_to?(:remote_token) ? Rails.application.config.remote_token : 'be happy'
+  self.headers['X-SERVICE-TOKEN'] =  Rails.application.config.respond_to?(:remote_service_token) ? Rails.application.config.remote_service_token : 'be happy'
 end

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

@@ -28,11 +28,18 @@ class Session < Ixtlan::Guard::AbstractSession
 <% end -%>
       user.name = auth.name
       user.groups = auth.groups
+<% if options[:remote_users] -%>
+      user.applications = auth.applications
+<% end -%>
       user
     rescue ActiveResource::ResourceNotFound
       result = User.new
       result.log = "access denied #{login}" # error message
       result
+    rescue ActiveResource::UnauthorizedAccess
+      result = User.new
+      result.log = "access denied #{login}" # error message
+      result
     end
   end
 end

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

@@ -1,6 +1,6 @@
 class SessionsController < ApplicationController
 
-  skip_before_filter :authorization
+  skip_before_filter :authorize
 
   skip_before_filter :check_session, :only => :destroy
 
@@ -10,7 +10,7 @@ class SessionsController < ApplicationController
 
   def create
     auth = params[:authentication] || params
-    method = Rails.application.config.respond_to?(:remote_sso_url) ? :create_remote : :create
+    method = Rails.application.config.respond_to?(:remote_service_url) ? :create_remote : :create
     @session = Session.send(method, auth[:login] || auth[:email], 
                               auth[:password])
     

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

@@ -1,11 +1,12 @@
 class User<% if options[:remote_users] -%> < ActiveRecord::Base
 
-  attr_accessor :groups
-  
+  attr_accessor :groups, :applications
+
   validates :login, :presence => true
 
   record_timestamps = false
 <% else -%>
+
   include ActiveModel::Serializers::JSON
   include ActiveModel::Serializers::Xml
   
@@ -35,6 +36,9 @@ class User<% if options[:remote_users] -%> < ActiveRecord::Base
       result.id = 0
 <% end -%>
       result.groups = [Group.new('name' => login)]
+<% if options[:remote_users] -%>
+      result.applications = []
+<% end -%>
     else
       result.log = "wrong password for login: #{login}"
     end
@@ -42,7 +46,13 @@ class User<% if options[:remote_users] -%> < ActiveRecord::Base
   end
 
   def self.reset_password(login)
-    Authentication.post(:reset_password, :login => login)
+    result = User.new(:login => login)
+    begin
+      Authentication.post(:reset_password, :login => login)
+    rescue ActiveResource::ResourceNotFound
+      result.log = "User(#{login}) not found"
+    end
+    result
   end
 
   def log=(msg)
@@ -53,11 +63,19 @@ class User<% if options[:remote_users] -%> < ActiveRecord::Base
     if @log
       @log
     else
-      "User(#{id})"
+      "User(#{id ? (id.to_s + ':') : ''}#{login})"
     end
   end
 
-<% unless options[:remote_users] -%>
+<% if options[:remote_users] -%>
+  unless respond_to? :old_as_json
+    alias :old_as_json :as_json
+    def as_json(options = nil)
+      options = { :methods => [ :applications ] } unless options
+      old_as_json(options)
+    end
+  end
+<% else -%>
   def valid?(ignore)
     @log.nil?
   end

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

@@ -11,6 +11,7 @@ import <%= events_package %>.<%= class_name %>EventHandler;
 <% 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 %>;
@@ -39,6 +40,7 @@ import com.google.gwt.user.client.ui.AcceptsOneWidget;
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 
+import <%= gwt_rails_package %>.DisplayErrors;
 import <%= gwt_rails_package %>.Notice;
 <% if !options[:singleton] && !options[:read_only] -%>
 import <%= gwt_rails_package %>.events.ModelEvent;
@@ -55,6 +57,7 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
 <% end -%>
     private final <%= class_name.pluralize %>RestService service;
     private final Notice notice;
+    private final DisplayErrors errors;
     private final PlaceController placeController;
     private final <%= class_name %>View view;
 <% if !options[:singleton] && !options[:read_only] -%>
@@ -66,8 +69,8 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
     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<% if !options[:singleton] && !options[:read_only] -%>,
+    public <%= class_name %>Activity(@Assisted <%= class_name %>Place place, final Notice notice, DisplayErrors errors,
+            final <%= class_name %>View view, <%= 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 -%>
@@ -76,6 +79,7 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
         this.place = place;
 <% end -%>
         this.notice = notice;
+        this.errors = errors;
         this.view = view;
         this.service = service;
         this.placeController = placeController;
@@ -202,7 +206,10 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
 
             public void onFailure(Method method, Throwable exception) {
                 notice.finishLoading();
-                notice.error("error creating <%= class_name.underscore.humanize %>", exception);
+                switch (errors.showMessages(method, exception)) {
+                case GENERAL:
+                    notice.error("error creating <%= class_name.underscore.humanize %>", exception);
+                }
             }
 
             public void onSuccess(Method method, <%= class_name %> response) {
@@ -254,7 +261,12 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
 
             public void onFailure(Method method, Throwable exception) {
                 notice.finishLoading();
-                notice.error("error saving <%= class_name.underscore.humanize %>", exception);
+                switch (errors.showMessages(method, exception)) {
+                case CONFLICT:
+                    //TODO
+                case GENERAL:
+                    notice.error("error saving <%= class_name.underscore.humanize %>", exception);
+                }
             }
 
             public void onSuccess(Method method, <%= class_name %> response) {
@@ -272,7 +284,12 @@ public class <%= class_name %>Activity extends AbstractActivity implements <%= c
 
             public void onFailure(Method method, Throwable exception) {
                 notice.finishLoading();
-                notice.error("error deleting <%= class_name.underscore.humanize %>", exception);
+                switch (errors.showMessages(method, exception)) {
+                case CONFLICT:
+                    //TODO
+                case GENERAL:
+                    notice.error("error deleting <%= class_name.underscore.humanize %>", exception);
+                }
             }
 
             public void onSuccess(Method method, Void response) {

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

@@ -85,6 +85,7 @@ public class <%= class_name %>Editor extends Composite implements Editor<<%= cla
 <% elsif attribute.type == :text && options[:read_only] -%>
     @UiField Label <%= attribute.name.camelcase.sub(/^(.)/){ $1.downcase } %>;
 <% else -%>
+<% raise "unknown widget for type #{attribute.type}" unless type_widget_map[attribute.type] -%>
     @UiField <%= type_widget_map[attribute.type][2..-1] %> <%= attribute.name.camelcase.sub(/^(.)/){ $1.downcase } %>;
 <% end -%>
 

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

@@ -47,7 +47,7 @@ public class <%= class_name %> implements HasToDisplay<% unless options[:singlet
 <% if attribute.type == :has_one || attribute.type == :belongs_to -%>
   private <%= attribute.name.classify %> <%= name %>;
 <% elsif attribute.type == :has_many -%>
-  private java.util.List<<%= attribute.name.classify %>> <%= name %>;
+  private java.util.List<<%= attribute.name.singularize.classify %>> <%= name %>;
 <% else -%>
   private <%= type_map[attribute.type] || attribute.type.to_s.classify %> <%= name %>;
 <% end -%>
@@ -128,7 +128,13 @@ public class <%= class_name %> implements HasToDisplay<% unless options[:singlet
   }
 <% end -%>
 <% elsif attribute.type == :has_many -%>
-       //TODO  private java.util.List<<%= attribute.name.classify %>> <%= name %>;
+  public java.util.List<<%= attribute.name.singularize.classify %>> get<%= attribute.name.pluralize.camelcase %>(){
+    return <%= name %>;
+  }
+
+  public void set<%= attribute.name.pluralize.camelcase %>(java.util.List<<%= attribute.name.singularize.classify %>> value){
+    <%= name %> = value;
+  }
 <% else -%>
   public <%= type_map[attribute.type] || attribute.type.to_s.classify %> get<%= name.camelcase %>(){
     return <%= name %>;

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

@@ -21,7 +21,6 @@ import org.fusesource.restygwt.client.RestService;
 
 <% if name -%>
 import <%= models_package %>.<%= class_name %>;
-import <%= models_package %>.*;
 <% end -%>
 
 <% if options[:singleton] -%>@Path("/<%= singular_table_name %>")

data/lib/ixtlan/core/heartbeat.rb~

@@ -36,8 +36,14 @@ class Ixtlan::Core::Heartbeat
       last_update = res.local.maximum(:updated_at) || 2000.years.ago
       last_update = last_update.strftime('%Y-%m-%d %H:%M:%S.') + ("%06d" % last_update.usec)
       res.remote.get(:last_changes, :updated_at => last_update).each do |remote|
-        u = res.local.find_by_id(remote.delete('id'))
-        u.update_attributes(res.remote)
+        id = remote.delete('id')
+        u = res.local.find_by_id(id)
+        if u
+          u.update_attributes(remote)
+        else
+          u = res.local.new(remote)
+          u.id = id
+        end
         if u.save
           res.count = res.count + 1
         else