Changeset 1215

Timestamp:

01/08/08 19:50:39 (8 months ago)

Author:

e.@brainspl.at

Message:

add support for generators for PartControllers? closes #416 [siebertm85@googlemail.com]

Files:

• trunk/lib/merb/generators/merb_generator_helpers.rb (modified) (3 diffs)
• trunk/spec/merb/generator_spec.rb (modified) (3 diffs)
• trunk/spec/spec_generator_helper.rb (modified) (1 diff)

trunk/lib/merb/generators/merb_generator_helpers.rb

@@ -256 +256 @@
-        @template_actions = runtime_options[:actions] || %w[index] # Used by subclasses only
-        @test_generator   = runtime_options[:test_stub_generator] || "merb_controller_test"
+        @base_dest_folder = runtime_options[:base_dest_folder] || "app"
-        extract_options
-      end
@@ -265 +266 @@
-          m.class_collisions(@class_name)
-          
-app
-app
+#{@base_dest_folder}
+#{@base_dest_folder}
-          
-app
+#{@base_dest_folder}
-          
-          # Include templates if they exist
@@ -276 +277 @@
-
-            if File.exists?(File.join(template_path,template_name))
-app
+#{@base_dest_folder}
-            end
-          end
-
-app
-app
+#{@base_dest_folder}
+#{@base_dest_folder}
-          m.dependency @test_generator, [name], :destination => destination_root, :template_actions => @template_actions
-        end

trunk/spec/merb/generator_spec.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-require File.dirname(__FILE__) + '/../spec_generator_helper'
+
-
-describe "an app generator" do
@@ -107 +108 @@
-    }.each{|file| file_should_be_executable(file)}
-  end
-    
-  
-  
-  
-  
-  def directory_should_be_created(directory)
-    File.should be_exist(File.join(APP_ROOT, directory))
-    File.should be_directory(File.join(APP_ROOT, directory))
-  end
-
-  def file_should_be_created(file)
-    File.should be_exist(File.join(APP_ROOT, file))
-    File.should be_file(File.join(APP_ROOT, file))
-  end
-
-  def file_should_be_executable(file)
-    File.should be_executable(File.join(APP_ROOT, file))
-  end
-    
-  
-  def sources
@@ -137 +119 @@
-  
-end
+
+describe "a controller generator" do
+  include RubiGen::GeneratorTestHelper
+
+  before :all do
+    module Kernel
+      alias_method :old_dependency, :dependency
+      undef dependency
+    end  
+  end
+
+  after :all do
+    module Kernel
+      alias_method :dependency, :old_dependency
+    end  
+  end
+
+  before do
+    @generator =  build_generator('controller', ["my_posts"], sources, {})
+  end
+
+  after do
+    bare_teardown  # Cleans up the temporary application directory that gets created as part of the test.
+  end
+
+  it "should be get created" do
+    @generator.should_not be_nil
+  end
+
+  it "should be a ControllerGenerator" do
+    @generator.should be_an_instance_of(ControllerGenerator)
+  end
+
+  it "should create directory structure" do
+    silence_generator do
+      @generator.command(:create).invoke!
+    end
+    %w{
+      app
+      app/controllers
+      app/helpers
+      app/views
+      app/views/my_posts
+    }.each{|dir| directory_should_be_created(dir)}    
+  end
+
+  it "should create files from templates" do
+    silence_generator do
+      @generator.command(:create).invoke!
+    end
+    %w{
+      app/controllers/my_posts.rb
+      app/helpers/my_posts_helper.rb
+      app/views/my_posts/index.html.erb
+    }.each{|file| file_should_be_created(file)}
+  end
+
+  def sources
+    [
+      RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__),"../../", "merb_generators")),
+      RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__),"../../", "rspec_generators"))
+    ]
+  end
+end
+
+describe "a part_controller generator" do
+  include RubiGen::GeneratorTestHelper
+
+  before :all do
+    module Kernel
+      alias_method :old_dependency, :dependency
+      undef dependency
+    end  
+  end
+
+  after :all do
+    module Kernel
+      alias_method :dependency, :old_dependency
+    end  
+  end
+
+  before do
+    @generator =  build_generator('part_controller', ["my_posts"], sources, {})
+  end
+
+  after do
+    bare_teardown  # Cleans up the temporary application directory that gets created as part of the test.
+  end
+
+  it "should be get created" do
+    @generator.should_not be_nil
+  end
+
+  it "should be a PartControllerGenerator" do
+    @generator.should be_an_instance_of(PartControllerGenerator)
+  end
+
+  it "should create directory structure" do
+    silence_generator do
+      @generator.command(:create).invoke!
+    end
+    %w{
+      app
+      app/parts/controllers
+      app/parts/helpers
+      app/parts/views
+      app/parts/views/my_posts_part
+    }.each{|dir| directory_should_be_created(dir)}    
+  end
+
+  it "should create files from templates" do
+    silence_generator do
+      @generator.command(:create).invoke!
+    end
+    %w{
+      app/parts/controllers/my_posts_part.rb
+      app/parts/helpers/my_posts_part_helper.rb
+      app/parts/views/my_posts_part/index.html.erb
+    }.each{|file| file_should_be_created(file)}
+  end
+
+  def sources
+    [
+      RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__),"../../", "merb_generators")),
+      RubiGen::PathSource.new(:app, File.join(File.dirname(__FILE__),"../../", "rspec_generators"))
+    ]
+  end
+end

trunk/spec/spec_generator_helper.rb

@@ -18 +18 @@
-end
-require 'rubigen/helpers/generator_test_helper'
+
+
+def directory_should_be_created(directory)
+  File.should be_exist(File.join(APP_ROOT, directory))
+  File.should be_directory(File.join(APP_ROOT, directory))
+end
+
+def file_should_be_created(file)
+  File.should be_exist(File.join(APP_ROOT, file))
+  File.should be_file(File.join(APP_ROOT, file))
+end
+
+def file_should_be_executable(file)
+  File.should be_executable(File.join(APP_ROOT, file))
+end