rails-app-spec 0.2.13 → 0.2.14

data/Rakefile

@@ -2,8 +2,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "rails-app-spec"
-    gem.summary = %Q{RSpec 2 matchers to spec the structure of your Rails 3 app}
-    gem.description = %Q{RSpec 2 matchers to spec the structure of your Rails 3 app}
+    gem.summary = %Q{Spec the structure of your Rails 3 app}
+    gem.description = %Q{RSpec 2 matchers to help spec the structure and content of your Rails 3 app}
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/rails-app-spec"
     gem.authors = ["Kristian Mandrup"]

data/VERSION

@@ -1 +1 @@
-0.2.13
+0.2.14

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

@@ -23,7 +23,7 @@ module RSpec::RailsApp::Artifact
           return nil if !artifact_found
 
           # check file content for class or subclass
-          self.content = File.read(artifact_found) 
+          @content = File.read(artifact_found) 
         
           if artifact_type == :view
             yield content if block

data/lib/rails_app_spec/matchers/artifact/shared/artifact_helper.rb

@@ -30,17 +30,16 @@ module Artifact::Matcher
     def parse_type artifact_type
       @artifact_type = artifact_type      
       @postfix = artifact_type.to_s.camelize if has_postfix? artifact_type  
+      @type = :class
       case artifact_type       
       when :helper, :controller
         # artifact class check 
-        @class_type = :class
-        @type = :class                          
+        @class_type = :class                                  
       when :observer, :migration, :mailer, :permit
         @class_type = :subclass
         # artifact subclass check
         @superclass = SUPERCLASS_MAP[artifact_type]        
       when :model
-        # check class == name
         @class_type = :class        
       end
     end
@@ -123,13 +122,13 @@ module Artifact::Matcher
     def failure_message        
       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}"        
+      "Expected the #{artifact_name} file at: #{artifact_found} to have a #{artifact_type} class. The class should #{should_be_msg}. RegExp: #{main_expr}"        
     end
 
     def negative_failure_message
       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}"                
+      "Did not expected #{artifact_name} at file: #{artifact_found} to have a #{artifact_type} class. The class should not #{should_be_msg}. RegExp: #{main_expr}"                
     end    
   end
 end

data/rails-app-spec.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-app-spec}
-  s.version = "0.2.13"
+  s.version = "0.2.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
   s.date = %q{2010-09-20}
-  s.description = %q{RSpec 2 matchers to spec the structure of your Rails 3 app}
+  s.description = %q{RSpec 2 matchers to help spec the structure and content of your Rails 3 app}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -71,7 +71,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{RSpec 2 matchers to spec the structure of your Rails 3 app}
+  s.summary = %q{Spec the structure of your Rails 3 app}
   s.test_files = [
     "spec/rails_app_spec/matchers/artifact/controller_spec.rb",
      "spec/rails_app_spec/matchers/artifact/core/have_artifacts_spec.rb",
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
      "spec/rails_app_spec/matchers/artifact/mailer_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_mongoid_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/core/have_artifacts_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 root_dir = Rails3::Assist::Directory.rails_root
 
 describe 'controller' do
+  use_orm :none
   use_helpers :controller, :app
   
   before :each do              
@@ -19,25 +20,32 @@ describe 'controller' do
     remove_controllers :account, :person
   end
 
-  # it "should not have :controller artifact :person" do      
-  #   root_dir.should_not have_artifact :person, :controller
-  # end
-  #   
-  # it "should have an account_controller file that contains an AccountController class with an index method inside" do      
-  #   root_dir.should have_artifact :account, :controller do |content|
-  #     content.should have_method :index
-  #   end
-  # 
-  #   create_controller :person do
-  #     %q{
-  #       def index
-  #       end
-  #     }
-  #   end    
-  # 
-  #   root_dir.should have_artifacts :controller, :account, :person
-  #   root_dir.should have_artifacts :controller, [:account, :person]
-  # end
+  it "should not have :controller artifact :person" do      
+    root_dir.should_not have_artifact :person, :controller
+  end
+
+  it "should have model" do
+    create_model :user
+    root_dir.should have_artifact :user, :model 
+    puts read_model :user
+    root_dir.should have_model :user
+  end
+    
+  it "should have an account_controller file that contains an AccountController class with an index method inside" do      
+    root_dir.should have_artifact :account, :controller do |content|
+      content.should have_method :index
+    end
+  
+    create_controller :person do
+      %q{
+        def index
+        end
+      }
+    end    
+  
+    root_dir.should have_artifacts :controller, :account, :person
+    root_dir.should have_artifacts :controller, [:account, :person]
+  end
   
   it "should not have :controller artifacts :account and :user" do       
     root_dir.should_not have_artifacts :controller, [:account, :user]    

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

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+root_dir = Rails3::Assist::Directory.rails_root
+
+describe 'model helper' do
+  use_orm :mongoid  
+  
+  before :each do
+    create_model :account do
+      %q{
+        # hello
+        def do_it
+        end
+      }
+    end
+
+    create_model :person, :content => '# hello'
+  end
+
+  after :each do              
+    remove_models :account, :person
+  end
+    
+  it "should have an :account model file that contains an Account class" do 
+    puts read_model :account 
+    root_dir.should have_model_file :account do |file|
+      file.should have_model_class :account
+      file.should have_comment 'hello'
+      file.should have_method :do_it
+    end
+    root_dir.should have_model :account do |clazz|
+      puts clazz
+      clazz.should have_comment 'hello'
+      clazz.should have_method :do_it
+    end
+    root_dir.should_not have_model :user    
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 13
-  version: 0.2.13
+  - 14
+  version: 0.2.14
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -156,7 +156,7 @@ dependencies:
         version: 0.2.10
   type: :runtime
   version_requirements: *id009
-description: RSpec 2 matchers to spec the structure of your Rails 3 app
+description: RSpec 2 matchers to help spec the structure and content of your Rails 3 app
 email: kmandrup@gmail.com
 executables: []
 
@@ -215,6 +215,7 @@ files:
 - spec/rails_app_spec/matchers/special/have_gem_spec.rb
 - spec/rails_app_spec/matchers/special/have_gems_spec.rb
 - spec/spec_helper.rb
+- spec/rails_app_spec/matchers/artifact/model_mongoid_spec.rb
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/rails-app-spec
 licenses: []
@@ -246,7 +247,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: RSpec 2 matchers to spec the structure of your Rails 3 app
+summary: Spec the structure of your Rails 3 app
 test_files: 
 - spec/rails_app_spec/matchers/artifact/controller_spec.rb
 - spec/rails_app_spec/matchers/artifact/core/have_artifacts_spec.rb
@@ -254,6 +255,7 @@ test_files:
 - spec/rails_app_spec/matchers/artifact/mailer_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_mongoid_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