rails-app-spec 0.2.8 → 0.2.10

data/README.markdown

@@ -25,6 +25,8 @@ Usage example (teaser):
     end
   end
 
+  Rails.root.should have_view_files :edit, :new, :show, :folder => :person	
+
   Rails.root.should have_view_dirs :person, :post, :blog	
 
   Rails.root.should have_model_dirs :admin, :editor
@@ -38,10 +40,6 @@ end
 
 This library takes advantage of *code-spec*, *file-spec* and other essential spec extensions I have created ;)
 
-## TODO
-
-Finish specs for the file matchers including the special file matchers to make sure they work!
-
 ## Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -9,9 +9,9 @@ begin
     gem.authors = ["Kristian Mandrup"]
     gem.add_dependency "rspec",             "~> 2.0.0.beta.22"
     gem.add_dependency "require_all",       "~> 1.1.0"
-    gem.add_dependency "rails3_artifactor", "~> 0.1.4"
-    gem.add_dependency "sugar-high",        "~> 0.2.6"
-    gem.add_dependency "code-spec",         "~> 0.2.1"
+    gem.add_dependency "rails3_artifactor", "~> 0.2.4"
+    gem.add_dependency "sugar-high",        "~> 0.2.8"
+    gem.add_dependency "code-spec",         "~> 0.2.5"
     gem.add_dependency "file-spec",         "~> 0.1.1"        
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.10

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

@@ -16,17 +16,21 @@ module RSpec::RailsApp::Artifact
 
       def matches?(root_path, &block)
         @root_path = root_path
-        artifact_found = find_artifact        
-        return nil if !artifact_found
+        begin
+          artifact_found = find_artifact                
+          return nil if !artifact_found
 
-        # check file content for class or subclass
-        self.content = File.read(artifact_found) 
+          # check file content for class or subclass
+          self.content = File.read(artifact_found) 
         
-        if artifact_type == :view
-          yield content if block
-          return true
+          if artifact_type == :view
+            yield content if block
+            return true
+          end
+          super content, &block     
+        rescue
+          false
         end
-        super content, &block     
       end   
     end
 

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

@@ -11,7 +11,6 @@ module RSpec::RailsApp::Artifact
 
       def initialize(artifact_type, *names)
         extend "Rails3::Assist::Artifact::#{artifact_type.to_s.camelize}".constantize        
-
         @names = names
         parse_type artifact_type
         if artifact_type == :view
@@ -23,23 +22,33 @@ module RSpec::RailsApp::Artifact
 
       def matches?(root_path, &block)
         @root_path = root_path
-        
-        names.to_strings.each do |name|
-          parse_name name
-          artifact_found = find_artifact
+        begin          
+          labels = names.to_strings          
+          return false if labels.empty?
+          labels.each do |name| 
+            parse_name name              
+            
+            @artifact_found = find_artifact
+            @artifact_name = name
+            
+            return false if !artifact_found
+            return false if !File.file? artifact_found
 
-          # check file content for class or subclass
-          self.content = File.read(artifact_found) 
+            # check file content for class or subclass
+            self.content = File.read(artifact_found) 
         
-          res = if artifact_type == :view            
-            true
-          else
-            super content         
+            res = if artifact_type == :view            
+              true
+            else
+              super content         
+            end
+            return false if !res
           end
-          return false if !res
+          yield if block
+          true
+        rescue
+          nil
         end
-        yield if block
-        true
       end  
 
       protected

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

@@ -21,13 +21,16 @@ module RSpec::RailsApp::ArtifactFile
       end
 
       def matches?(root_path, &block)
-        self.artifact_name = get_artifact_name
-
-        match = File.file? artifact_name      
-        if block && match
-          yield File.read(artifact_name)
+        begin
+          self.artifact_name = get_artifact_name
+          match = File.file? artifact_name      
+          if block && match
+            yield File.read(artifact_name)
+          end
+          match        
+        rescue
+          false
         end
-        match        
       end        
     end
 

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

@@ -13,14 +13,20 @@ module RSpec::RailsApp::ArtifactFile
         @artifact_type = artifact_type        
       end
 
-      def matches?(root_path, &block)
-        names.to_strings.each do |name|       
-          @artifact_name = name
-          @artifact_name = get_artifact_name
-          return false if !File.file?(artifact_name)
+      def matches?(root_path, &block) 
+        labels = names.to_strings          
+        return false if labels.empty?
+        begin
+          labels.each do |name|
+            @artifact_name = name
+            @artifact_name = get_artifact_name
+            return false if !File.file?(artifact_name)
+          end
+          yield if block
+          true
+        rescue
+          false
         end
-        yield if block
-        true
       end            
     end
 

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

@@ -13,7 +13,6 @@ module ArtifactFile::Matcher
     
     def set_view name
       view_options  = name
-      puts "view_options: #{view_options}"
       @folder   = view_options[:folder]
       @action   = view_options[:action] 
       @view_ext = view_options[:view_ext] 
@@ -22,13 +21,10 @@ module ArtifactFile::Matcher
     
     def handle_view artifact_type, names
       if artifact_type == :view
-        puts "handle view"
         lang_option = last_arg({:lang => 'erb.html'}, names)
         raise ArgumentException, ':folder option must be specified in the last hash argument for #have_views' if !lang_option[:folder]          
         @folder = lang_option[:folder]
-        @view_ext = get_view_ext(lang_option[:lang] || :erb)
-        
-        puts "folder: #{folder}, ext: #{view_ext}"
+        @view_ext = get_view_ext(lang_option[:lang] || :erb)        
       end
     end
     
@@ -46,12 +42,7 @@ module ArtifactFile::Matcher
     def get_artifact_name
       case artifact_type
       when :view
-        puts "args: #{folder}"
-        puts "args: #{artifact_name}"
-         #, #{action}"
         path = send(:view_file_name, folder, artifact_name) #, view_ext, :root_path => root_path)
-        # puts "path: #{path}"
-        # File.expand_path(path)
       else                                                     
         find_existing_artifact_method = "existing_#{artifact_type}_file"
         if respond_to? find_existing_artifact_method

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

@@ -17,10 +17,11 @@ module Artifact::Matcher
     SUPERCLASS_MAP = {
       :observer   => 'ActiveRecord::Observer', 
       :mailer     => 'ActionMailer::Base',
-      :migration  => 'ActiveRecord::Migration'
+      :migration  => 'ActiveRecord::Migration',
+      :permit     => 'Permit::Base'
       }
 
-    POSTFIX = [:helper, :observer, :controller, :mailer]
+    POSTFIX = [:helper, :observer, :controller, :mailer, :permit]
 
     def has_postfix? key
       POSTFIX.include? key
@@ -29,12 +30,12 @@ module Artifact::Matcher
     def parse_type artifact_type
       @artifact_type = artifact_type      
       @postfix = artifact_type.to_s.camelize if has_postfix? artifact_type  
-      case artifact_type
+      case artifact_type       
       when :helper, :controller
         # artifact class check 
         @class_type = :class
         @type = :class                          
-      when :observer, :migration, :mailer
+      when :observer, :migration, :mailer, :permit
         @class_type = :subclass
         # artifact subclass check
         @superclass = SUPERCLASS_MAP[artifact_type]        
@@ -113,7 +114,7 @@ module Artifact::Matcher
       when :subclass
         "have the name: #{name}#{postfix} and be a subclass of: #{superclass}"
       when :class
-        "have the name: #{name}#{postfix}"
+        "have the name: #{name}#{postfix}"  
       else           
         raise "Class type must be either :class or :subclass, was #{class_type}" if artifact_type != :view
       end

data/lib/rails_app_spec/matchers/directory/have_rails_dirs.rb

@@ -10,8 +10,10 @@ module RSpec::RailsApp::Directory
         @dirs = dirs
       end
 
-      def matches?(obj, &block)
-        dirs.to_strings.each do |dir_name|
+      def matches?(obj, &block)   
+        labels = dirs.to_strings          
+        return false if labels.empty?
+        labels.each do |dir_name|
           @dir_name = dir_name
           @dir = send :"#{dir_name}_dir"
           return false if !File.directory?(dir)

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

@@ -13,8 +13,12 @@ module RSpec::RailsApp::File
       end
 
       def matches?(obj, &block)
-        @file = type ? send(:"#{type}_file", name) : send(:"#{name}_file")
-        File.file? file
+        begin
+          @file = type ? send(:"#{type}_file", name) : send(:"#{name}_file")
+          File.file? file
+        rescue
+          false
+        end
       end  
     end
 

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

@@ -15,15 +15,19 @@ module RSpec::RailsApp::File
       end
 
       def matches?(obj, &block)
-        puts "type: #{type}"
-        names.to_strings.each do |name|
-          @name = name
-          puts "name: #{name}"
-          @file = send(:"#{type}_file", name)
-          return false if !File.file?(file)
+        begin
+          labels = names.to_strings          
+          return false if labels.empty?
+          labels.each do |name| 
+            @name = name
+            @file = send(:"#{type}_file", name)
+            return false if !File.file?(file)
+          end
+          yield if block
+          true
+        rescue
+          false
         end
-        yield if block
-        true
       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.8"
+  s.version = "0.2.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-15}
+  s.date = %q{2010-09-18}
   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 = [
@@ -49,9 +49,8 @@ Gem::Specification.new do |s|
      "lib/rails_app_spec/rspec.rb",
      "lib/rails_app_spec/rspec/configure.rb",
      "rails-app-spec.gemspec",
-     "sandbox/dir_logic.rb",
-     "sandbox/file_logic.rb",
      "spec/rails_app_spec/matchers/artifact/controller_spec.rb",
+     "spec/rails_app_spec/matchers/artifact/core/have_artifacts_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/migration_simple_number_spec.rb",
@@ -75,6 +74,7 @@ Gem::Specification.new do |s|
   s.summary = %q{RSpec 2 matchers to 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",
      "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/migration_simple_number_spec.rb",
@@ -99,24 +99,24 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.1.4"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.6"])
-      s.add_runtime_dependency(%q<code-spec>, ["~> 0.2.1"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.2.4"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.8"])
+      s.add_runtime_dependency(%q<code-spec>, ["~> 0.2.5"])
       s.add_runtime_dependency(%q<file-spec>, ["~> 0.1.1"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
       s.add_dependency(%q<require_all>, ["~> 1.1.0"])
-      s.add_dependency(%q<rails3_artifactor>, ["~> 0.1.4"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.2.6"])
-      s.add_dependency(%q<code-spec>, ["~> 0.2.1"])
+      s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.4"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.2.8"])
+      s.add_dependency(%q<code-spec>, ["~> 0.2.5"])
       s.add_dependency(%q<file-spec>, ["~> 0.1.1"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
     s.add_dependency(%q<require_all>, ["~> 1.1.0"])
-    s.add_dependency(%q<rails3_artifactor>, ["~> 0.1.4"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.2.6"])
-    s.add_dependency(%q<code-spec>, ["~> 0.2.1"])
+    s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.4"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.2.8"])
+    s.add_dependency(%q<code-spec>, ["~> 0.2.5"])
     s.add_dependency(%q<file-spec>, ["~> 0.1.1"])
   end
 end

data/spec/rails_app_spec/matchers/artifact/core/have_artifacts_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+root_dir = Rails3::Assist::Directory.rails_root
+
+describe 'controller' do
+  use_helpers :controller, :app
+  
+  before :each do              
+    create_empty_tmp :controller    
+    create_controller :account do
+      %q{
+        def index
+        end
+      }
+    end    
+  end
+
+  after :each 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 artifacts :account and :user" do       
+    root_dir.should_not have_artifacts :controller, [:account, :user]    
+  end 
+end

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

@@ -19,6 +19,7 @@ describe 'mailer helper' do
   end
     
   it "should have an account mailer file with a mail_it! method inside" do      
+    root_dir.should_not have_mailer :user
     root_dir.should have_mailer :account do |klass|
       klass.should have_method :mail_it!
     end

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

@@ -4,20 +4,32 @@ root_dir = Rails3::Assist::Directory.rails_root
 
 describe 'model helper' do
   use_orm :active_record  
+  
+  before :each do
+    create_model :account do
+      %q{
+        # hello
+        def do_it
+        end
+      }
+    end
 
-  before :each do              
-    create_model :account, :content => '# hello'
+    create_model :person, :content => '# hello'
   end
 
   after :each do              
-    remove_model :account
+    remove_models :account, :person
   end
     
-  it "should have an :account model file that contains an Account class" do
+  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
+    root_dir.should_not have_model :user    
   end
 end
 

data/spec/rails_app_spec/matchers/directory/have_rails_dirs_spec.rb

@@ -13,4 +13,13 @@ describe 'Rails matcher: have_rails_dirs' do
   it "should have a rails dirs :locale and :controller" do      
     root_dir.should have_rails_dirs :locale, :controller
   end
+
+  it "should not have rails dirs :locale and :model" do      
+    root_dir.should_not have_rails_dirs :locale, :model
+  end
+
+  it "should not have rails dirs :locale and :model - bad array" do      
+    root_dir.should_not have_rails_dirs [[:locale, :model]]
+    root_dir.should_not have_rails_dirs []    
+  end
 end

data/spec/rails_app_spec/matchers/file/have_rails_file_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 root_dir = Rails3::Assist::Directory.rails_root
 
 describe 'Rails matcher: have_rails_file' do
-  use_helpers :file, :controller
+  use_helpers :file, :controller, :permit
   
   before :each do              
     create_controller :account do
@@ -13,6 +13,18 @@ describe 'Rails matcher: have_rails_file' do
       }
     end    
 
+    create_permit :admin do
+      %q{
+        license :blogging
+      }
+    end    
+
+    create_permit :super_admin, :base => :admin do
+      %q{
+        license :user_admin
+      }
+    end    
+
     create_javascript :effects do
       '# effects '
     end    
@@ -29,6 +41,12 @@ describe 'Rails matcher: have_rails_file' do
     
   it "should have a controller :account" do      
     root_dir.should have_controller_file :account
+    root_dir.should_not have_controller_file :user
+  end
+
+  it "should have a permit for :admin role" do      
+    root_dir.should have_permit_file :admin
+    root_dir.should have_permit :super_admin
   end
 
   it "should have a js :effects" do      

data/spec/rails_app_spec/matchers/file/have_rails_files_spec.rb

@@ -34,9 +34,14 @@ describe 'Rails matcher: have_rails_files' do
   after :each do              
     # remove_controller :account
   end
+
+  it "should not have a controller :account, :user" do      
+    root_dir.should_not have_controller_files :account, :user
+  end
     
   it "should have a controller :account, :person" do      
     root_dir.should have_controller_files :account, :person
+    root_dir.should_not have_model_files :account, :user
   end
 
   it "should have a js :effects, :noise" do      
@@ -49,5 +54,6 @@ describe 'Rails matcher: have_rails_files' do
   
   it "should have a view :effects, :noise" do      
     root_dir.should have_view_files :edit, :new, :folder => :person
+    root_dir.should_not have_view_files :edit, :unknown, :folder => :person    
   end  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +02:00
+date: 2010-09-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,9 +59,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
+        - 2
         - 4
-        version: 0.1.4
+        version: 0.2.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -75,8 +75,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 6
-        version: 0.2.6
+        - 8
+        version: 0.2.8
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -90,8 +90,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 5
+        version: 0.2.5
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -151,9 +151,8 @@ files:
 - lib/rails_app_spec/rspec.rb
 - lib/rails_app_spec/rspec/configure.rb
 - rails-app-spec.gemspec
-- sandbox/dir_logic.rb
-- sandbox/file_logic.rb
 - spec/rails_app_spec/matchers/artifact/controller_spec.rb
+- spec/rails_app_spec/matchers/artifact/core/have_artifacts_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/migration_simple_number_spec.rb
@@ -203,6 +202,7 @@ specification_version: 3
 summary: RSpec 2 matchers to 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
 - 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/migration_simple_number_spec.rb

data/sandbox/file_logic.rb

@@ -1,61 +0,0 @@
-attr_accessor :relative_path
-
-def initialize(relative_path, type = nil)
-  @relative_path = relative_rails_file(relative_path, type)
-end
-
-def matches?(generator, &block)
-  file = File.expand_path(relative_path, Rails.root)
-  file_exists = File.exists?(file)
-  if block && file_exists
-    read = File.read(file)
-    ruby_content = read.extend(RSpec::RubyContent::Helpers)
-    yield ruby_content
-  else
-    file_exists
-  end        
-end          
-
-
-# REFACTOR
-
-def relative_rails_file path, type = nil                       
-  path = path.to_s
-  f_name = file_name(path, type)      
-  return send :"#{type}_dir" if type        
-  File.join(::Rails.root, path)
-end
-
-def file_name path, type
-  return "#{path}#{postfix(type)}.rb" if !path.include? '.'
-  path
-end
-  
-
-def postfix type
-  "_#{type}" if ![:model].include?(type)
-end
-
-def folder type
-  case type
-  when :observer
-    'models'
-  else
-    type == :controller ? type.to_s : type.to_s.pluralize
-  end
-end      
-
-def base_dir type
-  case type
-  when :model, :controller, :view, :helper, :observer, :mailer
-    'app'
-  when :migration
-    'db'
-  when :javascript, :stylesheet
-    'public'
-  when :initializer, :locale
-    'config'
-  else
-    ''          
-  end
-end