resty-generators 0.2.0 → 0.3.0

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

@@ -0,0 +1,25 @@
+package <%= places_package %>;
+
+import com.google.gwt.place.shared.PlaceTokenizer;
+import com.google.gwt.place.shared.Prefix;
+
+import <%= gwt_rails_package %>.RestfulPlaceTokenizer;
+
+@Prefix("<% if options[:singleton] -%><%= singular_table_name %><% else -%><%= table_name %><% end -%>") 
+public class <%= class_name %>PlaceTokenizer extends RestfulPlaceTokenizer<<%= class_name %>Place> 
+    implements PlaceTokenizer<<%= class_name %>Place> {
+    
+    public <%= class_name %>Place getPlace(String token) {
+<% if options[:singleton] -%>
+	return new <%= class_name %>Place(toSingletonToken(token).action);
+<% else -%>
+        Token t = toToken(token);
+        if(t.identifier == null){
+            return new <%= class_name %>Place(t.action);
+        }
+        else {
+            return new <%= class_name %>Place(t.identifier, t.action);
+        }
+<% end -%>
+    }
+}

data/lib/generators/resty/templates/{Controller.java → RestService.java}

@@ -1,5 +1,6 @@
-package <%= controllers_base_package %>;
+package <%= restservices_package %>;
 
+import <%= gwt_rails_package %>.RestfulDispatcherSingleton;
 <% if action_map.values.member? :get_all -%>
 import java.util.List;
 <% end -%>
@@ -7,43 +8,46 @@ import java.util.List;
 import javax.ws.rs.*;
 
 import org.fusesource.restygwt.client.*;
+import org.fusesource.restygwt.client.dispatcher.DefaultDispatcher;
 
 <% if name -%>
-import <%= models_base_package %>.*;
+import <%= models_package %>.*;
 <% end -%>
 
-@Path("/<%= table_name %><%= options[:singleton] ? '.json' : '' %>")
-public interface <%= controller_class_name %>Controller extends RestService {
+<% if options[:singleton] -%>@Path("/<%= singular_table_name %>")<% end %>
+@Options(dispatcher = RestfulDispatcherSingleton.class)
+public interface <%= controller_class_name %>RestService extends RestService {
 
 <% actions.each do |action| 
      case action_map[action]
      when :get_all -%>
-  @GET @Path("/<%= table_name %>.json")
+  @GET @Path("/<%= table_name %>")
+  @Options(dispatcher = DefaultDispatcher.class)
   void <%= action %>(MethodCallback<List<<%= class_name %>>> callback);
 
-//  @GET @Path("/<%= table_name %>.json")
+//  @GET @Path("/<%= table_name %>")
 //  void <%= action %>(MethodCallback<List<<%= class_name %>>> callback, @QueryParam("limit") int limit, @QueryParam("offset") int offset);
 //
 <%   when :get_single -%>
-  @GET<% unless options[:singleton] -%> @Path("/<%= table_name %>/{id}.json")<% end %>
+  @GET<% unless options[:singleton] -%> @Path("/<%= table_name %>/{id}")<% end %>
   void <%= action %>(<% unless options[:singleton] -%>@PathParam("id") int id, <% end -%>MethodCallback<<%= class_name %>> callback);
 
 <%   when :post -%>
-  @POST @Path("/<%= table_name %>.json")
+  @POST @Path("/<%= table_name %>")
   void <%= action %>(<%= class_name %> value, MethodCallback<<%= class_name %>> callback);
 
 <%   when :put -%>
-  @PUT<% unless options[:singleton] -%> @Path("/<%= table_name %>/{id}.json")<% end %>
+  @PUT<% unless options[:singleton] -%> @Path("/<%= table_name %>/{id}")<% end %>
   void <%= action %>(<% unless options[:singleton] -%>@PathParam("id") @Attribute("id") <% end -%><%= class_name %> value, MethodCallback<<%= class_name %>> callback);
 
 <%   when :delete -%>
-  @DELETE @Path("/<%= table_name %>/{id}.json")
+  @DELETE @Path("/<%= table_name %>/{id}")
   void <%= action %>(@PathParam("id") @Attribute("id") <%= class_name %> value, MethodCallback<Void> callback);
 
 <%   else -%>
-  @GET @Path("/<%= table_name %>/<%= action %>.json")
+  @GET @Path("/<%= table_name %>/<%= action %>")
   void <%= action %>(MethodCallback<Void> callback);
 
 <% end
 end -%>
-}
+}

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

@@ -0,0 +1,35 @@
+package <%= views_package %>;
+
+import java.util.List;
+
+import <%= models_package %>.<%= class_name %>;
+
+import com.google.gwt.place.shared.Place;
+import com.google.gwt.user.client.ui.IsWidget;
+import com.google.inject.ImplementedBy;
+
+import <%= gwt_rails_package %>.RestfulAction;
+
+@ImplementedBy(<%= class_name %>ViewImpl.class)
+public interface <%= class_name %>View extends IsWidget {
+
+    public interface Presenter {
+<% unless options[:singleton] -%>
+        void create();
+<% end -%>        
+        void save();
+<% unless options[:singleton] -%>
+        void delete();
+<% end -%>
+        void goTo(Place place);
+    }
+    void setPresenter(Presenter presenter);
+
+    void reset(<%= class_name %> model);
+
+    void reset(RestfulAction action);
+    
+    void setEnabled(boolean enabled);
+
+    <%= class_name %> retrieve<%= class_name %>();
+}

data/lib/generators/resty/templates/View.ui.xml

@@ -0,0 +1,47 @@
+<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
+<ui:UiBinder
+  xmlns:ui="urn:ui:com.google.gwt.uibinder"
+  xmlns:g="urn:import:com.google.gwt.user.client.ui">
+
+  <ui:style>
+     .buttons {}
+     .signatur { float: left; }
+     .signatur * { display: inline; margin-right: 1em; font-size: 0.8em;}
+     .fields { clear: both;}
+     .field { }
+  </ui:style>
+
+  <g:FlowPanel>
+    <g:FlowPanel styleName="{style.buttons}">
+<% unless options[:singleton] -%>
+      <g:Button ui:field="newButton">New</g:Button>
+      <g:Button ui:field="createButton">Create</g:Button>
+<% end -%>
+      <g:Button ui:field="editButton">Edit</g:Button>
+      <g:Button ui:field="saveButton">Save</g:Button>
+<% unless options[:singleton] -%>
+      <g:Button ui:field="deleteButton">Delete</g:Button>
+<% end -%>
+    </g:FlowPanel>
+    <g:FlowPanel styleName="{style.signatur}">
+<% unless options[:singleton] -%>
+      <g:Label ui:field="id" />
+<% end -%>
+<% if options[:timestamps] %>
+      <g:Label ui:field="createdAt" />
+      <g:Label ui:field="updatedAt" />
+<% end -%>
+    </g:FlowPanel>
+    <g:FlowPanel styleName="{style.fields}">
+<% for attribute in attributes -%>
+<%   if attribute.type != :has_one && attribute.type != :has_many -%>
+<%     name = attribute.name.classify.sub(/^(.)/){ $1.downcase } -%>
+      <g:FlowPanel styleName="{style.field}">
+        <g:HTML><label name="<%= name %>"><%= name.humanize %></label></g:HTML>
+        <g:TextBox ui:field="<%= name %>" name="<%= name %>"/>
+      </g:FlowPanel>
+<%   end -%>
+<% end -%>
+    </g:FlowPanel>
+  </g:FlowPanel>
+</ui:UiBinder>

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

@@ -0,0 +1,196 @@
+package <%= views_package %>;
+
+<% if options[:timestamps] %>
+import java.util.Date;
+<% end -%>
+
+import <%= gwt_rails_package %>.RestfulAction;
+import <%= gwt_rails_package %>.RestfulActionEnum;
+
+import <%= models_package %>.<%= class_name %>;
+import <%= places_package %>.<%= class_name %>Place;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+<% if options[:timestamps] %>
+import com.google.gwt.i18n.client.DateTimeFormat;
+import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
+<% end -%>
+import com.google.gwt.uibinder.client.UiBinder;
+import com.google.gwt.uibinder.client.UiField;
+import com.google.gwt.uibinder.client.UiHandler;
+import com.google.gwt.uibinder.client.UiTemplate;
+import com.google.gwt.user.client.ui.*;
+import com.google.inject.Singleton;
+
+@Singleton
+public class <%= class_name %>ViewImpl extends Composite
+        implements <%= class_name %>View {
+
+    @UiTemplate("<%= class_name %>View.ui.xml")
+    interface <%= class_name %>ViewUiBinder extends UiBinder<Widget, <%= class_name %>ViewImpl> {}
+    
+    private static <%= class_name %>ViewUiBinder uiBinder = GWT.create(<%= class_name %>ViewUiBinder.class);
+
+<% unless options[:singleton] -%>
+    @UiField
+    Button newButton;
+    
+    @UiField
+    Button createButton;
+<% end -%>    
+    @UiField
+    Button editButton;
+
+    @UiField
+    Button saveButton;
+<% unless options[:singleton] -%>
+    @UiField
+    Button deleteButton;
+
+    @UiField
+    Label id;
+
+<% end -%>
+<% if options[:timestamps] %>
+    @UiField
+    Label createdAt;
+
+    @UiField
+    Label updatedAt;
+
+<% end -%>
+<% for attribute in attributes -%>
+<% if attribute.type == :has_one -%>
+  // TODO <%= attribute.name.classify %> <%= attribute.name %>;
+<% elsif attribute.type == :has_many -%>
+  // TODO public java.util.List<<%= attribute.name.classify %>> <%= attribute.name %>;
+<% else -%>
+    @UiField
+    TextBox <%= attribute.name.classify.sub(/^(.)/){ $1.downcase } %>;
+<% end -%>
+
+<% end -%>
+
+    private Presenter presenter;
+
+<% unless options[:singleton] -%>
+    private int idCache;
+
+<% end -%>
+<% if options[:timestamps] %>
+    private Date createdAtCache;
+    private Date updatedAtCache;
+
+<% end -%>
+    public <%= class_name %>ViewImpl() {
+        initWidget(uiBinder.createAndBindUi(this));
+    }
+<% unless options[:singleton] -%>
+    @UiHandler("newButton")
+    void onClickNew(ClickEvent e) {
+        presenter.goTo(new <%= class_name %>Place(RestfulActionEnum.NEW));
+    }
+
+    @UiHandler("createButton")
+    void onClickCreate(ClickEvent e) {
+        presenter.create();
+    }
+<% end -%>
+    @UiHandler("editButton")
+    void onClickEdit(ClickEvent e) {
+        presenter.goTo(new <%= class_name %>Place(<% unless options[:singleton] -%>idCache, <% end -%>RestfulActionEnum.EDIT));
+    }
+
+    @UiHandler("saveButton")
+    void onClickSave(ClickEvent e) {
+        presenter.save();
+    }
+<% unless options[:singleton] -%>
+    @UiHandler("deleteButton")
+    void onClickDelete(ClickEvent e) {
+        presenter.delete();
+    }
+<% end -%>
+    public void setPresenter(Presenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void reset(<%= class_name %> model) {
+<% if options[:singleton] -%>
+	//TODO singleton support
+<% else -%>
+        if(model.id > 0){
+            id.setText("id: " + model.id);
+<% if options[:timestamps] %>
+            createdAt.setText("created at: "
+                    + DateTimeFormat.getFormat(PredefinedFormat.DATE_TIME_MEDIUM).format(model.created_at));
+            updatedAt.setText("updated at: "
+                    + DateTimeFormat.getFormat(PredefinedFormat.DATE_TIME_MEDIUM).format(model.updated_at));
+<% end -%>
+        }
+        else {
+            id.setText(null);
+<% if options[:timestamps] %>
+            createdAt.setText(null);
+            updatedAt.setText(null);
+<% end -%>
+        }
+        this.idCache = model.id;
+<% if options[:timestamps] %>
+        this.createdAtCache = model.created_at;
+        this.updatedAtCache = model.updated_at;
+<% end -%>
+<% end -%>
+<% for attribute in attributes -%>
+<%   if attribute.type != :has_one && attribute.type != :has_many -%>
+<%     name = attribute.name.classify.sub(/^(.)/){ $1.downcase } -%>
+<%     field_name = attribute.name.classify.underscore.sub(/^(.)/){ $1.downcase } -%>
+        <%= name %>.setText(model.<%= field_name %><% if type_conversion_map[attribute.type] -%> + ""<% end -%>);
+<%   end -%>
+<% end -%>
+    }
+
+    public void reset(RestfulAction action) {
+        GWT.log(action.name() + " <%= class_name %>"<% unless options[:singleton] -%> + (idCache > 0 ? "(" + id + ")" : "")<% end -%>);
+<% unless options[:singleton] -%>
+        newButton.setVisible(!action.name().equals(RestfulActionEnum.NEW.name()));
+        createButton.setVisible(action.name().equals(RestfulActionEnum.NEW.name()));
+<% end -%>
+        editButton.setVisible(action.name().equals(RestfulActionEnum.SHOW.name()));
+        saveButton.setVisible(action.name().equals(RestfulActionEnum.EDIT.name()));
+<% unless options[:singleton] -%>
+        deleteButton.setVisible(!action.name().equals(RestfulActionEnum.NEW.name()));
+<% end -%>
+        setEnabled(!action.viewOnly());
+    }
+
+    public <%= class_name %> retrieve<%= class_name %>() {
+        <%= class_name %> model = new <%= class_name %>();
+<% unless options[:singleton] -%>
+        model.id = idCache;
+<% end -%>
+<% if options[:timestamps] %>
+        model.created_at = createdAtCache;
+        model.updated_at = updatedAtCache;
+<% end -%>
+
+<% for attribute in attributes -%>
+<%   if attribute.type != :has_one && attribute.type != :has_many -%>
+<%     name = attribute.name.classify.sub(/^(.)/){ $1.downcase } -%>
+        model.<%= attribute.name.classify.underscore.sub(/^(.)/){ $1.downcase } %> = <% if (conv = type_conversion_map[attribute.type]).nil? -%><%= name %>.getText()<% else -%><%= conv %>(<%= name %>.getText())<% end -%>;
+<%   end -%>
+
+<% end -%>
+        return model;
+    }
+
+    public void setEnabled(boolean enabled) {
+<% for attribute in attributes -%>
+<%   if attribute.type != :has_one && attribute.type != :has_many -%>
+<%     name = attribute.name.classify.sub(/^(.)/){ $1.downcase } -%>
+         <%= name %>.setEnabled(enabled);
+<%   end -%>
+<% end -%>
+    }
+}

data/lib/resty-generators.rb

@@ -1,3 +1,4 @@
 if defined?(Rails)
   require 'resty/resty_railtie'
+  require 'ixtlan-core'
 end

data/lib/resty/child_path.rb

@@ -6,13 +6,26 @@ module Resty
     end
 
     def call(env)
+      is_json = (env['CONTENT_TYPE'] || env['HTTP_ACCEPT']) =~ /^application\/json/
+      is_child = false
       ['REQUEST_PATH','PATH_INFO','REQUEST_URI','SCRIPT_NAME'].each do |key|
-        if(env[key] =~ /\.json([?].*)?$/)
-          env[key].gsub!(/^\/#{@rootpath}\//, "/")
+        if(is_json || env[key] =~ /\.json([?].*)?$/)
+          is_json = true
+          value = env[key]
+          if value
+            is_child = is_child || value =~ /^\/#{@rootpath}\//
+            value.gsub!(/^\/#{@rootpath}\//, "/")
+          end
         end
       end
-      @app.call(env)
+      status, headers, response = @app.call(env)
+      if is_child && headers['Location']
+        uri = URI(headers['Location']) 
+        uri.path.gsub!(/^\//, "/#{@rootpath}/")
+        headers['Location'] = uri.to_s
+      end
+      headers['Content-Type'] = 'application/json' if is_json
+      [status, headers, response]
     end
-
   end
 end

data/lib/resty/resty_railtie.rb

@@ -10,7 +10,6 @@ module Resty
       Rails::Generators::ControllerGenerator.hook_for :resty, :type => :boolean, :default => true do |controller|
         invoke controller, [ class_name, actions ]
       end
-      #Erb::Generators::ScaffoldGenerator.source_paths.insert(0, File.expand_path('../../generators/ixtlan/templates', __FILE__))
     end
 
     config.after_initialize do
@@ -21,22 +20,22 @@ module Resty
       # get the time/date format right ;-) and match it with resty
       class DateTime
         def as_json(options = nil)
-          strftime('%Y-%m-%dT%H:%M:%S.%s%z')
+          strftime('%Y-%m-%dT%H:%M:%S.%N%z')
         end
       end
       class ActiveSupport::TimeWithZone
         def as_json(options = nil)
-          strftime('%Y-%m-%dT%H:%M:%S.%s%z')
+          strftime('%Y-%m-%dT%H:%M:%S.%N%z')
         end
       end
       class Date
         def as_json(options = nil)
-          strftime('%Y-%m-%dT%H:%M:%S.%s%z')
+          strftime('%Y-%m-%dT%H:%M:%S.%N%z')
         end
       end
       class Time
         def as_json(options = nil)
-          strftime('%Y-%m-%dT%H:%M:%S.%s%z')
+          strftime('%Y-%m-%dT%H:%M:%S.%N%z')
         end
       end
     end