dubious 0.0.2-java → 0.0.3-java

data/README.rdoc

@@ -53,6 +53,7 @@ http://code.google.com/appengine/docs/java/configyaml/appconfig_yaml.html
    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/mirah_model.git
    git clone http://github.com/mirah/dubious.git
 
 * Then build and install the gems for Mirah, Bitescript and Dubious
@@ -72,9 +73,9 @@ http://code.google.com/appengine/docs/java/configyaml/appconfig_yaml.html
     cd -
 
 
-To build the gem
+To build the gem (requires RubyGems ~> 1.5.0 to build)
 
-  gem build dubious.gemspec
+  rake package
 
 ===Developing your App
 

data/Rakefile

@@ -1,6 +1,10 @@
 require 'rubygems'
 require 'rubygems/package_task'
 require 'rake/clean'
+require 'bundler/setup'
+require 'rspec/core/rake_task'
+
+Bundler.setup
 
 begin
   require 'ant'
@@ -14,32 +18,17 @@ Gem::PackageTask.new Gem::Specification.load('dubious.gemspec') do |pkg|
   pkg.need_tar = true
 end
 
-task :gem => :jar
-
-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')
-  $: << File.expand_path(ENV['MIRAH_HOME'] +'/lib')
-end
+Rspec::Core::RakeTask.new
 
-if File.exist?('../bitescript/lib/bitescript.rb')
-   $: << File.expand_path('../bitescript/lib/')
-end
+task :default => :spec
 
-require 'mirah/appengine_tasks'
+require 'dubious_tasks'
 
 OUTDIR = File.expand_path 'build'
 SRCDIR = File.expand_path 'src'
 
 CLEAN.include(OUTDIR)
-CLOBBER.include("lib/dubious.jar")
+CLOBBER.include("lib/dubious.jar", "javalib/mirahdatastore.jar")
 
 def class_files_for files
   files.map do |f|
@@ -50,7 +39,6 @@ def class_files_for files
   end
 end
 
-#MODEL_JAR = "#{OUTDIR}/dubydatastore.jar"
 LIB_MIRAH_SRC = Dir["src/**/*{.duby,.mirah}"]
 LIB_JAVA_SRC  = Dir["src/**/*.java"]
  
@@ -58,10 +46,11 @@ LIB_SRC = LIB_MIRAH_SRC + LIB_JAVA_SRC
 LIB_CLASSES = class_files_for LIB_SRC
 STDLIB_CLASSES= LIB_CLASSES.select{|l|l.include? 'stdlib'}
 
-Mirah.dest_paths << OUTDIR
-Mirah.source_paths << SRCDIR
-Mirah.compiler_options << '--classpath' << [File.expand_path(OUTDIR), *FileList["lib/*.jar", "javalib/*.jar"].map{|f|File.expand_path(f)}].join(':')
-
+task :set_compile_options do
+  mirah_compile_options :compiler_options => ['--classpath', [OUTDIR+'/', SERVLET_JAR,*FileList["lib/*.jar", "javalib/*.jar"].map{|f|File.expand_path(f)}].join(':')],
+                        :dest_path => OUTDIR,
+                        :source_paths => SRCDIR
+end
 
 file "#{OUTDIR}/dubious/Inflection.class" => :'compile:java'
 file "#{OUTDIR}/dubious/ScopedParameterMap.class" => :'compile:java'
@@ -103,21 +92,30 @@ task :compile => LIB_CLASSES
 desc "compiles jar for gemification"
 task :jar => "lib/dubious.jar"
 
+desc "pull dependencies"
+task :dependencies => 'javalib/mirahdatastore.jar'
+
+directory 'javalib'
+
+file 'javalib/mirahdatastore.jar' => 'javalib' do
+  
+  cp Gem.find_files('mirahdatastore.jar'), 'javalib/'
+end
+
 namespace :compile do
   task :dubious => "lib/dubious.jar"
   task :java => OUTDIR do
     ant.javac :srcdir => SRCDIR, 
-    	      :destdir => OUTDIR, 
-	      :classpath => CLASSPATH
+    	        :destdir => OUTDIR, 
+	            :classpath => CLASSPATH,
+              :includeantruntime => true
   end
 end
 
-CLASSPATH = [AppEngine::Rake::SERVLET, AppEngine::SDK::API_JAR].join(":")
-
 directory OUTDIR
 
 (LIB_CLASSES).zip(LIB_SRC).each do |klass,src|
