padrino-gen 0.9.28 → 0.9.29

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

@@ -1,10 +1,26 @@
 COUCHREST = (<<-COUCHREST) unless defined?(COUCHREST)
 case Padrino.env
-  when :development then COUCHDB_NAME = '!NAME!_development'
-  when :production  then COUCHDB_NAME = '!NAME!_production'
-  when :test        then COUCHDB_NAME = '!NAME!_test'
+  when :development then db_name = '!NAME!_development'
+  when :production  then db_name = '!NAME!_production'
+  when :test        then db_name = '!NAME!_test'
+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.connection = {
+  #   :protocol => 'http',
+  #   :host     => 'localhost',
+  #   :port     => '5984',
+  #   :prefix   => 'padrino',
+  #   :suffix   => nil,
+  #   :join     => '_',
+  #   :username => nil,
+  #   :password => nil
+  # }
 end
-COUCHDB = CouchRest.database!(COUCHDB_NAME)
 COUCHREST
 
 def setup_orm
@@ -16,8 +32,6 @@ end
 
 CR_MODEL = (<<-MODEL) unless defined?(CR_MODEL)
 class !NAME! < CouchRest::Model::Base
-  use_database COUCHDB
-
   unique_id :id
   # property <name>
   !FIELDS!

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

@@ -1,7 +1,7 @@
 SEQUEL = (<<-SEQUEL) unless defined?(SEQUEL)
 Sequel::Model.plugin(:schema)
 Sequel::Model.raise_on_save_failure = false # Do not throw exceptions on failure
-DB = case Padrino.env
+Sequel::Model.db = case Padrino.env
   when :development then Sequel.connect(!DB_DEVELOPMENT!, :loggers => [logger])
   when :production  then Sequel.connect(!DB_PRODUCTION!,  :loggers => [logger])
   when :test        then Sequel.connect(!DB_TEST!,        :loggers => [logger])

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

@@ -1,14 +1,18 @@
 # 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)
-# Load Bundler
-require 'rubygems'
-require 'bundler'
-# Only have default and environment 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}"
+PADRINO_ROOT = File.expand_path('../..', __FILE__) unless defined?(PADRINO_ROOT)
+
+# Load our dependencies
+require 'rubygems' unless defined?(Gem)
+require 'bundler/setup'
+Bundler.require(:default, PADRINO_ENV)
+
+##
+# Enable devel logging
+#
+# Padrino::Logger::Config[:development] = { :log_level => :devel, :stream => :stdout }
+# Padrino::Logger.log_static = true
+#
 
 ##
 # Add your before load hooks here
@@ -22,4 +26,4 @@ end
 Padrino.after_load do
 end
 
-Padrino.load!
+Padrino.load!

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

@@ -1,9 +1,11 @@
 source :rubygems
 
+# Server requirements
+# gem 'thin' or mongrel
+
 # Project requirements
 gem 'rake'
 gem 'rack-flash'
-gem 'thin' # or mongrel
 
 # Component requirements
 
@@ -18,4 +20,6 @@ end
 <%- else -%>
 # Padrino
 gem 'padrino', "<%= Padrino.version %>"
-<%- end -%>
+<%- end -%>
+# Padrino EDGE
+# gem 'padrino', :git => "git://github.com/padrino/padrino-framework.git"

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

@@ -9,7 +9,7 @@
 
 $("form[data-remote=true]").live('submit', function(e) {
   e.preventDefault(); e.stopped = true;
-  var element = $(e.target);
+  var element = $(this);
   var message = element.data('confirm');
   if (message && !confirm(message)) { return false; }
   JSAdapter.sendRequest(element, { 

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_name}" + "\n" +
+                           "      name: #{klass.model_name.human}" + "\n" +
                            "      attributes:" + "\n" +
                            columns.map { |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/datamapper.rb

@@ -23,14 +23,14 @@ if defined?(DataMapper)
       end
 
       desc "Migrate up using migrations"
-      task :up, :version, :needs => :load do |t, args|
+      task :up, [:version] => :load do |t, args|
         version = args[:version] || ENV['VERSION']
         migrate_up!(version)
         puts "<= dm:migrate:up #{version} executed"
       end
 
       desc "Migrate down using migrations"
-      task :down, :version, :needs => :load do |t, args|
+      task :down, [:version] => :load do |t, args|
         version = args[:version] || ENV['VERSION']
         migrate_down!(version)
         puts "<= dm:migrate:down #{version} executed"

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

@@ -5,31 +5,31 @@ if defined?(Sequel)
       desc "Perform automigration (reset your db data)"
       task :auto => :environment do
         ::Sequel.extension :migration
-        ::Sequel::Migrator.run DB, "db/migrate", :target => 0
-        ::Sequel::Migrator.run DB, "db/migrate"
+        ::Sequel::Migrator.run Sequel::Model.db, "db/migrate", :target => 0
+        ::Sequel::Migrator.run Sequel::Model.db, "db/migrate"
         puts "<= sq:migrate:auto executed"
       end
 
       desc "Perform migration up/down to VERSION"
-      task :to, :version, :needs => :environment do |t, args|
+      task :to, [:version] => :environment do |t, args|
         version = (args[:version] || ENV['VERSION']).to_s.strip
         ::Sequel.extension :migration
         raise "No VERSION was provided" if version.empty?
-        ::Sequel::Migrator.apply(DB, "db/migrate", version.to_i)
+        ::Sequel::Migrator.apply(Sequel::Model.db, "db/migrate", version.to_i)
         puts "<= sq:migrate:to[#{version}] executed"
       end
 
       desc "Perform migration up to latest migration available"
       task :up => :environment do
         ::Sequel.extension :migration
-        ::Sequel::Migrator.run DB, "db/migrate"
+        ::Sequel::Migrator.run Sequel::Model.db, "db/migrate"
         puts "<= sq:migrate:up executed"
       end
 
       desc "Perform migration down (erase all data)"
       task :down => :environment do
         ::Sequel.extension :migration
-        ::Sequel::Migrator.run DB, "db/migrate", :target => 0
+        ::Sequel::Migrator.run Sequel::Model.db, "db/migrate", :target => 0
         puts "<= sq:migrate:down executed"
       end
     end

data/test/test_model_generator.rb

@@ -123,7 +123,6 @@ class TestModelGenerator < Test::Unit::TestCase
       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(/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
 
@@ -131,7 +130,6 @@ class TestModelGenerator < Test::Unit::TestCase
       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(/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")
       assert_match_in_file(/property :email/m, "#{@apptmp}/sample_project/app/models/person.rb")

data/test/test_project_generator.rb

@@ -132,7 +132,6 @@ class TestProjectGenerator < Test::Unit::TestCase
       silence_logger { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none') }
       assert_match_in_file(/gem 'padrino'/, "#{@apptmp}/sample_project/Gemfile")
       assert_match_in_file(/gem 'rack-flash'/, "#{@apptmp}/sample_project/Gemfile")
-      assert_match_in_file(/gem 'thin'/, "#{@apptmp}/sample_project/Gemfile")
     end
   end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-gen
 version: !ruby/object:Gem::Version 
-  hash: 3
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 28
-  version: 0.9.28
+  version: 0.9.29
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 Z
+date: 2011-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: padrino-core
@@ -28,12 +23,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 9
-        - 28
-        version: 0.9.28
+        version: 0.9.29
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,11 +34,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
         version: 1.0.2
   type: :runtime
   version_requirements: *id002
@@ -60,9 +45,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -186,20 +168,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []