resty-generators 0.2.0 → 0.3.0

data/lib/generators/resty/base.rb

@@ -22,12 +22,36 @@ module Resty
           end
       end
 
-      def models_base_package
-        @models_base_package ||= base_package + ".models"
+      def managed_package
+        @managed_package ||= base_package + ".managed"
       end
 
-      def controllers_base_package
-        @controllers_base_package ||= base_package + ".controllers"
+      def models_package
+        @models_package ||= base_package + ".models"
+      end
+
+      def views_package
+        @views_package ||= base_package + ".views"
+      end
+
+      def places_package
+        @places_package ||= base_package + ".places"
+      end
+
+      def activities_package
+        @activities_package ||= base_package + ".activities"
+      end
+
+      def gwt_rails_package
+        'de.mkristian.gwt.rails'
+      end
+
+      def gwt_rails_session_package
+        @gwt_rails_session_package ||= gwt_rails_package + '.session'
+      end
+
+      def restservices_package
+        @restservices_package ||= base_package + ".restservices"
       end
 
       def action_map
@@ -35,7 +59,11 @@ module Resty
       end
 
       def type_map
-        @type_map ||= {:integer => 'int', :boolean => 'bool', :string => 'String', :float => 'Double', :date => 'java.util.Date', :datetime => 'java.util.Date', :number => 'long', :fixnum => 'long'}
+        @type_map ||= {:integer => 'int', :boolean => 'bool', :string => 'String', :float => 'double', :date => 'java.util.Date', :datetime => 'java.util.Date', :number => 'long', :fixnum => 'long'}
+      end
+
+      def type_conversion_map
+        @type_conversion_map ||= {:integer => 'Integer.parseInt', :boolean => 'Boolean.parseBoolean', :float => 'Double.parseDouble', :date => 'TODO', :datetime => 'TODO', :number => 'Long.parseLong', :fixnum => 'Long.parseLong'}
       end
 
       def find_gwt_xml(basedir)

data/lib/generators/resty/controller/controller_generator.rb

@@ -9,8 +9,8 @@ module Resty
       
       argument :actions, :type => :array, :default => [], :banner => "action action"
 
-      def create_controller_file
-        template 'Controller.java', File.join(java_root, controllers_base_package.gsub(/\./, "/"), class_path, "#{controller_class_name}Controller.java")
+      def create_rest_service_file
+        template 'RestService.java', File.join(java_root, rest_services_base_package.gsub(/\./, "/"), class_path, "#{controller_class_name}RestService.java")
       end
 
     end

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

@@ -11,7 +11,7 @@ module Resty
       if defined? ::Ixtlan::ModifiedBy
         class_option :modified_by, :type => :boolean
       end
-      class_option :timestamps, :type => :boolean
+      class_option :timestamps, :type => :boolean, :default => true
       class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
 
       def create_model_file

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

@@ -12,16 +12,88 @@ module Resty
       if defined? ::Ixtlan::ModifiedBy
         class_option :modified_by, :type => :boolean
       end
-      class_option :timestamps, :type => :boolean
+      class_option :timestamps, :type => :boolean, :default => true
       class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
       class_option :singleton,  :type => :boolean
 
       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
 
-      def create_controller_file
-        template 'Controller.java', File.join(java_root, controllers_base_package.gsub(/\./, "/"), class_path, "#{controller_class_name}Controller.java")
+      def create_rest_service_file
+        template 'RestService.java', File.join(java_root, restservices_package.gsub(/\./, "/"), class_path, "#{controller_class_name}RestService.java")
+      end
+
+      def create_view_files
+        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
+        template 'Place.java', File.join(java_root, places_package.gsub(/\./, "/"), class_path, "#{class_name}Place.java")
+        template 'PlaceTokenizer.java', File.join(java_root, places_package.gsub(/\./, "/"), class_path, "#{class_name}PlaceTokenizer.java")
+      end
+
+      def create_activity_file
+        template 'Activity.java', File.join(java_root, activities_package.gsub(/\./, "/"), class_path, "#{class_name}Activity.java")
+      end
+
+      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
+        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
+        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);"
+
+          content.sub! /new GinFactoryModuleBuilder\(\)/, "new GinFactoryModuleBuilder()\n            .implement(Activity.class, Names.named(\"#{table_name}\"), #{activities_package}.#{class_name}Activity.class)"
+
+          content.sub! /^}/, <<-EOF
+
+    @Singleton
+    public static class #{class_name.pluralize}RestServiceProvider implements Provider<#{restservices_package}.#{class_name.pluralize}RestService> {
+        private final #{restservices_package}.#{class_name.pluralize}RestService service = GWT.create(#{restservices_package}.#{class_name.pluralize}RestService.class);
+        public #{restservices_package}.#{class_name.pluralize}RestService get() {
+            return service;
+        }
+    }
+}
+EOF
+          File.open(file, 'w') { |f| f.print content }
+          log "added to", file
+        end
       end
 
       def actions

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

@@ -9,6 +9,8 @@ module Resty
       
       argument :gwt_module_name, :type => :string, :required => true
 