-  file klass => src
+  file klass => [:dependencies, :set_compile_options, src]
 end
  
 task :generate_build_properties do
@@ -135,7 +133,7 @@ task :generate_build_properties do
   dubious_data = git_data(".")
   mirah_data = git_data(MIRAH_HOME)
   bite_data = git_data(MIRAH_HOME + '/../bitescript')
-  model_data = git_data(File.dirname(MODEL_SRC_JAR),File.basename(MODEL_SRC_JAR))
+  model_data = git_data(File.dirname(Gem.find_files('mirahdatastore.jar')),'mirahdatastore.jar')
 
   prop_file = "config/build.properties"
   File.open(prop_file, 'w') do |f| 

data/examples/contacts/Gemfile

@@ -0,0 +1,2 @@
+gem 'dubious', :path => '../..'
+gem 'rake'

data/examples/contacts/Gemfile.lock

@@ -0,0 +1,31 @@
+PATH
+  remote: ../..
+  specs:
+    dubious (0.0.3.dev-java)
+      activesupport
+      appengine-sdk (~> 1.4.0)
+      i18n
+      mirah (= 0.0.5)
+      mirah_model (= 0.0.2)
+      thor (= 0.13.8)
+
+GEM
+  specs:
+    activesupport (3.0.4)
+    appengine-sdk (1.4.2)
+    bitescript (0.0.7)
+    i18n (0.5.0)
+    mirah (0.0.5-java)
+      bitescript (>= 0.0.6)
+    mirah_model (0.0.2-java)
+      appengine-sdk (~> 1.4.0)
+      mirah (= 0.0.5)
+    rake (0.8.7)
+    thor (0.13.8)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  dubious!
+  rake

data/examples/contacts/Rakefile

@@ -10,12 +10,15 @@ require 'dubious_tasks'
 
 OUTDIR = 'WEB-INF/classes'
 CLEAN.include(OUTDIR)
-CLOBBER.include("WEB-INF/lib/dubious.jar", 'WEB-INF/appengine-generated')
-
-
-mirah_compile_options :dest_path => OUTDIR,
-                      :source_paths => ['lib', 'app' ],
-                      :compiler_options => ['--classpath', [File.expand_path(OUTDIR), *FileList["WEB-INF/lib/*.jar"].map{|f|File.expand_path(f)}].join(':') + ':' + CLASSPATH ]
+CLOBBER.include('WEB-INF/appengine-generated')
+
+task :set_compile_options do |t|
+  def t.needed?;false;end
+  
+  mirah_compile_options :dest_path => OUTDIR,
+                        :source_paths => [File.expand_path('lib'), File.expand_path('app') ],
+                        :compiler_options => ['--classpath', [File.expand_path(OUTDIR), *FileList["WEB-INF/lib/*.jar"].map{|f|File.expand_path(f)}].join(':') + ':' + CLASSPATH ]
+end
 
 def class_files_for files
   files.map do |f|
@@ -26,7 +29,7 @@ def class_files_for files
   end
 end
 
-MODEL_JAR = "WEB-INF/lib/dubydatastore.jar"
+MODEL_JAR = "WEB-INF/lib/mirahdatastore.jar"
 
 LIB_MIRAH_SRC = Dir["lib/**/*.{duby,mirah}"]
 LIB_JAVA_SRC  = Dir["lib/**/*.java"]
@@ -63,7 +66,7 @@ file MODEL_JAR => MODEL_SRC_JAR do |t|
   cp MODEL_SRC_JAR, MODEL_JAR
 end
 
-appengine_app :app, 'app', '' => APP_CLASSES+LIB_CLASSES
+appengine_app :app, '', '.' => [:set_compile_options] + APP_CLASSES + LIB_CLASSES
 
 namespace :compile do
   task :app => APP_CLASSES

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

@@ -1,4 +1,4 @@
-<!-- Indices written at Tue, 14 Dec 2010 02:36:14 UTC -->
+<!-- Indices written at Wed, 23 Feb 2011 06:51:55 UTC -->
 
 <datastore-indexes/>
 

data/examples/contacts/app/models/contact.mirah

@@ -1,4 +1,4 @@
-import com.google.appengine.ext.duby.db.Model
+import com.google.appengine.ext.mirah.db.Model
 import com.google.appengine.api.datastore.*
 import dubious.TimeConversion
 import java.util.Date

data/examples/shout/Rakefile

@@ -14,7 +14,7 @@ mirah_compile_options :dest_path => OUTDIR,
 		      :source_paths => '.',
 		      :compiler_options => ['--classpath', [File.expand_path(OUTDIR), *FileList["WEB-INF/lib/*.jar"].map{|f|File.expand_path(f)}].join(':') + ':' + CLASSPATH]
 
-MODEL_JAR = "WEB-INF/lib/dubydatastore.jar"
+MODEL_JAR = "WEB-INF/lib/mirahdatastore.jar"
 
 CLEAN.include(OUTDIR)
 CLOBBER.include("WEB-INF/lib/dubious.jar", 'WEB-INF/appengine-generated')

data/examples/shout/app.mirah

@@ -1,5 +1,5 @@
 import com.google.appengine.api.datastore.Text
-import com.google.appengine.ext.duby.db.Model
+import com.google.appengine.ext.mirah.db.Model
 import com.google.appengine.api.datastore.*
 import java.util.HashMap
 import dubious.*

data/lib/dubious/cli.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'thor/group'
 require 'active_support/core_ext'
+require 'active_support'
 
 require File.dirname(__FILE__) + '/cli/init'
 require File.dirname(__FILE__) + '/cli/generator'

data/lib/dubious/cli/generator.rb

@@ -4,9 +4,9 @@ module Dubious
       include Thor::Actions
       source_root File.dirname(__FILE__)+"/../templates/generator"
       argument :name
+      add_runtime_options!
       
-      
-      desc "model NAME", "creates model file" 
+      desc "model NAME", "creates model file"
       def model#(name)
         template "model.mirah.tt", "app/models/#{name.underscore}.mirah"
       end

data/lib/dubious/cli/init.rb

@@ -26,8 +26,8 @@ Uses NAME as the appengine app name.
         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"
+      def cp_mirahdatastore_jar
+        copy_file '../../../../javalib/mirahdatastore.jar', "#{name}/WEB-INF/lib/mirahdatastore.jar"
       end
       
     end

data/lib/dubious/cli/server.rb

@@ -0,0 +1,46 @@
+require 'appengine-sdk'
+module Dubious
+  module CLI
+    class Server < Thor::Group
+      SERVLET = AppEngine::SDK::SDK_ROOT + '/lib/shared/servlet-api.jar'
+      APIS = AppEngine::SDK::API_JAR
+      TOOLS = AppEngine::SDK::TOOLS_JAR
+      
+      class_option :port,:type=>:numeric,:desc=>'port to run on',:default => 8080
+      class_option :address, :type=>:string,:desc => 'address to run on eg localhost',:default => '0.0.0.0'
+      
+      def start_watcher
+        @done=false
+        Thread.new do
+          until @done
+            sleep_time = next_time - Time.now
+            sleep(sleep_time) if sleep_time > 0
+            next_time = Time.now + 5
+            #success = `rake compile:reload`
+            #          if 
+            puts 'foo'
+            sleep 5
+          end
+        end
+        
+      end
+      
+      def start_server   
+        
+        args = [
+          'java', '-cp', TOOLS,
+          'com.google.appengine.tools.KickStart',
+          'com.google.appengine.tools.development.DevAppServerMain',
+          "--address=#{options[:address]}",
+          "--port=#{options[:port]}",
+          '.']
+        system *args
+        @done=true
+      end
+      
+      def self.subcommand_help *args
+        %Q(Runs the Appengine dev server along with a file watcher that recompiles the app on changes.)
+      end
+    end
+  end
+end

data/lib/dubious/templates/base/Rakefile

@@ -10,12 +10,15 @@ require 'dubious_tasks'
 
 OUTDIR = 'WEB-INF/classes'
 CLEAN.include(OUTDIR)
-CLOBBER.include("WEB-INF/lib/dubious.jar", 'WEB-INF/appengine-generated')
-
-
-mirah_compile_options :dest_path => OUTDIR,
-                      :source_paths => ['lib', 'app' ],
-                      :compiler_options => ['--classpath', [File.expand_path(OUTDIR), *FileList["WEB-INF/lib/*.jar"].map{|f|File.expand_path(f)}].join(':') + ':' + CLASSPATH ]
+CLOBBER.include('WEB-INF/appengine-generated')
+
+task :set_compile_options do |t|
+  def t.needed?;false;end
+  
+  mirah_compile_options :dest_path => OUTDIR,
+                        :source_paths => [File.expand_path('lib'), File.expand_path('app') ],
+                        :compiler_options => ['--classpath', [File.expand_path(OUTDIR), *FileList["WEB-INF/lib/*.jar"].map{|f|File.expand_path(f)}].join(':') + ':' + CLASSPATH ]
+end
 
 def class_files_for files
   files.map do |f|
