padrino-gen 0.10.0 → 0.10.1

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

@@ -206,8 +206,6 @@ module Padrino
           template "templates/helper.rb.tt", destination_root(app, "helpers.rb")
           @short_name = 'notifier'
           template "templates/mailer.rb.tt", destination_root(app, "mailers.rb")
-          empty_directory destination_root(app, "views", "layouts")
-          empty_directory destination_root(app, "views", "mailers")
         else # generate standard folders
           empty_directory destination_root(app, 'controllers')
           empty_directory destination_root(app, 'helpers')
@@ -258,4 +256,4 @@ module Padrino
       end
     end # Actions
   end # Generators
-end # Padrino
+end # Padrino

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

@@ -112,7 +112,6 @@ def setup_orm
   end
   require_dependencies 'activerecord', :require => 'active_record'
   create_file("config/database.rb", ar)
-  empty_directory('app/models')
 end
 
 AR_MODEL = (<<-MODEL) unless defined?(AR_MODEL)
@@ -169,4 +168,4 @@ def create_migration_file(migration_name, name, columns)
     :add => Proc.new { |field, kind| "t.#{kind.underscore.gsub(/_/, '')} :#{field}" },
     :remove => Proc.new { |field, kind| "t.remove :#{field}" }
   )
-end
+end

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

@@ -26,7 +26,6 @@ def setup_orm
   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')
 end
 
 CR_MODEL = (<<-MODEL) unless defined?(CR_MODEL)
@@ -53,4 +52,4 @@ end
 
 def create_migration_file(migration_name, name, columns)
   # NO MIGRATION NEEDED
-end
+end

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

@@ -50,7 +50,6 @@ def setup_orm
   end
 
   create_file("config/database.rb", dm)
-  empty_directory('app/models')
   insert_hook("DataMapper.finalize", :after_load)
 end
 
@@ -116,4 +115,4 @@ def create_migration_file(migration_name, name, columns)
     :add => Proc.new { |field, kind| "add_column :#{field}, #{kind.classify}" },
     :remove => Proc.new { |field, kind| "drop_column :#{field}" }
   )
-end
+end

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

@@ -31,7 +31,6 @@ def setup_orm
   require_dependencies 'mongoid'
   require_dependencies('SystemTimer', :require => 'system_timer') if RUBY_VERSION =~ /1\.8/
   create_file("config/database.rb", MONGOID.gsub(/!NAME!/, @app_name.underscore))
-  empty_directory('app/models')
 end
 
 MONGOID_MODEL = (<<-MODEL) unless defined?(MONGOID_MODEL)
@@ -66,4 +65,4 @@ end
 
 def create_migration_file(migration_name, name, columns)
   # NO MIGRATION NEEDED
-end
+end

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

@@ -13,7 +13,6 @@ def setup_orm
   require_dependencies 'mongo_mapper'
   require_dependencies('SystemTimer', :require => 'system_timer') if RUBY_VERSION =~ /1\.8/
   create_file("config/database.rb", MONGO.gsub(/!NAME!/, @app_name.underscore))
-  empty_directory('app/models')
 end
 
 MM_MODEL = (<<-MODEL) unless defined?(MM_MODEL)

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

@@ -12,7 +12,6 @@ def setup_orm
   require_dependencies 'bson_ext', :require => 'mongo'
   require_dependencies 'mongomatic'
   create_file("config/database.rb", MONGOMATIC.gsub(/!NAME!/, @app_name.underscore))
-  empty_directory('app/models')
 end
 
 MONGOMATIC_MODEL = (<<-MODEL) unless defined?(MONGOMATIC_MODEL)

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

@@ -28,7 +28,6 @@ def setup_orm
   require_dependencies 'ohm', :require => 'ohm'
   require_dependencies 'ohm-contrib', :require => 'ohm/contrib'
   create_file("config/database.rb", ohm)
-  empty_directory('app/models')
 end
 
 OHM_MODEL = (<<-MODEL) unless defined?(OHM_MODEL)
@@ -69,4 +68,4 @@ end
 
 def create_migration_file(migration_name, name, columns)
   # NO MIGRATION NEEDED
-end
+end

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

@@ -37,7 +37,6 @@ 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)

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

@@ -30,7 +30,6 @@ def setup_orm
     'sqlite3'
   end
   create_file("config/database.rb", sequel)
-  empty_directory('app/models')
   empty_directory('db/migrate')
 end
 
@@ -88,4 +87,4 @@ def create_migration_file(migration_name, name, columns)
     :add => Proc.new { |field, kind| "add_column :#{field}, #{kind.camelize}"  },
     :remove => Proc.new { |field, kind| "drop_column :#{field}" }
   )
-end
+end

data/lib/padrino-gen/generators/components/renderers/slim.rb

@@ -1,3 +1,3 @@
 def setup_renderer
-  require_dependencies 'slim', :version => "~> 0.9.2"
+  require_dependencies 'slim'
 end

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

@@ -80,30 +80,15 @@ module Padrino
 
       # Finish message
       def finish_message
-        if options[:bundle]
-          text = (<<-TEXT).gsub(/ {10}/,'')
-
-          =================================================================
-          #{name} is ready for development! Next, follow these steps:
-          =================================================================
-          1) cd #{options[:root]}/#{name}
-          =================================================================
-
-          TEXT
-        else
-          text = (<<-TEXT).gsub(/ {10}/,'')
-
-          =================================================================
-          #{name} is ready for development! Next, follow these steps:
-          =================================================================
-          1) cd #{options[:root]}/#{name}
-          2) bundle install
-          =================================================================
-
-          TEXT
-        end
-        say(text)
+        say
+        say "="*65, :green
+        say "#{name} is ready for development!", :green
+        say "="*65, :green
+        say "$ cd #{options[:root]}/#{name}", :bold
+        say "$ bundle install", :bold unless options[:bundle]
+        say "="*65, :green
+        say
       end
     end # Project
   end # Generators
-end # Padrino
+end # Padrino

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

@@ -28,7 +28,6 @@ gem 'padrino', '<%= Padrino.version %>'
 # 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/mootools.js

@@ -6,67 +6,6 @@
 // Halt Definition
 Event.implement({ halt: function() { this.stop(); this.stopped = true; }});
 
-window.addEvent('domready', function() {
-
-/* Remote Form Support
- * form_for @user, '/user', :remote => true
-**/
-
-document.body.delegateEvent('submit', { "form[data-remote=true]" :
-  function(e) {
-    e.halt();
-    var element = e.target;
-    var message = element.get('data-confirm');
-    if (message && !confirm(message)) { return false; }
-    JSAdapter.sendRequest(element, { 
-      verb: element.get('data-method') || element.get('method') || 'post', 
-      url: element.get('action'), 
-      params: element.toQueryString()
-    });
-  }
-});
-
-/* Confirmation Support
- * link_to 'sign out', '/logout', :confirm => "Log out?"
-**/
-
-document.body.delegateEvent('click', { "a[data-confirm]" : 
-  function(e) {
-    var message = e.target.get('data-confirm');
-    if (message && !confirm(message)) { e.halt(); }
-  }
-});
-
-/* 
- * Link Remote Support 
- * link_to 'add item', '/create', :remote => true
-**/
-
-document.body.delegateEvent('click', { "a[data-remote]" : 
-  function(e) {
-    if (e.stopped) return; e.halt();
-    var element = e.target;
-    JSAdapter.sendRequest(element, { 
-      verb: element.get('data-method') || 'get', 
-      url: element.get('href')
-    }); 
-  }
-});
-
-/* 
- * Link Method Support
- * link_to 'delete item', '/destroy', :method => :delete
-**/
-
-document.body.delegateEvent('click', { "a[data-method]:not([data-remote])" :
-  function(e) {
-    if (e.stopped) return;
-    console.log(e.target);
-    JSAdapter.sendMethod(e.target);
-    e.halt();
-  }});
-});
-
 /* JSAdapter */
 var JSAdapter = {
   // Sends an xhr request to the specified url with given verb and params
@@ -101,4 +40,64 @@ var JSAdapter = {
     }
     form.submit();
   }
-};
+};
+window.addEvent('domready', function() {
+
+/* Remote Form Support
+ * form_for @user, '/user', :remote => true
+**/
+
+  $$("form[data-remote=true]").addEvent('click', function(e) {
+    e.halt();
+    var element = e.target;
+    var message = element.get('data-confirm');
+    if (message && !confirm(message)) { 
+      return false; 
+    }
+    JSAdapter.sendRequest(element, { 
+      verb: element.get('data-method') || element.get('method') || 'post', 
+      url: element.get('action'), 
+      params: element.toQueryString()
+    });
+  });
+
+  /* Confirmation Support
+   * link_to 'sign out', '/logout', :confirm => "Log out?"
+  **/
+
+  $$('a[data-confirm').addEvent('click', function(e) {
+    var message = e.target.get('data-confirm');
+    if (message && !confirm(message)) { 
+      e.halt(); 
+    }
+  });
+
+  /* 
+   * Link Remote Support 
+   * link_to 'add item', '/create', :remote => true
+  **/
+
+  $$("a[data-remote]").addEvent('click', function(e) {
+    if (e.stopped) return; e.halt();
+    var element = e.target;
+    JSAdapter.sendRequest(element, { 
+      verb: element.get('data-method') || 'get', 
+      url: element.get('href')
+    }); 
+  })
+
+  /* 
+   * Link Method Support
+   * link_to 'delete item', '/destroy', :method => :delete
+  **/
+
+
+  $$("a[data-method]:not([data-remote])").addEvent('click', function(e) {
+    if (e.stopped) {
+      return;
+    }
+    JSAdapter.sendMethod(e.target);
+    e.halt();
+  });
+
+});

data/lib/padrino-gen/padrino-tasks/activerecord.rb

@@ -315,7 +315,7 @@ if defined?(ActiveRecord)
     if defined?(I18n)
       desc "Generates .yml files for I18n translations"
       task :translate => :environment do
-        models = Dir["#{Padrino.root}/app/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
+        models = Dir["#{Padrino.root}/{app,}/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
 
         models.each do |m|
           # Get the model class
@@ -567,4 +567,4 @@ if defined?(ActiveRecord)
   end
 
   ActiveRecord::Migration.send :include, AutoMigrations
-end
+end

data/lib/padrino-gen/padrino-tasks/datamapper.rb

@@ -50,7 +50,7 @@ if defined?(DataMapper)
       puts "=> Creating database '#{database}'"
       case config[:adapter]
         when 'postgres'
-          system("createdb", "-E", charset, "-U", user, database)
+          system("createdb", "-E", charset, "-h", host, "-U", user, database)
           puts "<= dm:create executed"
         when 'mysql'
           query = [
@@ -74,7 +74,7 @@ if defined?(DataMapper)
       puts "=> Dropping database '#{database}'"
       case config[:adapter]
         when 'postgres'
-          system("dropdb", "-U", user, database)
+          system("dropdb", "-h", host, "-U", user, database)
           puts "<= dm:drop executed"
         when 'mysql'
           query = [
@@ -96,4 +96,4 @@ if defined?(DataMapper)
     desc "Create the database migrate and initialize with the seed data"
     task :setup => [:create, :migrate, :seed]
   end
-end
+end

data/lib/padrino-gen/padrino-tasks/mongoid.rb

@@ -9,7 +9,7 @@ if defined?(Mongoid)
     # Helper to retrieve a list of models.
     def get_mongoid_models
       documents = []
-      Dir.glob('app/models/*.rb').sort.each do |file|
+      Dir['{app,}/models/*.rb'].sort.each do |file|
         model_path = file[0..-4].split('/')[2..-1]
 
         begin

data/lib/padrino-gen/padrino-tasks/mongomapper.rb

@@ -8,7 +8,7 @@ if defined?(MongoMapper)
     if defined?(I18n)
       desc "Generates .yml files for I18n translations"
       task :translate => :environment do
-        models = Dir["#{Padrino.root}/app/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
+        models = Dir["#{Padrino.root}/{app,}/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
 
         models.each do |m|
           # Get the model class
@@ -47,4 +47,4 @@ if defined?(MongoMapper)
       end
     end
   end
-end
+end

data/padrino-gen.gemspec

@@ -23,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("bundler", "~> 1.0")
   s.add_dependency("grit", "~> 2.4.1")
 end

data/test/test_app_generator.rb

@@ -42,7 +42,6 @@ class TestAppGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/demo/helpers.rb")
       assert_file_exists("#{@apptmp}/sample_project/demo/controllers.rb")
       assert_file_exists("#{@apptmp}/sample_project/demo/mailers.rb")
-      assert_dir_exists("#{@apptmp}/sample_project/demo/views/mailers")
       assert_dir_exists("#{@apptmp}/sample_project/public/demo")
       assert_match_in_file(/:notifier/,"#{@apptmp}/sample_project/demo/mailers.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/demo/helpers")
@@ -62,8 +61,6 @@ class TestAppGenerator < Test::Unit::TestCase
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon') }
       silence_logger { generate(:app, 'demo_app', "--root=#{@apptmp}/sample_project") }
       silence_logger { generate(:mailer, 'demo', "-r=#{@apptmp}/sample_project", '-a=demoapp') }
-      assert_match_in_file(/DemoApp.mailer :demo/m, "#{@apptmp}/sample_project/demoapp/mailers/demo.rb")
-      assert_dir_exists("#{@apptmp}/sample_project/demoapp/views/mailers/demo")
     end
 
     # only destroys what it generated.
@@ -81,4 +78,4 @@ class TestAppGenerator < Test::Unit::TestCase
       assert_no_match_in_file(/Padrino\.mount\("Demo"\).to\("\/demo"\)/,"#{@apptmp}/sample_project/config/apps.rb")
     end
   end
-end
+end

data/test/test_project_generator.rb

@@ -67,8 +67,7 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_dir_exists("#{@apptmp}/sample_project/public/images")
       assert_dir_exists("#{@apptmp}/sample_project/public/javascripts")
       assert_dir_exists("#{@apptmp}/sample_project/public/stylesheets")
-      assert_dir_exists("#{@apptmp}/sample_project/app/views/mailers")
-      assert_dir_exists("#{@apptmp}/sample_project/app/views/layouts")
+      # assert_dir_exists("#{@apptmp}/sample_project/app/views/layouts")
       assert_match_in_file(/:notifier/,"#{@apptmp}/sample_project/app/mailers.rb")
       assert_no_file_exists("#{@apptmp}/sample_project/demo/helpers")
       assert_no_file_exists("#{@apptmp}/sample_project/demo/controllers")
@@ -76,7 +75,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     should "not create models folder if no orm is chosen" do
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '--orm=none') }
-      assert_no_dir_exists("#{@apptmp}/sample_project/app/models")
+      assert_no_dir_exists("#{@apptmp}/sample_project/models")
     end
 
     should "not create tests folder if no test framework is chosen" do
@@ -177,7 +176,6 @@ class TestProjectGenerator < Test::Unit::TestCase
         assert_match_in_file(/Sequel.connect/, "#{@apptmp}/project.com/config/database.rb")
         assert_match_in_file(%r{sqlite://}, "#{@apptmp}/project.com/config/database.rb")
         assert_match_in_file(%r{project_com}, "#{@apptmp}/project.com/config/database.rb")
-        assert_dir_exists("#{@apptmp}/project.com/app/models")
       end
 
       should "properly generate mysql" do
@@ -210,7 +208,6 @@ class TestProjectGenerator < Test::Unit::TestCase
         assert_match_in_file(/gem 'sqlite3'/, "#{@apptmp}/project.com/Gemfile")
         assert_match_in_file(/ActiveRecord::Base.establish_connection/, "#{@apptmp}/project.com/config/database.rb")
         assert_match_in_file(/project_com/, "#{@apptmp}/project.com/config/database.rb")
-        assert_dir_exists("#{@apptmp}/project.com/app/models")
       end
 
       should "properly generate mysql" do
@@ -250,7 +247,6 @@ class TestProjectGenerator < Test::Unit::TestCase
         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")
-        assert_dir_exists("#{@apptmp}/project.com/app/models")
       end
 
       should "properly generate for mysql" do
@@ -281,7 +277,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'bson_ext'/, "#{@apptmp}/project.com/Gemfile")
       assert_match_in_file(/MongoMapper.database/, "#{@apptmp}/project.com/config/database.rb")
       assert_match_in_file(/project_com/, "#{@apptmp}/project.com/config/database.rb")
-      assert_dir_exists("#{@apptmp}/project.com/app/models")
     end
 
     should "properly generate for mongoid" do
@@ -291,7 +286,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'bson_ext'/, "#{@apptmp}/project.com/Gemfile")
       assert_match_in_file(/Mongoid.database/, "#{@apptmp}/project.com/config/database.rb")
       assert_match_in_file(/project_com/, "#{@apptmp}/project.com/config/database.rb")
-      assert_dir_exists("#{@apptmp}/project.com/app/models")
     end
 
 
@@ -301,7 +295,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'couchrest_model'/, "#{@apptmp}/project.com/Gemfile")
       assert_match_in_file(/CouchRest.database!/, "#{@apptmp}/project.com/config/database.rb")
       assert_match_in_file(/project_com/, "#{@apptmp}/project.com/config/database.rb")
-      assert_dir_exists("#{@apptmp}/project.com/app/models")
     end
 
     should "properly generate for ohm" do
@@ -311,7 +304,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'ohm'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'ohm-contrib', :require => "ohm\/contrib"/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/Ohm.connect/, "#{@apptmp}/sample_project/config/database.rb")
-      assert_dir_exists("#{@apptmp}/sample_project/app/models")
     end
 
     should "properly generate for mongomatic" do
@@ -320,7 +312,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'bson_ext'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'mongomatic'/, "#{@apptmp}/sample_project/Gemfile")
       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
@@ -329,7 +320,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       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
 

metadata

@@ -2,7 +2,7 @@
 name: padrino-gen
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -07:00
+date: 2011-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.10.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: "1.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency