padrino-gen 0.11.2 → 0.11.3

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

@@ -45,7 +45,7 @@ module Padrino
         path = File.expand_path(File.dirname(__FILE__) + "/components/#{component.to_s.pluralize}/#{choice}.rb")
         say_status :apply, "#{component.to_s.pluralize}/#{choice}"
         shell.padding += 1
-        instance_eval(open(path).read)
+        instance_eval(File.read(path))
         shell.padding -= 1
       end
 

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

@@ -15,7 +15,7 @@ end
 #     set :foo, :bar
 #   end
 #
-def app(app = nil &blk)
+def app(app = nil, &blk)
   @app ||= block_given? ? app.instance_eval(&blk) : app
   @app ||= Padrino.application
 end

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

@@ -14,7 +14,7 @@ class MiniTest::Unit::TestCase
   #     set :foo, :bar
   #   end
   #
-  def app(app = nil &blk)
+  def app(app = nil, &blk)
     @app ||= block_given? ? app.instance_eval(&blk) : app
     @app ||= Padrino.application
   end

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

@@ -19,7 +19,7 @@ class Riot::Situation
   #     set :foo, :bar
   #   end
   #
-  def app(app = nil &blk)
+  def app(app = nil, &blk)
     @app ||= block_given? ? app.instance_eval(&blk) : app
     @app ||= Padrino.application
   end

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

@@ -15,7 +15,7 @@ end
 #     set :foo, :bar
 #   end
 #
-def app(app = nil &blk)
+def app(app = nil, &blk)
   @app ||= block_given? ? app.instance_eval(&blk) : app
   @app ||= Padrino.application
 end

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

@@ -16,7 +16,7 @@ class Test::Unit::TestCase
   #     set :foo, :bar
   #   end
   #
-  def app(app = nil &blk)
+  def app(app = nil, &blk)
     @app ||= block_given? ? app.instance_eval(&blk) : app
     @app ||= Padrino.application
   end

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

@@ -14,7 +14,7 @@ class Test::Unit::TestCase
   #     set :foo, :bar
   #   end
   #
-  def app(app = nil &blk)
+  def app(app = nil, &blk)
     @app ||= block_given? ? app.instance_eval(&blk) : app
     @app ||= Padrino.application
   end

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

@@ -5,4 +5,5 @@ bin/*
 vendor/gems/*
 !vendor/gems/cache/
 .sass-cache/*
-db/*.db
+db/*.db
+.*.sw*

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

@@ -120,7 +120,7 @@ module Padrino
       #
       # @api private
       def git_author_name
-        git_author_name = `git config user.name`.chomp
+        git_author_name = `git config user.name`.chomp rescue ''
         git_author_name.empty? ? "TODO: Write your name" : git_author_name
       end
 
@@ -128,7 +128,7 @@ module Padrino
       #
       # @api private
       def git_author_email
-        git_author_email = `git config user.email`.chomp
+        git_author_email = `git config user.email`.chomp rescue ''
         git_author_email.empty? ? "TODO: Write your email address" : git_author_email
       end
     end # Project

data/lib/padrino-gen/generators/templates/gem/README.md.tt

@@ -1,4 +1,4 @@
-# <%=name.camelcase%>
+# <%= @project_name %>
 
 A padrino gem
 
@@ -13,7 +13,7 @@ gem '<%=name%>'
 and mount the app in your `apps.rb`:
 
 ```ruby
-Padrino.mount("<%=name.camelcase%>::App").to("/<%=name%>")
+Padrino.mount("<%= @project_name %>::App").to("/<%=name%>")
 ```
 
 ## Development
@@ -26,4 +26,4 @@ $ bundle exec padrino start
 ```
 
 The Rakefile also works like the normal Padrino one and supports all standard
-components.
+components.

data/lib/padrino-gen/generators/templates/gem/gemspec.tt

@@ -11,9 +11,9 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = <%=name.underscore.inspect%>
+  gem.name          = <%= name.downcase.inspect %>
   gem.require_paths = ["lib", "app"]
-  gem.version       = <%=name.camelcase%>::VERSION
+  gem.version       = <%= @project_name %>::VERSION
 
   gem.add_dependency "padrino-core"
 end

data/lib/padrino-gen/generators/templates/gem/lib/libname/version.tt

@@ -1,3 +1,3 @@
-module <%=name.camelcase%>
+module <%= @project_name %>
   VERSION = '0.0.1'
-end
+end

data/lib/padrino-gen/generators/templates/gem/lib/libname.tt

@@ -1,6 +1,6 @@
 require 'padrino-core'
 
-module <%=name.camelcase%>
+module <%= @project_name %>
   extend Padrino::Module
-  gem! <%=name.downcase.inspect%>
-end
+  gem! <%= name.downcase.inspect %>
+end

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

@@ -84,12 +84,26 @@ $(function(){
         var verb = element.data('method');
         var url = element.attr('href');
         var form = $('<form method="post" action="'+url+'"></form>');
+        var csrf_token = $('meta[name=csrf-token]').attr('content');
+        var csrf_param = $('meta[name=csrf-param]').attr('content');
         form.hide().appendTo('body');
         if (verb !== 'post') {
           var field = '<input type="hidden" name="_method" value="' + verb + '" />';
           form.append(field);
         }
+        if (csrf_param !== undefined && csrf_token !== undefined) {
+          var field = '<input type="hidden" name="' + csrf_param + '" value="' + csrf_token + '" />';
+          form.append(field);
+        }
         form.submit();
       }
     };
+
+    // Every xhr request is sent along with the CSRF token.
+    $.ajaxPrefilter(function(options, originalOptions, xhr) {
+      if (options.verb !== 'GET') {
+        var token = $('meta[name="csrf-token"]').attr('content');
+        if (token) xhr.setRequestHeader('X-CSRF-Token', token);
+      }
+    });
 });

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

@@ -1,7 +1,12 @@
 if PadrinoTasks.load?(:activerecord, defined?(ActiveRecord))
   # Fixes for Yardoc YRI Building
-  module ActiveRecord; end unless defined?(ActiveRecord)
-  class ActiveRecord::Schema; end unless defined?(ActiveRecord::Schema)
+  begin
+    require 'active_record'
+    require 'active_record/schema'
+  rescue LoadError
+    module ActiveRecord; end unless defined?(ActiveRecord)
+    class ActiveRecord::Schema; end unless defined?(ActiveRecord::Schema)
+  end
 
   namespace :ar do
     namespace :create do

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

@@ -3,13 +3,13 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
     namespace :auto do
       desc "Perform automigration (reset your db data)"
       task :migrate => :environment do
-        ::DataMapper.auto_migrate!
+        ::DataMapper.repository.auto_migrate!
         puts "<= dm:auto:migrate executed"
       end
 
       desc "Perform non destructive automigration"
       task :upgrade => :environment do
-        ::DataMapper.auto_upgrade!
+        ::DataMapper.repository.auto_upgrade!
         puts "<= dm:auto:upgrade executed"
       end
     end
@@ -55,34 +55,15 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
       database       = config[:database]  || config[:path].sub(/\//, "")
       charset        = config[:charset]   || ENV['CHARSET']   || 'utf8'
       collation      = config[:collation] || ENV['COLLATION'] || 'utf8_unicode_ci'
-      puts "=> Creating database '#{database}'"
-      case config[:adapter]
-        when 'postgres'
-          arguments = []
-          arguments << "--encoding=#{charset}" if charset
-          arguments << "--host=#{host}" if host
-          arguments << "--username=#{user}" if user
-          arguments << database
-          system("createdb", *arguments)
-          puts "<= dm:create executed"
-        when 'mysql'
-          arguments = ["--user=#{user}"]
-          arguments << "--password=#{password}" unless password.blank?
-          
-          unless %w[127.0.0.1 localhost].include?(host)
-            arguments << "--host=#{host}"
-          end
-
-          arguments << '-e'
-          arguments << "CREATE DATABASE #{database} DEFAULT CHARACTER SET #{charset} DEFAULT COLLATE #{collation}"
 
-          system('mysql',*arguments)
-          puts "<= dm:create executed"
-        when 'sqlite3'
-          DataMapper.setup(DataMapper.repository.name, config)
-        else
-          raise "Adapter #{config[:adapter]} not supported for creating databases yet."
+      puts "=> Creating database '#{database}'"
+      if config[:adapter] == 'sqlite3'
+        DataMapper.setup(DataMapper.repository.name, config)
+      else
+        # require 'padrino-gen/padrino-tasks/sql-helpers'
+        Padrino::Generators::SqlHelpers.create_db(config[:adapter], user, password, host, database, charset, collation) 
       end
+      puts "<= dm:create executed"
     end
 
     desc "Drop the database (postgres and mysql only)"
@@ -90,33 +71,14 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
       config = DataMapper.repository.adapter.options.symbolize_keys
       user, password, host = config[:user], config[:password], config[:host]
       database       = config[:database] || config[:path].sub(/\//, "")
-      puts "=> Dropping database '#{database}'"
-      case config[:adapter]
-        when 'postgres'
-          arguments = []
-          arguments << "--host=#{host}" if host
-          arguments << "--username=#{user}" if user
-          arguments << database
-          system("dropdb", *arguments)
-          puts "<= dm:drop executed"
-        when 'mysql'
-          arguments = ["--user=#{user}"]
-          arguments << "--password=#{password}" unless password.blank?
 
-          unless %w[127.0.0.1 localhost].include?(host)
-            arguments << "--host=#{host}"
-          end
-
-          arguments << '-e'
-          arguments << "DROP DATABASE IF EXISTS #{database}"
-
-          system('mysql',*arguments)
-          puts "<= dm:drop executed"
-        when 'sqlite3'
-          File.delete(config[:path]) if File.exist?(config[:path])
-        else
-          raise "Adapter #{config[:adapter]} not supported for dropping databases yet."
+      puts "=> Dropping database '#{database}'"
+      if config[:adapter] == 'sqlite3'
+        File.delete(config[:path]) if File.exist?(config[:path])
+      else
+        Padrino::Generators::SqlHelpers.drop_db(config[:adapter], user, password, host, database)
       end
+      puts "<= dm:drop executed"
     end
 
     desc "Drop the database, migrate from scratch and initialize with the seed data"

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

@@ -67,7 +67,7 @@ if PadrinoTasks.load?(:mongoid, defined?(Mongoid))
     # Helper to retrieve a list of models.
     def get_mongoid_models
       documents = []
-      Dir['{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/sequel.rb

@@ -36,7 +36,43 @@ if PadrinoTasks.load?(:sequel, defined?(Sequel))
 
     desc "Perform migration up to latest migration available"
     task :migrate => 'sq:migrate:up'
+
+    desc "Create the database"
+    task :create => :environment do
+      config = Sequel::Model.db.opts
+      user, password, host = config[:user], config[:password], config[:host]
+      database = config[:database]
+      charset = config[:charset] || ENV['CHARSET']   || 'utf8'
+      collation = config[:collation] || ENV['COLLATION'] || 'utf8_unicode_ci'
+
+      puts "=> Creating database '#{database}'"
+      if config[:adapter] == 'sqlite3'
+        ::Sequel.sqlite(database)
+      else
+        require 'padrino-gen/padrino-tasks/sql-helpers'
+        Padrino::Generators::SqlHelpers.create_db(config[:adapter], user, password, host, database, charset, collation) 
+      end
+      puts "<= sq:create executed"
+    end
+
+    desc "Drop the database (postgres and mysql only)"
+    task :drop => :environment do
+      config = ::Sequel::Model.db.opts
+      user, password, host, database = config[:user], config[:password], config[:host], config[:database]
+
+      ::Sequel::Model.db.disconnect
+
+      puts "=> Dropping database '#{database}'"
+      if config[:adapter] == 'sqlite3'
+        File.delete(database) if File.exist?(database)
+      else
+        Padrino::Generators::SqlHelpers.drop_db(config[:adapter], user, password, host, database)
+      end
+      puts "<= sq:drop executed"
+    end
+
   end
 
   task 'db:migrate' => 'sq:migrate'
+  task 'db:reset' => ['sq:drop', 'sq:create', 'sq:migrate', 'seed']
 end

data/lib/padrino-gen/padrino-tasks/sql-helpers.rb

@@ -0,0 +1,56 @@
+module Padrino
+  module Generators 
+    module SqlHelpers
+      def self.create_db(adapter, user, password, host, database, charset, collation)
+        case adapter
+          when 'postgres'
+            arguments = []
+            arguments << "--encoding=#{charset}" if charset
+            arguments << "--host=#{host}" if host
+            arguments << "--username=#{user}" if user
+            arguments << database
+            system("createdb", *arguments)
+          when 'mysql'
+            arguments = ["--user=#{user}"]
+            arguments << "--password=#{password}" unless password.blank?
+            
+            unless %w[127.0.0.1 localhost].include?(host)
+              arguments << "--host=#{host}"
+            end
+
+            arguments << '-e'
+            arguments << "CREATE DATABASE #{database} DEFAULT CHARACTER SET #{charset} DEFAULT COLLATE #{collation}"
+
+            system('mysql',*arguments)
+          else
+            raise "Adapter #{adapter} not supported for creating databases yet."
+        end
+      end
+
+      def self.drop_db(adapter, user, password, host, database)
+        case adapter
+          when 'postgres'
+            arguments = []
+            arguments << "--host=#{host}" if host
+            arguments << "--username=#{user}" if user
+            arguments << database
+            system("dropdb", *arguments)
+          when 'mysql'
+            arguments = ["--user=#{user}"]
+            arguments << "--password=#{password}" unless password.blank?
+
+            unless %w[127.0.0.1 localhost].include?(host)
+              arguments << "--host=#{host}"
+            end
+
+            arguments << '-e'
+            arguments << "DROP DATABASE IF EXISTS #{database}"
+
+            system('mysql',*arguments)
+          else
+            raise "Adapter #{adapter} not supported for dropping databases yet."
+        end
+      end
+    end
+  end
+end

data/test/test_project_generator.rb

@@ -41,6 +41,19 @@ describe "ProjectGenerator" do
       assert_match_in_file("Padrino.mount('ProjectCom::WsDci2011', :app_file => Padrino.root('ws_dci_2011/app.rb')).to('/ws_dci_2011')", "#{@apptmp}/project.com/config/apps.rb")
     end
 
+    should "generate nested path with dashes in name" do
+      capture_io { generate(:project, 'sample-project', "--root=#{@apptmp}") }
+      assert_file_exists("#{@apptmp}/sample-project")
+      assert_match_in_file(/module SampleProject/,  "#{@apptmp}/sample-project/app/app.rb")
+      assert_match_in_file(/class App < Padrino::Application/,  "#{@apptmp}/sample-project/app/app.rb")
+      assert_match_in_file("Padrino.mount('SampleProject::App', :app_file => Padrino.root('app/app.rb')).to('/')", "#{@apptmp}/sample-project/config/apps.rb")
+      capture_io { generate(:app, 'ws-dci-2011', "--root=#{@apptmp}/sample-project") }
+      assert_file_exists("#{@apptmp}/sample-project/ws_dci_2011")
+      assert_match_in_file(/module SampleProject/,  "#{@apptmp}/sample-project/ws_dci_2011/app.rb")
+      assert_match_in_file(/class WsDci2011 < Padrino::Application/,  "#{@apptmp}/sample-project/ws_dci_2011/app.rb")
+      assert_match_in_file("Padrino.mount('SampleProject::WsDci2011', :app_file => Padrino.root('ws_dci_2011/app.rb')).to('/ws_dci_2011')", "#{@apptmp}/sample-project/config/apps.rb")
+    end
+
     should "raise an Error when given invalid constant names" do
       assert_raises(::NameError) { capture_io { generate(:project, "123asdf", "--root=#{@apptmp}") } }
       assert_raises(::NameError) { capture_io { generate(:project, "./sample_project", "--root=#{@apptmp}") } }
@@ -96,6 +109,22 @@ describe "ProjectGenerator" do
       assert_file_exists("#{@apptmp}/sample_gem/README.md")
     end
 
+    should "generate gemspec and special files with dashes in name" do
+      capture_io { generate(:project,'sample-gem', '--gem', "--root=#{@apptmp}") }
+      assert_file_exists("#{@apptmp}/sample-gem/sample-gem.gemspec")
+      assert_file_exists("#{@apptmp}/sample-gem/README.md")
+      assert_match_in_file(/\/lib\/sample-gem\/version/,"#{@apptmp}/sample-gem/sample-gem.gemspec")
+      assert_match_in_file(/"sample-gem"/,"#{@apptmp}/sample-gem/sample-gem.gemspec")
+      assert_match_in_file(/SampleGem::VERSION/,"#{@apptmp}/sample-gem/sample-gem.gemspec")
+      assert_match_in_file(/^# SampleGem/,"#{@apptmp}/sample-gem/README.md")
+      assert_match_in_file(/SampleGem::App/,"#{@apptmp}/sample-gem/README.md")
+      assert_match_in_file(/^module SampleGem/,"#{@apptmp}/sample-gem/lib/sample-gem.rb")
+      assert_match_in_file(/gem! "sample-gem"/,"#{@apptmp}/sample-gem/lib/sample-gem.rb")
+      assert_match_in_file(/^module SampleGem/,"#{@apptmp}/sample-gem/lib/sample-gem/version.rb")
+      assert_match_in_file(/^module SampleGem/,"#{@apptmp}/sample-gem/app/app.rb")
+      assert_match_in_file(/class App/,"#{@apptmp}/sample-gem/app/app.rb")
+    end
+
     should "not create models folder if no orm is chosen" do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '--orm=none') }
       assert_no_dir_exists("#{@apptmp}/sample_project/models")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ files:
 - lib/padrino-gen/padrino-tasks/mongoid.rb
 - lib/padrino-gen/padrino-tasks/mongomapper.rb
 - lib/padrino-gen/padrino-tasks/sequel.rb
+- lib/padrino-gen/padrino-tasks/sql-helpers.rb
 - padrino-gen.gemspec
 - test/fixtures/admin_template.rb
 - test/fixtures/example_template.rb
@@ -176,9 +177,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2733379671843302871
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: