generator-spec 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/generator-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{generator-spec}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-07}
+  s.date = %q{2010-08-08}
   s.description = %q{RSpec 2 library to assist in writing generator specs}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [

data/lib/generators/migration/migration_generator.rb

@@ -1,7 +1,5 @@
-require 'rspec_for_generators/migration_helper'
-
 class MigrationGenerator < Rails::Generators::NamedBase 
-  include MigrationHelper
+  include Rails::Generators::MigrationHelper
 
   desc "Creates a migration"
 

data/lib/rspec_for_generators.rb

@@ -3,6 +3,7 @@ require 'rake'
 require 'rails'
 require 'require_all'
 require 'rails/generators'
+require 'active_support/core_ext/module/aliasing'
 require 'rspec_for_generators/main'
 
 RSpec.configure do |config|

data/lib/rspec_for_generators/generator_spec_helper.rb

@@ -2,21 +2,26 @@ require 'test/unit'
 require 'rails/all'
 require 'rails/generators'
 require 'rails/generators/test_case'
-
 require 'rspec_for_generators/rails_spec_helper'
 
 # Call configure to load the settings from
 # Rails.application.config.generators to Rails::Generators
 
 # require the generators
-def require_generators *generator_list
-  generator_list.each do |name, generators|    
-    if !generators || generators.empty
-      require File.join('generators', name.to_s, "#{name.to_s}_generator")      
-    else  
-      generators.each do |generator_name|
-        require File.join('generators', name.to_s, generator_name.to_s, "#{generator_name}_generator")
-      end    
+def require_generators *generator_list     
+  req = RSpec::Generator::Require
+  generator_list.each do |name, generators|
+    case name
+    when Hash
+      req.parse_generator_hash name      
+    when Symbol
+      if !generators || generators.empty?
+        req.require_generator! name
+      else
+        req.parse_generator_list name, generators  
+      end
+    else
+      raise ArgumentError, "required generator(s) must be stated either using a symbol or array of symbols"      
     end
   end
 end  
@@ -24,8 +29,40 @@ alias :require_generator :require_generators
 
 module RSpec    
   module Generator
+    module Require
+      class << self
+        def parse_generator_hash hash
+          parse_generator_list hash.keys.first, hash.values.flatten
+        end
+
+        def parse_generator_list name, generators           
+          if generators.empty?                       
+            require_generator! name          
+          else  
+            generators.each do |generator_name|
+              require_generator! name, generator_name
+            end  
+          end  
+        end
+
+        def require_generator! name, generator=nil
+          file = (require_file_name name, generator)          
+          puts "Loading generator: #{file}" if RSpec::Generator.debug?
+          require file
+        end
+
+        def require_file_name name, name_space=nil
+          File.join('generators', name.to_s, "#{name_space}", "#{name_space || name}_generator")
+        end
+      end
+    end
+    
     class << self  
-      attr_accessor :generator, :test_method_name, :remove_temp_dir
+      attr_accessor :generator, :test_method_name, :remove_temp_dir, :debug
+
+      def debug?
+        debug
+      end
 
       def remove_rails_dir!
         FileUtils.rm_rf ::TmpRails.root

data/lib/rspec_for_generators/main.rb

@@ -1,3 +1,4 @@
+require 'rspec_for_generators/migration_helper'
 require 'rspec_for_generators/rails_spec_helper'
 require 'rspec_for_generators/rspec_test_case'
 require 'rspec_for_generators/generator_spec_helper'

data/lib/rspec_for_generators/matchers/content/have_block.rb

@@ -3,7 +3,7 @@ module RSpec::RubyContentMatchers
     attr_reader :name, :args, :block_args
 
     def initialize(name, options={})
-      @name = name
+      @name = name.to_s
       @args = options[:args]
       @block_args = options[:block_args]
     end

data/lib/rspec_for_generators/matchers/content/have_calls.rb

@@ -9,7 +9,7 @@ module RSpec::RubyContentMatchers
 
     def matches?(content)
       calls.each_pair do |method, args|
-        @method = method
+        @method = method.to_s
         @args = args
         return false if (content =~ /#{method}\s+#{args_expr}/m) == nil
       end

data/lib/rspec_for_generators/matchers/file/generate_directory.rb

@@ -6,35 +6,37 @@
 
 module RSpec::FileMatchers
   class GenerateDir
+    attr_accessor :relative_path
 
     def initialize(relative_path, type = nil)
-      @relative_path = relative_rails_dir relative_path, type
+      @relative_path = relative_rails_dir(relative_path, type)
     end
 
     def matches?(generator, &block)              
-      @expected = File.expand_path(@relative_path, generator.class.destination_root)
-      ex = File.exists?(@expected)
-      if block && ex
-        read = File.read(@expected)
+      file = File.expand_path(relative_path, generator.class.destination_root)
+      file_exists = File.exists?(expected)
+      if block && file_exists
+        read = File.read(file)
         ruby_content = read.extend(RSpec::RubyContent::Helpers)
         yield ruby_content
       else
-        ex
+        file_exists
       end        
     end          
   
     def failure_message
-      "Expected file #{@relative_path} to have been generated, but it was not"
+      "Expected file #{relative_path} to have been generated, but it was not"
     end
 
     def negative_failure_message
-      "Did not expected file #{@relative_path} to have been generated, but it was"
+      "Did not expected file #{relative_path} to have been generated, but it was"
     end
     
     protected
     
     def relative_rails_dir path, type = nil                             
-      return File.join(::Rails.root, base_dir(type), folder(type), "#{path.to_s}") if type        
+      path = path.to_s
+      return File.join(::Rails.root, base_dir(type), folder(type), "#{path}") if type        
       File.join(::Rails.root, path)
     end
 

data/lib/rspec_for_generators/matchers/file/generate_file.rb

@@ -7,33 +7,36 @@
 module RSpec::FileMatchers
   class GenerateFile
 
+    attr_accessor :relative_path
+
     def initialize(relative_path, type = nil)
       @relative_path = relative_rails_file(relative_path, type)
     end
 
     def matches?(generator, &block)              
-      @expected = File.expand_path(@relative_path, generator.class.destination_root)
-      ex = File.exists?(@expected)
-      if block && ex
-        read = File.read(@expected)
+      file = File.expand_path(relative_path, generator.class.destination_root)
+      file_exists = File.exists?(file)
+      if block && file_exists
+        read = File.read(file)
         ruby_content = read.extend(RSpec::RubyContent::Helpers)
         yield ruby_content
       else
-        ex
+        file_exists
       end        
     end          
   
     def failure_message
-      "Expected file #{@relative_path} to have been generated, but it was not"
+      "Expected file #{relative_path} to have been generated, but it was not"
     end
 
     def negative_failure_message
-      "Did not expected file #{@relative_path} to have been generated, but it was"
+      "Did not expected file #{relative_path} to have been generated, but it was"
     end
     
     protected
     
     def relative_rails_file path, type = nil                       
+      path = path.to_s
       f_name = file_name(path, type)      
       return File.join(::Rails.root, base_dir(type), folder(type), f_name) if type        
       File.join(::Rails.root, path)

data/lib/rspec_for_generators/matchers/file/generate_migration.rb

@@ -13,7 +13,7 @@ module RSpec
       attr_reader :name
 
       def initialize(name)
-        @name = name      
+        @name = name.to_s
       end
 
       def matches?(generator)

data/lib/rspec_for_generators/migration_helper.rb

@@ -1,39 +1,43 @@
-module MigrationHelper
-  include Rails::Generators::Migration
+module Rails
+  module Generators
+    module MigrationHelper
+      include Rails::Generators::Migration
 
-  module ClassMethods    
-    def migration_lookup_at(dirname) #:nodoc:
-      Dir.glob("#{dirname}/[0-9]*_*.rb")
-    end
+      module ClassMethods    
+        def migration_lookup_at(dirname) #:nodoc:
+          Dir.glob("#{dirname}/[0-9]*_*.rb")
+        end
 
-    def migration_exists?(dirname, file_name) #:nodoc:
-      migration_lookup_at(dirname).grep(/\d+_#{file_name}.rb$/).first
-    end
+        def migration_exists?(dirname, file_name) #:nodoc:
+          migration_lookup_at(dirname).grep(/\d+_#{file_name}.rb$/).first
+        end
 
-    def current_migration_number(dirname) #:nodoc:
-      migration_lookup_at(dirname).collect do |file|
-        File.basename(file).split("_").first.to_i
-      end.max.to_i
-    end
+        def current_migration_number(dirname) #:nodoc:
+          migration_lookup_at(dirname).collect do |file|
+            File.basename(file).split("_").first.to_i
+          end.max.to_i
+        end
 
-    def next_migration_number(dirname) #:nodoc:
-      orm = Rails.configuration.generators.options[:rails][:orm]
-      require "rails/generators/#{orm}"
-      "#{orm.to_s.camelize}::Generators::Base".constantize.next_migration_number(dirname)
-    rescue
-      raise NotImplementedError
-    end
-  end         
+        def next_migration_number(dirname) #:nodoc:
+          orm = Rails.configuration.generators.options[:rails][:orm]
+          require "rails/generators/#{orm}"
+          "#{orm.to_s.camelize}::Generators::Base".constantize.next_migration_number(dirname)
+        rescue
+          raise NotImplementedError
+        end
+      end         
 
-  def self.included(base) #:nodoc: 
-    base.extend ClassMethods      
-  end
+      def self.included(base) #:nodoc: 
+        base.extend ClassMethods      
+      end
 
-  def info msg
-    Rails.logger.info msg
-  end
+      def info msg
+        Rails.logger.info msg
+      end
       
-  def migration(options)
-    migration_template "create_users.erb", "db/migrations/#{name}"
+      def migration(options)
+        migration_template "create_users.erb", "db/migrations/#{name}"
+      end
+    end
   end
 end

data/spec/rspec_for_generators/helper_generator_spec.rb

@@ -1,5 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require_generator :helper
+
+RSpec::Generator.debug = true
+
+require_generator :helper => [:hello, :goodbye]
 
 module RSpec::Core
   class ExampleGroup

data/spec/rspec_for_generators/migration_generator_spec.rb

@@ -16,9 +16,9 @@ describe 'migration_generator' do
     
   it "should generate create_user migration" do    
     with_generator do |g|
-      name = 'create_users'
-      remove_migration 'create_users'
-      g.run_generator [name]
+      name = :create_users
+      remove_migration :create_users
+      g.run_generator [name.to_s]
       g.should generate_migration name do |content|
         content.should have_migration name do |klass|
           klass.should have_up do |up|

data/spec/spec_helper.rb

@@ -5,12 +5,6 @@ require 'rspec_for_generators'
 RSpec::Generator.remove_temp_dir = true
 RSpec::Generator.configure_root_dir __FILE__
   
-# RSpec::Core::ExampleGroup
-
-# RSpec.configure do |c|
-#  c.extend RSpec::Generator
-# end
-
 module Rails
   def self.logger
     @logger ||= Logger.new(STDOUT)     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-07 00:00:00 +02:00
+date: 2010-08-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency