rails-app-spec 0.2.0 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.3

data/lib/rails-app-spec.rb

@@ -1,28 +1,12 @@
 require 'rspec'
+require 'rails3_artifactor'
 require 'rails3_assist'
 require 'require_all'
 require 'code-spec'
+require 'active_support/inflector'
 require 'file-spec'
 
-module RSpec
-  module RailsApp      
-    module Artifact
-    end
-
-    module ArtifactClass
-    end
-
-    module ArtifactFile
-    end
-
-    module File
-    end
-
-    module Dir
-    end
-  end
-end
-
+require 'rails_app_spec/namespaces'
 require_all File.dirname(__FILE__) + '/rails_app_spec/matchers'
                    
 RSpec.configure do |config|

data/lib/rails_app_spec/matchers/artifact/class/have_artifact_subclass.rb

@@ -22,7 +22,7 @@ module RSpec::RailsApp::ArtifactClass
 #    alias_method :be_observer_class, :have_observer_class
 
     def have_mailer_class klass   
-      have_artifact_subclass klass, 'ActionMailer::Base'
+      have_artifact_subclass klass, 'ActionMailer::Base', :mailer
     end      
 #    alias_method :be_mailer_class, :have_mailer_class
 

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

@@ -4,11 +4,11 @@ module RSpec::RailsApp::Artifact
   module Matchers
     class HaveArtifact < RSpec::RubyContentMatcher
       
-      include ::Rails::Assist::App
+      # include ::Rails3::Assist::Directory
 
-      include Rails::Migration::Assist::ClassMethods
-      include ::Rails::Assist::BaseHelper::FileName
-      include ::Rails::Assist::Migration::FileName
+      # include Rails::Migration::Assist::ClassMethods
+      include Rails3::Assist::Artifact::FileName
+      # include ::Rails3::Assist::Migration::FileName
     
       attr_accessor :artifact_type, :artifact_name, :class_type, :content       
       # class      
@@ -17,6 +17,8 @@ module RSpec::RailsApp::Artifact
       attr_accessor :superclass
 
       attr_accessor :folder, :action, :view_ext
+      
+      attr_accessor :artifact_found
 
       SUPERCLASS_MAP = {
         :observer   => 'ActiveRecord::Observer', 
@@ -24,7 +26,7 @@ module RSpec::RailsApp::Artifact
         :migration  => 'ActiveRecord::Migration'
         }
 
-      POSTFIX = [:helper, :observer, :controller]
+      POSTFIX = [:helper, :observer, :controller, :mailer]
 
       def has_postfix? key
         POSTFIX.include? key
@@ -33,6 +35,8 @@ module RSpec::RailsApp::Artifact
       def initialize(name, artifact_type)
         self.artifact_type = artifact_type
 
+        extend "Rails3::Assist::Artifact::#{artifact_type.to_s.camelize}".constantize
+
         if name.kind_of? Hash                  
           view_options  = name
           self.folder   = view_options[:folder]
@@ -64,22 +68,38 @@ module RSpec::RailsApp::Artifact
         end
       end
 
-      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
+      def matches?(root_path, &block)
+        @root_path = root_path
+        artifact_found = case artifact_type
+        when :view                                           
+          find_view_method = "#{artifact_type}_file_name"
+          File.expand_path(send find_view_method, folder, action, view_ext, :root_path => root_path)          
+        else                                                     
+          find_existing_artifact_method = "existing_#{artifact_type}_file"
+          if respond_to? find_existing_artifact_method
+            begin
+              send find_existing_artifact_method, artifact_name, artifact_type, :root_path => root_path 
+            rescue Exception => e 
+              @error_msg = e.message
+              @trace = e.backtrace.join "\n"
+              nil
+            end
+          else
+            raise "The method ##{find_existing_artifact_method} to find the artifact was not available"
+          end
+        end
+        if !artifact_found
+          self.artifact_found = '[unknown]'
+          return nil
         end
 
-        self.artifact_name = File.expand_path(artifact_name)
-        
-        @file_found = File.file?(artifact_name)
+        @file_found = File.file?(artifact_found)
         return nil if !@file_found
 
+        artifact_found = File.expand_path(artifact_found)        
+
         # check file content for class or subclass
-        self.content = File.read(artifact_name) 
+        self.content = File.read(artifact_found) 
         
         if artifact_type == :view
           yield content if block
@@ -117,13 +137,13 @@ module RSpec::RailsApp::Artifact
       end
   
       def failure_message        
-        return "Expected the #{type} #{artifact_name} to exist, but it didn't" if !@file_found
+        return "Expected the #{artifact_type} #{artifact_name} to exist at #{artifact_found} (root = #{@root_path}), but it didn't.\nError: #{@error_msg}.\n\nTrace:\n #{@trace}" if !@file_found
         puts "Content: #{content}"
         "Expected the file: #{artifact_name} to have a #{artifact_type} class. The class should #{should_be_msg}"        
       end
 
       def negative_failure_message
-        return "Did not expect the #{type} #{artifact_name} to exist, but it did" if !@file_found
+        return "Did not expect the #{artifact_type} #{artifact_name} to exist at #{artifact_found}, but it did" if !@file_found
         puts "Content: #{content}"        
         "Did not expected the file: #{artifact_name} to have a #{artifact_type} class. The class should not #{should_be_msg}"                
       end    
@@ -134,7 +154,7 @@ module RSpec::RailsApp::Artifact
     end
     alias_method :contain_artifact, :have_artifact
     
-    (::Rails::Assist.artifacts - [:view]).each do |name|
+    (::Rails3::Assist.artifacts - [:view]).each do |name|
       class_eval %{
         def have_#{name} relative
           have_artifact relative, :#{name}

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

@@ -1,11 +1,10 @@
 module RSpec::RailsApp::ArtifactFile  
   module Matchers
-    include ::Rails::Assist::App
     
-    (::Rails::Assist.artifacts - [:view]).each do |name|
+    (::Rails3::Assist.artifacts - [:view]).each do |name|
       class_eval %{
         def have_#{name}_file relative
-          have_rails_file relative, :#{name}
+          have_rails_artifact_file relative, :#{name}
         end
         alias_method :contain_#{name}_file, :have_#{name}_file
       }

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

@@ -0,0 +1,68 @@
+module RSpec::RailsApp::ArtifactFile
+  module Matchers
+    class HaveRailsArtifactFile
+
+      # include Rails::Migration::Assist::ClassMethods
+      include ::Rails3::Assist::Artifact::FileName
+      # include ::Rails::Assist::Migration::FileName
+    
+      attr_accessor :name, :artifact_type, :artifact_name
+
+      attr_accessor :folder, :action, :view_ext
+
+      def initialize(name, artifact_type = nil)
+        self.artifact_type = artifact_type
+
+        extend "Rails3::Assist::Artifact::#{artifact_type.to_s.camelize}".constantize
+        
+        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?(root_path, &block)
+        self.artifact_name = case artifact_type
+        when :view                                           
+          find_view_method = "#{artifact_type}_file_name"
+          File.expand_path(send find_view_method, folder, action, view_ext, :root_path => root_path)          
+        else                                                     
+          find_existing_artifact_method = "existing_#{artifact_type}_file"
+          if respond_to? find_existing_artifact_method
+            send find_existing_artifact_method, artifact_name, artifact_type, :root_path => root_path 
+          else
+            raise "The method ##{find_existing_artifact_method} to find the artifact was not available"
+          end
+        end                    
+          
+        # puts "artifact_name: #{artifact_name}"
+
+        match = File.file? artifact_name      
+        if block && match
+          yield File.read(artifact_name)
+        end
+        match        
+      end          
+  
+      def failure_message
+        "Expected the #{artifact_type} #{artifact_name} to exist, but it didn't"
+      end
+
+      def negative_failure_message
+        "Did not expect the #{artifact_type} #{artifact_name} to exist, but it did"
+      end
+    
+    end
+
+    def have_rails_artifact_file(relative, artifact_type = nil)
+      HaveRailsArtifactFile.new(relative, artifact_type)
+    end
+    alias_method :contain_rails_artifact_file, :have_rails_artifact_file
+  end
+end
+

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

@@ -1,7 +1,6 @@
 module RSpec::RailsApp::Dir
   module Matchers    
     class HaveRailsDir    
-      include ::Rails::Assist::App
     
       attr_accessor :dir, :type
 
@@ -27,7 +26,7 @@ module RSpec::RailsApp::Dir
       HaveRailsDir.new(type)
     end
 
-    ::Rails::Assist::App::RailsDirs.root_directories.each do |name|
+    ::Rails3::Assist::Directory::Root.root_directories.each do |name|
       class_eval %{
         def have_#{name}_dir
           have_rails_dir :#{name}
@@ -35,7 +34,7 @@ module RSpec::RailsApp::Dir
       }
     end
 
-    ::Rails::Assist::App::RailsDirs.app_directories.each do |name|
+    ::Rails3::Assist::Directory::App.app_directories.each do |name|
       class_eval %{
         def have_#{name}_dir
           have_rails_dir :#{name}

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

@@ -1,62 +1,47 @@
 module RSpec::RailsApp::File
-  module Matchers
+  module Matchers    
     class HaveRailsFile
-      include ::Rails::Assist::App
-
-      include Rails::Migration::Assist::ClassMethods
-      include ::Rails::Assist::BaseHelper::FileName
-      include ::Rails::Assist::Migration::FileName
+      include ::Rails3::Assist::Artifact
     
-      attr_accessor :name, :artifact_type, :artifact_name
-
-      attr_accessor :folder, :action, :view_ext
+      attr_reader :file, :type, :name
 
-      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
+      def initialize(name, type = nil)
+        @type = type if type
+        @name = name
       end
 
-      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
-
-        # puts "artifact_name: #{artifact_name}"
-
-        match = File.file? artifact_name      
-        if block && match
-          yield File.read(artifact_name)
-        end
-        match        
+      def matches?(obj, &block)
+        @file = type ? send(:"#{type}_file", name) : send(:"#{name}_file")
+        File.file? file
       end          
   
       def failure_message
-        "Expected the #{artifact_type} #{artifact_name} to exist, but it didn't"
+        "Expected Rails app to have file: #{file}, but it didn't"
       end
 
       def negative_failure_message
-        "Did not expect the #{artifact_type} #{artifact_name} to exist, but it did"
-      end
-    
+        "Did not expected Rails app to have file: #{file}, but it did"
+      end   
     end
 
-    def have_rails_file(relative, artifact_type = nil)
-      HaveRailsFile.new(relative, artifact_type)
+    def have_rails_file(type = nil)
+      HaveRailsFile.new(type)
+    end
+
+    [:initializer, :db, :migration, :locale, :javascript, :stylesheet].each do |name|
+      class_eval %{
+        def have_#{name}_file name
+          have_rails_file name, :#{name}
+        end    
+      }
     end
-    alias_method :contain_rails_file, :have_rails_file
-  end
-end
 
+    [:application, :seed, :environment].each do |name|
+      class_eval %{
+        def have_#{name}_file
+          have_rails_file #{name}
+        end    
+      }
+    end
+  end
+end

data/lib/rails_app_spec/namespaces.rb

@@ -0,0 +1,5 @@
+module RSpec
+  module RailsApp      
+    modules :artifact, :artifact_class, :artifact_file, :file, :dir
+  end
+end

data/rails-app-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-app-spec}
-  s.version = "0.2.0"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-20}
+  s.date = %q{2010-09-11}
   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 = [
@@ -29,8 +29,10 @@ Gem::Specification.new do |s|
      "lib/rails_app_spec/matchers/artifact/class/have_artifact_subclass.rb",
      "lib/rails_app_spec/matchers/artifact/have_artifact.rb",
      "lib/rails_app_spec/matchers/artifact/have_artifact_file.rb",
+     "lib/rails_app_spec/matchers/artifact/have_rails_artifact_file.rb",
      "lib/rails_app_spec/matchers/file/have_rails_dir.rb",
      "lib/rails_app_spec/matchers/file/have_rails_file.rb",
+     "lib/rails_app_spec/namespaces.rb",
      "rails-app-spec.gemspec",
      "sandbox/dir_logic.rb",
      "sandbox/file_logic.rb",
@@ -38,7 +40,8 @@ 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/migration/migration_simple_number_spec.rb",
+     "spec/rails_app_spec/matchers/artifact/migration/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",
@@ -56,7 +59,8 @@ 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/migration/migration_simple_number_spec.rb",
+     "spec/rails_app_spec/matchers/artifact/migration/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/controller_spec.rb

@@ -1,7 +1,9 @@
 require 'spec_helper'
 
+root_dir = Rails3::Assist::Directory.rails_root
+
 describe 'controller' do
-  use_helpers :app, :controller
+  use_helper :controller
   
   before :each do              
     create_empty_tmp :controller    
@@ -16,6 +18,10 @@ describe 'controller' do
   after :each do              
     remove_controller :account
   end
+
+  it "should not have an person controller file" do      
+    root_dir.should_not have_controller :person
+  end
     
   it "should have an account_controller file that contains an AccountController class with an index method inside" do      
     root_dir.should have_controller :account do |content|

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

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+root_dir = Rails3::Assist::Directory.rails_root
+
 describe 'rails helper' do
   use_helper :helper
 

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

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+root_dir = Rails3::Assist::Directory.rails_root
+
 describe 'mailer helper' do
   load_helper :mailer
 
@@ -13,7 +15,7 @@ describe 'mailer helper' do
   end
 
   after :each do              
-    remove_mailer :account
+    # remove_mailer :account
   end
     
   it "should have an account mailer file with a mail_it! method inside" do      

data/spec/rails_app_spec/matchers/artifact/{migration_spec.rb → migration/migration_simple_number_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-Rails::Migration::Assist.orm = :active_record
+# Rails::Migration::Assist.orm = :active_record
 
 describe 'migration' do 
   # use_orm :active_record
@@ -12,17 +12,20 @@ describe 'migration' do
     create_migration :create_account do
       %q{  def self.up
   end
-
+  
   def self.down
   end}
     end    
   end
 
   after :each do              
-    # remove_migration :create_account
+    remove_migration :create_account
   end
     
   it "should have an create_account_migration file that contains an index method and two inserted comments" do
+    existing_migration_file_name = existing_file_name :create_account, :migration
+    FileUtils.mv existing_migration_file_name, existing_migration_file_name.gsub(/\d+_/, '001_')
+
     insert_into_migration :create_account, :content => '# hello'
     insert_into_migration :create_account do
       '# goodbye'
@@ -30,14 +33,14 @@ describe 'migration' do
     read_migration(:create_account).should have_comment 'hello'
     puts read_migration(:create_account)
 
-    puts migration_file_name :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
+    root_dir.should have_migration :create_account do |migration_file|
+      migration_file.should have_class_method :up
+      migration_file.should have_comment 'hello'
+      migration_file.should have_comment 'goodbye'
+    end
   end
 end

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

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+Rails::Migration::Assist.orm = :active_record
+
+root_dir = Rails::Migration::Assist.rails_root_dir
+
+describe 'migration' do 
+  use_orm :active_record
+  use_helper :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
+    existing_file_name :create_account, :migration
+
+    root_dir.should_not have_migration :create_creative_accounting
+
+    # root_dir.should have_migration :create_creative_accounting
+
+    root_dir.should have_migration :create_account
+
+    root_dir.should have_migration :create_account do |migration_file|
+      migration_file.should have_class_method :up
+      migration_file.should have_comment 'hello'
+      migration_file.should have_comment 'goodbye'
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+root_dir = Rails3::Assist::Directory.rails_root
+
 describe 'observer helper' do
   use_helper :observer
 

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ require 'rails-app-spec'
 
 RSpec.configure do |config| 
   config.before do                                         
-    Rails::Assist::App.rails_root_dir = temp_dir('tmp_rails')
+    Rails3::Assist::Directory.rails_root = temp_dir('tmp_rails')
   end
 
   config.after do
@@ -28,4 +28,4 @@ end
 
 def remove_temp_dir name   
   FileUtils.rm_rf temp_dir(name)
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +02:00
+date: 2010-09-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,8 +116,10 @@ files:
 - lib/rails_app_spec/matchers/artifact/class/have_artifact_subclass.rb
 - lib/rails_app_spec/matchers/artifact/have_artifact.rb
 - lib/rails_app_spec/matchers/artifact/have_artifact_file.rb
+- lib/rails_app_spec/matchers/artifact/have_rails_artifact_file.rb
 - lib/rails_app_spec/matchers/file/have_rails_dir.rb
 - lib/rails_app_spec/matchers/file/have_rails_file.rb
+- lib/rails_app_spec/namespaces.rb
 - rails-app-spec.gemspec
 - sandbox/dir_logic.rb
 - sandbox/file_logic.rb
@@ -125,7 +127,8 @@ 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/migration/migration_simple_number_spec.rb
+- spec/rails_app_spec/matchers/artifact/migration/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
@@ -169,7 +172,8 @@ 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/migration/migration_simple_number_spec.rb
+- spec/rails_app_spec/matchers/artifact/migration/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