dubious 0.0.0-java → 0.0.1-java

data/README.rdoc

@@ -21,40 +21,10 @@ make. Mirah uses the Java type system. Join the mirah mailing list to get
 involved: http://groups.google.com/group/mirah
 
 === Getting Started
-Since Dubious relies on features of Mirah and Bitescript that have not been 
-released yet, you need to clone the repositories and manually build and install
-the gems for each of them.
-
-  #assuming you are in a workspace directory.
-  git clone http://github.com/headius/bitescript.git
-  git clone http://github.com/mirah/mirah.git
-  git clone http://github.com/mirah/dubious.git
-
-  #assuming your gem and rake commands are from jruby
-  cd bitescript
-  gem build bitescript.gemspec
-  gem install bitescript-*
-  cd ../mirah
-  git checkout 5e98ddab33ee4d581881f7822f8148704426af1a #checkout mirah before the new parser.
-  rake jar:bootstrap
-  gem build mirah.gemspec
-  gem install mirah-* 
-  cd ../dubious
-  rake jar #compile the mirah src and put the jar in lib
-  gem build dubious.gemspec
-  gem install dubious-*
-
-In the future, you will be able to simply install Dubious as a JRuby gem. That will look like the following:
-
-If your gem command is the JRuby one, run
 
-  gem install dubious
+Install Dubious(Note: Dubious requires JRuby).
 
-* this currently only installs Dubious and not Mirah.
-
-If not run
-
-  jruby -S gem install dubious
+    gem install dubious
 
 This will add a `dubious` command that you can create new apps, generate controllers and models etc with.
 
@@ -68,51 +38,44 @@ Once dubious is installed, you can generate an app skeleton.
 The layout is based on Rails' with some Java WAR directories, and files geared towards deploying on AppEngine.
 
 * WEB-INF/app.yaml
-contains handlers for different routes. It's like a lightweight version of web.xml--I think it actually generates it
+contains handlers for different routes, as well as filters and settings for serving static files.
 
-http://code.google.com/appengine/docs/python/config/appconfig.html#About_app_yaml
+http://code.google.com/appengine/docs/java/configyaml/appconfig_yaml.html
 
 ==Hacking on Dubious
 ===Setup the Mirah development environment 
 
-Fetch App Engine Java SDK and JRuby, then install them into /usr/local
-
-//-included in the gem-* http://googleappengine.googlecode.com/files/appengine-java-sdk-1.3.7.zip
-* http://jruby.org.s3.amazonaws.com/downloads/1.5.1/jruby-bin-1.5.1.tar.gz
+* Install JRuby. You can find good instructions on the JRuby website http://jruby.org/
+* Install the prerelease appengine-sdk gem from http://code.google.com/p/appengine-jruby/
 
