padrino-gen 0.10.6 → 0.10.7

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

@@ -32,7 +32,7 @@ def setup_orm
     dm-validations
   ).each { |dep| require_dependencies dep }
   require_dependencies case options[:adapter]
-    when 'mysql'
+    when 'mysql', 'mysql2'
       dm.gsub!(/!DB_DEVELOPMENT!/,"\"mysql://root@localhost/#{db}_development\"")
       dm.gsub!(/!DB_PRODUCTION!/,"\"mysql://root@localhost/#{db}_production\"")
       dm.gsub!(/!DB_TEST!/,"\"mysql://root@localhost/#{db}_test\"")

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

@@ -8,20 +8,36 @@ require 'bundler/setup'
 Bundler.require(:default, PADRINO_ENV)
 
 ##
-# Enable devel logging
+# ## Enable devel logging
 #
 # Padrino::Logger::Config[:development][:log_level]  = :devel
 # Padrino::Logger::Config[:development][:log_static] = true
 #
+# ## Configure your I18n
+#
+# I18n.default_locale = :en
+#
+# ## Configure your HTML5 data helpers
+#
+# Padrino::Helpers::TagHelpers::DATA_ATTRIBUTES.push(:dialog)
+# text_field :foo, :dialog => true
+# Generates: <input type="text" data-dialog="true" name="foo" />
+#
+# ## Add helpers to mailer
+#
+# Mail::Message.class_eval do
+#   include Padrino::Helpers::NumberHelpers
+#   include Padrino::Helpers::TranslationHelpers
+# end
 
 ##
-# Add your before load hooks here
+# Add your before (RE)load hooks here
 #
 Padrino.before_load do
 end
 
 ##
-# Add your after load hooks here
+# Add your after (RE)load hooks here
 #
 Padrino.after_load do
 end

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

@@ -80,7 +80,7 @@ module Padrino
         end
       end
 
-      # Executes git commmands in project using Grit
+      # Executes git commmands in project
       #
       # @param [Symbol] action
       #   Git command to execute

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

@@ -55,7 +55,7 @@ if defined?(ActiveRecord)
         end
       rescue
         case config[:adapter]
-        when 'mysql', 'mysql2'
+        when 'mysql', 'mysql2', 'jdbcmysql'
           @charset   = ENV['CHARSET']   || 'utf8'
           @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
           creation_options = {:charset => (config[:charset] || @charset), :collation => (config[:collation] || @collation)}
@@ -184,7 +184,7 @@ if defined?(ActiveRecord)
     task :charset => :environment do
       config = ActiveRecord::Base.configurations[Padrino.env || :development]
       case config[:adapter]
-      when 'mysql', 'mysql2'
+      when 'mysql', 'mysql2', 'jdbcmysql'
         ActiveRecord::Base.establish_connection(config)
         puts ActiveRecord::Base.connection.charset
       when 'postgresql'
@@ -199,7 +199,7 @@ if defined?(ActiveRecord)
     task :collation => :environment do
       config = ActiveRecord::Base.configurations[Padrino.env || :development]
       case config[:adapter]
-      when 'mysql', 'mysql2'
+      when 'mysql', 'mysql2', 'jdbcmysql'
         ActiveRecord::Base.establish_connection(config)
         puts ActiveRecord::Base.connection.collation
       else
@@ -256,7 +256,7 @@ if defined?(ActiveRecord)
       task :dump => :environment do
         abcs = ActiveRecord::Base.configurations
         case abcs[Padrino.env][:adapter]
-        when "mysql", "mysql2", "oci", "oracle"
+        when "mysql", "mysql2", "oci", "oracle", 'jdbcmysql'
           ActiveRecord::Base.establish_connection(abcs[Padrino.env])
           File.open("#{Padrino.root}/db/#{Padrino.env}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
         when "postgresql"
@@ -337,7 +337,7 @@ if defined?(ActiveRecord)
 
   def drop_database(config)
     case config[:adapter]
-    when 'mysql', 'mysql2'
+    when 'mysql', 'mysql2', 'jdbcmysql'
       ActiveRecord::Base.establish_connection(config)
       ActiveRecord::Base.connection.drop_database config[:database]
     when /^sqlite/

data/test/helper.rb

@@ -4,9 +4,8 @@ require 'rack/test'
 require 'rack'
 require 'uuid'
 require 'webrat'
-require 'grit'
-require 'thor/group'
 require 'fakeweb'
+require 'thor/group'
 require 'padrino-gen'
 require 'padrino-core/support_lite' unless defined?(SupportLite)
 
@@ -111,20 +110,6 @@ class MiniTest::Spec
     #options.reverse_merge!(:root => '/tmp')
     Padrino.expects(:bin).with("rake", command, "-c=#{options[:root]}").returns(true)
   end
-
-  # expects_git :commit, "hello world"
-  def expects_git(command,options={})
-    FileUtils.mkdir_p(options[:root])
-    if command.to_s == 'init'
-      args = options[:arguments] || options[:root]
-      ::Grit::Repo.expects(:init).with(args).returns(true)
-    else
-      base = ::Grit::Git.new(options[:root])
-      ::Grit::Repo.stubs(:new).with(options[:root]).returns(base)
-      ::Grit::Git.any_instance.expects(command.to_sym).with(options[:arguments]).returns(true)
-    end
-  end
-
 end
 
 module Webrat

data/test/test_project_generator.rb

@@ -263,6 +263,14 @@ describe "ProjectGenerator" do
         assert_match_in_file(/sample_project_development/, "#{@apptmp}/sample_project/config/database.rb")
       end
 
+      # DataMapper has do_mysql that is the version of MySQL driver.
+      should "properly generate for mysql2" do
+        out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=datamapper', '--adapter=mysql2') }
+        assert_match_in_file(/gem 'dm-mysql-adapter'/, "#{@apptmp}/sample_project/Gemfile")
+        assert_match_in_file(%r{"mysql://}, "#{@apptmp}/sample_project/config/database.rb")
+        assert_match_in_file(/sample_project_development/, "#{@apptmp}/sample_project/config/database.rb")
+      end
+
       should "properly generate for sqlite" do
         out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--orm=datamapper', '--adapter=sqlite') }
         assert_match_in_file(/gem 'dm-sqlite-adapter'/, "#{@apptmp}/sample_project/Gemfile")

metadata

@@ -1,10 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: padrino-gen
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.10.7
   prerelease: 
-  version: 0.10.6
 platform: ruby
-authors: 
+authors:
 - Padrino Team
 - Nathan Esquenazi
 - Davide D'Agostino
@@ -12,40 +12,49 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: padrino-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.10.6
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.10.7
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id002
-description: Generators for easily creating and building padrino applications from the console
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: Generators for easily creating and building padrino applications from
+  the console
 email: padrinorb@gmail.com
-executables: 
+executables:
 - padrino-gen
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .document
 - .gitignore
 - .yardopts
@@ -150,32 +159,30 @@ files:
 - lib/padrino-gen/generators/templates/static/ujs/right.js
 homepage: http://www.padrinorb.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: padrino-gen
-rubygems_version: 1.8.19
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Generators for easily creating and building padrino applications
-test_files: 
+test_files:
 - test/fixtures/admin_template.rb
 - test/fixtures/example_template.rb
 - test/fixtures/git_template.rb
@@ -191,3 +198,4 @@ test_files:
 - test/test_model_generator.rb
 - test/test_plugin_generator.rb
 - test/test_project_generator.rb
+has_rdoc: