generator-spec 0.4.8 → 0.5.0

data/lib/generator_spec/rails_helpers/rails_view.rb

@@ -1,18 +1,15 @@
 module RSpec::Rails
   module View
-    include RSpec::Rails::App    
+    include RSpec::Rails::BaseHelper
     
-    def create_view name, action='show', *args, &block
-      type, content = parse_args(*args)
-      file = view_file_name(name, action, type)
-
-      # make dir
-      unless File.exist?(file)    
-        FileUtils.mkdir_p File.dirname(file)
-      end       
-
+    # CREATE
+    def create_view name, options = {}, &block
+      file = view_file_name(name, options[:action], options[:type])
+      dir = File.dirname(file)
+      FileUtils.mkdir_p dir if !File.directory?(dir)
+      content = options[:content]
       # set content to block
-      content = yield if block
+      content ||= yield if block
 
       # abort if no content given
       return if !content    
@@ -23,29 +20,46 @@ module RSpec::Rails
       end
     end  
 
-    def parse_args *args
-      type='html.erb'
-      content=nil       
-      if args && args[0]
-        case args[0]
-        when String
-          content = args[0]
-        when Symbol
-          type = args[0]
-          content = args[1] if args.size > 1
-        end
-      end
-      [type, content]
+    # READ
+    def read_view(name, options = {}, &block)
+      file_name = view_file_name(name, options[:action], options[:type])
+      debug "reading from: #{file_name}"
+      content = File.new(file_name).try :read
+      debug "read content: #{content}"
+      yield content if block
+      content
+    end
+    
+
+    # UPDATE
+    def insert_into_view(name, options = {}, &block)
+      debug "insert_into_view: #{options}"
+      file = view_file_name(name, options[:action], options[:type])
+      debug "file insertion (view): #{file}"
+      marker = options[:before] || options[:after]
+      file_insertion(file, marker, options, &block) if marker
     end
+    alias_method :update_view, :insert_into_view
 
-    def remove_view name, action='show', type='html.erb'
+    # DELETE
+    def remove_view name, action=nil, type=nil
       file = view_file_name(name, action, type)
       FileUtils.rm_f(file) if File.exist?(file)
     end
+    alias_method :delete_view, :remove_view
+
+    def get_action action
+      action || 'show'
+    end
+
+    def get_type type
+      type || 'html.erb'
+    end
     
-    def view_file_name name, action='show', type='html.erb'
-      File.join(view_dir, name.to_s, "#{action}.#{type}")
+    def view_file_name name, action=nil, type=nil
+      File.join(view_dir, name.to_s, "#{get_action action}.#{get_type type}")
     end        
-    
+
+    aliases_for :view 
   end
 end

data/spec/generator_spec/matchers/content/have_call_spec.rb

@@ -33,6 +33,22 @@ describe 'method call matcher' do
       end
     end
   end  
+  context "class User with call role_strategy" do    
+    clazz = %q{
+  class User < ActiveRecord::Base  
+    include RoleModels::Generic 
+    role_strategy :admin_flag
+
+    roles :admin,:user
+
+          end}
+
+    it "should have call to role_strategy with args :admin_flag" do            
+      call.should have_call :role_strategy, :args => ':admin_flag' do |content|
+        puts "content: #{content}"
+      end
+    end
+  end
 end
 
 

data/spec/generator_spec/matchers/rails/controller_matcher_spec.rb

@@ -1,9 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'controller' do
-  include RSpec::Rails::Controller 
-
+  load_helper :controller
+  
   before :each do              
