padrino-gen 0.9.26 → 0.9.27

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

@@ -1,42 +1,49 @@
-if (defined?(MongoMapper) && defined?(I18n))
+if defined?(MongoMapper)
   namespace :mm do
-    desc "Generates .yml files for I18n translations"
-    task :translate => :environment do
-      models = Dir["#{Padrino.root}/app/models/**/*.rb"].map { |m| File.basename(m, ".rb") }
+    desc 'Drops all the collections for the database for the current Rails.env'
+    task :drop => :environment do
+      MongoMapper.database.collections.select {|c| c.name !~ /system/ }.each(&:drop)
+    end
+
+    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.each do |m|
-        # Get the model class
-        klass = m.camelize.constantize
+        models.each do |m|
+          # Get the model class
+          klass = m.camelize.constantize
 
-        # Init the processing
-        print "Processing #{m.humanize}: "
-        FileUtils.mkdir_p("#{Padrino.root}/app/locale/models/#{m}")
-        langs = Array(I18n.locale) # for now we use only one
+          # Init the processing
+          print "Processing #{m.humanize}: "
+          FileUtils.mkdir_p("#{Padrino.root}/app/locale/models/#{m}")
+          langs = Array(I18n.locale) # for now we use only one
 
-        # Create models for it and en locales
-        langs.each do |lang|
-          filename   = "#{Padrino.root}/app/locale/models/#{m}/#{lang}.yml"
-          columns    = klass.keys.values.map(&:name).reject { |name| name =~ /id/i }
-          # If the lang file already exist we need to check it
-          if File.exist?(filename)
-            locale = File.open(filename).read
-            columns.each do |c|
-              locale += "\n        #{c}: #{c.humanize}" unless locale.include?("#{c}:")
+          # Create models for it and en locales
+          langs.each do |lang|
+            filename   = "#{Padrino.root}/app/locale/models/#{m}/#{lang}.yml"
+            columns    = klass.keys.values.map(&:name).reject { |name| name =~ /id/i }
+            # If the lang file already exist we need to check it
+            if File.exist?(filename)
+              locale = File.open(filename).read
+              columns.each do |c|
+                locale += "\n        #{c}: #{c.humanize}" unless locale.include?("#{c}:")
+              end
+              print "Lang #{lang.to_s.upcase} already exist ... "; $stdout.flush
+              # Do some ere
+            else
+              locale     = "#{lang}:" + "\n" +
+                           "  models:" + "\n" +
+                           "    #{m}:" + "\n" +
+                           "      name: #{klass.human_name}" + "\n" +
+                           "      attributes:" + "\n" +
+                           columns.map { |c| "        #{c}: #{c.humanize}" }.join("\n")
+              print "created a new for #{lang.to_s.upcase} Lang ... "; $stdout.flush
             end
-            print "Lang #{lang.to_s.upcase} already exist ... "; $stdout.flush
-            # Do some ere
-          else
-            locale     = "#{lang}:" + "\n" +
-                         "  models:" + "\n" +
-                         "    #{m}:" + "\n" +
-                         "      name: #{klass.human_name}" + "\n" +
-                         "      attributes:" + "\n" +
-                         columns.map { |c| "        #{c}: #{c.humanize}" }.join("\n")
-            print "created a new for #{lang.to_s.upcase} Lang ... "; $stdout.flush
+            File.open(filename, "w") { |f| f.puts locale }
           end
-          File.open(filename, "w") { |f| f.puts locale }
+          puts
         end
-        puts
       end
     end
   end

data/padrino-gen.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.date = Time.now.strftime("%Y-%m-%d")
 
   s.extra_rdoc_files = Dir["*.rdoc"]
-  s.files         = `git ls-files`.split("\n")
+  s.files         = `git ls-files`.split("\n") | Dir.glob("{lib}/**/*")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]

data/test/fixtures/example_template.rb

@@ -1,9 +1,10 @@
-project :test => :shoulda, :orm => :activerecord, :dev => true
+project :test => :shoulda, :orm => :activerecord, :template => 'mongochist', :dev => true
 
 generate :model, "post title:string body:text"
 generate :controller, "posts get:index get:new post:new"
 generate :migration, "AddEmailToUser email:string"
 generate :fake, "foo bar"
+generate :plugin, "carrierwave"
 
 require_dependencies 'nokogiri'
 
@@ -11,4 +12,4 @@ initializer :test, "# Example"
 
 app :testapp do
   generate :controller, "users get:index"
-end
+end

data/test/helper.rb

@@ -84,7 +84,7 @@ class Test::Unit::TestCase
     project_root = options[:root]
     project_name = options[:name]
     settings = options.slice!(:name, :root)
-    components = settings.map { |component, value| "--#{component}=#{value}" }
+    components = settings.sort_by { |k, v| k.to_s }.map { |component, value| "--#{component}=#{value}" }
     params = [project_name, *components].push("-r=#{project_root}")
     Padrino.expects(:bin_gen).with(*params.unshift('project')).returns(true)
   end

data/test/test_app_generator.rb

@@ -28,19 +28,10 @@ class TestAppGenerator < Test::Unit::TestCase
       assert_file_exists("#{@apptmp}/sample_project/demo/views")
       assert_file_exists("#{@apptmp}/sample_project/demo/views/layouts")
       assert_dir_exists("#{@apptmp}/sample_project/public/demo")
-      assert_match_in_file 'Padrino.mount("Demo").to("/demo")', "#{@apptmp}/sample_project/config/apps.rb"
-      assert_match_in_file 'class Demo < Padrino::Application', "#{@apptmp}/sample_project/demo/app.rb"
-      assert_match_in_file 'set :session_secret, "', "#{@apptmp}/sample_project/demo/app.rb"
-    end
-
-    should "store and apply session_secret" do
-      silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}") }
-      silence_logger { generate(:app, 'demo', "--root=#{@apptmp}/sample_project") }
-      assert_match_in_file(/session_secret:.+/, "#{@apptmp}/sample_project/.components")
-      session_secret = YAML.load_file("#{@apptmp}/sample_project/.components")[:session_secret]
-      assert_not_equal "", session_secret
-      assert_match_in_file(/#{session_secret}/, "#{@apptmp}/sample_project/app/app.rb")
-      assert_match_in_file(/#{session_secret}/, "#{@apptmp}/sample_project/demo/app.rb")
+      assert_match_in_file('Padrino.mount("Demo").to("/demo")', "#{@apptmp}/sample_project/config/apps.rb")
+      assert_match_in_file('class Demo < Padrino::Application', "#{@apptmp}/sample_project/demo/app.rb")
+      assert_match_in_file(/Padrino.configure_apps do/, "#{@apptmp}/sample_project/config/apps.rb")
+      assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
     end
 
     should "generate tiny app skeleton" do

data/test/test_model_generator.rb

@@ -122,7 +122,7 @@ 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::ExtendedDocument/m, "#{@apptmp}/sample_project/app/models/user.rb")
+      assert_match_in_file(/class User < CouchRest::Model::Base/m, "#{@apptmp}/sample_project/app/models/user.rb")
       assert_match_in_file(/use_database COUCHDB/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")
     end
@@ -130,7 +130,7 @@ class TestModelGenerator < Test::Unit::TestCase
     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::ExtendedDocument/m, "#{@apptmp}/sample_project/app/models/person.rb")
+      assert_match_in_file(/class Person < CouchRest::Model::Base/m, "#{@apptmp}/sample_project/app/models/person.rb")
       assert_match_in_file(/use_database COUCHDB/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")

data/test/test_plugin_generator.rb

@@ -29,11 +29,12 @@ class TestPluginGenerator < Test::Unit::TestCase
     end
 
     before_should "invoke Padrino.bin_gen" do
-      expects_generated_project :name => 'sample_project', :test => :shoulda, :orm => :activerecord, :dev => true, :root => @apptmp
+      expects_generated_project :name => 'sample_project', :test => :shoulda, :orm => :activerecord, :dev => true, :template => 'mongochist', :root => @apptmp
       expects_generated :model, "post title:string body:text -r=#{@apptmp}/sample_project"
       expects_generated :controller, "posts get:index get:new post:new -r=#{@apptmp}/sample_project"
       expects_generated :migration, "AddEmailToUser email:string -r=#{@apptmp}/sample_project"
       expects_generated :fake, "foo bar -r=#{@apptmp}/sample_project"
+      expects_generated :plugin, "carrierwave -r=#{@apptmp}/sample_project"
       expects_dependencies 'nokogiri'
       expects_initializer :test, "# Example", :root => "#{@apptmp}/sample_project"
       expects_generated :app, "testapp -r=#{@apptmp}/sample_project"
@@ -125,4 +126,4 @@ class TestPluginGenerator < Test::Unit::TestCase
       expects_generated :admin_page, "post -r=#{@apptmp}/sample_admin"
     end
   end
-end
+end

data/test/test_project_generator.rb

@@ -92,10 +92,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
     should "store and apply session_secret" do
       silence_logger { generate(:project,'sample_project', '--tiny',"--root=#{@apptmp}") }
-      assert_match_in_file(/session_secret:.+/, "#{@apptmp}/sample_project/.components")
-      session_secret = YAML.load_file("#{@apptmp}/sample_project/.components")[:session_secret]
-      assert_not_equal "", session_secret
-      assert_match_in_file(/#{session_secret}/, "#{@apptmp}/sample_project/app/app.rb")
+      assert_match_in_file(/set :session_secret, '[0-9A-z]*'/, "#{@apptmp}/sample_project/config/apps.rb")
     end
 
     should "create components file containing options chosen with defaults" do
@@ -177,7 +174,7 @@ class TestProjectGenerator < Test::Unit::TestCase
         buffer = silence_logger { generate(:project, 'project.com', "--root=#{@apptmp}", '--orm=sequel', '--script=none') }
         assert_match(/Applying.*?sequel.*?orm/, buffer)
         assert_match_in_file(/gem 'sequel'/, "#{@apptmp}/project.com/Gemfile")
-        assert_match_in_file(/gem 'sqlite3-ruby'/, "#{@apptmp}/project.com/Gemfile")
+        assert_match_in_file(/gem 'sqlite3'/, "#{@apptmp}/project.com/Gemfile")
         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")
@@ -193,7 +190,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
       should "properly generate sqlite3" do
         buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=sequel', '--adapter=sqlite') }
-        assert_match_in_file(/gem 'sqlite3-ruby'/, "#{@apptmp}/sample_project/Gemfile")
+        assert_match_in_file(/gem 'sqlite3'/, "#{@apptmp}/sample_project/Gemfile")
         assert_match_in_file(%r{sqlite://}, "#{@apptmp}/sample_project/config/database.rb")
         assert_match_in_file(/sample_project_development/, "#{@apptmp}/sample_project/config/database.rb")
       end
@@ -211,7 +208,7 @@ class TestProjectGenerator < Test::Unit::TestCase
         buffer = silence_logger { generate(:project, 'project.com', "--root=#{@apptmp}", '--orm=activerecord', '--script=none') }
         assert_match(/Applying.*?activerecord.*?orm/, buffer)
         assert_match_in_file(/gem 'activerecord', :require => "active_record"/, "#{@apptmp}/project.com/Gemfile")
-        assert_match_in_file(/gem 'sqlite3-ruby', :require => "sqlite3"/, "#{@apptmp}/project.com/Gemfile")
+        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")
@@ -233,7 +230,7 @@ class TestProjectGenerator < Test::Unit::TestCase
 
       should "properly generate sqlite3" do
         buffer = silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=activerecord', '--adapter=sqlite3') }
-        assert_match_in_file(/gem 'sqlite3-ruby', :require => "sqlite3"/, "#{@apptmp}/sample_project/Gemfile")
+        assert_match_in_file(/gem 'sqlite3'/, "#{@apptmp}/sample_project/Gemfile")
         assert_match_in_file(/sample_project_development.db/, "#{@apptmp}/sample_project/config/database.rb")
         assert_match_in_file(%r{:adapter => 'sqlite3'}, "#{@apptmp}/sample_project/config/database.rb")
       end
@@ -302,7 +299,7 @@ class TestProjectGenerator < Test::Unit::TestCase
     should "properly generate for couchrest" do
       buffer = silence_logger { generate(:project, 'project.com', "--root=#{@apptmp}", '--orm=couchrest', '--script=none') }
       assert_match(/Applying.*?couchrest.*?orm/, buffer)
-      assert_match_in_file(/gem 'couchrest'/, "#{@apptmp}/project.com/Gemfile")
+      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")
@@ -541,4 +538,4 @@ class TestProjectGenerator < Test::Unit::TestCase
       assert_dir_exists("#{@apptmp}/sample_project/app/stylesheets")
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 9
-  - 26
-  version: 0.9.26
+  - 27
+  version: 0.9.27
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 Z
+date: 2011-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
@@ -28,12 +28,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 13
         segments: 
         - 0
         - 9
-        - 26
-        version: 0.9.26
+        - 27
+        version: 0.9.27
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -159,6 +159,20 @@ files:
 - test/test_model_generator.rb
 - test/test_plugin_generator.rb
 - test/test_project_generator.rb
+- lib/padrino-gen/generators/templates/static/js/dojo.js
+- lib/padrino-gen/generators/templates/static/js/ext.js
+- lib/padrino-gen/generators/templates/static/js/jquery.js
+- lib/padrino-gen/generators/templates/static/js/lowpro.js
+- lib/padrino-gen/generators/templates/static/js/mootools.js
+- lib/padrino-gen/generators/templates/static/js/protopak.js
+- lib/padrino-gen/generators/templates/static/js/right.js
+- lib/padrino-gen/generators/templates/static/README.rdoc
+- lib/padrino-gen/generators/templates/static/ujs/dojo.js
+- lib/padrino-gen/generators/templates/static/ujs/ext.js
+- lib/padrino-gen/generators/templates/static/ujs/jquery.js
+- 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
 homepage: http://www.padrinorb.com
 licenses: []