resty-generators 0.4.0 → 0.5.0

data/lib/generators/resty/model/model_generator.rb

@@ -15,7 +15,7 @@ module Resty
       class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
 
       def create_model_file
-        template 'Model.java', File.join(java_root, models_base_package.gsub(/\./, "/"), class_path, "#{class_name}.java")
+        template 'Model.java', File.join(java_root, models_package.gsub(/\./, "/"), class_path, "#{class_name}.java")
       end
 
     end

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

@@ -28,9 +28,6 @@ module Resty
         template 'View.java', File.join(java_root, views_package.gsub(/\./, "/"), class_path, "#{class_name}View.java")
         template 'View.ui.xml', File.join(java_root, views_package.gsub(/\./, "/"), class_path, "#{class_name}View.ui.xml")
         template 'ViewImpl.java', File.join(java_root, views_package.gsub(/\./, "/"), class_path, "#{class_name}ViewImpl.java")
-        unless options[:singleton]
-          template 'ColumnDefinitionsImpl.java', File.join(java_root, views_package.gsub(/\./, "/"), class_path, "#{class_name.pluralize}ColumnDefinitionsImpl.java")
-        end
       end
 
       def create_place_files
@@ -44,43 +41,62 @@ module Resty
 
       def add_to_activity_factory
         factory_file = File.join(java_root, managed_package.gsub(/\./, "/"), class_path, "ActivityFactory.java")
-        factory = File.read(factory_file)
-        if factory =~ /@Named\(.#{table_name}.\)/
-          log 'keep', factory_file
-        else
-          factory.sub! /interface\s+ActivityFactory\s+{/, "interface ActivityFactory {\n  @Named(\"#{table_name}\") Activity create(#{places_package}.#{class_name}Place place);"
-          File.open(factory_file, 'w') { |f| f.print factory }
-          log "added to", factory_file
+        if File.exists?(factory_file)
+          factory = File.read(factory_file)
+          if factory =~ /@Named\(.#{table_name}.\)/
+            log 'keep', factory_file
+          else
+            factory.sub! /interface\s+ActivityFactory\s+\{/, "interface ActivityFactory {\n  @Named(\"#{table_name}\") Activity create(#{places_package}.#{class_name}Place place);"
+            File.open(factory_file, 'w') { |f| f.print factory }
+            log "added to", factory_file
+          end
         end
       end
 
       def add_to_place_histroy_mapper
         file = File.join(java_root, managed_package.gsub(/\./, "/"), class_path, "#{application_name}PlaceHistoryMapper.java")
-        content = File.read(file)
-        if content =~ /#{class_name}PlaceTokenizer.class/
-          log 'keep', file
-        elsif content =~ /@WithTokenizers\({}\)/
-          content.sub! /@WithTokenizers\({}\)/, "@WithTokenizers({#{places_package}.#{class_name}PlaceTokenizer.class})"
-          File.open(file, 'w') { |f| f.print content }
-          log "added to", file
-        else
-          content.sub! /@WithTokenizers\({/, "@WithTokenizers({#{places_package}.#{class_name}PlaceTokenizer.class,\n    "
-          File.open(file, 'w') { |f| f.print content }
-          log "added to", file
+        if File.exists?(file)
+          content = File.read(file)
+          if content =~ /#{class_name}PlaceTokenizer/
+            log 'keep', file
+          else
+            content.sub! /public\s+#{application_name}PlaceHistoryMapper.(.*).\s*\{/ do |m|
+              "public #{application_name}PlaceHistoryMapper(#{$1}){\n        register(\"#{table_name}\", new #{places_package}.#{class_name}PlaceTokenizer());"
+end
+            File.open(file, 'w') { |f| f.print content }
+            log "added to", file
+          end
+        end
+      end
+
+      def add_to_menu_panel
+        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/
+            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        });"
+            File.open(file, 'w') { |f| f.print content }
+            log "added to", file
+          end
         end
       end
 
       def add_to_module
         file = File.join(java_root, managed_package.gsub(/\./, "/"), class_path, "#{application_name}Module.java")
-        content = File.read(file)
-        if content =~ /#{class_name.pluralize}RestService.class/
-          log 'keep', file
-        else content =~ /super.configure\(\);/
-          content.sub! /super.configure\(\);/, "super.configure();\n        bind(#{restservices_package}.#{class_name.pluralize}RestService.class).toProvider(#{class_name.pluralize}RestServiceProvider.class);"
+        if File.exists?(file)
+          content = File.read(file)
+          if content =~ /#{class_name.pluralize}RestService.class/
+            log 'keep', file
+          else content =~ /super.configure\(\);/
+            content.sub! /super.configure\(\);/, "super.configure();\n        bind(#{restservices_package}.#{class_name.pluralize}RestService.class).toProvider(#{class_name.pluralize}RestServiceProvider.class);"
 
-          content.sub! /new GinFactoryModuleBuilder\(\)/, "new GinFactoryModuleBuilder()\n            .implement(Activity.class, Names.named(\"#{table_name}\"), #{activities_package}.#{class_name}Activity.class)"
+            content.sub! /new GinFactoryModuleBuilder\(\)/, "new GinFactoryModuleBuilder()\n            .implement(Activity.class, Names.named(\"#{table_name}\"), #{activities_package}.#{class_name}Activity.class)"
 
-          content.sub! /^}/, <<-EOF
+            content.sub! /^}/, <<-EOF
 
     @Singleton
     public static class #{class_name.pluralize}RestServiceProvider implements Provider<#{restservices_package}.#{class_name.pluralize}RestService> {
@@ -91,8 +107,9 @@ module Resty
     }
 }
 EOF
-          File.open(file, 'w') { |f| f.print content }
-          log "added to", file
+            File.open(file, 'w') { |f| f.print content }
+            log "added to", file
+          end
         end
       end
 

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

@@ -11,6 +11,8 @@ module Resty
 
       class_option :session, :type => :boolean, :default => false
      
+      class_option :menu, :type => :boolean, :default => false
+     
       def name
         gwt_module_name
       end
@@ -44,6 +46,11 @@ module Resty
         template 'ActivityFactory.java', 
                         File.join(java_root, path, 
                                   "ActivityFactory.java")
+        if options[:menu]
+          template 'MenuPanel.java', 
+                        File.join(java_root, path, 
+                                  "#{application_name}MenuPanel.java")
+        end
       end
 
       def create_scaffolded_files
@@ -97,6 +104,10 @@ module Resty
         template 'gitignore', File.join('public', 'WEB-INF', '.gitignore')
       end
 
+      def add_gems
+        gem 'ixtlan-core'
+      end
+
       def create_rails_session_files
         if options[:session]
           template 'sessions_controller.rb', File.join('app', 'controllers', "sessions_controller.rb")

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

@@ -4,15 +4,19 @@ import <%= managed_package %>.ActivityFactory;
 
 import com.google.gwt.activity.shared.Activity;
 
-import <%= gwt_rails_package %>.RestfulAction;
-import <%= gwt_rails_package %>.RestfulPlace;
+import <%= gwt_rails_package %>.places.RestfulAction;
+import <%= gwt_rails_package %>.places.RestfulPlace;
 
-public abstract class ActivityPlace extends RestfulPlace {
+public abstract class ActivityPlace<T> extends RestfulPlace<T> {
 
     protected ActivityPlace(RestfulAction restfulAction, String name) {
         super(restfulAction, name);
     }
 
+    protected ActivityPlace(T model, RestfulAction restfulAction, String name) {
+        super(model, restfulAction, name);
+    }
+
     protected ActivityPlace(int id, RestfulAction restfulAction, String name) {
         super(id, restfulAction, name);
     }
@@ -22,4 +26,4 @@ public abstract class ActivityPlace extends RestfulPlace {
     }
 
     public abstract Activity create(ActivityFactory factory);
-}
+}

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

@@ -21,10 +21,10 @@ public class ActivityPlaceActivityMapper implements ActivityMapper {
 
 
     public Activity getActivity(Place place) {
-        if (place instanceof ActivityPlace) {
-            return ((ActivityPlace) place).create(factory);
+        if (place instanceof ActivityPlace<?>) {
+            return ((ActivityPlace<?>) place).create(factory);
         }
         notice.setText("nothing to see");
         return null;
     }
-}
+}

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

@@ -11,7 +11,6 @@ import org.fusesource.restygwt.client.MethodCallback;
 
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.Label;
@@ -28,13 +27,13 @@ public class BreadCrumbsPanel extends FlowPanel {
     @Inject
     public BreadCrumbsPanel(final SessionManager<User> sessionManager, final SessionRestService service,
             final Notice notice){
+        setStyleName("rails-breadcrumbs");
         setVisible(false);
         sessionManager.addSessionHandler(new SessionHandler<User>() {
 
             public void timeout() {
                 notice.setText("timeout");
-                setName(null);
-                History.fireCurrentHistoryState();
+                logout();
             }
 
             public void logout() {
@@ -45,12 +44,10 @@ public class BreadCrumbsPanel extends FlowPanel {
                     }
                 });
                 setName(null);
-                History.fireCurrentHistoryState();
             }
 
             public void login(User user) {
                 setName(user.name);
-                History.fireCurrentHistoryState();
             }
 
             public void accessDenied() {
@@ -77,4 +74,4 @@ public class BreadCrumbsPanel extends FlowPanel {
             setVisible(false);
         }
     }
-}
+}

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

@@ -1,16 +1,15 @@
 package <%= base_package %>;
 
-import <%= managed_package %>.<%= application_name %>PlaceHistoryMapper;
+<% if options[:menu] -%>
+import <%= managed_package %>.<%= application_name %>MenuPanel;
+<% end -%>
 import <%= managed_package %>.<%= application_name %>Module;
 
 import com.google.gwt.activity.shared.ActivityManager;
 import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.shared.EventBus;
 import com.google.gwt.inject.client.GinModules;
 import com.google.gwt.inject.client.Ginjector;
-import com.google.gwt.place.shared.Place;
-import com.google.gwt.place.shared.PlaceController;
 import com.google.gwt.place.shared.PlaceHistoryHandler;
 import com.google.gwt.user.client.ui.Panel;
 import com.google.gwt.user.client.ui.RootPanel;
@@ -18,7 +17,7 @@ import com.google.inject.Inject;
 
 import <%= gwt_rails_package %>.Application;
 import <%= gwt_rails_package %>.Notice;
-import <%= gwt_rails_package %>.DefaultDispatcherSingleton;
+import <%= gwt_rails_package %>.dispatchers.DefaultDispatcherSingleton;
 
 import org.fusesource.restygwt.client.Defaults;
 
