rails-app-spec 0.1.0 → 0.2.0

data/README.markdown

@@ -4,7 +4,7 @@ RSpec 2 matchers to spec the structure of your Rails 3 app
 
 ## Install
 
-<code>gem install rails3-app-spec</code>
+<code>gem install rails-app-spec</code>
 
 ## Usage
 
@@ -12,6 +12,9 @@ See specs for details on the API.
 
 Usage example (teaser):
 <pre>
+  require 'rails3_assist'
+  require 'rails-app-spec'  
+  
   Rails.root.should have_controller :account do |content|
     content.should have_method :index
   end
@@ -24,11 +27,6 @@ Usage example (teaser):
 end  
 </pre>  
 
-## Known issues
-
-* View generation fails when action arg supplied :( To be fixed ASAP
- - rails3_assist/artifact/view.rb:7:in `[]' can't convert Symbol into Integer 
-
 ## Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/rails_app_spec/matchers/artifact/have_artifact.rb

@@ -5,6 +5,10 @@ module RSpec::RailsApp::Artifact
     class HaveArtifact < RSpec::RubyContentMatcher
       
       include ::Rails::Assist::App
+
+      include Rails::Migration::Assist::ClassMethods
+      include ::Rails::Assist::BaseHelper::FileName
+      include ::Rails::Assist::Migration::FileName
     
       attr_accessor :artifact_type, :artifact_name, :class_type, :content       
       # class      
@@ -12,6 +16,8 @@ module RSpec::RailsApp::Artifact
       # subclass
       attr_accessor :superclass
 
+      attr_accessor :folder, :action, :view_ext
+
       SUPERCLASS_MAP = {
         :observer   => 'ActiveRecord::Observer', 
         :mailer     => 'ActionMailer::Base',
@@ -25,9 +31,19 @@ module RSpec::RailsApp::Artifact
       end
 
       def initialize(name, artifact_type)
-        # artifact file
         self.artifact_type = artifact_type
+
+        if name.kind_of? Hash                  
+          view_options  = name
+          self.folder   = view_options[:folder]
+          self.action   = view_options[:action] 
+          self.view_ext = view_options[:view_ext] 
+          self.artifact_type = :view
+          return nil
+        end        
+        
         self.postfix = artifact_type.to_s.camelize if has_postfix? artifact_type
+        self.artifact_name = name.to_s.downcase
         self.name = name.to_s.camelize
         
         case artifact_type
@@ -48,13 +64,27 @@ module RSpec::RailsApp::Artifact
         end
       end
 
-      def matches?(generator, &block)
-        self.artifact_name = File.expand_path(send :"#{artifact_type}_file_name", name.downcase)
+      def matches?(generator, &block)            
+        self.artifact_name = case artifact_type
+        when :view
+          File.expand_path(send :"#{artifact_type}_file_name", folder, action, view_ext)          
+        else                     
+          found_file = send :existing_file_name, artifact_name, artifact_type if respond_to? :existing_file_name
+          # send :"#{artifact_type}_file_name", artifact_name
+        end
+
+        self.artifact_name = File.expand_path(artifact_name)
+        
         @file_found = File.file?(artifact_name)
         return nil if !@file_found
 
         # check file content for class or subclass
-        self.content = File.read(artifact_name)
+        self.content = File.read(artifact_name) 
+        
+        if artifact_type == :view
+          yield content if block
+          return true
+        end
         super content, &block     
       end          
 
@@ -81,8 +111,8 @@ module RSpec::RailsApp::Artifact
           "have the name: #{name}#{postfix} and be a subclass of: #{superclass}"
         when :class
           "have the name: #{name}#{postfix}"
-        else 
-          raise "Class type must be either :class or :subclass, was #{class_type}" 
+        else           
+          raise "Class type must be either :class or :subclass, was #{class_type}" if artifact_type != :view
         end
       end
   
@@ -111,7 +141,13 @@ module RSpec::RailsApp::Artifact
         end
         alias_method :contain_#{name}, :have_#{name}
       }
-    end    
+    end  
+    
+    def have_view folder, action=nil, view_ext=nil      
+      arg = {:folder => folder, :action => action, :view_ext => view_ext}
+      have_artifact arg, :view
+    end
+    alias_method :contain_view, :have_view
   end
 end       
 

data/lib/rails_app_spec/matchers/artifact/have_artifact_file.rb

@@ -11,8 +11,9 @@ module RSpec::RailsApp::ArtifactFile
       }
     end
     
-    def have_view_file(relative, action='show', ext='html.erb')
-      have_rails_file "#{relative}/#{action}.#{ext}", :view
+    def have_view_file folder, action= :show, view_ext='html.erb'
+      arg = {:folder => folder, :action => action, :view_ext => view_ext}
+      have_rails_file arg, :view
     end
     alias_method :contain_view_file, :have_view_file
   end

data/lib/rails_app_spec/matchers/file/have_rails_file.rb

@@ -2,16 +2,40 @@ module RSpec::RailsApp::File
   module Matchers
     class HaveRailsFile
       include ::Rails::Assist::App
+
+      include Rails::Migration::Assist::ClassMethods
+      include ::Rails::Assist::BaseHelper::FileName
+      include ::Rails::Assist::Migration::FileName
     
-      attr_accessor :name, :type, :artifact_name
+      attr_accessor :name, :artifact_type, :artifact_name
+
+      attr_accessor :folder, :action, :view_ext
 
-      def initialize(name, type = nil)
-        self.name = name
-        self.type = type
+      def initialize(name, artifact_type = nil)
+        self.artifact_type = artifact_type
+        
+        if name.kind_of? Hash                  
+          view_options  = name
+          self.folder   = view_options[:folder]
+          self.action   = view_options[:action] 
+          self.view_ext = view_options[:view_ext] 
+          self.artifact_type = :view
+          return nil
+        end        
+        self.artifact_name = name.to_s
       end
 
       def matches?(generator, &block)
-        self.artifact_name = send :"#{type}_file_name", name
+        self.artifact_name = case artifact_type
+        when :view
+          File.expand_path(send :"#{artifact_type}_file_name", folder, action, view_ext)          
+        else            
+          found_file = send :existing_file_name, artifact_name, artifact_type if respond_to? :existing_file_name
+          # send :"#{artifact_type}_file_name", artifact_name
+        end
+
+        # puts "artifact_name: #{artifact_name}"
+
         match = File.file? artifact_name      
         if block && match
           yield File.read(artifact_name)
@@ -20,17 +44,17 @@ module RSpec::RailsApp::File
       end          
   
       def failure_message
-        "Expected the #{type} #{artifact_name} to exist, but it didn't"
+        "Expected the #{artifact_type} #{artifact_name} to exist, but it didn't"
       end
 
       def negative_failure_message
-        "Did not expect the #{type} #{artifact_name} to exist, but it did"
+        "Did not expect the #{artifact_type} #{artifact_name} to exist, but it did"
       end
     
     end
 
-    def have_rails_file(relative, type = nil)
-      HaveRailsFile.new(relative, type)
+    def have_rails_file(relative, artifact_type = nil)
+      HaveRailsFile.new(relative, artifact_type)
     end
     alias_method :contain_rails_file, :have_rails_file
   end

data/rails-app-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-app-spec}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-19}
+  s.date = %q{2010-08-20}
   s.description = %q{RSpec 2 matchers to spec the structure of your Rails 3 app}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -38,13 +38,13 @@ Gem::Specification.new do |s|
      "spec/rails_app_spec/matchers/artifact/controller_spec.rb",
      "spec/rails_app_spec/matchers/artifact/helper_spec.rb",
      "spec/rails_app_spec/matchers/artifact/mailer_spec.rb",
+     "spec/rails_app_spec/matchers/artifact/migration_spec.rb",
      "spec/rails_app_spec/matchers/artifact/model_spec.rb",
      "spec/rails_app_spec/matchers/artifact/observer_spec.rb",
      "spec/rails_app_spec/matchers/artifact/view_spec.rb",
      "spec/rails_app_spec/matchers/file/have_dir_spec.rb",
      "spec/rails_app_spec/matchers/file/have_file_spec.rb",
-     "spec/spec_helper.rb",
-     "tmp_rails/app/model/account_observer.rb"
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/kristianmandrup/rails-app-spec}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
      "spec/rails_app_spec/matchers/artifact/controller_spec.rb",
      "spec/rails_app_spec/matchers/artifact/helper_spec.rb",
      "spec/rails_app_spec/matchers/artifact/mailer_spec.rb",
+     "spec/rails_app_spec/matchers/artifact/migration_spec.rb",
      "spec/rails_app_spec/matchers/artifact/model_spec.rb",
      "spec/rails_app_spec/matchers/artifact/observer_spec.rb",
      "spec/rails_app_spec/matchers/artifact/view_spec.rb",

data/spec/rails_app_spec/matchers/artifact/helper_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+require 'spec_helper'
 
 describe 'rails helper' do
   use_helper :helper

data/spec/rails_app_spec/matchers/artifact/mailer_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+require 'spec_helper'
 
 describe 'mailer helper' do
   load_helper :mailer

data/spec/rails_app_spec/matchers/artifact/migration_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+Rails::Migration::Assist.orm = :active_record
+
+describe 'migration' do 
+  # use_orm :active_record
+  use_helpers :app, :migration
+
+  before :each do              
+    remove_migration :create_account        
+    
+    create_migration :create_account do
+      %q{  def self.up
+  end
+
+  def self.down
+  end}
+    end    
+  end
+
+  after :each do              
+    # remove_migration :create_account
+  end
+    
+  it "should have an create_account_migration file that contains an index method and two inserted comments" do
+    insert_into_migration :create_account, :content => '# hello'
+    insert_into_migration :create_account do
+      '# goodbye'
+    end
+    read_migration(:create_account).should have_comment 'hello'
+    puts read_migration(:create_account)
+
+    puts migration_file_name :create_account
+
+    root_dir.should have_migration :create_account
+
+    # root_dir.should have_migration :create_account do |migration_file|
+    #   migration_file.should have_method :index
+    #   migration_file.should have_comment 'hello'
+    #   migration_file.should have_comment 'goodbye'
+    # end
+  end
+end

data/spec/rails_app_spec/matchers/artifact/model_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+require 'spec_helper'
 
 describe 'model helper' do
   use_orm :active_record  

data/spec/rails_app_spec/matchers/artifact/observer_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+require 'spec_helper'
 
 describe 'observer helper' do
   use_helper :observer

data/spec/rails_app_spec/matchers/artifact/view_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
+require 'spec_helper'
 
 describe 'rails view helper' do
   use_helper :view
 
-  before :each do              
+  before do              
     create_view :account, :edit do
       %q{
         <h1><%= title %></h1>
@@ -11,17 +11,23 @@ describe 'rails view helper' do
     end    
   end
 
-  after :each do              
-    remove_view :account, :edit
+  after do              
+    # remove_view :account, :edit
   end
-    
-  it "should have an account/edit view file that displays a title" do      
-    root_dir.should have_view_file :account, :edit do |file|
-      file.should match /<%=\s*title\s*%>/
-    end
 
-    root_dir.should have_view :account, :edit do |klass|
-      file.should match /<%=\s*title\s*%>/
+  describe '#have_view' do
+    it "should have an account/edit view file that displays a title" do      
+      root_dir.should have_view :account, :edit do |klass|
+        klass.should match /<%=\s*title\s*%>/
+      end
+    end
+  end
+  
+  describe '#have_view_file' do
+    it "should have an account/edit view file that displays a title" do          
+      root_dir.should have_view_file :account, :edit do |file|
+        file.should match /<%=\s*title\s*%>/
+      end    
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'rspec'
 require 'rspec/autorun'
-require 'rails3_assist'
 require 'rails-app-spec'
 
 RSpec.configure do |config| 
@@ -9,7 +8,7 @@ RSpec.configure do |config|
   end
 
   config.after do
-    # remove_temp_dir 'tmp_rails'
+    remove_temp_dir 'tmp_rails'
   end
    
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +02:00
+date: 2010-08-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,13 +125,13 @@ files:
 - spec/rails_app_spec/matchers/artifact/controller_spec.rb
 - spec/rails_app_spec/matchers/artifact/helper_spec.rb
 - spec/rails_app_spec/matchers/artifact/mailer_spec.rb
+- spec/rails_app_spec/matchers/artifact/migration_spec.rb
 - spec/rails_app_spec/matchers/artifact/model_spec.rb
 - spec/rails_app_spec/matchers/artifact/observer_spec.rb
 - spec/rails_app_spec/matchers/artifact/view_spec.rb
 - spec/rails_app_spec/matchers/file/have_dir_spec.rb
 - spec/rails_app_spec/matchers/file/have_file_spec.rb
 - spec/spec_helper.rb
-- tmp_rails/app/model/account_observer.rb
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/rails-app-spec
 licenses: []
@@ -169,6 +169,7 @@ test_files:
 - spec/rails_app_spec/matchers/artifact/controller_spec.rb
 - spec/rails_app_spec/matchers/artifact/helper_spec.rb
 - spec/rails_app_spec/matchers/artifact/mailer_spec.rb
+- spec/rails_app_spec/matchers/artifact/migration_spec.rb
 - spec/rails_app_spec/matchers/artifact/model_spec.rb
 - spec/rails_app_spec/matchers/artifact/observer_spec.rb
 - spec/rails_app_spec/matchers/artifact/view_spec.rb

data/tmp_rails/app/model/account_observer.rb

@@ -1,3 +0,0 @@
-class AccountObserver < ActiveRecord::Observer
-  
-end