padrino-gen 0.9.20 → 0.9.21

data/README.rdoc

@@ -39,11 +39,11 @@ You can also instruct the generator to skip a certain component to avoid using o
 The available components and their default options are listed below:
 
 test::       rspec (default), bacon, shoulda, cucumber, testspec, riot
-renderer::   haml  (default), erb, erubis, liquid
+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
+orm::        none  (default), datamapper, mongomapper, mongoid, activerecord, sequel, couchrest, ohm, mongomatic
 
 In addition, you can generate projects based on existing templates:
 

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

@@ -207,6 +207,15 @@ module Padrino
         end
       end
 
+      # Ensure that project name is valid, else raise an NameError
+      def valid_constant?(name)
+        if name =~ /^\d/
+          raise ::NameError, "Project name #{name} cannot start with numbers"
+        elsif name =~ /^\W/
+          raise ::NameError, "Project name #{name} cannot start with non-word character"
+        end 
+      end
+
       module ClassMethods
         # Defines a class option to allow a component to be chosen and add to component type list
         # Also builds the available_choices hash of which component choices are supported
@@ -240,4 +249,4 @@ module Padrino
       end
     end # Actions
   end # Generators
-end # Padrino
+end # Padrino

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

@@ -28,7 +28,7 @@ MONGO
 
 def setup_orm
   require_dependencies 'bson_ext', :require => 'mongo'
-  require_dependencies 'mongoid'
+  require_dependencies 'mongoid', '2.0.0.beta.20'
   create_file("config/database.rb", MONGOID.gsub(/!NAME!/, @app_name.underscore))
   empty_directory('app/models')
 end
@@ -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/mongomapper.rb

@@ -10,7 +10,7 @@ MONGO
 
 def setup_orm
   require_dependencies 'bson_ext', :require => 'mongo'
-  require_dependencies 'mongo_mapper'
+  require_dependencies 'mongo_mapper', :git => "git://github.com/jnunemaker/mongomapper.git", :branch => "rails3"
   create_file("config/database.rb", MONGO.gsub(/!NAME!/, @app_name.underscore))
   empty_directory('app/models')
 end

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

@@ -27,7 +27,7 @@ class Riot::Context
   #     asserts(:status).equals(200)
   #   end
   def app(app=nil, &block)
-    setup { @app = (app || block) }
+    setup { @app = (app || block.call) }
   end
 end
 
@@ -86,4 +86,4 @@ end
 def generate_model_test(name)
   riot_contents = RIOT_MODEL_TEST.gsub(/!NAME!/, name.to_s.camelize)
   create_file destination_root("test/models/#{name.to_s.underscore}_test.rb"), riot_contents, :skip => true
-end
+end

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

@@ -34,7 +34,7 @@ module Padrino
       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
-      component_option :renderer,   "template engine",    :aliases => '-e', :choices => [:haml, :erb, :erubis, :liquid, :slim], :default => :haml
+      component_option :renderer,   "template engine",    :aliases => '-e', :choices => [:haml, :erb, :liquid, :slim], :default => :haml
       component_option :stylesheet, "stylesheet engine",  :aliases => '-c', :choices => [:less, :sass, :compass, :scss], :default => :none
 
       # Show help if no argv given
@@ -42,12 +42,17 @@ module Padrino
 
       # Copies over the Padrino base application App
       def setup_project
+        valid_constant?(options[:app] || name)
         @app_name = (options[:app] || name).gsub(/\W/, "_").underscore.camelize
         self.destination_root = File.join(options[:root], name)
         if options[:template] # Run the template to create project
           execute_runner(:template, options[:template])
         else # generate project without template
           directory("project/", destination_root)
+          empty_directory destination_root "public/images"
+          empty_directory destination_root "public/javascripts"
+          empty_directory destination_root "public/stylesheets"
+          empty_directory destination_root "tmp"
           app_skeleton('app', options[:tiny])
           store_component_config('.components')
           template "templates/Gemfile.tt", destination_root("Gemfile")
@@ -98,6 +103,7 @@ module Padrino
         end
         say(text)
       end
+
     end # Project
   end # Generators
-end # Padrino
+end # Padrino

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

@@ -1,17 +1,12 @@
 # Defines our constants
 PADRINO_ENV  = ENV["PADRINO_ENV"] ||= ENV["RACK_ENV"] ||= "development"  unless defined?(PADRINO_ENV)
 PADRINO_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unless defined?(PADRINO_ROOT)
-
-begin
-  # Require the preresolved locked set of gems.
-  require File.expand_path('../../.bundle/environment', __FILE__)
-rescue LoadError
-  # Fallback on doing the resolve at runtime.
-  require 'rubygems'
-  require 'bundler'
-  Bundler.setup
-end
-
+# Load Bundler
+require 'rubygems'
+require 'bundler'
+# Only have default and environemtn gems
+Bundler.setup(:default, PADRINO_ENV.to_sym)
+# Only require default and environment gems
 Bundler.require(:default, PADRINO_ENV.to_sym)
 puts "=> Located #{Padrino.bundle} Gemfile for #{Padrino.env}"
 
@@ -27,4 +22,4 @@ end
 Padrino.after_load do
 end
 
-Padrino.load!
+Padrino.load!

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

@@ -342,7 +342,7 @@ if defined?(ActiveRecord)
               locale     = "#{lang}:" + "\n" +
                            "  models:" + "\n" +
                            "    #{m}:" + "\n" +
-                           "      name: #{klass.human}" + "\n" +
+                           "      name: #{klass.human_name}" + "\n" +
                            "      attributes:" + "\n" +
                            columns.collect { |c| "        #{c}: #{klass.human_attribute_name(c)}" }.join("\n")
               print "created a new for #{lang.to_s.upcase} Lang ... "; $stdout.flush

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

@@ -0,0 +1,115 @@
+if defined?(Mongoid)
+  namespace :mi do
+
+    desc 'Drops all the collections for the database for the current Padrino.env'
+    task :drop => :environment do
+      Mongoid.master.collections.select {|c| c.name !~ /system/ }.each(&:drop)
+    end
+
+    # Helper to retrieve a list of models.
+    def get_mongoid_models
+      documents = []
+      Dir.glob('app/models/*.rb').sort.each do |file|
+        model_path = file[0..-4].split('/')[2..-1]
+
+        begin
+          klass = model_path.map(&:classify).join('::').constantize
+          if klass.ancestors.include?(Mongoid::Document) && !klass.embedded
+            documents << klass
+          end
+        rescue => e
+          # Just for non-mongoid objects that dont have the embedded
+          # attribute at the class level.
+        end
+      end
+
+      documents
+    end
+
+    desc 'Create the indexes defined on your mongoid models'
+    task :create_indexes => :environment do
+      get_mongoid_models.each { |model| model.create_indexes }
+    end
+
+    def convert_ids(obj)
+      if obj.is_a?(String) && obj =~ /^[a-f0-9]{24}$/
+        BSON::ObjectId(obj)
+      elsif obj.is_a?(Array)
+        obj.map do |v|
+          convert_ids(v)
+        end
+      elsif obj.is_a?(Hash)
+        obj.each do |k, v|
+          obj[k] = convert_ids(v)
+        end
+      else
+        obj
+      end
+    end
+
+    def collection_names
+      @collection_names ||= get_mongoid_models.map{ |d| d.collection.name }.uniq
+    end
+
+    desc "Convert string objectids in mongo database to ObjectID type"
+    task :objectid_convert => :environment do
+      collection_names.each do |collection_name|
+        puts "Converting #{collection_name} to use ObjectIDs"
+
+        # get old collection
+        collection = Mongoid.master.collection(collection_name)
+
+        # get new collection (a clean one)
+        collection.db["#{collection_name}_new"].drop
+        new_collection = collection.db["#{collection_name}_new"]
+
+        # convert collection documents
+        collection.find({}, :timeout => false, :sort => "_id") do |cursor|
+           cursor.each do |doc|
+            new_doc = convert_ids(doc)
+            new_collection.insert(new_doc, :safe => true)
+          end
+        end
+
+        puts "Done! Converted collection is in #{new_collection.name}\n\n"
+      end
+
+      # no errors. great! now rename _new to collection_name
+      collection_names.each do |collection_name|
+        collection = Mongoid.master.collection(collection_name)
+        new_collection = collection.db["#{collection_name}_new"]
+
+        # swap collection to _old
+        puts "Moving #{collection.name} to #{collection_name}_old"
+        collection.db["#{collection_name}_old"].drop
+
+        begin
+          collection.rename("#{collection_name}_old")
+        rescue Exception => e
+          puts "Unable to rename database #{collection_name} to #{collection_name}_old"
+          puts "reason: #{e.message}\n\n"
+        end
+
+        # swap _new to collection
+        puts "Moving #{new_collection.name} to #{collection_name}\n\n"
+
+        begin
+          new_collection.rename(collection_name)
+        rescue Exception => e
+          puts "Unable to rename database #{new_collection.name} to #{collection_name}"
+          puts "reason: #{e.message}\n\n"
+        end
+      end
+
+      puts "DONE! Run `padrino rake mi:cleanup_old_collections` to remove old collections"
+    end
+
+    desc "Clean up old collections backed up by objectid_convert"
+    task :cleanup_old_collections => :environment do
+      collection_names.each do |collection_name|
+        collection = Mongoid.master.collection(collection_name)
+        collection.db["#{collection.name}_old"].drop
+      end
+    end
+  end
+end

data/test/test_project_generator.rb

@@ -19,6 +19,9 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/Padrino.mount\("SampleProject"\).to\('\/'\)/,"#{@apptmp}/sample_project/config/apps.rb")
       assert_file_exists("#{@apptmp}/sample_project/config/boot.rb")
       assert_file_exists("#{@apptmp}/sample_project/public/favicon.ico")
