padrino-gen 0.13.0.beta2 → 0.13.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb6b8990a21282c06f0e7e0727d62ec5470fa604
-  data.tar.gz: 72044379f1f848294dfca02672199f5890382eb2
+  metadata.gz: aceae5b873cbcba1e4b72aa2dcb1f0466be21683
+  data.tar.gz: 746ce83ec7367d4472913f10efccedfe53af73e0
 SHA512:
-  metadata.gz: 8b810a9cdbd38cfa1ad0122a55610c5f036fb9890c5983c255942b490c036d45bbb18e1a1576b0fda731af4dd27122a5ddb1c65f0168a00af95b05b1bb358130
-  data.tar.gz: e7aeb4b08d77b333116225c30513822e035b1b99202571bd4a127b09cbdca1618f507487a17699c8f39ebd0a81352749d852046a9f30e8fee9233f07ae26afa5
+  metadata.gz: 93c568757fda1a7f6a05e28baf039fcf87d68b788d9d98ed7c0d4969215813eefa23002e03398119e5e392b9bfe9c298fc7d5b687cc152c685641d32f22db4ae
+  data.tar.gz: 5313b5922d16b4cbb587514f1b20bee6d1a5a3c7750d5ef39993fefa08426c69b5e8aba8ec9b46a1e082276551a9b4dac8437f1843053c0ebc6cd349fa5169f5

data/lib/padrino-gen/generators/app/app.rb.tt

@@ -15,7 +15,7 @@ module <%= @project_name %>
     #
     # set :cache, Padrino::Cache.new(:LRUHash) # Keeps cached values in memory
     # set :cache, Padrino::Cache.new(:Memcached) # Uses default server at localhost
-    # set :cache, Padrino::Cache.new(:Memcached, '127.0.0.1:11211', :exception_retry_limit => 1)
+    # set :cache, Padrino::Cache.new(:Memcached, :server => '127.0.0.1:11211', :exception_retry_limit => 1)
     # set :cache, Padrino::Cache.new(:Memcached, :backend => memcached_or_dalli_instance)
     # set :cache, Padrino::Cache.new(:Redis) # Uses default server at localhost
     # set :cache, Padrino::Cache.new(:Redis, :host => '127.0.0.1', :port => 6379, :db => 0)

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

@@ -41,6 +41,21 @@ case Padrino.env
 end
 DM
 
+IDENTITY_MAP_MIDDLEWARE = <<-MIDDLEWARE
+class IdentityMap
+  def initialize(app, name = :default)
+    @app = app
+    @name = name.to_sym
+  end
+
+  def call(env)
+    ::DataMapper.repository(@name) do
+      @app.call(env)
+    end
+  end
+end
+MIDDLEWARE
+
 def setup_orm
   dm = DM
   db = @project_name.underscore
@@ -73,6 +88,7 @@ def setup_orm
 
   create_file("config/database.rb", dm)
   insert_hook("DataMapper.finalize", :after_load)
+  middleware :identity_map, IDENTITY_MAP_MIDDLEWARE
 end
 
 DM_MODEL = (<<-MODEL) unless defined?(DM_MODEL)

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

@@ -0,0 +1,110 @@
+TESTUNIT_SETUP = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_SETUP)
+RACK_ENV = 'test' unless defined?(RACK_ENV)
+require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
+Dir[File.expand_path(File.dirname(__FILE__) + "/../app/helpers/**/*.rb")].each(&method(:require))
+
+class Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  # You can use this method to custom specify a Rack app
+  # you want rack-test to invoke:
+  #
+  #   app CLASS_NAME
+  #   app CLASS_NAME.tap { |a| }
+  #   app(CLASS_NAME) do
+  #     set :foo, :bar
+  #   end
+  #
+  def app(app = nil, &blk)
+    @app ||= block_given? ? app.instance_eval(&blk) : app
+    @app ||= Padrino.application
+  end
+end
+TEST
+
+TESTUNIT_RAKE = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_RAKE)
+require 'rake/testtask'
+
+test_tasks = Dir['test/*/'].map { |d| File.basename(d) }
+
+test_tasks.each do |folder|
+  Rake::TestTask.new("test:\#{folder}") do |test|
+    test.pattern = "test/\#{folder}/**/*_test.rb"
+    test.verbose = true
+  end
+end
+
+desc "Run application test suite"
+task 'test' => test_tasks.map { |f| "test:\#{f}" }
+TEST
+
+TESTUNIT_CONTROLLER_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_CONTROLLER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '/../../test_config.rb')
+
+class !NAME!ControllerTest < Test::Unit::TestCase
+  def setup
+    get "/"
+  end
+
+  def test_returns_hello_world_text
+    assert_equal "Hello World", last_response.body
+  end
+end
+TEST
+
+TESTUNIT_MODEL_TEST = (<<-TEST).gsub(/^ {10}/, '') unless defined?(TESTUNIT_MODEL_TEST)
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
+
+class !NAME!Test < Test::Unit::TestCase
+  def test_constructs_a_new_instance
+    @!DNAME! = !NAME!.new
+    refute_nil @!DNAME!
+  end
+end
+TEST
+
+TESTUNIT_HELPER_TEST = (<<-TEST) unless defined?(TESTUNIT_HELPER_TEST)
+require File.expand_path(File.dirname(__FILE__) + '!PATH!/test_config.rb')
+
+class !NAME!Test < Test::Unit::TestCase
+  def self.setup
+    @helpers = Class.new
+    @helpers.extend !CONSTANT_NAME!
+  end
+
+  def helpers
+    @helpers
+  end
+
+  def test_foo_helper
+    assert_equal nil, helpers.foo
+  end
+end
+TEST
+
+def setup_test
+  require_dependencies 'rack-test', :require => 'rack/test', :group => 'test'
+  require_dependencies 'test-unit', :require => 'test/unit', :group => 'test'
+  insert_test_suite_setup TESTUNIT_SETUP
+  create_file destination_root("test/test.rake"), TESTUNIT_RAKE
+end
+
+def generate_controller_test(name, path)
+  test_unit_contents = TESTUNIT_CONTROLLER_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize)
+  controller_test_path = File.join('test',options[:app],'controllers',"#{name.to_s.underscore}_controller_test.rb")
+  create_file destination_root(controller_test_path), test_unit_contents, :skip => true
+end
+
+def generate_model_test(name)
+  test_unit_contents = TESTUNIT_MODEL_TEST.gsub(/!NAME!/, name.to_s.underscore.camelize).gsub(/!DNAME!/, name.to_s.underscore)
+  test_unit_contents.gsub!(/!PATH!/, recognize_path)
+  model_test_path = File.join('test',options[:app],'models',"#{name.to_s.underscore}_test.rb")
+  create_file destination_root(model_test_path), test_unit_contents, :skip => true
+end
+
+def generate_helper_test(name, project_name, app_name)
+  test_unit_contents = TESTUNIT_HELPER_TEST.gsub(/!NAME!/, name).gsub(/!CONSTANT_NAME!/, "#{project_name}::#{app_name}::#{name}")
+  test_unit_contents.gsub!(/!PATH!/, recognize_path)
+  helper_spec_path = File.join('test', options[:app], 'helpers', "#{name.underscore}_test.rb")
+  create_file destination_root(helper_spec_path), test_unit_contents, :skip => true
+end

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

@@ -86,6 +86,8 @@ if PadrinoTasks.load?(:datamapper, defined?(DataMapper))
     task :setup => [:create, :migrate, :seed]
   end
 
+  task 'db:migrate:down' => 'dm:migrate:down'
+  task 'db:migrate:up' => 'dm:migrate:up'
   task 'db:migrate' => 'dm:migrate'
   task 'db:create'  => 'dm:create'
   task 'db:drop'    => 'dm:drop'

data/test/test_controller_generator.rb

@@ -200,6 +200,14 @@ describe "ControllerGenerator" do
       assert_match_in_file(/Capybara.app = /, "#{@apptmp}/sample_project/features/support/env.rb")
     end
 
+    it "should generate controller test for testunit" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=testunit') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:controller, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class DemoItemsControllerTest < Test::Unit::TestCase/m, "#{@apptmp}/sample_project/test/subby/controllers/demo_items_controller_test.rb")
+    end
+
+
     it 'should correctly generate file names' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
       capture_io { generate(:controller, 'DemoItems', "-r=#{@apptmp}/sample_project") }

data/test/test_helper_generator.rb

@@ -95,6 +95,14 @@ describe "HelperGenerator" do
       assert_match_in_file(/describe "SampleProject::Subby::DemoItemsHelper" do/m, "#{@apptmp}/sample_project/spec/subby/helpers/demo_items_helper_spec.rb")
     end
 
+    it "should generate helper test for testunit" do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=testunit', '--script=none') }
+      capture_io { generate(:app, 'subby', "-r=#{@apptmp}/sample_project") }
+      capture_io { generate(:helper, 'DemoItems','-a=/subby', "-r=#{@apptmp}/sample_project") }
+      assert_match_in_file(/class DemoItemsHelperTest < Test::Unit::TestCase/m, "#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb")
+      assert_match_in_file(/@helpers\.extend SampleProject::Subby::DemoItemsHelper/m, "#{@apptmp}/sample_project/test/subby/helpers/demo_items_helper_test.rb")
+    end
+
     it 'should correctly generate file names' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=rspec') }
       capture_io { generate(:helper, 'DemoItems', "-r=#{@apptmp}/sample_project") }

data/test/test_model_generator.rb

@@ -214,6 +214,12 @@ describe "ModelGenerator" do
 
   # DATAMAPPER
   describe "model generator using datamapper" do
+    it 'should add activerecord middleware' do
+      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-d=datamapper') }
+      assert_match_in_file(/  use IdentityMap/m, "#{@apptmp}/sample_project/app/app.rb")
+      assert_file_exists("#{@apptmp}/sample_project/lib/identity_map_middleware.rb")
+    end
+
     it 'should generate model file with camelized name' do
       capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=datamapper') }
       capture_io { generate(:model, 'ChunkyBacon', "-r=#{@apptmp}/sample_project") }

data/test/test_project_generator.rb

@@ -753,5 +753,20 @@ describe "ProjectGenerator" do
       assert_match_in_file(/class ControllerTest < Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb")
       assert_match_in_file(/class SampleProject::App::HelperTest < Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb")
     end
+
+    it "should properly generate for testunit" do
+      out, err = capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--test=testunit', '--script=none', '--tiny') }
+      assert_match(/applying.*?testunit.*?test/, out)
+      assert_match_in_file(/gem 'rack-test'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/:require => 'rack\/test'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/:group => 'test'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/gem 'test-unit'/, "#{@apptmp}/sample_project/Gemfile")
+      assert_match_in_file(/RACK_ENV = 'test' unless defined\?\(RACK_ENV\)/, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_file_exists("#{@apptmp}/sample_project/test/test.rake")
+      assert_match_in_file(/task 'test' => test_tasks/,"#{@apptmp}/sample_project/test/test.rake")
+      assert_match_in_file(/Dir\[File\.expand_path\(File\.dirname\(__FILE__\) \+ "\/\.\.\/app\/helpers\.rb"\)\]\.each\(&method\(:require\)\)/, "#{@apptmp}/sample_project/test/test_config.rb")
+      assert_match_in_file(/class ControllerTest < Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/app/controllers/controllers_test.rb")
+      assert_match_in_file(/class SampleProject::App::HelperTest < Test::Unit::TestCase/, "#{@apptmp}/sample_project/test/app/helpers/helpers_test.rb")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-gen
 version: !ruby/object:Gem::Version
-  version: 0.13.0.beta2
+  version: 0.13.0.beta3
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -47,28 +47,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: 0.13.0.beta3
 description: Generators for easily creating and building padrino applications from
   the console
 email: padrinorb@gmail.com
@@ -129,6 +129,7 @@ files:
 - lib/padrino-gen/generators/components/tests/rspec.rb
 - lib/padrino-gen/generators/components/tests/shoulda.rb
 - lib/padrino-gen/generators/components/tests/steak.rb
+- lib/padrino-gen/generators/components/tests/testunit.rb
 - lib/padrino-gen/generators/controller.rb
 - lib/padrino-gen/generators/helper.rb
 - lib/padrino-gen/generators/mailer.rb