generator-spec 0.5.0 → 0.6.3

data/lib/generator-spec/rspec.rb

@@ -0,0 +1 @@
+require_all File.dirname(__FILE__) + '/rspec'

data/lib/generator-spec/rspec/configure.rb

@@ -0,0 +1,6 @@
+require 'generator-spec/rspec/macro'
+
+RSpec.configure do |config|
+  config.extend RSpec::Generator::Macro
+  config.include RSpec::Generator::Macro
+end

data/lib/{generator_spec/rspec_generator/generator_util.rb → generator-spec/rspec/generator.rb}

@@ -1,18 +1,18 @@
 require 'rails/all'
 require 'rails/generators'
 require 'rails/generators/test_case'
-require 'generator_spec/rspec_generator/configure'
+require 'generator-spec/rspec/generator/configure'
 
 module RSpec::Generator
   class << self    
-    attr_accessor :generator, :test_method_name, :remove_temp_dir, :debug, :logger
+    attr_accessor :generator, :test_method_name, :remove_temp_dir, :debug, :logger, :logfile
 
     def debug?
       debug
     end
 
     def info msg
-      Rails.logger.info(msg) if RSpec::Generator.debug?
+      Rails.logger.info(msg) if debug?
     end      
 
     def remove_rails_dir!
@@ -30,11 +30,11 @@ module RSpec::Generator
       with(get_generator, &block)
     end
 
-    def setup_generator test_method_name=nil, &block
+    def setup_generator test_method_name, &block
       info "-----------------------------------------------------"
       info "#{Time.now} -- setup generator: [#{test_method_name}]"            
-      clean! if test_method_name  
-      generator = get_generator(test_method_name).extend(RSpec::Generator::Helpers)
+      clean! if test_method_name                                                              
+      generator = get_generator(test_method_name) #.extend(Rails::Assist::Generators::BasicHelper)
       if block
         block.arity < 1 ? generator.class.instance_eval(&block) : block.call(generator.class)  
       end

data/lib/generator-spec/rspec/macro.rb

@@ -0,0 +1,18 @@
+module RSpec::Generator
+  module Macro  
+    def with_generator &block
+      RSpec::Generator.with_generator &block
+    end
+
+    def setup_generator test_method_name=nil, &block
+      RSpec::Generator.setup_generator test_method_name, &block
+    end
+  end
+end
+
+module RSpec::Core
+  class ExampleGroup
+    extend RSpec::Generator::Macro
+  end
+end
+

data/lib/generator-spec/rspec/matchers/generate_artifact.rb

@@ -0,0 +1,34 @@
+module RSpec::RailsApp::Artifact
+  module Matchers
+    class GenerateArtifact < HaveArtifact
+      def initialize(name, artifact_type)
+        super
+      end
+      
+      def matches?(generator, &block)            
+        super File.join(Rails.application.config.root_dir, 'rails_app'), &block
+      end 
+    end    
+    
+    def generate_artifact name, type
+      GenerateArtifact.new name, type
+    end
+
+    (::Rails3::Assist.artifacts - [:view]).each do |name|
+      plural_artifact = name.to_s.pluralize
+      class_eval %{
+        def generate_#{name} name
+          generate_artifact name, :#{name}
+        end
+        alias_method :create_#{name}, :generate_#{name}
+      }
+    end  
+    
+    def generate_view folder, action=nil, view_ext=nil      
+      arg = {:folder => folder, :action => action, :view_ext => view_ext}
+      generate_artifact arg, :view
+    end
+    alias_method :create_view, :generate_view    
+  end
+end       
+

data/lib/generator-spec/rspec/matchers/generate_artifacts.rb

@@ -0,0 +1,33 @@
+module RSpec::RailsApp::Artifact
+  module Matchers
+    class GenerateArtifacts < HaveArtifacts
+      def initialize(artifact_type, *names)
+        super
+      end
+      
+      def matches?(generator, &block)            
+        super File.join(Rails.application.config.root_dir, 'rails_app'), &block
+      end 
+    end    
+    
+    def generate_artifacts type, *names
+      GenerateArtifacts.new type, *names
+    end
+    
+    (::Rails3::Assist.artifacts - [:view]).each do |name|
+      plural_artifact = name.to_s.pluralize
+      class_eval %{
+        def generate_#{plural_artifact} *names
+          generate_artifacts :#{name}, *names 
+        end
+        alias_method :create_#{plural_artifact}, :generate_#{plural_artifact}
+      }
+    end  
+    
+    def generate_views folder, *args
+      generate_artifacts folder, *args
+    end
+    alias_method :create_views, :generate_views    
+  end
+end       
+

data/lib/generators/controller/controller_generator.rb

@@ -1,33 +1,27 @@
+require 'rails3_artifactor'
+
 class ControllerGenerator < Rails::Generators::NamedBase
   desc "Adds method 'control_me' to a Controller" 
     
-  def self.source_root
-    @source_root ||= File.expand_path("../templates", __FILE__)
-  end
-
   def add_helper_method  
-    if File.exist?(controller_file_name)
-      inject_into_file(controller_file_name, controller_method_code, :after => after_txt) if after_txt
-    else
-      say "#{controller_file_name} does not exist. Please create it first before you can add a controller method to it!", :red
+    begin
+      insert_into_controller name do
+        include_txt
+      end
+    rescue
+      say "Controller #{name} does not exist. Please create it first before you can add a controller method to it!", :red
     end
   end
 
   protected
+  
+  extend Rails3::Assist::UseMacro
+  use_helpers :controller  
 
-  def after_txt
-    "#{class_name}Controller"
-  end
-                     
-  def controller_file_name
-    File.join(Rails.root, "app/controllers/#{file_name}_controller.rb")
-  end
-
-  def controller_method_code
-    %Q{
-  def control_me
+  def include_txt
+    %{def control_me
     "Control me please!"
+  end}
   end
-}
-  end
+
 end 

data/lib/generators/helper/helper_generator.rb

@@ -1,36 +1,20 @@
+require 'rails3_artifactor'
+
 class HelperGenerator < Rails::Generators::NamedBase
-  include Rails::Generators::BasicHelper
-  
+  include Rails3::Assist:Artifact::Helper
+
   desc "Adds method 'help_me' to a Helper" 
     
-  def self.source_root
-    @source_root ||= File.expand_path("../templates", __FILE__)
-  end
-
-  def add_helper_method
-    info "add_helper_method: #{helper_file_name}" 
-    if File.exist?(helper_file_name)
-      inject_into_file(helper_file_name, helper_method_code, :after => after_txt) if after_txt
-    else
-      say "#{helper_file_name} does not exist. Please create it first before you can add a helper method to it!", :red
+  def add_method  
+    begin
+      insert_into_helper name do
+        %{def help_me
+  "Help me please!"
+end}
+      end
+    rescue
+      say "Helper #{name} does not exist. Please create it!", :red
     end
   end
 
-  protected
-
-  def after_txt
-    "#{class_name}Helper"
-  end
-                     
-  def helper_file_name
-    File.join(Rails.root, "app/helpers/#{file_name}_helper.rb")
-  end
-
-  def helper_method_code
-    %Q{
-  def help_me
-    "Help me please!"
-  end
-}
-  end
 end 

data/lib/generators/migration/migration_generator.rb

@@ -1,14 +1,13 @@
+require 'migration_assist'
+
 class MigrationGenerator < Rails::Generators::NamedBase 
-  include Rails::Generators::MigrationHelper
+  include Rails::Migration::Assist
 
   desc "Creates a migration"
 
-  def self.source_root
-    @source_root ||= File.expand_path("../templates", __FILE__)
-  end
-    
+  source_root File.dirname(__FILE__) + '/templates'
+      
   def create_migration     
-    info "Create migration #{name}" 
-    migration "#{name} name:string age:integer admin:boolean"
+    migration name, 'create_users'
   end
 end 

data/lib/generators/model/model_generator.rb

@@ -1,91 +1,72 @@
-class ModelGenerator < Rails::Generators::Base
+require 'active_support/inflector'
+require 'logging_assist'
+
+include Log4r
+
+class ModelGenerator < Rails::Generators::NamedBase  
   desc "Adds Canable::Ables permission system to Model" 
 
-  argument :name, :type => :string, :default => 'User', :desc => 'Name of model to make Canable:Able', :required => false
-    
-  def self.source_root
-    @source_root ||= File.expand_path("../../templates", __FILE__)
-  end
+  # argument :name, :type => :string, :default => 'User', :desc => 'Name of model to make Canable:Able', :required => false
 
+  # class_option :user_stamps, :type => :boolean, :default => false 
+  
+    
   def make_canable_able  
-    if File.exist?(model_file_name)
-      @model_file_txt  = File.open(model_file_name).read
-      after_txt       = find_after_txt(model_file_txt)        
-      inject_into_file(model_file_name, canable_include_txt, :after => after_txt) if after_txt
-    else
-      say "#{model_file_name} does not exist. Please create it first before you can make it Canable:Able", :red
+    begin
+      log.debug "make_canable_able: #{name}"
+      insert_into_model name do
+        canable_include_txt
+      end
+    rescue
+      say "model #{name} does not exist. Please create it first before you can make it Canable:Able", :red
     end
   end
 
   def post_log
-    say "Your model #{model_class_name} is now Canable:Able. Please define your permission login in #{model_file_name}", :green
+    say "Your model #{name.to_s.camelize} is now Canable:Able. Please define your permissions in the model", :green
   end
 
   protected
 
-  attr_accessor :model_file_txt
-
-  def find_after_txt model_file_txt
-    # after first include statement
-    match = (model_file_txt =~ /(include\s+\S+)/)
-    return $1 if match
-
-    # or after class definition if no includes
-    match = model_file_txt =~ /(class\s+#{model_class_name}\s+<\s+ActiveRecord::Base)/ # first try match AR model
-    match = model_file_txt =~ /(class\s+#{model_class_name})/ if !match
-    $1 || nil       
-  end
-
-  def model_class_name
-    name.to_s.camelize
-  end
-                     
-  def model_file_name
-    File.join(Rails.root, "app/models/#{name}.rb")
+  def log
+    @log ||= Rails::Assist::Logging.new 
   end
+  
+  extend Rails3::Assist::UseMacro
+  use_orm   :mongoid
+  # use_helper :model
 
   def canable_include_txt
     %Q{
-include Canable::Ables
-#{add_userstamps}
+  include Canable::Ables
+  #{add_userstamps}
 
-# permission logic
-#{add_methods}
+  # permission logic
+  #{add_methods}
 }
   end
 
-  def has_userstamps?
-    model_file_txt =~ /userstamps!/       
-  end
-
   def add_userstamps 
-    if !has_userstamps?       
-      "userstamps! # adds creator and updater\n" if options[:userstamps]
-    end
+    "userstamps! # adds creator and updater\n" # if options[:userstamps]
   end
 
-  def has_method? name
-    model_file_txt =~ /(def #{name}_by\?)/ 
-  end     
-
   def add_methods
     methods = []
     %w{creatable destroyable updatable viewable}.each do |name|
-      if !has_method?(name)
+      # if !has_method?(name)
         method = add_method(name)
         methods << method if method
-      end
+      # end
     end
     methods.join("\n  ")
   end
 
   def add_method(name)        
-    if options[name.to_sym]
+    #if options[name.to_sym]
     %Q{
-def #{name}_by?(user)
-  true
-end
-}     
-    end
+  def #{name}_by?(user)
+    true
+  end}     
+    #end
   end      
 end 

data/lib/generators/observer/observer_generator.rb

@@ -1,4 +1,6 @@
 class ObserverGenerator < Rails::Generators::NamedBase
+  include Rails::Assist::Generators::BasicHelper  
+  
   desc "Adds method 'observe_me' to a Observer" 
     
   def self.source_root

data/lib/generators/view/view_generator.rb

@@ -1,4 +1,6 @@
 class ViewGenerator < Rails::Generators::NamedBase
+  include Rails::Assist::Generators::BasicHelper
+
   desc "Adds some view code to existing View" 
     
   argument :view, :type => :string, :required => true

data/spec/generator_spec/generators/controller_gen_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require_generator :controller
+
+describe 'helper_generator' do  
+  use_helper :controller  
+  
+  before :each do              
+    setup_generator 'controller_generator' do
+      tests ControllerGenerator
+    end    
+    remove_controller :account    
+  end
+
+  after :each do              
+    # remove_controller :account    
+  end
+    
+  it "should not work without an Account controller file" do            
+    remove_controller :account    
+    with_generator do |g|   
+      g.run_generator :account.args
+      g.should_not generate_controller :account
+    end
+  end
+
+  it "should decorate an existing Account controller file with a 'control_me' method" do            
+    with_generator do |g|  
+      create_controller :account do
+        '# controller content'
+      end    
+      g.run_generator :account.args
+      g.should generate_controller :account do |content|
+        content.should have_method :control_me
+      end
+    end
+  end
+end
+
+
+