@@ -26,7 +29,7 @@ def class_files_for files
   end
 end
 
-MODEL_JAR = "WEB-INF/lib/dubydatastore.jar"
+MODEL_JAR = "WEB-INF/lib/mirahdatastore.jar"
 
 LIB_MIRAH_SRC = Dir["lib/**/*.{duby,mirah}"]
 LIB_JAVA_SRC  = Dir["lib/**/*.java"]
@@ -63,7 +66,7 @@ file MODEL_JAR => MODEL_SRC_JAR do |t|
   cp MODEL_SRC_JAR, MODEL_JAR
 end
 
-appengine_app :app, 'app', '' => APP_CLASSES+LIB_CLASSES
+appengine_app :app, '', '.' => [:set_compile_options] + APP_CLASSES + LIB_CLASSES
 
 namespace :compile do
   task :app => APP_CLASSES

data/lib/dubious/templates/generator/model.mirah.tt

@@ -1,4 +1,4 @@
-import com.google.appengine.ext.duby.db.Model
+import com.google.appengine.ext.mirah.db.Model
 import com.google.appengine.api.datastore.*
 
 class <%= name.classify%> < Model

data/lib/dubious/version.rb

@@ -1,3 +1,3 @@
 module Dubious
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/dubious_tasks.rb

@@ -1,14 +1,152 @@
-require 'mirah/appengine_tasks'
+require 'appengine-sdk'
+require 'mirah_task'
+require 'java'
+require 'open-uri'
+require 'rake'
+require 'yaml'
 
+module AppEngine::Rake
+  SERVLET = AppEngine::SDK::SDK_ROOT + '/lib/shared/servlet-api.jar'
+  APIS = AppEngine::SDK::API_JAR
+  TOOLS = AppEngine::SDK::TOOLS_JAR
+
+  $CLASSPATH << SERVLET
+  $CLASSPATH << APIS
+  $CLASSPATH << TOOLS
+
+  class AppEngineTask < Rake::Task
+    def initialize(*args, &block)
+      super
+      AppEngineTask.tasks << self
+    end
+
+    def init(src, war)
+      @src = src
+      @war = war
+      unless $CLASSPATH.include?(webinf_classes)
+        $CLASSPATH << webinf_classes
+      end
+      webinf_lib_jars.each do |jar|
+        $CLASSPATH << jar unless $CLASSPATH.include?(jar)
+      end
+      Mirah.source_paths << src
+      Mirah.dest_paths << webinf_classes
+      directory(webinf_classes)
+      directory(webinf_lib)
+
+      file_create api_jar => webinf_lib do
+        puts 'Copying api jars'
+        cp APIS, api_jar
+      end
+
+      task :server , :address ,  :port , :needs => [name] do |t, args|
+        args.with_defaults(:address => '0.0.0.0', :port => '8080')
+        check_for_updates
+        args = [
+          'java', '-cp', TOOLS,
+          'com.google.appengine.tools.KickStart',
+          'com.google.appengine.tools.development.DevAppServerMain',
+          "--address=#{args.address}",
+          "--port=#{args.port}",
+          @war]
+        system *args
+        @done = true
+        @update_thread.join
+      end
+
+      desc "publish to appengine"
+      task :upload => ['compile:app', name] do
+        Java::ComGoogleAppengineToolsAdmin::AppCfg.main(
+            ['update', @war].to_java(:string))
+      end
+
+      enhance([api_jar])
+    end
+
+    def real_prerequisites
+      prerequisites.map {|n| application[n, scope]}
+    end
+
+    def check_for_updates
+      @update_thread = Thread.new do
+        # Give the server time to start
+        next_time = Time.now + 5
+        until @done
+          sleep_time = next_time - Time.now
+          sleep(sleep_time) if sleep_time > 0
+          next_time = Time.now + 1
+          update
+        end
+      end
+    end
+
+    def update
+      begin
+        timestamp = app_yaml_timestamp
+        @last_app_yaml_timestamp ||= timestamp
+        
+        needed_prerequisites = real_prerequisites.select {|r|r.needed?}
+        
+        needed_prerequisites.each {|dep| dep.execute }
+        unless needed_prerequisites.empty? && timestamp == @last_app_yaml_timestamp
+          begin
+            open('http://localhost:8080/_ah/reloadwebapp')
+            @last_app_yaml_timestamp = timestamp
+          rescue OpenURI::HTTPError
+          end
+        end
+      rescue Exception
+        puts $!, $@
+      end
+    end
+
+    def app_yaml_timestamp
+      if File.exist?(app_yaml)
+        File.mtime(app_yaml)
+      end
+    end
+
+    def app_yaml
+      @war + '/WEB-INF/app.yaml'
+    end
+
+    def webinf_classes
+      @war + '/WEB-INF/classes'
+    end
+
+    def webinf_lib
+      @war + '/WEB-INF/lib'
+    end
+
+    def api_jar
+      File.join(webinf_lib, File.basename(APIS))
+    end
+
+    def webinf_lib_jars
+      Dir.glob(webinf_lib + '/*.jar')
+    end
+  end
+end
+
+def appengine_app(name,src,hash={}, &block)
+  war = hash.keys.first
+  deps = hash[war] || []
+  
+  task = AppEngine::Rake::AppEngineTask.define_task(name => deps, &block)
+  src = File.expand_path(src || 'src')
+  war = File.expand_path(war || 'war')
+  task.init(src, war)
+  task
+end
 
 # sets mirah compile opts
 # @param [Hash] opts
 # @option opts [String] :dest_path