+    create_empty_tmp :controller    
     create_controller :account do
       %q{
         def index

data/spec/generator_spec/matchers/rails/helper_matcher_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'rails helper' do
-  include RSpec::Rails::Helper
+  load_helper :helper
 
   before :each do              
     create_helper :account do

data/spec/generator_spec/matchers/rails/mailer_matcher_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'mailer helper' do
-  include RSpec::Rails::Mailer
+  load_helper :mailer
 
   before :each do              
     create_mailer :account do

data/spec/generator_spec/matchers/rails/model_matcher_spec.rb

@@ -1,10 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'model helper' do
-  include RSpec::Rails::Orm::ActiveRecord  
+  use_orm :active_record  
 
   before :each do              
-    create_model :account
+    create_model :account, :content => '# hello'
   end
 
   after :each do              
@@ -19,9 +19,9 @@ describe 'model helper' do
 end
 
 describe 'model helper - no ORM helper' do
-  include RSpec::Rails::Model  
+  load_helper :model
 
-  after :each do              
+  before :each do              
     remove_model :account
   end
     

data/spec/generator_spec/matchers/rails/observer_matcher_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'observer helper' do
-  include RSpec::Rails::Observer
+  load_helper :observer
 
   before :each do              
     create_observer :account

data/spec/generator_spec/matchers/rails/view_matcher_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe 'rails view helper' do
-  include RSpec::Rails::View
+  load_helper :view
 
   before :each do              
     create_view :account, :edit do

data/spec/generator_spec/rails_helpers/rails_controller_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe 'controller' do
+  helpers :controller
+
+  before :each do              
+    remove_controller :account        
+    create_controller :account do
+      %q{
+        def index
+        end
+      }
+    end    
+  end
+
+  after :each do              
+    # remove_controller :account
+  end
+    
+  it "should have an account_controller file that contains an index method and two inserted comments" do
+    insert_into_controller :account, :content => '# hello'
+    insert_into_controller :account do
+      '# goodbye'
+    end
+    read_controller(:account).should have_comment 'hello'
+
+    Rails.application.should have_controller :account do |controller_file|
+      controller_file.should have_method :index
+      controller_file.should have_comment 'hello'
+      controller_file.should have_comment 'goodbye'
+    end
+  end
+end

data/spec/generator_spec/rails_helpers/rails_helper_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe 'helper' do
+  helpers :helper
+
+  before :each do              
+    remove_helper :account        
+    create_helper :account do
+      %q{
+        def index
+        end
+      }
+    end    
+  end
+
+  after :each do              
+    # remove_helper :account
+  end
+    
+  it "should have an account_helper file that contains an index method and two inserted comments" do
+    insert_into_helper :account, :content => '# hello'
+    insert_into_helper :account do
+      '# goodbye'
+    end
+    read_helper(:account).should have_comment 'hello'
+
+    Rails.application.should have_helper :account do |helper_file|
+      helper_file.should have_method :index
+      helper_file.should have_comment 'hello'
+      helper_file.should have_comment 'goodbye'
+    end
+  end
+end

data/spec/generator_spec/rails_helpers/rails_mailer_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe 'mailer' do
+  load_helper :mailer
+
+  before :each do              
+    remove_mailer :account        
+    create_mailer :account do
+      %q{
+        def index
+        end
+      }
+    end    
+  end
+
+  after :each do              
+    # remove_mailer :account
+  end
+    
+  it "should have an account_mailer file that contains an index method and two inserted comments" do
+    insert_into_mailer :account, :content => '# hello'
+    insert_into_mailer :account do
+      '# goodbye'
+    end
+    read_mailer(:account).should have_comment 'hello'
+
+    Rails.application.should have_mailer :account do |mailer_file|
+      mailer_file.should have_method :index
+      mailer_file.should have_comment 'hello'
+      mailer_file.should have_comment 'goodbye'
+    end
+  end
+end

data/spec/generator_spec/rails_helpers/rails_model_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe 'model' do
+  use_orm :active_record
+
+  before :each do              
+    remove_model :account        
+    create_model :account do
+      %q{  def index
+  end}
+    end    
+  end
+
+  after :each do              
+    # remove_model :account
+  end
+    
+  it "should have an account_model file that contains an index method and two inserted comments" do
+    insert_into_model :account, :content => '# hello'
+    insert_into_model :account do
+      '# goodbye'
+    end
+    read_model(:account).should have_comment 'hello'
+
+    Rails.application.should have_model :account do |model_file|
+      model_file.should have_method :index
+      model_file.should have_comment 'hello'
+      model_file.should have_comment 'goodbye'
+    end
+  end
+end

data/spec/generator_spec/rails_helpers/rails_observer_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe 'observer' do
+  load_helper :observer
+
+  before :each do              
+    remove_observer :account        
+    create_observer :account do
+      %q{
+        def index
+        end
+      }
+    end    
+  end
+
+  after :each do              
+    # remove_observer :account
+  end
+    
+  it "should have an account_observer file that contains an index method and two inserted comments" do
+    insert_into_observer :account, :content => '# hello'
+    insert_into_observer :account do
+      '# goodbye'
+    end
+    read_observer(:account).should have_comment 'hello'
+
+    Rails.application.should have_observer :account do |observer_file|
+      observer_file.should have_method :index
+      observer_file.should have_comment 'hello'
+      observer_file.should have_comment 'goodbye'
+    end
+  end
+end

data/spec/generator_spec/rails_helpers/rails_view_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe 'view' do
+  load_helper :view
+
+  before :each do              
+    remove_view :account        
+    create_view :account do
+      %q{  def index
+  end}
+    end    
+  end
+
+  after :each do              
+    # remove_view :account
+  end
+    
+  it "should have an account_view file that contains an index method and two inserted comments" do
+    insert_into_view :account, :content => '# hello', :before => 'def'
+    insert_into_view :account, :before => 'def' do
+      '# goodbye'
+    end
+    read_view(:account).should have_comment 'hello'
+
+    Rails.application.should have_view :account do |view_file|
+      view_file.should have_method :index
+      view_file.should have_comment 'hello'
+      view_file.should have_comment 'goodbye'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'rspec/autorun'
 require 'generator_spec'
 
 RSpec::Generator.configure do |config|
-  config.debug = true
+  config.debug = false
   config.remove_temp_dir = true
   config.default_rails_root(__FILE__) 
   config.lib = File.dirname(__FILE__) + '/../lib'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 8
-  version: 0.4.8
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +02:00
+date: 2010-08-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -140,6 +140,7 @@ files:
 - lib/generator_spec/matchers/content/have_call.rb
 - lib/generator_spec/matchers/content/have_calls.rb
 - lib/generator_spec/matchers/content/have_class_self.rb
+- lib/generator_spec/matchers/content/have_comment.rb
 - lib/generator_spec/matchers/content/have_method.rb
 - lib/generator_spec/matchers/content/have_module.rb
 - lib/generator_spec/matchers/content/have_region.rb
@@ -158,6 +159,7 @@ files:
 - lib/generator_spec/matchers/migration/have_table.rb
 - lib/generator_spec/matchers/migration/have_tbl_column.rb
 - lib/generator_spec/matchers/migration/have_up_down.rb
+- lib/generator_spec/rails_helpers/base_helper.rb
 - lib/generator_spec/rails_helpers/rails_app.rb
 - lib/generator_spec/rails_helpers/rails_controller.rb
 - lib/generator_spec/rails_helpers/rails_helper.rb