resty-generators 0.5.3 → 0.6.0

data/features/generators.feature

@@ -0,0 +1,67 @@
+Feature: Generators for Resty
+
+  Scenario: Create a rails application and adding 'resty-generators' gem will provide the resty generators
+    Given I create new rails application with template "simple.template"
+    And I execute "rails generate"
+    Then the output should contain "resty:controller" and "resty:model" and "resty:scaffold" and "resty:setup"
+
+    Given me an existing rails application "simple"
+    And I execute "rails generate resty:setup"
+    Then the output should contain "GWT_MODULE_NAME"
+    
+    Given me an existing rails application "simple"
+    And I execute "rails generate resty:setup com.example"
+    Then the output should contain "src/main/java/com/example/Simple.gwt.xml" and "Mavenfile" and "src/main/java/com/example/client/SimpleEntryPoint.java" and "public/Simple.html" and "public/stylesheets/simple.css"
+    
+    Given me an existing rails application "simple"
+    And I execute "compile gwt:compile"
+    Then the output should contain "Compilation succeeded"
+    
+    Given me an existing rails application "simple"
+    And I execute "rails generate scaffold user name:string"
+    Then the output should contain "src/main/java/com/example/client/models/User.java" and "src/main/java/com/example/client/restservices/UsersRestService.java"
+
+    Given me an existing rails application "simple"
+    And I execute "compile gwt:compile"
+    Then the output should contain "Compilation succeeded"
+    
+    Given me an existing rails application "simple"
+    And I execute "rake db:migrate test"
+    Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors" and "7 tests, 10 assertions, 0 failures, 0 errors"
+    
+    Given me an existing rails application "simple"
+    And I execute "rails generate scaffold project name:string children:number cars:fixnum age:integer weight:float activated:boolean expires_at:date fire_up_at:datetime --skip-timestamps"
+    And I execute "compile gwt:compile"
+    Then the output should contain "Compilation succeeded"
+    
+    Given me an existing rails application "simple"
+    And I execute "rails generate scaffold accounts name:string --timestamps --optimistic"
+    And I execute "compile gwt:compile"
+    Then the output should contain "Compilation succeeded"
+    
+    Given me an existing rails application "simple"
+    And I execute "rails generate model cars name:string"
+    And I execute "compile gwt:compile"
+    Then the output should contain "Compilation succeeded"
+    
+    
+
+  Scenario: Create a gwt rails application with session and menu
+    Given I create new rails application with template "complete.template" and "complete" tests
+    And I execute "rails generate resty:setup com.example --session --menu"
+   Then the output should contain "src/main/java/com/example/client/SessionActivityPlaceActivityMapper.java" and "src/main/java/com/example/client/managed/CompleteMenuPanel.java" and "src/main/java/com/example/client/activities/LoginActivity.java"
+
+    Given me an existing rails application "complete"
+    And I execute "compile gwt:compile"
+    Then the output should contain "Compilation succeeded"
+    
+    Given me an existing rails application "complete"
+    And I execute "rails generate scaffold accounts name:string"
+    And I execute "compile gwt:compile"
+    Then the output should contain "Compilation succeeded"
+    
+    Given me an existing rails application "complete"
+    And I execute "rake db:migrate test"
+    Then the output should contain "1 tests, 1 assertions, 0 failures, 0 errors" and "7 tests, 10 assertions, 0 failures, 0 errors"
+ 
+    

data/features/step_definitions/simple_steps.rb

@@ -0,0 +1 @@
+require 'maven/cucumber_steps'

data/lib/generators/resty/base.rb

@@ -38,6 +38,14 @@ module Resty
         @places_package ||= base_package + ".places"
       end
 
+      def events_package
+        @events_package ||= base_package + ".events"
+      end
+
+      def editors_package
+        @editors_package ||= base_package + ".editors"
+      end
+
       def activities_package
         @activities_package ||= base_package + ".activities"
       end
@@ -59,11 +67,15 @@ 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 => 'boolean', :string => 'String', :float => 'double', :date => 'java.util.Date', :datetime => 'java.util.Date', :number => 'long', :fixnum => 'long', :text => 'String', :password => 'String'}
+      end
+
+      def type_widget_map
+        @type_widget_map ||= {:integer => 'r:IntegerBox', :boolean => 'g:CheckBox', :float => 'r:DoubleBox', :date => 'd:DateBox', :datetime => 'd:DateBox', :number => 'r:LongBox', :fixnum => 'r:LongBox', :text => 'g:TextArea', :string => 'g:TextBox', :password => 'g:PasswordTextBox', :float => 'r:DoubleBox'}
       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'}
