generator-spec 0.6.4 → 0.6.5

data/Rakefile

@@ -9,15 +9,16 @@ begin
     gem.authors = ["Kristian Mandrup"]
     gem.add_development_dependency "rspec",           "~> 2.0.0.beta.22"
     gem.add_development_dependency "mocha",           "~> 0.9.8"
-    gem.add_development_dependency 'rails-app-spec',  "~> 0.2.5"
+    gem.add_development_dependency 'rails-app-spec',  "~> 0.2.14"
 
+    gem.add_dependency 'rails-app-spec',    "~> 0.2.14"
     gem.add_dependency "rspec",             "~> 2.0.0.beta.22"
     gem.add_dependency "rake",              "~> 0.8.7"
     gem.add_dependency "rails",             "~> 3.0.0" 
     gem.add_dependency "test-unit",         "~> 2.0.9" 
     gem.add_dependency "require_all",       "~> 1.1.0"
-    gem.add_dependency "sugar-high",        "~> 0.2.9"
-    gem.add_dependency "rails3_artifactor", "~> 0.2.3"
+    gem.add_dependency "sugar-high",        "~> 0.2.10"
+    gem.add_dependency "rails3_artifactor", "~> 0.2.4"
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.6.4
+0.6.5

data/generator-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{generator-spec}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-17}
+  s.date = %q{2010-09-20}
   s.description = %q{RSpec 2 library to facilitate creating generator specs}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -37,6 +37,8 @@ Gem::Specification.new do |s|
      "lib/generator-spec/rspec/generator/test_case.rb",
      "lib/generator-spec/rspec/macro.rb",
      "lib/generator-spec/rspec/matchers/generate_artifact.rb",
+     "lib/generator-spec/rspec/matchers/generate_artifact_file.rb",
+     "lib/generator-spec/rspec/matchers/generate_artifact_files.rb",
      "lib/generator-spec/rspec/matchers/generate_artifacts.rb",
      "lib/generators/controller/controller_generator.rb",
      "lib/generators/helper/helper_generator.rb",
@@ -45,15 +47,19 @@ Gem::Specification.new do |s|
      "lib/generators/model/model_generator.rb",
      "lib/generators/observer/observer_generator.rb",
      "lib/generators/view/view_generator.rb",
+     "rails_generator.log",
      "spec/generator_spec/generators/controller_gen_spec.rb",
      "spec/generator_spec/generators/helper_gen_spec.rb",
      "spec/generator_spec/generators/migration_gen_spec.rb",
      "spec/generator_spec/generators/model_gen_spec.rb",
      "spec/generator_spec/generators/observer_gen_spec.rb",
      "spec/generator_spec/generators/view_gen_spec.rb",
+     "spec/generator_spec/matchers/generate_artifact_file_spec.rb",
+     "spec/generator_spec/matchers/generate_artifact_files_spec.rb",
      "spec/generator_spec/matchers/generate_artifact_spec.rb",
      "spec/generator_spec/matchers/generate_artifacts_spec.rb",
      "spec/spec_helper.rb",
+     "tmp/rails_app/config/routes.rb",
      "wiki/Custom Rails 3 Generators.textile",
      "wiki/content_matchers.textile",
      "wiki/file_matchers.textile",
@@ -72,6 +78,8 @@ Gem::Specification.new do |s|
      "spec/generator_spec/generators/model_gen_spec.rb",
      "spec/generator_spec/generators/observer_gen_spec.rb",
      "spec/generator_spec/generators/view_gen_spec.rb",
+     "spec/generator_spec/matchers/generate_artifact_file_spec.rb",
+     "spec/generator_spec/matchers/generate_artifact_files_spec.rb",
      "spec/generator_spec/matchers/generate_artifact_spec.rb",
      "spec/generator_spec/matchers/generate_artifacts_spec.rb",
      "spec/spec_helper.rb"
@@ -84,37 +92,40 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_development_dependency(%q<mocha>, ["~> 0.9.8"])
-      s.add_development_dependency(%q<rails-app-spec>, ["~> 0.2.5"])
+      s.add_development_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
+      s.add_runtime_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
       s.add_runtime_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_runtime_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<test-unit>, ["~> 2.0.9"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.9"])
-      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.2.3"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.2.4"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_dependency(%q<mocha>, ["~> 0.9.8"])
-      s.add_dependency(%q<rails-app-spec>, ["~> 0.2.5"])
+      s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
+      s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
       s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_dependency(%q<test-unit>, ["~> 2.0.9"])
       s.add_dependency(%q<require_all>, ["~> 1.1.0"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.2.9"])
-      s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.3"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
+      s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.4"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
     s.add_dependency(%q<mocha>, ["~> 0.9.8"])
-    s.add_dependency(%q<rails-app-spec>, ["~> 0.2.5"])
+    s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
+    s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
     s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rails>, ["~> 3.0.0"])
     s.add_dependency(%q<test-unit>, ["~> 2.0.9"])
     s.add_dependency(%q<require_all>, ["~> 1.1.0"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.2.9"])
-    s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.3"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
+    s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.4"])
   end
 end
 

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

@@ -47,7 +47,6 @@ module RSpec::Generator
         base_path = File.join(lib, 'generators')
         path = name ? File.join(base_path, name) : base_path
         path = File.expand_path path
-        puts "require all generators from: #{path}" if debug?
         require_all path        
       end
 

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

@@ -2,11 +2,12 @@ module RSpec::RailsApp::Artifact
   module Matchers
     class GenerateArtifact < HaveArtifact
       def initialize(name, artifact_type)
-        super
+        super name, artifact_type
       end
       
       def matches?(generator, &block)            
-        super File.join(Rails.application.config.root_dir, 'rails_app'), &block
+        root = Rails.root # File.join(Rails.application.config.root_dir, 'rails_app')   
+        super root, &block
       end 
     end    
     
@@ -20,7 +21,6 @@ module RSpec::RailsApp::Artifact
         def generate_#{name} name
           generate_artifact name, :#{name}
         end
-        alias_method :create_#{name}, :generate_#{name}
       }
     end  
     
@@ -28,7 +28,6 @@ module RSpec::RailsApp::Artifact
       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_artifact_file.rb

@@ -0,0 +1,10 @@
+module RSpec::RailsApp::ArtifactFile  
+  module Matchers    
+    ::Rails3::Assist.artifacts.each do |name|
+      class_eval %{
+        alias_method :generate_#{name}_file, :have_#{name}_file
+      }
+    end
+  end
+end   
+

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

@@ -0,0 +1,12 @@
+module RSpec::RailsApp::ArtifactFile  
+  module Matchers    
+    alias_method :generate_artifact_files, :have_rails_artifact_files
+    
+    ::Rails3::Assist.artifacts.each do |name|
+      class_eval %{
+        alias_method :generate_#{name}_files, :have_#{name}_files
+      }
+    end
+  end
+end   
+

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

@@ -6,7 +6,8 @@ module RSpec::RailsApp::Artifact
       end
       
       def matches?(generator, &block)            
-        super File.join(Rails.application.config.root_dir, 'rails_app'), &block
+        root = Rails.root # File.join(Rails.application.config.root_dir, 'rails_app'), &block
+        super root
       end 
     end    
     
@@ -20,14 +21,12 @@ module RSpec::RailsApp::Artifact
         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/model/model_generator.rb

@@ -13,7 +13,7 @@ class ModelGenerator < Rails::Generators::NamedBase
     
   def make_canable_able  
     begin
-      log.debug "make_canable_able: #{name}"
+      logger.debug "make_canable_able: #{name}"
       insert_into_model name do
         canable_include_txt
       end
@@ -28,9 +28,7 @@ class ModelGenerator < Rails::Generators::NamedBase
 
   protected
 
-  def log
-    @log ||= Rails::Assist::Logging.new 
-  end
+  include Rails3::Assist::BasicLogger
   
   extend Rails3::Assist::UseMacro
   use_orm   :mongoid

data/rails_generator.log

@@ -0,0 +1,15 @@
+# Logfile created on 2010-09-20 22:06:04 +0200 by logger.rb/25413
+-----------------------------------------------------
+2010-09-20 22:06:04 +0200 -- setup generator: [model]
+-----------------------------------------------------
+2010-09-20 22:06:38 +0200 -- setup generator: [model]
+-----------------------------------------------------
+2010-09-20 22:06:38 +0200 -- setup generator: [model]
+-----------------------------------------------------
+2010-09-20 22:06:38 +0200 -- setup generator: [model]
+-----------------------------------------------------
+2010-09-20 22:07:41 +0200 -- setup generator: [model]
+-----------------------------------------------------
+2010-09-20 22:07:41 +0200 -- setup generator: [model]
+-----------------------------------------------------
+2010-09-20 22:07:41 +0200 -- setup generator: [model]

data/spec/generator_spec/generators/model_gen_spec.rb

@@ -28,7 +28,6 @@ describe 'model_generator' do
       create_model :account     
       g.run_generator :account.args
       g.should generate_model :account do |content|
-        puts content
         content.should include_module 'Canable::Ables'
       end
     end

data/spec/generator_spec/matchers/generate_artifact_file_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require_generator :model
+
+describe 'model_generator' do
+  use_orm :mongoid
+
+  before do
+    setup_generator :model do
+      tests ModelGenerator
+    end    
+  end
+  
+  before :each do              
+    remove_model :account    
+  end
+
+  after :each do              
+    remove_model :account    
+  end
+    
+  it "should not work without an Account model file" do            
+    with_generator do |g|   
+      g.run_generator :account.args
+      g.should_not generate_model_file :account
+    end
+  end
+
+  it "should decorate an existing Account model file with include Canable:Ables" do            
+    create_model :account do
+      'hello'
+    end
+    with_generator do |g|             
+      # g.run_generator :account.args
+      
+      g.should_not generate_model_file :user
+      g.should_not generate_controller_file :user      
+      
+      g.should generate_model_file :account do |content|
+        content.should include_module 'Canable::Ables'
+      end
+    end
+  end
+  
+  it "should not have generated other things!" do            
+    with_generator do |g|        
+      g.should_not generate_model_file :user
+      g.should_not generate_controller_file :user      
+    end
+  end
+end

data/spec/generator_spec/matchers/generate_artifact_files_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require_generator :model
+
+describe 'model_generator' do
+  use_orm     :mongoid
+  
+  before :each do              
+    setup_generator 'model_generator' do
+      tests ModelGenerator
+    end    
+    remove_models :account, :person
+  end
+
+  after :each do              
+    remove_models :account, :person    
+  end
+    
+  it "should not work without an Account model file" do            
+    with_generator do |g|   
+      g.run_generator :account.args
+      g.should_not generate_model_files :account, :person
+    end
+  end
+
+  it "should decorate an existing Account model file with include Canable:Ables" do            
+    with_generator do |g|  
+      create_model :account
+      create_model :person           
+      g.run_generator :account.args
+      g.run_generator :person.args
+      g.should generate_artifact_files :model, :account, :person
+      g.should generate_model_files :account, :person
+    end
+  end
+end

data/spec/generator_spec/matchers/generate_artifact_spec.rb

@@ -26,18 +26,18 @@ describe 'model_generator' do
   end
 
   it "should decorate an existing Account model file with include Canable:Ables" do            
-    with_generator do |g|  
-      create_model :account     
+    create_model :account
+       
+    with_generator do |g|        
       g.run_generator :account.args
       g.should generate_artifact :account, :model
-      
-      g.should_not generate_model :user
-      g.should_not generate_controller :user      
-      
+            
       g.should generate_model :account do |content|
-        puts content
         content.should include_module 'Canable::Ables'
       end
+      
+      g.should_not generate_model :user
+      g.should_not generate_controller :user            
     end
   end
   

data/spec/generator_spec/matchers/generate_artifacts_spec.rb

@@ -23,9 +23,10 @@ describe 'model_generator' do
   end
 
   it "should decorate an existing Account model file with include Canable:Ables" do            
+    create_model :account
+    create_model :person           
+
     with_generator do |g|  
-      create_model :account
-      create_model :person           
       g.run_generator :account.args
       g.run_generator :person.args
       g.should generate_artifacts :model, :account, :person

data/spec/spec_helper.rb

@@ -3,9 +3,9 @@ require 'generator-spec'
 
 RSpec::Generator.configure do |config|
   config.debug = true
-  config.remove_temp_dir = true #false
+  config.remove_temp_dir = false # true #false
   config.default_rails_root(__FILE__) 
   config.lib = File.dirname(__FILE__) + '/../lib'
-  config.logger = :stdout  # :file
+  config.logger = :file
 end
    

data/tmp/rails_app/config/routes.rb

@@ -0,0 +1,2 @@
+Rails.application.routes.draw do
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-17 00:00:00 +02:00
+date: 2010-09-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,14 +60,29 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 5
-        version: 0.2.5
+        - 14
+        version: 0.2.14
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rails-app-spec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 14
+        version: 0.2.14
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,11 +95,11 @@ dependencies:
         - 22
         version: 2.0.0.beta.22
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,11 +110,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,11 +125,11 @@ dependencies:
         - 0
         version: 3.0.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: test-unit
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,11 +140,11 @@ dependencies:
         - 9
         version: 2.0.9
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: require_all
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -140,11 +155,11 @@ dependencies:
         - 0
         version: 1.1.0
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: sugar-high
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -152,14 +167,14 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 9
-        version: 0.2.9
+        - 10
+        version: 0.2.10
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rails3_artifactor
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -167,10 +182,10 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 3
-        version: 0.2.3
+        - 4
+        version: 0.2.4
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 description: RSpec 2 library to facilitate creating generator specs
 email: kmandrup@gmail.com
 executables: []
@@ -201,6 +216,8 @@ files:
 - lib/generator-spec/rspec/generator/test_case.rb
 - lib/generator-spec/rspec/macro.rb
 - lib/generator-spec/rspec/matchers/generate_artifact.rb
+- lib/generator-spec/rspec/matchers/generate_artifact_file.rb
+- lib/generator-spec/rspec/matchers/generate_artifact_files.rb
 - lib/generator-spec/rspec/matchers/generate_artifacts.rb
 - lib/generators/controller/controller_generator.rb
 - lib/generators/helper/helper_generator.rb
@@ -209,15 +226,19 @@ files:
 - lib/generators/model/model_generator.rb
 - lib/generators/observer/observer_generator.rb
 - lib/generators/view/view_generator.rb
+- rails_generator.log
 - spec/generator_spec/generators/controller_gen_spec.rb
 - spec/generator_spec/generators/helper_gen_spec.rb
 - spec/generator_spec/generators/migration_gen_spec.rb
 - spec/generator_spec/generators/model_gen_spec.rb
 - spec/generator_spec/generators/observer_gen_spec.rb
 - spec/generator_spec/generators/view_gen_spec.rb
+- spec/generator_spec/matchers/generate_artifact_file_spec.rb
+- spec/generator_spec/matchers/generate_artifact_files_spec.rb
 - spec/generator_spec/matchers/generate_artifact_spec.rb
 - spec/generator_spec/matchers/generate_artifacts_spec.rb
 - spec/spec_helper.rb
+- tmp/rails_app/config/routes.rb
 - wiki/Custom Rails 3 Generators.textile
 - wiki/content_matchers.textile
 - wiki/file_matchers.textile
@@ -262,6 +283,8 @@ test_files:
 - spec/generator_spec/generators/model_gen_spec.rb
 - spec/generator_spec/generators/observer_gen_spec.rb
 - spec/generator_spec/generators/view_gen_spec.rb
+- spec/generator_spec/matchers/generate_artifact_file_spec.rb
+- spec/generator_spec/matchers/generate_artifact_files_spec.rb
 - spec/generator_spec/matchers/generate_artifact_spec.rb
 - spec/generator_spec/matchers/generate_artifacts_spec.rb
 - spec/spec_helper.rb