@@ -29,8 +28,7 @@ public class <%= application_name %>EntryPoint implements EntryPoint {
 
     @GinModules(<%= application_name %>Module.class)
     static public interface <%= application_name %>Ginjector extends Ginjector {
-        PlaceController getPlaceController();
-        EventBus getEventBus();
+        PlaceHistoryHandler getPlaceHistoryHandler();
         Application getApplication();
     }
 
@@ -38,6 +36,9 @@ public class <%= application_name %>EntryPoint implements EntryPoint {
         private final Notice notice;
 <% if options[:session] -%>
         private final BreadCrumbsPanel breadCrumbs;
+<% end -%>
+<% if options[:menu] -%>
+        private final <%= application_name %>MenuPanel menu;
 <% end -%>
         private RootPanel root;
 
@@ -45,6 +46,9 @@ public class <%= application_name %>EntryPoint implements EntryPoint {
         <%= application_name %>Application(final Notice notice,
 <% if options[:session] -%>
                                            final BreadCrumbsPanel breadCrumbs,
+<% end -%>
+<% if options[:menu] -%>
+                                           final <%= application_name %>MenuPanel menu,
 <% end -%>
                                            final ActivityManager activityManager){
             super(activityManager);
@@ -52,7 +56,10 @@ public class <%= application_name %>EntryPoint implements EntryPoint {
 <% if options[:session] -%>
             this.breadCrumbs = breadCrumbs;
 <% end -%>
- }
+<% if options[:menu] -%>
+	    this.menu = menu;
+<% end -%>
+        }
 
         protected Panel getApplicationPanel(){
             if (this.root == null) {
@@ -60,6 +67,9 @@ public class <%= application_name %>EntryPoint implements EntryPoint {
                 this.root.add(notice);
 <% if options[:session] -%>
                 this.root.add(breadCrumbs);
+<% end -%>
+<% if options[:menu] -%>
+                this.root.add(menu);
 <% end -%>
             }
             return this.root;
@@ -76,15 +86,10 @@ public class <%= application_name %>EntryPoint implements EntryPoint {
 
         final <%= application_name %>Ginjector injector = GWT.create(<%= application_name %>Ginjector.class);
 
+        // setup display
         injector.getApplication().run();
-
-        // Start PlaceHistoryHandler with our PlaceHistoryMapper
-        <%= application_name %>PlaceHistoryMapper historyMapper = GWT.create(<%= application_name %>PlaceHistoryMapper.class);
-
-        PlaceHistoryHandler historyHandler = new PlaceHistoryHandler(historyMapper);
-        historyHandler.register(injector.getPlaceController(), injector.getEventBus(), Place.NOWHERE);
-
+     
         // Goes to the place represented on URL else default place
-        historyHandler.handleCurrentHistory();
+        injector.getPlaceHistoryHandler().handleCurrentHistory();
     }
-}
+}

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

@@ -5,16 +5,16 @@ import <%= managed_package %>.ActivityFactory;
 
 import com.google.gwt.activity.shared.Activity;
 
-public class LoginPlace extends ActivityPlace {
+public class LoginPlace extends ActivityPlace<Void> {
 
     public static final LoginPlace LOGIN = new LoginPlace();
 
     private LoginPlace() {
-        super(null);
+        super(null, null);
     }
 
     @Override
     public Activity create(ActivityFactory factory) {
         return factory.create(this);
     }
-}
+}

data/lib/generators/resty/setup/templates/LoginView.ui.xml

@@ -6,7 +6,7 @@
   <ui:style>
   </ui:style>
 
-  <g:FlowPanel>
+  <g:FlowPanel styleName="display">
     <g:HTML><label name="login">Username or Email</label></g:HTML>
     <g:TextBox ui:field="login" name="login"/>
     <g:HTML><label name="password">Password</label></g:HTML>

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

@@ -1,5 +1,5 @@
 #-*- mode: ruby -*-
-GWT_VERSION = '2.2.0'
+GWT_VERSION = '2.3.0'
 jar('org.fusesource.restygwt:restygwt', '1.2-SNAPSHOT').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

@@ -0,0 +1,27 @@
+package <%= managed_package %>;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+<% if options[:session] -%>
+
+import <%= models_package %>.User;
+<% end -%>
+
+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;
+<% if options[:session] -%>
+import <%= gwt_rails_package %>.session.SessionManager;
+<% end -%>
+import <%= gwt_rails_package %>.views.MenuPanel;
+
+@Singleton
+public class <%= application_name %>MenuPanel extends MenuPanel<User> {
+
+    @Inject
+    <%= application_name %>MenuPanel(final PlaceController placeController<% if options[:session] -%>, SessionManager<User> sessionManager<% end %>){
+        super(<% if options[:session] -%>sessionManager<% end -%>);
+    }
+}

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

@@ -1,8 +1,41 @@
 package <%= managed_package %>;
 
-import com.google.gwt.place.shared.PlaceHistoryMapper;
-import com.google.gwt.place.shared.WithTokenizers;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 
-@WithTokenizers({})
-public interface <%= application_name %>PlaceHistoryMapper extends PlaceHistoryMapper {
+<% if options[:session] -%>
+import <%= models_package %>.User;
+
+import com.google.gwt.place.shared.Place;
+
+import <%= gwt_rails_package %>.places.RestfulPlace;
+<% end -%>
+import <%= gwt_rails_package %>.places.RestfulPlaceHistoryMapper;
+<% if options[:session] -%>
+import <%= gwt_rails_package %>.session.SessionManager;
+<% end -%>
+
+@Singleton
+public class <%= application_name %>PlaceHistoryMapper extends RestfulPlaceHistoryMapper {
+<% if options[:session] -%>
+
+    private final SessionManager<User> manager;
+<% end -%>
+
+    @Inject
+    public <%= application_name %>PlaceHistoryMapper(<% if options[:session] -%>SessionManager<User> manager<% end -%>){
+<% if options[:session] -%>
+        this.manager = manager;
+<% end -%>
+    }
+<% if options[:session] -%>
+
+    @Override
+    public Place getPlace(String 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;
+    }
+<% end -%>
 }

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

@@ -9,11 +9,11 @@ import <%= places_package %>.LoginPlace;
 import com.google.gwt.activity.shared.Activity;
 import com.google.gwt.place.shared.Place;
 
-import de.mkristian.gwt.rails.Notice;
-import de.mkristian.gwt.rails.RestfulPlace;
-import de.mkristian.gwt.rails.session.NeedsAuthorization;
-import de.mkristian.gwt.rails.session.NoAuthorization;
-import de.mkristian.gwt.rails.session.SessionManager;
+import <%= gwt_rails_package %>.Notice;
+import <%= gwt_rails_package %>.places.RestfulPlace;
+import <%= gwt_rails_package %>.session.NeedsAuthorization;
+import <%= gwt_rails_package %>.session.NoAuthorization;
+import <%= gwt_rails_package %>.session.SessionManager;
 
 public class SessionActivityPlaceActivityMapper extends ActivityPlaceActivityMapper {
 
@@ -35,8 +35,8 @@ public class SessionActivityPlaceActivityMapper extends ActivityPlaceActivityMap
      */
     protected Activity pessimisticGetActivity(Place place) {
         if (!(place instanceof NoAuthorization)) {
-            if(manager.isActive()){
-                if(!manager.isAllowed((RestfulPlace)place)){
+            if(manager.hasSession()){
+                if(!manager.isAllowed((RestfulPlace<?>)place)){
                     notice.setText("nothing to see");
                     return null;
                 }
@@ -56,8 +56,8 @@ public class SessionActivityPlaceActivityMapper extends ActivityPlaceActivityMap
      */
     protected Activity optimisticGetActivity(Place place) {
         if (place instanceof NeedsAuthorization) {
-            if(manager.isActive()){
-                if(!manager.isAllowed((RestfulPlace)place)){
+            if(manager.hasSession()){
+                if(!manager.isAllowed((RestfulPlace<?>)place)){
                     notice.setText("nothing to see");
                     return null;
                 }
@@ -68,4 +68,4 @@ public class SessionActivityPlaceActivityMapper extends ActivityPlaceActivityMap
         }
         return super.getActivity(place);
     }
-}
+}

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

@@ -1,3 +1,3 @@
 class Authentication < ActiveResource::Base
-  self.site = Rails.application.config.remote_sso_url
+  self.site = Rails.application.config.remote_sso_url if Rails.application.config.respond_to? :remote_sso_url
 end