+     def type_widget_prefix_map
+        @type_widget_prefix_map ||= {:integer => 'r', :boolean => 'g', :float => 'r', :date => 'd', :datetime => 'd', :number => 'r', :fixnum => 'r', :text => 'g', :string => 'g', :passord => 'g', :float => 'r'}
       end
 
       def find_gwt_xml(basedir)

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

@@ -8,16 +8,46 @@ module Resty
       
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
-      if defined? ::Ixtlan::ModifiedBy
-        class_option :modified_by, :type => :boolean
-      end
       class_option :timestamps, :type => :boolean, :default => true
+      class_option :read_only, :type => :boolean, :default => false
+      class_option :modified_by, :type => :boolean, :default => false
+      class_option :singleton, :type => :boolean, :default => false
       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_package.gsub(/\./, "/"), class_path, "#{class_name}.java")
       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")
+      end
+
+      def create_rest_service_file
+        template 'RestService.java', File.join(java_root, restservices_package.gsub(/\./, "/"), class_path, "#{controller_class_name}RestService.java")
+      end
+
+      def controller_class_name
+        @controller_class_name ||= class_name
+      end
+
+      def actions
+        @actions ||= 
+          begin
+            keys = action_map.keys
+            if options[:singleton]
+              keys.delete('index')
+              keys.delete('create')
+              keys.delete('destroy')
+            end
+            if options[:read_only]
+              keys.delete('update')
+              keys.delete('create')
+              keys.delete('destroy')
+            end
+            keys
+          end
+      end
     end
   end
 end

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

@@ -9,17 +9,21 @@ module Resty
       
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
-      if defined? ::Ixtlan::ModifiedBy
-        class_option :modified_by, :type => :boolean
-      end
-      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
+      class_option :timestamps,  :type => :boolean, :default => true
+      class_option :read_only,   :type => :boolean, :default => false
+      class_option :modified_by, :type => :boolean, :default => false
+      class_option :singleton,   :type => :boolean, :default => false
+      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_package.gsub(/\./, "/"), class_path, "#{class_name}.java")
       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")
+      end
+
       def create_rest_service_file
         template 'RestService.java', File.join(java_root, restservices_package.gsub(/\./, "/"), class_path, "#{controller_class_name}RestService.java")
       end
@@ -30,6 +34,11 @@ module Resty
         template 'ViewImpl.java', File.join(java_root, views_package.gsub(/\./, "/"), class_path, "#{class_name}ViewImpl.java")
       end
 
+      def create_editor_files
+        template 'Editor.java', File.join(java_root, editors_package.gsub(/\./, "/"), class_path, "#{class_name}Editor.java")
+        template 'Editor.ui.xml', File.join(java_root, editors_package.gsub(/\./, "/"), class_path, "#{class_name}Editor.ui.xml")
+      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")
@@ -115,15 +124,21 @@ EOF
       end
 
       def actions
-        if options[:singleton]
-          keys = action_map.keys
-          keys.delete('index')
-          keys.delete('create')
-          keys.delete('destroy')
-          keys
-        else
-          action_map.keys
-        end
+        @actions ||= 
+          begin
+            keys = action_map.keys
+            if options[:singleton]
+              keys.delete('index')
+              keys.delete('create')
+              keys.delete('destroy')
+            end
+            if options[:read_only]
+              keys.delete('update')
+              keys.delete('create')
+              keys.delete('destroy')
+            end
+            keys
+          end
       end
     end
   end

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

@@ -179,8 +179,8 @@ resource :session do
 ROUTE
           gem 'ixtlan-session-timeout'
           gem 'ixtlan-guard'
-          # TODO until rmvn uses the right openssl gem
-          #gem "jruby-openssl", "~> 0.7.4", :platforms => :jruby
+          # needs to be in Gemfile to have jruby find the gem
+          gem "jruby-openssl", "~> 0.7.4", :platforms => :jruby
         end
       end
       

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

@@ -0,0 +1,31 @@
+require 'generators/resty/base'
+module Resty
+  module Generators
+    class SetupGenerator < Base
+
+      arguments.clear # clear name argument from NamedBase
+      
+      argument :gwt_module_name, :type => :string, :required => true
+
+      def name
+        gwt_module_name
+      end
+
+      def create_module_file
+        template 'module.gwt.xml', File.join(java_root, name.gsub(/\./, "/"), "#{application_name.underscore}.gwt.xml")
+      end
+
+      def create_maven_file
+        template 'Mavenfile', File.join("Mavenfile")
+      end
+
+      def create_entry_point_file
+        template 'EntryPoint.java', File.join(java_root, base_package.gsub(/\./, "/"), "#{application_name}.java")
+      end
+
+      def base_package
+        name + ".client"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+package <%= base_package %>.managed;
+
+import com.google.gwt.activity.shared.Activity;
+import com.google.inject.name.Named;
+
+public interface ActivityFactory {
+}

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

@@ -25,5 +25,10 @@ public abstract class ActivityPlace<T> extends RestfulPlace<T> {
         super(id, restfulAction, name);
     }
 
+    protected ActivityPlace(int id, T model, RestfulAction restfulAction,
+            String name) {
+        super(id, model, restfulAction, name);
+    }
+
     public abstract Activity create(ActivityFactory factory);
 }

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

@@ -0,0 +1,8 @@
+package de.mkristian.gwt.rails;
+
+import org.dhamma.schedules.client.managed.ActivityFactory;
+
+public abstract class ActivityPlace extends Place {
+
+    public abstract Activity create(ActivityFactory factory);
+}

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

@@ -1,3 +1,4 @@
+
 package <%= base_package %>;
 
 import javax.inject.Inject;
@@ -27,7 +28,7 @@ public class BreadCrumbsPanel extends FlowPanel {
     @Inject
     public BreadCrumbsPanel(final SessionManager<User> sessionManager, final SessionRestService service,
             final Notice notice){
-        setStyleName("rails-breadcrumbs");
+        setStyleName("gwt-rails-breadcrumbs");
         setVisible(false);
         sessionManager.addSessionHandler(new SessionHandler<User>() {
 
@@ -47,7 +48,7 @@ public class BreadCrumbsPanel extends FlowPanel {
             }
 
             public void login(User user) {
-                setName(user.name);
+                setName(user.getName());
             }
 
             public void accessDenied() {

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

@@ -0,0 +1,79 @@
+package org.dhamma.schedules.client;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.dhamma.schedules.client.models.User;
+import org.dhamma.schedules.client.restservices.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);
+        }
+    }
+}

data/lib/generators/resty/setup/templates/GinModule.java~

@@ -0,0 +1,7 @@
+package <%= base_package %>.managed;
+
+import com.google.gwt.activity.shared.Activity;
+import com.google.inject.name.Named;
+
+public interface ActivityFactory {
+}

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

@@ -0,0 +1,58 @@
+package org.dhamma.schedules.client.activities;
+
+import javax.inject.Inject;
+
+import org.dhamma.schedules.client.models.User;
+import org.dhamma.schedules.client.places.LoginPlace;
+import org.dhamma.schedules.client.restservices.SessionRestService;
+import org.fusesource.restygwt.client.Method;
+import org.fusesource.restygwt.client.MethodCallback;
+
+import com.google.gwt.activity.shared.AbstractActivity;
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.user.client.ui.AcceptsOneWidget;
+import com.google.inject.assistedinject.Assisted;
+
+import de.mkristian.gwt.rails.session.Authentication;
+import de.mkristian.gwt.rails.session.LoginView;
+import de.mkristian.gwt.rails.session.Session;
+import de.mkristian.gwt.rails.session.SessionManager;
+
+public class LoginActivity extends AbstractActivity implements LoginView.Presenter{
+
+    private final SessionRestService service;
+    private final LoginView view;
+    private final SessionManager<User> sessionManager;
+
+    @Inject
+    public LoginActivity(@Assisted LoginPlace place, 
+            LoginView view, 
+            SessionRestService service, 
+            SessionManager<User> sessionManager) {
+        this.view = view;
+        this.service = service;
+        this.sessionManager = sessionManager;   
+    }
+
+    public void start(AcceptsOneWidget display, EventBus eventBus) {
+        display.setWidget(view.asWidget());
+        view.setPresenter(this);
+    }
+
+    public void login(final String login, String password) {
+        Authentication authentication = new Authentication(login, password);
+        service.create(authentication, new MethodCallback<Session<User>>() {
+    
+            public void onSuccess(Method method, Session<User> session) {
+                GWT.log("logged in: " + login);
+                sessionManager.login(session);
+            }
+    
+            public void onFailure(Method method, Throwable exception) {
+                GWT.log("login failed: " + exception.getMessage(), exception);
+                sessionManager.accessDenied();
+            }
+        });
+    }
+}