padrino-gen 0.9.29 → 0.10.0

data/README.rdoc

@@ -43,7 +43,7 @@ renderer::   haml  (default), erb, erubis, liquid, slim
 stylesheet:: sass  (default), less, compass
 mock::       none  (default), mocha, rr
 script::     none  (default), jquery, prototype, mootools, rightjs, extcore, dojo
-orm::        none  (default), datamapper, mongomapper, mongoid, activerecord, sequel, couchrest, ohm, mongomatic
+orm::        none  (default), datamapper, mongomapper, mongoid, activerecord, sequel, couchrest, ohm, mongomatic, ripple
 
 In addition, you can generate projects based on existing templates:
 

data/bin/padrino-gen

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems' unless defined?(Gem) # Useful only on --dev mode
+require 'bundler/setup' if %w(Gemfile .components).all? { |f| File.exist?(f) }
 
 padrino_gen_path = File.expand_path('../../lib', __FILE__)
 $:.unshift(padrino_gen_path) if File.directory?(padrino_gen_path) && !$:.include?(padrino_gen_path)

data/lib/padrino-gen/generators/app/app.rb.tt

@@ -1,4 +1,5 @@
 class <%= @app_name %> < Padrino::Application
+  register Padrino::Rendering
   register Padrino::Mailer
   register Padrino::Helpers
 

data/lib/padrino-gen/generators/cli.rb

@@ -29,6 +29,9 @@ module Padrino
         rescue Exception => e
           puts "=> Problem loading #{boot}"
           puts ["=> #{e.message}", *e.backtrace].join("\n  ")
+        ensure
+          ENV.delete('BUNDLE_GEMFILE')
+          ENV.delete('PADRINO_LOG_LEVEL')
         end
       end
 

data/lib/padrino-gen/generators/components/orms/couchrest.rb

@@ -8,8 +8,7 @@ end
 CouchRest::Model::Base.configure do |conf|
   conf.model_type_key = 'type' # compatibility with CouchModel 1.1
   conf.database = CouchRest.database!(db_name)
-  # Only with CouchModel 1.1
-  # conf.environment = Padrino.env
+  conf.environment = Padrino.env
   # conf.connection = {
   #   :protocol => 'http',
   #   :host     => 'localhost',
@@ -24,7 +23,7 @@ end
 COUCHREST
 
 def setup_orm
-  require_dependencies 'couchrest_model'
+  require_dependencies 'couchrest_model', :version => '~>1.1.0'
   require_dependencies 'json_pure'
   create_file("config/database.rb", COUCHREST.gsub(/!NAME!/, @app_name.underscore))
   empty_directory('app/models')

data/lib/padrino-gen/generators/components/orms/datamapper.rb

@@ -23,7 +23,14 @@ DM
 def setup_orm
   dm = DM
   db = @app_name.underscore
-  require_dependencies 'data_mapper'
+  %w(
+    dm-core
+    dm-aggregates
+    dm-constraints
+    dm-migrations
+    dm-timestamps
+    dm-validations
+  ).each { |dep| require_dependencies dep }
   require_dependencies case options[:adapter]
     when 'mysql'
       dm.gsub!(/!DB_DEVELOPMENT!/,"\"mysql://root@localhost/#{db}_development\"")
@@ -93,7 +100,7 @@ MIGRATION
 
 def create_model_migration(migration_name, name, columns)
   output_model_migration(migration_name, name, columns,
-       :column_format => Proc.new { |field, kind| "column :#{field}, #{kind.classify}" },
+       :column_format => Proc.new { |field, kind| "column :#{field}, #{kind.classify}#{', :length => 255' if kind =~ /string/i}" },
        :base => DM_MIGRATION, :up => DM_MODEL_UP_MG, :down => DM_MODEL_DOWN_MG)
 end
 

data/lib/padrino-gen/generators/components/orms/mongoid.rb

@@ -66,4 +66,4 @@ end
 
 def create_migration_file(migration_name, name, columns)
   # NO MIGRATION NEEDED
-end
+end

data/lib/padrino-gen/generators/components/orms/ripple.rb

@@ -0,0 +1,76 @@
+RIPPLE_DB = (<<-RIAK) unless defined?(RIPPLE_DB)
+development:
+  http_port: 8098
+  pb_port: 8087
+  host: localhost
+
+# The test environment has additional keys for configuring the
+# Riak::TestServer for your test/spec suite:
+#
+# * bin_dir specifies the path to the "riak" script that you use to
+#           start Riak (just the directory)
+# * js_source_dir specifies where your custom Javascript functions for
+#           MapReduce should be loaded from. Usually app/mapreduce.
+test:
+  http_port: 9000
+  pb_port: 9002
+  host: localhost
+  bin_dir: /usr/local/bin   # Default for Homebrew.
+  js_source_dir: <%%= Padrino.root + "app/mapreduce" %>
+
+production:
+  http_port: 8098
+  pb_port: 8087
+  host: localhost
+RIAK
+RIPPLE_CFG = (<<RIAK) unless defined?(RIPPLE_CFG)
+# encoding: utf-8
+
+require 'ripple'
+
+if File.exist?(Padrino.root + "config/riak.yml")
+  Ripple.load_configuration Padrino.root.join('config', 'riak.yml'), [Padrino.env]
+end
+RIAK
+
+def setup_orm
+  require_dependencies 'ripple'
+  create_file("config/riak.yml", RIPPLE_DB.gsub(/!NAME!/, @app_name.underscore))
+  create_file("config/database.rb", RIPPLE_CFG)
+  empty_directory('app/models')
+end
+
+RIPPLE_MODEL = (<<-MODEL) unless defined?(RIPPLE_MODEL)
+# encoding: utf-8
+
+class !NAME!
+  include Ripple::Document
+
+  # Standart properties
+  # property :name, String
+  !FIELDS!
+
+  # Relations
+  # many :addresses
+  # many :friends, :class_name => "Person"
+  # one :account
+end
+
+MODEL
+# options => { :fields => ["title:string", "body:string"], :app => 'app' }
+def create_model_file(name, options={})
+  model_path = destination_root(options[:app], 'models', "#{name.to_s.underscore}.rb")
+  field_tuples = options[:fields].map { |value| value.split(":") }
+  column_declarations = field_tuples.map { |field, kind| "property :#{field}, #{kind.camelize}" }.join("\n  ")
+  model_contents = RIPPLE_MODEL.gsub(/!NAME!/, name.to_s.camelize)
+  model_contents.gsub!(/!FIELDS!/, column_declarations)
+  create_file(model_path, model_contents)
+end
+
+def create_model_migration(filename, name, fields)
+  # NO MIGRATION NEEDED
+end
+
+def create_migration_file(migration_name, name, columns)
+  # NO MIGRATION NEEDED
+end

data/lib/padrino-gen/generators/components/tests/cucumber.rb

@@ -82,4 +82,4 @@ def setup_test
   require_dependencies 'rspec', :group => 'test'
   insert_test_suite_setup RSPEC_SETUP, :path => "spec/spec_helper.rb"
   create_file destination_root("spec/spec.rake"), RSPEC_RAKE
-end
+end

data/lib/padrino-gen/generators/model.rb

@@ -20,7 +20,7 @@ module Padrino
       argument :name, :desc => "The name of your padrino model"
       argument :fields, :desc => "The fields for the model", :type => :array, :default => []
       class_option :root, :desc => "The root destination", :aliases => '-r', :default => ".", :type => :string
-      class_option :app, :desc => "The application destination path", :aliases => '-a', :default => "/app", :type => :string
+      class_option :app, :desc => "The application destination path", :aliases => '-a', :default => ".", :type => :string
       class_option :destroy, :aliases => '-d', :default => false, :type => :boolean
       class_option :skip_migration, :aliases => "-s", :default => false, :type => :boolean
 
@@ -53,4 +53,4 @@ module Padrino
       end
     end # Model
   end # Generators
-end # Padrino
+end # Padrino

data/lib/padrino-gen/generators/project/config.ru

@@ -1,2 +1,9 @@
-require ::File.dirname(__FILE__) + '/config/boot.rb'
-run Padrino.application
+#!/usr/bin/env rackup
+# encoding: utf-8
+
+# This file can be used to start Padrino,
+# just execute it from the command line.
+
+require File.expand_path("../config/boot.rb", __FILE__)
+
+run Padrino.application

data/lib/padrino-gen/generators/project.rb

@@ -31,7 +31,7 @@ module Padrino
       class_option :template,     :desc => "Generate project from template",                        :aliases => '-p', :default => nil,      :type => :string
 
       # Definitions for the available customizable components
-      component_option :orm,        "database engine",    :aliases => '-d', :choices => [:activerecord, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest, :ohm, :mongomatic], :default => :none
+      component_option :orm,        "database engine",    :aliases => '-d', :choices => [:activerecord, :datamapper, :mongomapper, :mongoid, :sequel, :couchrest, :ohm, :mongomatic, :ripple], :default => :none
       component_option :test,       "testing framework",  :aliases => '-t', :choices => [:rspec, :shoulda, :cucumber, :bacon, :testspec, :riot], :default => :none
       component_option :mock,       "mocking library",    :aliases => '-m', :choices => [:mocha, :rr], :default => :none
       component_option :script,     "javascript library", :aliases => '-s', :choices => [:jquery, :prototype, :rightjs, :mootools, :extcore, :dojo], :default => :none

data/lib/padrino-gen/generators/templates/Gemfile.tt

@@ -19,7 +19,16 @@ gem 'rack-flash'
 end
 <%- else -%>
 # Padrino
-gem 'padrino', "<%= Padrino.version %>"
+gem 'padrino', '<%= Padrino.version %>'
 <%- end -%>
 # Padrino EDGE
-# gem 'padrino', :git => "git://github.com/padrino/padrino-framework.git"
+# gem 'padrino', :git => 'git://github.com/padrino/padrino-framework.git'
+#
+# Individual GEMS
+# gem 'padrino-core', '<%= Padrino.version %>'
+# gem 'padrino-admin', '<%= Padrino.version %>'
+# gem 'padrino-cache', '<%= Padrino.version %>'
+# gem 'padrino-core', '<%= Padrino.version %>'
+# gem 'padrino-gen', '<%= Padrino.version %>'
+# gem 'padrino-helpers', '<%= Padrino.version %>'
+# gem 'padrino-mailer', '<%= Padrino.version %>'

data/lib/padrino-gen/generators/templates/static/ujs/jquery.js

@@ -15,6 +15,7 @@ $("form[data-remote=true]").live('submit', function(e) {
   JSAdapter.sendRequest(element, { 
     verb: element.data('method') || element.attr('method') || 'post', 
     url: element.attr('action'), 
+    dataType: element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType) || 'script',
     params: element.serializeArray()
   });
 });
@@ -59,14 +60,14 @@ var JSAdapter = {
   // Sends an xhr request to the specified url with given verb and params
   // JSAdapter.sendRequest(element, { verb: 'put', url : '...', params: {} });
   sendRequest : function(element, options) {
-    var verb = options.verb, url = options.url, params = options.params;
+    var verb = options.verb, url = options.url, params = options.params, dataType = options.dataType;
     var event = element.trigger("ajax:before");
     if (event.stopped) return false;
     $.ajax({
       url: url,
       type: verb.toUpperCase() || 'POST',
       data: params || [],
-      dataType: 'script',
+      dataType: dataType,
 
       beforeSend: function(request) { element.trigger("ajax:loading",  [ request ]); },
       complete:   function(request) { element.trigger("ajax:complete", [ request ]); },

data/lib/padrino-gen.rb

@@ -1,6 +1,7 @@
 require 'padrino-core/support_lite'
 require 'padrino-core/tasks'
 require 'padrino-core/command'
+require 'active_support/ordered_hash'
 
 module Padrino
   ##

data/padrino-gen.gemspec

@@ -1,4 +1,6 @@
-# -*- encoding: utf-8 -*-
+#!/usr/bin/env gem build
+# encoding: utf-8
+
 require File.expand_path("../../padrino-core/lib/padrino-core/version.rb", __FILE__)
 
 Gem::Specification.new do |s|
@@ -21,6 +23,6 @@ Gem::Specification.new do |s|
   s.rdoc_options  = ["--charset=UTF-8"]
 
   s.add_dependency("padrino-core", Padrino.version)
-  s.add_dependency("bundler", ">= 1.0.2")
-  s.add_dependency("grit")
+  s.add_dependency("bundler", "~> 1.0.2")
+  s.add_dependency("grit", "~> 2.4.1")
 end

data/test/test_model_generator.rb

@@ -14,13 +14,13 @@ class TestModelGenerator < Test::Unit::TestCase
     should "fail outside app root" do
       output = silence_logger { generate(:model, 'user', "-r=#{@apptmp}") }
       assert_match(/not at the root/, output)
-      assert_no_file_exists('/tmp/app/models/user.rb')
+      assert_no_file_exists('/tmp/models/user.rb')
     end
 
     should "generate filename properly" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=couchrest') }
       silence_logger { generate(:model, 'DemoItem', "name:string", "age", "email:string", "-r=#{@apptmp}/sample_project") }
-      assert_file_exists("#{@apptmp}/sample_project/app/models/demo_item.rb")
+      assert_file_exists("#{@apptmp}/sample_project/models/demo_item.rb")
     end
 
     should "fail if field name is not acceptable" do
@@ -32,7 +32,7 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_match(/re@l\$ly:string/, output)
       assert_no_match(/email_two:string/, output)
       assert_no_match(/apply/, output)
-      assert_no_file_exists("#{@apptmp}/sample_project/app/models/demo_item.rb")
+      assert_no_file_exists("#{@apptmp}/sample_project/models/demo_item.rb")
     end
 
     should "fail if we don't use an adapter" do
@@ -43,7 +43,7 @@ class TestModelGenerator < Test::Unit::TestCase
     should "not fail if we don't have test component" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=none', '-d=activerecord') }
       response_success = silence_logger { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/user.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/test")
     end
 
@@ -54,7 +54,7 @@ class TestModelGenerator < Test::Unit::TestCase
       assert_match_in_file(/class Post\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/subby/models/post.rb")
       assert_match_in_file(/property :body, String/m, "#{@apptmp}/sample_project/subby/models/post.rb")
       assert_match_in_file(/migration 1, :create_posts do/m, "#{@apptmp}/sample_project/db/migrate/001_create_posts.rb")
-      assert_match_in_file(/gem 'data_mapper'/m,"#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/gem 'dm-core'/m,"#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/DataMapper.finalize/m,"#{@apptmp}/sample_project/config/boot.rb")
     end
 
@@ -62,9 +62,9 @@ class TestModelGenerator < Test::Unit::TestCase
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       response_success = silence_logger { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
       response_duplicate = silence_logger { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match "identical\e[0m  app/models/user.rb", response_duplicate
-      assert_match "identical\e[0m  test/app/models/user_test.rb", response_duplicate
+      assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match "identical\e[0m  models/user.rb", response_duplicate
+      assert_match "identical\e[0m  test/models/user_test.rb", response_duplicate
     end
 
     should "generate migration file versions properly" do
@@ -83,14 +83,14 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate model file" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       silence_logger { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/user.rb")
     end
 
     should "generate model file with camelized name" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       silence_logger { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class ChunkyBacon < ActiveRecord::Base/m, "#{@apptmp}/sample_project/app/models/chunky_bacon.rb")
-      assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/app/models/chunky_bacon_test.rb")
+      assert_match_in_file(/class ChunkyBacon < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/chunky_bacon.rb")
+      assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
     end
 
     should "generate migration file with no fields" do
@@ -122,17 +122,17 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate model file with no properties" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=couchrest') }
       silence_logger { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User < CouchRest::Model::Base/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/# property <name>[\s\n]+?end/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User < CouchRest::Model::Base/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/# property <name>[\s\n]+?end/m, "#{@apptmp}/sample_project/models/user.rb")
     end
 
     should "generate model file with given fields" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=couchrest') }
       silence_logger { generate(:model, 'person', "name:string", "age", "email:string", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class Person < CouchRest::Model::Base/m, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/property :name/m, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/property :age/m, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/property :email/m, "#{@apptmp}/sample_project/app/models/person.rb")
+      assert_match_in_file(/class Person < CouchRest::Model::Base/m, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/property :name/m, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/property :age/m, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/property :email/m, "#{@apptmp}/sample_project/models/person.rb")
     end
   end
 
@@ -142,23 +142,23 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate gemfile gem" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
       silence_logger { generate(:model, 'user', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/gem 'data_mapper'/m,"#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/gem 'dm-core'/m,"#{@apptmp}/sample_project/Gemfile")
     end
 
     should "generate model file with camelized name" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       silence_logger { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class ChunkyBacon\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/app/models/chunky_bacon.rb")
-      assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/app/models/chunky_bacon_test.rb")
+      assert_match_in_file(/class ChunkyBacon\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/chunky_bacon.rb")
+      assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
     end
 
     should "generate model file with fields" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
       silence_logger { generate(:model, 'user', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/property :name, String/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/property :age, Integer/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/property :created_at, DateTime/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/property :name, String/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/property :age, Integer/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/property :created_at, DateTime/m, "#{@apptmp}/sample_project/models/user.rb")
     end
 
     should "properly generate version numbers" do
@@ -166,11 +166,11 @@ class TestModelGenerator < Test::Unit::TestCase
       silence_logger { generate(:model, 'user', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
       silence_logger { generate(:model, 'person', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
       silence_logger { generate(:model, 'account', "name:string", "age:integer", "created_at:datetime", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/user.rb")
       assert_match_in_file(/migration 1, :create_users do/m, "#{@apptmp}/sample_project/db/migrate/001_create_users.rb")
-      assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/app/models/person.rb")
+      assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/person.rb")
       assert_match_in_file(/migration 2, :create_people do/m, "#{@apptmp}/sample_project/db/migrate/002_create_people.rb")
-      assert_match_in_file(/class Account\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/app/models/account.rb")
+      assert_match_in_file(/class Account\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/account.rb")
       assert_match_in_file(/migration 3, :create_accounts do/m, "#{@apptmp}/sample_project/db/migrate/003_create_accounts.rb")
     end
 
@@ -178,7 +178,7 @@ class TestModelGenerator < Test::Unit::TestCase
       current_time = stop_time_for_test.strftime("%Y%m%d%H%M%S")
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
       silence_logger { generate(:model, 'person', "name:string", "created_at:date_time", "email:string", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/app/models/person.rb")
+      assert_match_in_file(/class Person\n\s+include DataMapper::Resource/m, "#{@apptmp}/sample_project/models/person.rb")
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
       assert_match_in_file(/migration 1, :create_people do/m, migration_file_path)
       assert_match_in_file(/create_table :people do/m, migration_file_path)
@@ -194,14 +194,14 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate model file with given properties" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=sequel') }
       silence_logger { generate(:model, 'user', "name:string", "age:integer", "created:datetime", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User < Sequel::Model/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User < Sequel::Model/m, "#{@apptmp}/sample_project/models/user.rb")
     end
 
     should "generate model file with camelized name" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=sequel') }
       silence_logger { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class ChunkyBacon < Sequel::Model/m, "#{@apptmp}/sample_project/app/models/chunky_bacon.rb")
-      assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/app/models/chunky_bacon_test.rb")
+      assert_match_in_file(/class ChunkyBacon < Sequel::Model/m, "#{@apptmp}/sample_project/models/chunky_bacon.rb")
+      assert_match_in_file(/ChunkyBacon Model/, "#{@apptmp}/sample_project/test/models/chunky_bacon_test.rb")
     end
 
     should "generate migration file with given properties" do
@@ -209,7 +209,7 @@ class TestModelGenerator < Test::Unit::TestCase
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=sequel') }
       silence_logger { generate(:model, 'person', "name:string", "age:integer", "created:datetime", "-r=#{@apptmp}/sample_project") }
       migration_file_path = "#{@apptmp}/sample_project/db/migrate/001_create_people.rb"
-      assert_match_in_file(/class Person < Sequel::Model/m, "#{@apptmp}/sample_project/app/models/person.rb")
+      assert_match_in_file(/class Person < Sequel::Model/m, "#{@apptmp}/sample_project/models/person.rb")
       assert_match_in_file(/class CreatePeople < Sequel::Migration/m, migration_file_path)
       assert_match_in_file(/create_table :people/m, migration_file_path)
       assert_match_in_file(/String :name/m,   migration_file_path)
@@ -224,19 +224,19 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate model file with no properties" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongomapper') }
       silence_logger { generate(:model, 'person', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class Person\n\s+include MongoMapper::Document/m, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/# key <name>, <type>/m, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/timestamps![\n\s]+end/m, "#{@apptmp}/sample_project/app/models/person.rb")
+      assert_match_in_file(/class Person\n\s+include MongoMapper::Document/m, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/# key <name>, <type>/m, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/timestamps![\n\s]+end/m, "#{@apptmp}/sample_project/models/person.rb")
     end
 
     should "generate model file with given fields" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongomapper') }
       silence_logger { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User\n\s+include MongoMapper::Document/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/key :name, String/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/key :age, Integer/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/key :email, String/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/timestamps!/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User\n\s+include MongoMapper::Document/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/key :name, String/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/key :age, Integer/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/key :email, String/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/timestamps!/m, "#{@apptmp}/sample_project/models/user.rb")
     end
   end
 
@@ -244,17 +244,17 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate model file with no properties" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongoid') }
       silence_logger { generate(:model, 'person', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class Person\n\s+include Mongoid::Document/m, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/# field <name>, :type => <type>, :default => <value>/m, "#{@apptmp}/sample_project/app/models/person.rb")
+      assert_match_in_file(/class Person\n\s+include Mongoid::Document/m, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/# field <name>, :type => <type>, :default => <value>/m, "#{@apptmp}/sample_project/models/person.rb")
     end
 
     should "generate model file with given fields" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongoid') }
       silence_logger { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User\n\s+include Mongoid::Document/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/field :name, :type => String/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/field :age, :type => Integer/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/field :email, :type => String/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User\n\s+include Mongoid::Document/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/field :name, :type => String/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/field :age, :type => Integer/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/field :email, :type => String/m, "#{@apptmp}/sample_project/models/user.rb")
     end
   end
 
@@ -263,20 +263,20 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate model file with no properties" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=ohm') }
       silence_logger { generate(:model, 'person', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class Person < Ohm::Model/, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/include Ohm::Timestamping/, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/include Ohm::Typecast/, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/# attribute :name/m, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/# reference :venue, Venue/m, "#{@apptmp}/sample_project/app/models/person.rb")
+      assert_match_in_file(/class Person < Ohm::Model/, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/include Ohm::Timestamping/, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/include Ohm::Typecast/, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/# attribute :name/m, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/# reference :venue, Venue/m, "#{@apptmp}/sample_project/models/person.rb")
     end
 
     should "generate model file with given fields" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=ohm') }
       silence_logger { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User < Ohm::Model/, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/attribute :name, String/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/attribute :age, Integer/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/attribute :email, String/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User < Ohm::Model/, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/attribute :name, String/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/attribute :age, Integer/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/attribute :email, String/m, "#{@apptmp}/sample_project/models/user.rb")
     end
   end
 
@@ -285,19 +285,40 @@ class TestModelGenerator < Test::Unit::TestCase
     should "generate model file with no properties" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongomatic') }
       silence_logger { generate(:model, 'person', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class Person < Mongomatic::Base/, "#{@apptmp}/sample_project/app/models/person.rb")
-      assert_match_in_file(/include Mongomatic::Expectations::Helper/m, "#{@apptmp}/sample_project/app/models/person.rb")
+      assert_match_in_file(/class Person < Mongomatic::Base/, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/include Mongomatic::Expectations::Helper/m, "#{@apptmp}/sample_project/models/person.rb")
     end
 
     should "generate model file with given fields" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=mongomatic') }
       silence_logger { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User < Mongomatic::Base/, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/include Mongomatic::Expectations::Helper/, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/be_present self\['name'\]/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/be_present self\['age'\]/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/be_present self\['email'\]/m, "#{@apptmp}/sample_project/app/models/user.rb")
-      assert_match_in_file(/be_a_number self\['age'\]/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User < Mongomatic::Base/, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/include Mongomatic::Expectations::Helper/, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/be_present self\['name'\]/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/be_present self\['age'\]/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/be_present self\['email'\]/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/be_a_number self\['age'\]/m, "#{@apptmp}/sample_project/models/user.rb")
+    end
+  end
+
+  # RIPPLE
+  context "model generator using ripple" do
+    should "generate model file with no properties" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=ripple') }
+      silence_logger { generate(:model, 'person', "name:string", "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class Person\n\s+include Ripple::Document/m, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/# property :name, String/m, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/# many :addresses/m, "#{@apptmp}/sample_project/models/person.rb")
+      assert_match_in_file(/# one :account/m, "#{@apptmp}/sample_project/models/person.rb")
+    end
+
+    should "generate model file with given fields" do
+      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=ripple') }
+      silence_logger { generate(:model, 'user', "name:string", "age:integer", "email:string", "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class User\n\s+include Ripple::Document/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/property :name, String/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/property :age, Integer/m, "#{@apptmp}/sample_project/models/user.rb")
+      assert_match_in_file(/property :email, String/m, "#{@apptmp}/sample_project/models/user.rb")
     end
   end
 
@@ -360,8 +381,8 @@ class TestModelGenerator < Test::Unit::TestCase
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       silence_logger { generate(:model, 'User', "-r=#{@apptmp}/sample_project") }
       silence_logger { generate(:model, 'User', "-r=#{@apptmp}/sample_project", '-d') }
-      assert_no_file_exists("#{@apptmp}/sample_project/app/models/user.rb")
-      assert_no_file_exists("#{@apptmp}/sample_project/test/app/models/user_test.rb")
+      assert_no_file_exists("#{@apptmp}/sample_project/models/user.rb")
+      assert_no_file_exists("#{@apptmp}/sample_project/test/models/user_test.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/db/migrate/001_create_users.rb")
     end
 
@@ -369,7 +390,7 @@ class TestModelGenerator < Test::Unit::TestCase
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec', '-d=activerecord') }
       silence_logger { generate(:model, 'User', "-r=#{@apptmp}/sample_project") }
       silence_logger { generate(:model, 'User', "-r=#{@apptmp}/sample_project", '-d') }
-      assert_no_file_exists("#{@apptmp}/sample_project/spec/app/models/user_spec.rb")
+      assert_no_file_exists("#{@apptmp}/sample_project/spec/models/user_spec.rb")
     end
 
     should "destroy the model test file in a sub app" do

data/test/test_project_generator.rb

@@ -246,7 +246,7 @@ class TestProjectGenerator < Test::Unit::TestCase
       should "properly generate default" do
         buffer = silence_logger { generate(:project, 'project.com', "--root=#{@apptmp}", '--orm=datamapper', '--script=none') }
         assert_match(/Applying.*?datamapper.*?orm/, buffer)
-        assert_match_in_file(/gem 'data_mapper'/, "#{@apptmp}/project.com/Gemfile")
+        assert_match_in_file(/gem 'dm-core'/, "#{@apptmp}/project.com/Gemfile")
         assert_match_in_file(/gem 'dm-sqlite-adapter'/, "#{@apptmp}/project.com/Gemfile")
         assert_match_in_file(/DataMapper.setup/, "#{@apptmp}/project.com/config/database.rb")
         assert_match_in_file(/project_com/, "#{@apptmp}/project.com/config/database.rb")
@@ -322,6 +322,15 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/Mongomatic.db = Mongo::Connection.new.db/, "#{@apptmp}/sample_project/config/database.rb")
       assert_dir_exists("#{@apptmp}/sample_project/app/models")
     end
+
+    should "properly generate for ripple" do
+      buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=ripple', '--script=none') }
+      assert_match(/Applying.*?ripple.*?orm/, buffer)
+      assert_match_in_file(/gem 'ripple'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/Ripple.load_configuration/, "#{@apptmp}/sample_project/config/database.rb")
+      assert_match_in_file(/http_port: 8098/, "#{@apptmp}/sample_project/config/riak.yml")
+      assert_dir_exists("#{@apptmp}/sample_project/app/models")
+    end
   end
 
 
@@ -410,8 +419,8 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/:require => "rack\/test"/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/:group => "test"/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'bacon'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/test/test_config.rb")
       assert_match_in_file(/Bacon::Context/, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/test/test_config.rb")
       assert_file_exists("#{@apptmp}/sample_project/test/test.rake")
       assert_match_in_file(/Rake::TestTask.new\("test:\#/,"#{@apptmp}/sample_project/test/test.rake")
       assert_match_in_file(/task 'test' => test_tasks/,"#{@apptmp}/sample_project/test/test.rake")
@@ -471,6 +480,7 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'test-spec'.*?:require => "test\/spec"/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/test/test_config.rb")
       assert_match_in_file(/Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_match_in_file(/gem 'test-spec'.*?:require => "test\/spec"/, "#{@apptmp}/sample_project/Gemfile")
       assert_file_exists("#{@apptmp}/sample_project/test/test.rake")
       assert_match_in_file(/Rake::TestTask\.new\("test:\#/,"#{@apptmp}/sample_project/test/test.rake")
       assert_match_in_file(/task 'test' => test_tasks/,"#{@apptmp}/sample_project/test/test.rake")
@@ -484,9 +494,9 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/:group => "test"/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'rspec'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'cucumber'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/gem 'capybara'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
       assert_match_in_file(/PADRINO_ENV = 'test' unless defined\?\(PADRINO_ENV\)/, "#{@apptmp}/sample_project/features/support/env.rb")
+      assert_match_in_file(/gem 'capybara'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/RSpec.configure/, "#{@apptmp}/sample_project/spec/spec_helper.rb")
       assert_match_in_file(/Capybara.app = /, "#{@apptmp}/sample_project/features/support/env.rb")
       assert_match_in_file(/World\(Cucumber::Web::URLs\)/, "#{@apptmp}/sample_project/features/support/url.rb")
@@ -537,4 +547,4 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_dir_exists("#{@apptmp}/sample_project/app/stylesheets")
     end
   end
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: padrino-gen
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.29
+  version: 0.10.0
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,7 +13,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-07-07 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
@@ -23,7 +24,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.29
+        version: 0.10.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -32,7 +33,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 1.0.2
   type: :runtime
@@ -43,9 +44,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.4.1
   type: :runtime
   version_requirements: *id003
 description: Generators for easily creating and building padrino applications from the console
@@ -79,6 +80,7 @@ files:
 - lib/padrino-gen/generators/components/orms/mongomapper.rb
 - lib/padrino-gen/generators/components/orms/mongomatic.rb
 - lib/padrino-gen/generators/components/orms/ohm.rb
+- lib/padrino-gen/generators/components/orms/ripple.rb
 - lib/padrino-gen/generators/components/orms/sequel.rb
 - lib/padrino-gen/generators/components/renderers/erb.rb
 - lib/padrino-gen/generators/components/renderers/haml.rb
@@ -155,6 +157,7 @@ files:
 - lib/padrino-gen/generators/templates/static/ujs/mootools.js
 - lib/padrino-gen/generators/templates/static/ujs/prototype.js
 - lib/padrino-gen/generators/templates/static/ujs/right.js
+has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
 
@@ -178,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: padrino-gen
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Generators for easily creating and building padrino applications