-Make sure the appengine tools are executable
-
-   sudo chmod a+x /usr/local/appengine-java-sdk-1.3.7/bin/*.sh
-
-Now git clone bitescript, mirah and dubious to your drive
+* Now git clone bitescript, mirah and dubious to your drive
 
    mkdir -p ~/mystuff; cd ~/mystuff
    git clone http://github.com/headius/bitescript.git
    git clone http://github.com/mirah/mirah.git
    git clone http://github.com/mirah/dubious.git
 
-Edit .bash_profile to find these tools
-
-   export JRUBY_HOME=/usr/local/jruby-1.5.1
-   export MIRAH_HOME=~/mystuff/mirah
-   export APPENGINE_JAVA_SDK=/usr/local/appengine-java-sdk-1.3.7
-   export PATH=$PATH:$JRUBY_HOME/bin:$MIRAH_HOME/bin:$APPENGINE_JAVA_SDK/bin
+* Then build and install the gems for Mirah, Bitescript and Dubious
 
-Verify tools are configured properly, and check to see
-that script/build.sh has the correct path to the SDK.
+    cd bitescript
+    gem build bitescript.gemspec
+    gem install bitescript-*
+    cd -
+    cd mirah
+    rake jar:bootstrap
+    gem build mirah.gemspec
+    gem install mirah-*
+    cd -
+    cd dubious
+    rake jar
+    gem build dubious.gemspec
+    gem install dubious-*
+    cd -
 
-   which appcfg.sh
-   which dev_appserver.sh
-   which mirah
-   which jruby
-
-After that you should install the appengine-sdk gem
-
-   jgem install appengine-sdk
 
 To build the gem
 
-  jgem build dubious.gemspec
+  gem build dubious.gemspec
 
 ===Developing your App
 
@@ -127,26 +90,8 @@ Generate your app
 
 There are two ways to develop the app. The first way is to run the build script each time you make a change. The new way is to use the Rakefile. If you are using jruby's rake, the task will watch for source file changes and update the running class files. Otherwise, you need to restart the server when you have changes.
 
-=== Use the Original Scripts
-
-Compile the Mirah files and populate the WEB-INF/lib dir
-
-   ./script/build.sh
-
-Run the app locally
-
-   ./script/server.sh
-
-Edit the app-id in app.yaml, then publish to appspot.com
-
-   ./script/publish.sh
-
 === Use the New Rakefile
 
-Populate the WEB-INF/lib dir
-
-   ./script/environment.rb
-
 Run the app locally
 
    jruby -S rake server

data/Rakefile

@@ -7,6 +7,14 @@ rescue LoadError
   exit 1
 end
 
+
+neighbor_mirah = File.expand_path '../mirah'
+
+if File.exists?(neighbor_mirah)
+  ENV['MIRAH_HOME'] ||= neighbor_mirah
+end
+
+
 MIRAH_HOME = ENV['MIRAH_HOME'] ? ENV['MIRAH_HOME'] : Gem.find_files('mirah').first.sub(/lib\/mirah.rb/,'')
 
 if ENV['MIRAH_HOME'] && File.exist?(ENV['MIRAH_HOME'] +'/lib/mirah.rb')
@@ -35,7 +43,7 @@ def class_files_for files
 end
 
 #MODEL_JAR = "#{OUTDIR}/dubydatastore.jar"
-LIB_MIRAH_SRC = Dir["src/**/*.duby"]
+LIB_MIRAH_SRC = Dir["src/**/*{.duby,.mirah}"]
 LIB_JAVA_SRC  = Dir["src/**/*.java"]
  
 LIB_SRC = LIB_MIRAH_SRC + LIB_JAVA_SRC
@@ -55,11 +63,20 @@ file "#{OUTDIR}/dubious/ActionController.class" => ["#{OUTDIR}/dubious/Params.cl
 						    "#{OUTDIR}/dubious/CustomRoutes.class",
 						    ]
 
-file "#{OUTDIR}/dubious/Inflections.class" => ["#{OUTDIR}/dubious/TextHelper.class",
-      					       "#{OUTDIR}/dubious/Inflection.class"]
+file "#{OUTDIR}/dubious/Inflections.class" => [
+        "#{OUTDIR}/dubious/TextHelper.class",
+      	"#{OUTDIR}/dubious/Inflection.class"
+      ]
+
+file "#{OUTDIR}/dubious/TextHelper.class" => [
+   			"#{OUTDIR}/dubious/Inflection.class",
+      ]
+
+                      
 file "#{OUTDIR}/dubious/FormHelper.class" => [
      					      "#{OUTDIR}/dubious/Inflections.class",
      					      "#{OUTDIR}/dubious/InstanceTag.class",
+     					      "#{OUTDIR}/dubious/Params.class",
 					      "#{OUTDIR}/dubious/TimeConversion.class",
 					      *STDLIB_CLASSES]
 file "#{OUTDIR}/dubious/InstanceTag.class" => "#{OUTDIR}/dubious/SanitizeHelper.class"

data/examples/contacts/WEB-INF/app.yaml

@@ -1,4 +1,4 @@
-application: contacts
+application: dubious-demo # duby-primer
 version: duby
 runtime: java
 public_root: /public
@@ -6,4 +6,39 @@ public_root: /public
 resource_files:
   - exclude: /build/**
 
+static_files:
+  - include: /**/*.ico
+    expiration: 365d
+  - include: /**/*.gif
+    expiration: 365d
+  - include: /**/*.jpeg
+    expiration: 365d
+  - include: /**/*.jpg
+    expiration: 365d
+  - include: /**/*.png
+    expiration: 365d
+  - include: /**/*.js
+    expiration: 365d
+  - include: /**/*.css
+    expiration: 365d
+
 handlers:
+  - url: /info/properties
+    servlet: controllers.InfoPropertiesController
+    name: info_properties
+
+  - url: /contacts/*
+    servlet: controllers.ContactsController
+    name: contacts
+
+  - url: /source/*
+    servlet: controllers.SourceController
+    name: source
+
+  - url: /simple_duby/*
+    servlet: testing.SimpleDuby
+    name: dimple_duby
+
+  - url: /simple_java/*
+    servlet: testing.SimpleJava
+    name: simple_java

data/examples/contacts/WEB-INF/appengine-generated/datastore-indexes-auto.xml

@@ -0,0 +1,4 @@
+<!-- Indices written at Thu, 11 Nov 2010 15:17:40 UTC -->
+
+<datastore-indexes/>
+

data/examples/contacts/WEB-INF/appengine-web.xml

@@ -1,9 +1,16 @@
 <!-- Generated from app.yaml. Do not edit. -->
 <appengine-web-app xmlns='http://appengine.google.com/ns/1.0'>
-  <application>contacts</application>
+  <application>dubious-demo</application>
   <version>duby</version>
   <public-root>/public</public-root>
   <static-files>
+    <include path='/**/*.ico' expiration='365d'/>
+    <include path='/**/*.gif' expiration='365d'/>
+    <include path='/**/*.jpeg' expiration='365d'/>
+    <include path='/**/*.jpg' expiration='365d'/>
+    <include path='/**/*.png' expiration='365d'/>
+    <include path='/**/*.js' expiration='365d'/>
+    <include path='/**/*.css' expiration='365d'/>
   </static-files>
   <resource-files>
     <exclude path='/build/**'/>

data/examples/contacts/WEB-INF/classes/controllers/ContactsController.java

@@ -0,0 +1,285 @@
+// Generated from contacts_controller.mirah
+package controllers;
+public class ContactsController extends controllers.ApplicationController {
+  private models.Contact[] contacts;
+  private models.Contact contact;
+  public static void main(java.lang.String[] argv) {
+  public java.lang.Object index() {
+    this.contacts = models.Contact.all().run();
+    return this.render(this.index_erb(), this.main_erb());
+  }
+  public java.lang.Object show() {
+    this.contact = models.Contact.get(this.params().id());
+    return this.render(this.show_erb(), this.main_erb());
+  }
+  public java.lang.Object new() {
+    this.contact = new models.Contact();
+    return this.render(this.new_erb(), this.main_erb());
+  }
+  public java.lang.Object edit() {
+    this.contact = models.Contact.get(this.params().id());
+    return this.render(this.edit_erb(), this.main_erb());
+  }
+  public java.lang.Object delete() {
+    models.Contact.delete(models.Contact.get(this.params().id()).key());
+    return this.redirect_to(this.params().index());
+  }
+  public java.lang.Object create() {
+    new models.Contact().update(this.params().for("contact")).save();
+    return this.redirect_to(this.params().index());
+  }
+  public java.lang.Object update() {
+    models.Contact.get(this.params().id()).update(this.params().for("contact")).save();
+    return this.redirect_to(this.params().show());
+  }
+  public void doGet(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException, java.io.IOException {
+    this.action_response(response, this.action_request(request, "get"));
+  }
+  public void doPost(javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response) throws javax.servlet.ServletException, java.io.IOException {
+    this.action_response(response, this.action_request(request, "post"));
+  }
+  public java.lang.String index_erb() {
+    java.lang.StringBuilder _edbout = new java.lang.StringBuilder();
+    _edbout.append("<h1>Listing contacts</h1>\n\n<table>\n  <tr>\n    <th>Title</th>\n    <th>Summary</th>\n    <th>Birthday</th>\n    <th>URL</th>\n    <th>Platform</th>\n    <th>Editor</th>\n    <th>Address</th>\n    <th>Phone</th>\n    <th>Private</th>\n    <th>Happy</th>\n  </tr>\n\n");
+    int __xform_tmp_1 = 0;
+    models.Contact[] __xform_tmp_2 = this.contacts;
+    label1:
+    while ((__xform_tmp_1 < __xform_tmp_2.length)) {
+      models.Contact contact = __xform_tmp_2[__xform_tmp_1];
+      label2:
+       {
+        _edbout.append("\n  <tr>\n    <td>");
+        _edbout.append(this.h(contact.title()));
+        _edbout.append("</td>\n    <td>");
+        _edbout.append(this.h(contact.summary()));
+        _edbout.append("</td>\n    <td>");
+        _edbout.append(this.date_format(contact.birthday()));
+        _edbout.append("</td>\n    <td>");
+        _edbout.append(this.h(contact.url()));
+        _edbout.append("</td>\n    <td>");
+        _edbout.append(this.h(contact.platform()));
+        _edbout.append("</td>\n    <td>");
+        _edbout.append(this.h(contact.editor()));
+        _edbout.append("</td>\n    <td>");
+        _edbout.append(this.h(contact.address()));
+        _edbout.append("</td>\n    <td>");
+        _edbout.append(this.h(contact.phone()));
+        _edbout.append("</td>\n    <td>");
+        _edbout.append(contact.private() ? ("true") : ("false"));
+        _edbout.append("</td>\n    <td>");
+        _edbout.append(this.link_to("Show", this.resource(contact)));
+        _edbout.append("</td>\n    <td>");
+        _edbout.append(this.link_to("Edit", this.resource(contact, "edit")));
+        _edbout.append("</td>\n    <td>");
+        java.lang.String temp$3 = null;
+        java.lang.String temp$4 = this.resource(contact);
+        java.util.HashMap temp$5 = null;
+         {
+           {
+            java.util.HashMap temp$6 = null;
+             {
+              java.util.HashMap self$2000 = new java.util.HashMap(16);
+              self$2000.put("confirm", "Are you sure?");
+              temp$6 = self$2000;
+            }
+            java.util.HashMap self$2002 = temp$6;
+            self$2002.put("method", "delete");
+            temp$5 = self$2002;
+          }
+        }
+        temp$3 = this.link_to("Destroy", temp$4, temp$5);
+        _edbout.append(temp$3);
+        _edbout.append("</td>\n  </tr>\n");
+      }
+      __xform_tmp_1 = (__xform_tmp_1 + 1);
+    }
+    _edbout.append("\n</table>\n\n<br />\n\n");
+    _edbout.append(this.link_to("New contact", this.resource("contacts", "new")));
+    _edbout.append("\n");
+    return _edbout.toString();
+  }
+  public java.lang.String show_erb() {
+    java.lang.StringBuilder _edbout = new java.lang.StringBuilder();
+    _edbout.append("<p>\n  <b>Title:</b>\n  ");
+    _edbout.append(this.h(this.contact.title()));
+    _edbout.append("\n</p>\n\n<p>\n  <b>Summary:</b>\n  ");
+    _edbout.append(this.h(this.contact.summary()));
+    _edbout.append("\n</p>\n\n<p>\n  <b>Birthday:</b>\n  ");
+    _edbout.append(this.h(this.contact.birthday()));
+    _edbout.append("\n</p>\n\n<p>\n  <b>Platform:</b>\n  ");
+    _edbout.append(this.h(this.contact.platform()));
+    _edbout.append("\n</p>\n\n<p>\n  <b>Editor:</b>\n  ");
+    _edbout.append(this.h(this.contact.editor()));
+    _edbout.append("\n</p>\n\n<p>\n  <b>Url:</b>\n  ");
+    _edbout.append(this.h(this.contact.url()));
+    _edbout.append("\n</p>\n\n<p>\n  <b>Address:</b>\n  ");
+    _edbout.append(this.h(this.contact.address()));
+    _edbout.append("\n</p>\n\n<p>\n  <b>Phone:</b>\n  ");
+    _edbout.append(this.h(this.contact.phone()));
+    _edbout.append("\n</p>\n\n<p>\n  <b>Private:</b>\n  ");
+    _edbout.append(this.contact.private());
+    _edbout.append("\n</p>\n\n");
+    _edbout.append(this.link_to("edit", this.resource(this.contact, "edit")));
+    _edbout.append(" |\n");
+    _edbout.append(this.link_to("Back", this.resource("contacts")));
+    _edbout.append("\n");
+    return _edbout.toString();
+  }
+  public java.lang.String new_erb() {
+    java.lang.StringBuilder _edbout = new java.lang.StringBuilder();
+    _edbout.append("<h1>New contact</h1>\n\n");
+    dubious.FormHelper f = this.form_for(this.contact);
+    _edbout.append("\n  ");
+    _edbout.append(f.start_form());
+    _edbout.append("\n  ");
+    _edbout.append(f.error_messages());
+    _edbout.append("\n  <p>\n    ");
+    _edbout.append(f.label("title"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.text_field("title"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("summary"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.text_area("summary"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("birthday"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.date_select("birthday"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("platform"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.radio_button("platform", "Mac"));
+    _edbout.append("Mac\n    ");
+    _edbout.append(f.radio_button("platform", "PC"));
+    _edbout.append("PC\n    ");
+    _edbout.append(f.radio_button("platform", "Linux"));
+    _edbout.append("Linux\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("editor"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.select("editor", java.util.Collections.unmodifiableList(java.util.Arrays.asList("Vim", "Emacs", "TextMate", "Other"))));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("url"));
+    _edbout.append("<br />\n    ");
+    java.lang.String temp$1 = null;
+    java.util.HashMap temp$2 = null;
+     {
+       {
+        java.util.HashMap self$2004 = new java.util.HashMap(16);
+        self$2004.put("size", "60");
+        temp$2 = self$2004;
+      }
+    }
+    temp$1 = f.text_field("url", temp$2);
+    _edbout.append(temp$1);
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("address"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.text_field("address"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("phone"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.text_field("phone"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("private"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.check_box("private"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.submit("Create"));
+    _edbout.append("\n  </p>\n  ");
+    _edbout.append(f.end_form());
+    _edbout.append("\n\n");
+    _edbout.append(this.link_to("Back", this.resource("contacts")));
+    _edbout.append("\n");
+    return _edbout.toString();
+  }
+  public java.lang.String edit_erb() {
+    java.lang.StringBuilder _edbout = new java.lang.StringBuilder();
+    _edbout.append("<h1>Editing contact</h1>\n\n");
+    dubious.FormHelper f = this.form_for(this.contact);
+    _edbout.append("\n  ");
+    _edbout.append(f.start_form());
+    _edbout.append("\n  ");
+    _edbout.append(f.error_messages());
+    _edbout.append("\n  <p>\n    ");
+    _edbout.append(f.label("title"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.text_field("title"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("summary"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.text_area("summary"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("birthday"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.date_select("birthday"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("platform"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.radio_button("platform", "Mac"));
+    _edbout.append("Mac\n    ");
+    _edbout.append(f.radio_button("platform", "PC"));
+    _edbout.append("PC\n    ");
+    _edbout.append(f.radio_button("platform", "Linux"));
+    _edbout.append("Linux\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("editor"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.select("editor", java.util.Collections.unmodifiableList(java.util.Arrays.asList("Vim", "Emacs", "TextMate", "Other"))));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("url"));
+    _edbout.append("<br />\n    ");
+    java.lang.String temp$1 = null;
+    java.util.HashMap temp$2 = null;
+     {
+       {
+        java.util.HashMap self$2006 = new java.util.HashMap(16);
+        self$2006.put("size", "60");
+        temp$2 = self$2006;
+      }
+    }
+    temp$1 = f.text_field("url", temp$2);
+    _edbout.append(temp$1);
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("address"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.text_field("address"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("phone"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.text_field("phone"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.label("private"));
+    _edbout.append("<br />\n    ");
+    _edbout.append(f.check_box("private"));
+    _edbout.append("\n  </p>\n  <p>\n    ");
+    _edbout.append(f.submit("Update"));
+    _edbout.append("\n  </p>\n  ");
+    _edbout.append(f.end_form());
+    _edbout.append("\n\n");
+    _edbout.append(this.link_to("Show", this.resource(this.contact, "show")));
+    _edbout.append(" |\n");
+    _edbout.append(this.link_to("Back", this.resource("contacts")));
+    _edbout.append("\n");
+    return _edbout.toString();
+  }
+  public java.lang.String main_erb() {
+    java.lang.StringBuilder _edbout = new java.lang.StringBuilder();
+    _edbout.append("<!DOCTYPE html>\n<head>\n  <meta charset=\"UTF-8\" /> \n  <meta name=\"csrf-param\" content=\"authenticity_token\"/>\n  <meta name=\"csrf-token\" content=\"123\"/>\n  <title>Contacts: ");
+    _edbout.append(this.params().action());
+    _edbout.append("</title>\n  ");
+    _edbout.append(this.stylesheet_link_tag("scaffold"));
+    _edbout.append("\n  ");
+    _edbout.append(this.stylesheet_link_tag("http://jqueryui.com/themes/base/jquery.ui.all.css"));
+    _edbout.append("\n  ");
+    _edbout.append(this.javascript_include_tag("http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"));
+    _edbout.append("\n  ");
+    _edbout.append(this.javascript_include_tag("http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.2/jquery-ui.min.js"));
+    _edbout.append("\n  ");
+    _edbout.append(this.javascript_include_tag("jquery.rails.min"));
+    _edbout.append("\n</head>\n<body>\n\n<p style=\"color: green\">");
+    _edbout.append(this.flash_notice());
+    _edbout.append("</p>\n\n");
+    _edbout.append(this.yield_body());
+    _edbout.append("\n\n</body>\n</html>\n");
+    return _edbout.toString();
+  }
+}

data/examples/contacts/WEB-INF/web.xml

@@ -1,3 +1,43 @@
 <!-- Generated from app.yaml. Do not edit. -->
 <web-app version='2.5' xmlns='http://java.sun.com/xml/ns/javaee'>
+  <servlet>
+    <servlet-name>info_properties</servlet-name>
+    <servlet-class>controllers.InfoPropertiesController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>info_properties</servlet-name>
+    <url-pattern>/info/properties</url-pattern>
+  </servlet-mapping>
+  <servlet>
+    <servlet-name>contacts</servlet-name>
+    <servlet-class>controllers.ContactsController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>contacts</servlet-name>
+    <url-pattern>/contacts/*</url-pattern>
+  </servlet-mapping>
+  <servlet>
+    <servlet-name>source</servlet-name>
+    <servlet-class>controllers.SourceController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>source</servlet-name>
+    <url-pattern>/source/*</url-pattern>
+  </servlet-mapping>
+  <servlet>
+    <servlet-name>dimple_duby</servlet-name>
+    <servlet-class>testing.SimpleDuby</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>dimple_duby</servlet-name>
+    <url-pattern>/simple_duby/*</url-pattern>
+  </servlet-mapping>
+  <servlet>
+    <servlet-name>simple_java</servlet-name>
+    <servlet-class>testing.SimpleJava</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>simple_java</servlet-name>
+    <url-pattern>/simple_java/*</url-pattern>
+  </servlet-mapping>
 </web-app>

data/examples/contacts/app/controllers/contacts_controller.mirah

@@ -45,14 +45,6 @@ class ContactsController < ApplicationController
     redirect_to params.show
   end
 
-  def doGet(request, response)
-    action_response(response, action_request(request, 'get'))
-  end
-
-  def doPost(request, response)
-    action_response(response, action_request(request, 'post'))
-  end
-
   # render templates
   def_edb(index_erb, 'views/contacts/index.html.erb')
   def_edb(show_erb,  'views/contacts/show.html.erb')

data/examples/contacts/app/views/contacts/edit.html.erb

@@ -27,7 +27,7 @@
   </p>
   <p>
     <%= f.label :url %><br />
-    <%= f.text_field :url, :size => '60' %>
+    <%= f.text_field :url, size:  '60' %>
   </p>
   <p>
     <%= f.label :address %><br />

data/examples/contacts/app/views/contacts/index.html.erb

@@ -27,8 +27,7 @@
     <td><%= contact.private ? :true : :false %></td>
     <td><%= link_to 'Show', resource(contact) %></td>
     <td><%= link_to 'Edit', resource(contact, :edit) %></td>
-    <td><%= link_to 'Destroy', resource(contact),
-            :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to 'Destroy', resource(contact), confirm: 'Are you sure?', method: :delete %></td>
   </tr>
 <% end %>
 </table>

data/examples/contacts/app/views/contacts/new.html.erb

@@ -27,7 +27,7 @@
   </p>
   <p>
     <%= f.label :url %><br />
-    <%= f.text_field :url, :size => '60' %>
+    <%= f.text_field :url, size: '60' %>
   </p>
   <p>
     <%= f.label :address %><br />

data/lib/dubious/cli.rb

@@ -1,65 +1,24 @@
 require 'thor'
 require 'thor/group'
-require 'active_support'
+require 'active_support/core_ext'
 
-module Dubious
-  class Init < Thor::Group
-    include Thor::Actions
-    argument :name, :required => true, :desc => "Name of the application/directory"
-    source_root File.dirname(__FILE__)+"/templates/base"
-
-    no_tasks do
-      def name= name
-        @name = name.sub /\/$/,'' #remove trailing slash
-      end
-    end
-
-    def self.subcommand_help *args
-%Q(
-Creates a new dubious project application structure in the NAME directory.
-Uses NAME as the appengine app name.
-)
-    end
-
-    def init
-      directory '.', "#{name}/"
-    end
-
-    def cp_dubious_jar
-      copy_file '../../../dubious.jar', "#{name}/WEB-INF/lib/dubious.jar"
-    end
-
-    def cp_dubydatastore_jar
-      copy_file '../../../../javalib/dubydatastore.jar', "#{name}/WEB-INF/lib/dubydatastore.jar"
-    end
-
-  end
-
-  class Generator < Thor
-    include Thor::Actions
-    source_root File.dirname(__FILE__)+"/templates/generator"
-    argument :name
+require File.dirname(__FILE__) + '/cli/init'
+require File.dirname(__FILE__) + '/cli/generator'
 
+module Dubious
 
-    desc "model NAME", "creates model file" 
-    def model#(name)
-      template "model.mirah.tt", "app/models/#{name.underscore}.mirah"
+  module CLI
+    
+    class Main < Thor
+      desc "new NAME", "creates a new dubious project in NAME"
+      subcommand :new, Init
+      
+      desc "generate GENERATOR", "run generator GENERATOR"
+      subcommand :generate, Generator
     end
-
-    desc "controller NAME", "creates controller file"
-    def controller#(name)
-      template "controller.mirah.tt", "app/controllers/#{name.underscore}_controller.mirah"
-      empty_directory "app/views/#{name.underscore}"
-      inject_into_file "WEB-INF/app.yaml", "  - url: /#{name.underscore}/*\n    servlet: controller.#{name.classify}Controller\n    name: #{name.underscore}\n",:after => "handlers:\n"
+    
+    def self.start
+      Main.start
     end
   end
-
-  class CLI < Thor
-    desc "new NAME", "creates a new dubious project in NAME"
-    subcommand :new, Init
-
-    desc "generate GENERATOR", "run generator GENERATOR"
-    subcommand :generate, Generator
-  end
-
 end

data/lib/dubious/cli/generator.rb

@@ -0,0 +1,23 @@
+module Dubious
+  module CLI
+    class Generator < Thor
+      include Thor::Actions
+      source_root File.dirname(__FILE__)+"/../templates/generator"
+      argument :name
+      
+      
+      desc "model NAME", "creates model file" 
+      def model#(name)
+        template "model.mirah.tt", "app/models/#{name.underscore}.mirah"
+      end
+      
+      desc "controller NAME", "creates controller file"
+      def controller#(name)
+        template "controller.mirah.tt", "app/controllers/#{name.underscore}_controller.mirah"
+        empty_directory "app/views/#{name.underscore}"
+        inject_into_file "WEB-INF/app.yaml", "  - url: /#{name.underscore}/*\n    servlet: controllers.#{name.classify}Controller\n    name: #{name.underscore}\n",:after => "handlers:\n"
+      end
+      
+    end
+  end
+end

data/lib/dubious/cli/init.rb

@@ -0,0 +1,35 @@
+module Dubious
+  module CLI
+    class Init < Thor::Group
+      include Thor::Actions
+      argument :name, :required => true, :desc => "Name of the application/directory"
+      source_root File.dirname(__FILE__)+"/../templates/base"
+      
+      no_tasks do
+        def name= name
+          @name = name.sub /\/$/,'' #remove trailing slash
+        end
+      end
+
+      def self.subcommand_help *args
+        %Q(
+Creates a new dubious project application structure in the NAME directory.
+Uses NAME as the appengine app name.
+)
+      end
+      
+      def init
+        directory '.', "#{name}/"
+      end
+      
+      def cp_dubious_jar
+        copy_file '../../../dubious.jar', "#{name}/WEB-INF/lib/dubious.jar"
+      end
+      
+      def cp_dubydatastore_jar
+        copy_file '../../../../javalib/dubydatastore.jar', "#{name}/WEB-INF/lib/dubydatastore.jar"
+      end
+      
+    end
+  end
+end

data/lib/dubious/templates/base/Rakefile

@@ -5,10 +5,21 @@ rescue LoadError
   exit 1
 end
 
+
+neighbor_mirah = File.expand_path '../mirah'
+
+if File.exists?(neighbor_mirah)
+  ENV['MIRAH_HOME'] ||= neighbor_mirah
+end
+
 if  ENV['MIRAH_HOME'] && File.exist?(ENV['MIRAH_HOME'] +'/lib/mirah.rb')
   $: << File.expand_path(ENV['MIRAH_HOME'] +'/lib')
 end
 
+require 'rake/clean'
+require 'mirah/appengine_tasks'
+
+
 if File.exist?('../bitescript/lib/bitescript.rb')
    $: << File.expand_path('../bitescript/lib/')
 end
@@ -19,9 +30,6 @@ MODEL_SRC_JAR =  File.join(MIRAH_HOME, 'examples', 'appengine', 'war',
                                  'WEB-INF', 'lib', 'dubydatastore.jar')
 
 
-require 'rake/clean'
-require 'mirah/appengine_tasks'
-
 def mirahc *files
   if files[-1].kind_of?(Hash)
     options = files.pop
@@ -45,7 +53,6 @@ def mirahc *files
   end
 end
 
-
 OUTDIR = 'WEB-INF/classes'
 
 def class_files_for files
@@ -59,18 +66,15 @@ end
 
 MODEL_JAR = "WEB-INF/lib/dubydatastore.jar"
 
-LIB_MIRAH_SRC = Dir["lib/**/*.duby"]
+LIB_MIRAH_SRC = Dir["lib/**/*.{duby,mirah}"]
 LIB_JAVA_SRC  = Dir["lib/**/*.java"]
 LIB_SRC = LIB_MIRAH_SRC + LIB_JAVA_SRC
 LIB_CLASSES = class_files_for LIB_SRC
 
 STDLIB_CLASSES= LIB_CLASSES.select{|l|l.include? 'stdlib'}
 
-
 CLASSPATH = [AppEngine::Rake::SERVLET, AppEngine::SDK::API_JAR].join(":")
 
-
-
 Duby.dest_paths << OUTDIR
 Duby.source_paths << 'lib'
 Duby.source_paths << 'app'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 0
-    - 0
-  version: 0.0.0
+    - 1
+  version: 0.0.1
 platform: java
 authors: 
   - John Woodell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 11:24:42.191000 -06:00
+date: 2010-11-21 23:30:22.996000 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -45,9 +45,35 @@ dependencies:
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: appengine-sdk
+    name: i18n
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: mirah
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 0
+              - 4
+            version: 0.0.4
+    type: :runtime
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: appengine-sdk
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
@@ -56,7 +82,7 @@ dependencies:
               - 3
             version: "1.3"
     type: :runtime
-    version_requirements: *id003
+    version_requirements: *id005
 description: Dubious is a web framework written in Mirah.
 email: 
   - woodie@netpress.com
@@ -74,6 +100,8 @@ files:
   - lib/dubious.jar
   - lib/dubious.rb
   - lib/dubious/cli.rb
+  - lib/dubious/cli/generator.rb
+  - lib/dubious/cli/init.rb
   - lib/dubious/templates/base/Rakefile
   - lib/dubious/templates/base/app/controllers/application_controller.mirah
   - lib/dubious/templates/base/config/application.properties.tt
@@ -98,7 +126,6 @@ files:
   - lib/dubious/templates/base/WEB-INF/app.yaml.tt
   - lib/dubious/templates/generator/controller.mirah.tt
   - lib/dubious/templates/generator/model.mirah.tt
-  - examples/contacts/app.yaml
   - examples/contacts/Rakefile
   - examples/contacts/app/controllers/application_controller.mirah
   - examples/contacts/app/controllers/contacts_controller.mirah
@@ -152,8 +179,10 @@ files:
   - examples/contacts/WEB-INF/app.yaml
   - examples/contacts/WEB-INF/appengine-web.xml
   - examples/contacts/WEB-INF/web.xml
+  - examples/contacts/WEB-INF/appengine-generated/datastore-indexes-auto.xml
   - examples/contacts/WEB-INF/classes/controllers/ApplicationController.class
   - examples/contacts/WEB-INF/classes/controllers/ContactsController.class
+  - examples/contacts/WEB-INF/classes/controllers/ContactsController.java
   - examples/contacts/WEB-INF/classes/controllers/InfoPropertiesController.class
   - examples/contacts/WEB-INF/classes/controllers/SourceController.class
   - examples/contacts/WEB-INF/classes/models/Contact$Query.class
@@ -191,8 +220,8 @@ files:
   - README.rdoc
 has_rdoc: true
 homepage: http://github.com/mirah/dubious/
-licenses: []
-
+licenses: 
+  - Apache-2.0
 post_install_message: 
 rdoc_options: 
   - --main

data/examples/contacts/app.yaml

@@ -1,44 +0,0 @@
-application: dubious-demo # duby-primer
-version: duby
-runtime: java
-public_root: /public
-
-resource_files:
-  - exclude: /build/**
-
-static_files:
-  - include: /**/*.ico
-    expiration: 365d
-  - include: /**/*.gif
-    expiration: 365d
-  - include: /**/*.jpeg
-    expiration: 365d
-  - include: /**/*.jpg
-    expiration: 365d
-  - include: /**/*.png
-    expiration: 365d
-  - include: /**/*.js
-    expiration: 365d
-  - include: /**/*.css
-    expiration: 365d
-
-handlers:
-  - url: /info/properties
-    servlet: controllers.InfoPropertiesController
-    name: info_properties
-
-  - url: /contacts/*
-    servlet: controllers.ContactsController
-    name: contacts
-
-  - url: /source/*
-    servlet: controllers.SourceController
-    name: source
-
-  - url: /simple_duby/*
-    servlet: testing.SimpleDuby
-    name: dimple_duby
-
-  - url: /simple_java/*
-    servlet: testing.SimpleJava
-    name: simple_java