+      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")
       assert_dir_exists("#{@apptmp}/sample_project/app/views/layouts")
     end
@@ -30,6 +33,11 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/Padrino.mount\("ProjectCom"\).to\('\/'\)/,"#{@apptmp}/project.com/config/apps.rb")
     end
 
+    should "raise an Error when given invalid constant names" do
+      assert_raise(::NameError) { silence_logger { generate(:project, "123asdf", "--root=#{@apptmp}") } }
+      assert_raise(::NameError) { silence_logger { generate(:project, "./sample_project", "--root=#{@apptmp}") } }
+    end
+
     should "display the right path" do
       buffer = silence_logger { generate(:project, 'project', "--root=/tmp") }
       assert_file_exists("/tmp/project")
@@ -53,6 +61,9 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/app/controllers.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/helpers.rb")
       assert_file_exists("#{@apptmp}/sample_project/app/mailers.rb")
+      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_match_in_file(/:notifier/,"#{@apptmp}/sample_project/app/mailers.rb")
@@ -319,12 +330,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_match_in_file(/gem 'haml'/, "#{@apptmp}/sample_project/Gemfile")
     end
 
-    should "properly generate for erubis" do
-      buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=erubis','--script=none') }
-      assert_match(/Applying.*?erubis.*?renderer/,buffer)
-      assert_match_in_file(/gem 'erubis'/, "#{@apptmp}/sample_project/Gemfile")
-    end
-
     should "properly generate for liquid" do
       buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--renderer=liquid','--script=none') }
       assert_match(/Applying.*?liquid.*?renderer/,buffer)
@@ -507,4 +512,4 @@ class TestProjectGenerator < Test::Unit::TestCase
     end
 
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 9
-  - 20
-  version: 0.9.20
+  - 21
+  version: 0.9.21
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -08:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: padrino-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 9
-        - 20
-        version: 0.9.20
+        - 21
+        version: 0.9.21
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,6 @@ files:
 - lib/padrino-gen/generators/components/orms/ohm.rb
 - lib/padrino-gen/generators/components/orms/sequel.rb
 - lib/padrino-gen/generators/components/renderers/erb.rb
-- lib/padrino-gen/generators/components/renderers/erubis.rb
 - lib/padrino-gen/generators/components/renderers/haml.rb
 - lib/padrino-gen/generators/components/renderers/liquid.rb
 - lib/padrino-gen/generators/components/renderers/slim.rb
@@ -131,7 +130,6 @@ files:
 - lib/padrino-gen/generators/project/config/boot.rb
 - lib/padrino-gen/generators/project/config.ru
 - lib/padrino-gen/generators/project/public/favicon.ico
-- lib/padrino-gen/generators/project/public/index.html
 - lib/padrino-gen/generators/project.rb
 - lib/padrino-gen/generators/runner.rb
 - lib/padrino-gen/generators/templates/controller.rb.tt
@@ -148,6 +146,7 @@ files:
 - lib/padrino-gen/generators/templates/scripts/right.js
 - lib/padrino-gen/padrino-tasks/activerecord.rb
 - lib/padrino-gen/padrino-tasks/datamapper.rb
+- lib/padrino-gen/padrino-tasks/mongoid.rb
 - lib/padrino-gen/padrino-tasks/mongomapper.rb
 - lib/padrino-gen/padrino-tasks/seed.rb
 - lib/padrino-gen/padrino-tasks/sequel.rb
@@ -199,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: padrino-gen
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Generators for easily creating and building padrino applications

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

@@ -1,3 +0,0 @@
-def setup_renderer
-  require_dependencies 'erubis'
-end

data/lib/padrino-gen/generators/project/public/index.html

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<title>
-			Welcome to Padrino
-		</title>
-		<style type="text/css">
-		body{
-		font-family:Helvetica,Arial,sans-serif;
-		line-height:150%;
-		}
-		ul,li{
-		list-style-type:none;
-		margin:0px;
-		padding:5px 0px 5px 0px;
-		margin-left:5px;
-		}
-		a{
-		color:#333;
-		}
-		</style>
-	</head>
-	<body>
-		<h1>
-			Welcome to Padrino.rb
-		</h1>
-		<p>
-			Thanks for choosing Padrino for your Development.<br />
-			To get you started you we collected some Tutorials and Links:<br />
-		</p>
-		<ul>
-			<li>
-				<a href="http://www.padrinorb.com/guides/blog-tutorial">Blog Tutorial</a>
-			</li>
-			<li>
-				<a href="http://www.padrinorb.com/guides/generators">Generators</a>
-			</li>
-			<li>
-				<a href="http://www.padrinorb.com/guides/development-commands">Development Commands</a>
-			</li>
-		</ul>
-		<p>
-			To define a new default site for your project please delete this <em>index.html</em> file from the <em>public</em> directory.
-		</p>
-	</body>
-</html>