+      class_option :session, :type => :boolean, :default => false
+     
       def name
         gwt_module_name
       end
@@ -18,26 +20,161 @@ module Resty
       end
 
       def create_maven_file
-        template 'Mavenfile', File.join("Mavenfile")
+        template 'Mavenfile', "Mavenfile"
+        unless File.read(".gitignore") =~ /^target/
+          File.open(".gitignore", "a") { |f| f.puts "target/" }
+        end
+        unless File.read(".gitignore") =~ /^*pom/
+          File.open(".gitignore", "a") { |f| f.puts "*pom" }
+        end
       end
 
       def create_entry_point_file
-        template 'EntryPoint.java', File.join(java_root, base_package.gsub(/\./, "/"), "#{application_name}.java")
+        template 'EntryPoint.java', File.join(java_root, base_package.gsub(/\./, "/"), "#{application_name}EntryPoint.java")
+      end
+
+      def create_managed_files
+        path = managed_package.gsub(/\./, "/")
+        template 'PlaceHistoryMapper.java', 
+                        File.join(java_root, path, 
+                                  "#{application_name}PlaceHistoryMapper.java")
+        template 'GinModule.java', 
+                        File.join(java_root, path, 
+                                  "#{application_name}Module.java")
+        template 'ActivityFactory.java', 
+                        File.join(java_root, path, 
+                                  "ActivityFactory.java")
+      end
+
+      def create_scaffolded_files
+        path = base_package.gsub(/\./, "/")
+        template 'ActivityPlace.java', 
+                        File.join(java_root, path, 
+                                  "ActivityPlace.java")
+        template 'ActivityPlaceActivityMapper.java', 
+                        File.join(java_root, path, 
+                                  "ActivityPlaceActivityMapper.java")
+        if options[:session]
+          template 'SessionActivityPlaceActivityMapper.java', 
+                        File.join(java_root, path, 
+                                  "SessionActivityPlaceActivityMapper.java")
+          template 'BreadCrumbsPanel.java', 
+                        File.join(java_root, path, 
+                                  "BreadCrumbsPanel.java")          
+        end
+      end
+
+      def create_session_files
+        if options[:session]
+          template 'LoginActivity.java',
+                        File.join(java_root, activities_package.gsub(/\./, "/"),
+                                  "LoginActivity.java")
+          template 'User.java',
+                        File.join(java_root, models_package.gsub(/\./, "/"),
+                                  "User.java")
+          template 'LoginPlace.java',
+                        File.join(java_root, places_package.gsub(/\./, "/"),
+                                  "LoginPlace.java")
+          template 'SessionRestService.java',
+                        File.join(java_root, restservices_package.gsub(/\./, "/"),
+                                  "SessionRestService.java")
+          template 'LoginViewImpl.java',
+                        File.join(java_root, views_package.gsub(/\./, "/"),
+                                  "LoginViewImpl.java")
+          template 'LoginView.ui.xml',
+                        File.join(java_root, views_package.gsub(/\./, "/"),
+                                  "LoginView.ui.xml")
+        end
       end
 
       def create_initializers
-        template 'initializer.rb', File.join('config', 'initializers', 'resty.rb')
         template 'monkey_patch.rb', File.join('config', 'initializers', 'resty_monkey_patch.rb')
       end
 
       def create_html
         template 'page.html', File.join('public', "#{application_name.underscore}.html")
-        template 'empty.css', File.join('public', 'stylesheets', "#{application_name.underscore}.css")
+        template 'gwt.css', File.join('public', 'stylesheets', "#{application_name.underscore}.css")
       end
 
+      def create_web_xml
+        template 'web.xml', File.join('public', 'WEB-INF', 'web.xml')
+        template 'gitignore', File.join('public', 'WEB-INF', '.gitignore')
+      end
+
+      def create_rails_session_files
+        if options[:session]
+          template 'sessions_controller.rb', File.join('app', 'controllers', "sessions_controller.rb")
+          file = File.join('config', 'environments', "development.rb")
+          development = File.read(file)
+          changed = false
+          unless development =~ /config.remote_sso_url/
+            changed = true
+            development.sub! /^end\s*$/, <<ENV
+
+  if ENV['SSO'] == 'true' || ENV['SSO'] == ''
+    config.remote_sso_url = "http://localhost:3000"
+  end
+end
+ENV
+          end
+          if changed
+            File.open(file, 'w') { |f| f.print development }
+            log "changed", file
+          else
+            log "unchanged", file
+          end
+          file = File.join('app', 'controllers', "application_controller.rb")
+          app_controller = File.read(file)
+          changed = false
+          unless app_controller =~ /def\s+current_user/
+            changed = true
+            app_controller.sub! /^end\s*$/, <<SESSION
+
+  protected
+
+  def current_user(user = nil)
+    session['user'] = user if user
+    session['user']
+  end
+end
+SESSION
+          end
+          unless app_controller =~ /def\s+csrf/
+            changed = true
+            app_controller.sub! /^end\s*$/, <<SESSION
+
+  private
+
+  after_filter :csrf
+
+  def csrf
+    response.header['X-CSRF-Token'] = form_authenticity_token if current_user
+  end
+end
+SESSION
+          end
+          if changed
+            File.open(file, 'w') { |f| f.print app_controller }
+            log "changed", file
+          else
+            log "unchanged", file
+          end
+          template 'authentication.rb', File.join('app', 'models', "authentication.rb")
+          template 'group.rb', File.join('app', 'models', "group.rb")          
+          template 'session.rb', File.join('app', 'models', "session.rb")
+          template 'user.rb', File.join('app', 'models', "user.rb")
+          route "resource :session"
+          gem 'ixtlan-session-timeout'
+          gem 'ixtlan-guard'
+          # TODO until rmvn uses the right openssl gem
+          gem "jruby-openssl", "~> 0.7.4", :platforms => :jruby
+        end
+      end
+      
       def base_package
         name + ".client"
       end
+
     end
   end
 end

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

@@ -0,0 +1,12 @@
+package <%= managed_package %>;
+
+import com.google.gwt.activity.shared.Activity;
+import com.google.inject.name.Named;
+<% if options[:session] -%>
+import <%= places_package %>.LoginPlace;
+<% end -%>
+public interface ActivityFactory {
+<% if options[:session] -%>
+    @Named("login") Activity create(LoginPlace place);
+<% end -%>
+}

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

@@ -0,0 +1,25 @@
+package <%= base_package %>;
+
+import <%= managed_package %>.ActivityFactory;
+
+import com.google.gwt.activity.shared.Activity;
+
+import <%= gwt_rails_package %>.RestfulAction;
+import <%= gwt_rails_package %>.RestfulPlace;
+
+public abstract class ActivityPlace extends RestfulPlace {
+
+    protected ActivityPlace(RestfulAction restfulAction) {
+        super(restfulAction);
+    }
+
+    protected ActivityPlace(int id, RestfulAction restfulAction) {
+        super(id, restfulAction);
+    }
+
+    protected ActivityPlace(String id, RestfulAction restfulAction) {
+        super(id, restfulAction);
+    }
+
+    public abstract Activity create(ActivityFactory factory);
+}

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

@@ -0,0 +1,30 @@
+package <%= base_package %>;
+
+import <%= managed_package %>.ActivityFactory;
+
+import com.google.gwt.activity.shared.Activity;
+import com.google.gwt.activity.shared.ActivityMapper;
+import com.google.gwt.place.shared.Place;
+import com.google.inject.Inject;
+
+import de.mkristian.gwt.rails.Notice;
+
+public class ActivityPlaceActivityMapper implements ActivityMapper {
+    protected final ActivityFactory factory;
+    protected final Notice notice;
+
+    @Inject
+    public ActivityPlaceActivityMapper(ActivityFactory factory, Notice notice) {
+        this.notice = notice;
+        this.factory = factory;
+    }
+
+
+    public Activity getActivity(Place place) {
+        if (place instanceof ActivityPlace) {
+            return ((ActivityPlace) place).create(factory);
+        }
+        notice.setText("nothing to see");
+        return null;
+    }
+}

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

@@ -0,0 +1,80 @@
+package <%= base_package %>;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import <%= models_package %>.User;
+import <%= restservices_package %>.SessionRestService;
+
+import org.fusesource.restygwt.client.Method;
+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;
+
+import de.mkristian.gwt.rails.Notice;
+import de.mkristian.gwt.rails.session.SessionHandler;
+import de.mkristian.gwt.rails.session.SessionManager;
+
+@Singleton
+public class BreadCrumbsPanel extends FlowPanel {
+
+    private final Button logout;
+
+    @Inject
+    public BreadCrumbsPanel(final SessionManager<User> sessionManager, final SessionRestService service,
+            final Notice notice){
+        setVisible(false);
+        sessionManager.addSessionHandler(new SessionHandler<User>() {
+
+            public void timeout() {
+                notice.setText("timeout");
+                setName(null);
+                History.fireCurrentHistoryState();
+            }
+
+            public void logout() {
+                service.destroy(new MethodCallback<Void>() {
+                    public void onSuccess(Method method, Void response) {
+                    }
+                    public void onFailure(Method method, Throwable exception) {
+                    }
+                });
+                setName(null);
+                History.fireCurrentHistoryState();
+            }
+
+            public void login(User user) {
+                setName(user.name);
+                History.fireCurrentHistoryState();
+            }
+
+            public void accessDenied() {
+                notice.setText("access denied");
+            }
+        });
+        logout = new Button("logout");
+        logout.addClickHandler(new ClickHandler() {
+
+            public void onClick(ClickEvent event) {
+                sessionManager.logout();
+            }
+        });
+    }
+
+    private void setName(String name){
+        clear();
+        if(name != null){
+            add(new Label("Welcome " + name));
+            add(logout);
+            setVisible(true);
+        }
+        else {
+            setVisible(false);
+        }
+    }
+}