-# @option opts [Array<String>] :source_paths 
-# @option opts [Array<String>] :compiler_options commandline style options 
+# @option opts [Array<String>] :source_paths
+# @option opts [Array<String>] :compiler_options commandline style options
 def mirah_compile_options opts
   Mirah.dest_paths << opts[:dest_path]
-  Mirah.source_paths.push *opts[:source_paths]
+  Mirah.source_paths.unshift *opts[:source_paths]
   Mirah.compiler_options.push *opts[:compiler_options]
 end
 
@@ -19,10 +157,10 @@ if JRUBY_VERSION < "1.5.6"
     else
       options = {}
     end
-    source_dir = options.fetch(:dir, Duby.source_path)
-    dest = File.expand_path(options.fetch(:dest, Duby.dest_path))
+    source_dir = options.fetch(:dir, Mirah.source_path)
+    dest = File.expand_path(options.fetch(:dest, Mirah.dest_path))
     files = files.map {|f| f.sub(/^#{source_dir}\//, '')}
-    flags = options.fetch(:options, Duby.compiler_options)
+    flags = options.fetch(:options, Mirah.compiler_options)
     args = ['-d', dest, *flags] + files
     chdir(source_dir) do
       cmd = "mirahc #{args.join ' '}"
@@ -30,14 +168,14 @@ if JRUBY_VERSION < "1.5.6"
       if files.any? {|f|f.include? 'controllers'}
         system cmd
       else
-        Duby.compile(*args)
-        Duby.reset
+        Mirah.compile(*args)
+        Mirah.reset
       end
     end
   end
 end
 
-SERVLET_JAR = File.join(AppEngine::SDK::SDK_ROOT, *%w{lib shared servlet-api.jar}) 
+SERVLET_JAR = File.join(AppEngine::SDK::SDK_ROOT, *%w{lib shared servlet-api.jar})
 
 unless $CLASSPATH.include? SERVLET_JAR
   $CLASSPATH << SERVLET_JAR
@@ -45,16 +183,11 @@ end
 
 CLASSPATH = [SERVLET_JAR, AppEngine::SDK::API_JAR].join(":")
 
-MIRAH_HOME = ENV['MIRAH_HOME'] ? ENV['MIRAH_HOME'] : Gem.find_files('mirah').first.sub(/lib\/mirah.rb/,'')
+MODEL_SRC_JAR = File.dirname(Gem.find_files('dubious.rb').first) + '/../javalib/mirahdatastore.jar'
 
-MODEL_SRC_JAR =  File.join(MIRAH_HOME, 'examples', 'appengine', 'war',
-                                 'WEB-INF', 'lib', 'dubydatastore.jar')
+MIRAH_HOME = ENV['MIRAH_HOME'] ? ENV['MIRAH_HOME'] : Gem.find_files('mirah').first.sub(/lib\/mirah.rb/,'')
 
-#there is an upload task in appengine_tasks, but I couldn't get it to work
-desc "publish to appengine"
-task :publish => 'compile:app' do
-  sh "appcfg.sh update ."
-end
+task :publish => :upload
 
 desc "run development server"
 task :server
@@ -79,7 +212,7 @@ task :generate_build_properties do
   model_data = git_data(File.dirname(MODEL_SRC_JAR),File.basename(MODEL_SRC_JAR))
 
   prop_file = "config/build.properties"
-  File.open(prop_file, 'w') do |f| 
+  File.open(prop_file, 'w') do |f|
     f.write <<-EOF
 # the current build environment
 application.build.time=#{Time.now.xmlschema}

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dubious
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 0
-    - 2
-  version: 0.0.2
+  prerelease: 
+  version: 0.0.3
 platform: java
 authors: 
   - John Woodell
@@ -15,75 +11,97 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 23:04:19.458000 -07:00
+date: 2011-03-17 22:02:50.458000 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: thor
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 13
-              - 8
             version: 0.13.8
+    requirement: *id001
+    prerelease: false
     type: :runtime
-    version_requirements: *id001
   - !ruby/object:Gem::Dependency 
     name: activesupport
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
+    requirement: *id002
+    prerelease: false
     type: :runtime
-    version_requirements: *id002
   - !ruby/object:Gem::Dependency 
     name: i18n
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
             version: "0"
+    requirement: *id003
+    prerelease: false
     type: :runtime
-    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: mirah
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 0.0.5
+    requirement: *id004
     prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: mirah_model
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
-        - - ">="
+        - - "="
           - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 0
-              - 4
-            version: 0.0.4
+            version: 0.0.2
+    requirement: *id005
+    prerelease: false
     type: :runtime
-    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: appengine-sdk
-    prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
+    version_requirements: &id006 !ruby/object:Gem::Requirement 
+      none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 4
-              - 0
             version: 1.4.0
+    requirement: *id006
+    prerelease: false
     type: :runtime
-    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    version_requirements: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 2.4.0
+    requirement: *id007
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    version_requirements: &id008 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 0.9.12
+    requirement: *id008
+    prerelease: false
+    type: :development
 description: Dubious is a web framework written in Mirah.
 email: 
   - woodie@netpress.com
@@ -105,6 +123,7 @@ files:
   - lib/dubious/version.rb
   - lib/dubious/cli/generator.rb
   - lib/dubious/cli/init.rb
+  - lib/dubious/cli/server.rb
   - lib/dubious/templates/base/Rakefile
   - lib/dubious/templates/base/app/controllers/application_controller.mirah
   - lib/dubious/templates/base/config/application.properties.tt
@@ -129,6 +148,8 @@ 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/Gemfile
+  - examples/contacts/Gemfile.lock
   - examples/contacts/Rakefile
   - examples/contacts/app/controllers/application_controller.mirah
   - examples/contacts/app/controllers/contacts_controller.mirah
@@ -185,7 +206,6 @@ files:
   - 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
@@ -193,6 +213,7 @@ files:
   - examples/contacts/WEB-INF/lib/appengine-api.jar
   - examples/contacts/WEB-INF/lib/dubious.jar
   - examples/contacts/WEB-INF/lib/dubydatastore.jar
+  - examples/contacts/WEB-INF/lib/mirahdatastore.jar
   - examples/shout/app.mirah
   - examples/shout/app.yaml
   - examples/shout/Rakefile
@@ -229,7 +250,7 @@ files:
   - examples/shout/WEB-INF/lib/appengine-api.jar
   - examples/shout/WEB-INF/lib/dubious.jar
   - examples/shout/WEB-INF/lib/dubydatastore.jar
-  - javalib/dubydatastore.jar
+  - javalib/mirahdatastore.jar
   - Rakefile
   - LICENSE
   - ROADMAP.rdoc
@@ -245,25 +266,29 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
         segments: 
           - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 2
         segments: 
           - 0
         version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: A web framework for Mirah, running on appengine.
+summary: A web framework for Mirah, running on Google App Engine.
 test_files: []
 

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

@@ -1,285 +0,0 @@
-// 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();
-  }
-}