rails-app-spec 0.2.7 → 0.2.8

data/README.markdown

@@ -40,7 +40,7 @@ This library takes advantage of *code-spec*, *file-spec* and other essential spe
 
 ## TODO
 
-Create specs for the special file matchers to make sure they work for all edge cases!
+Finish specs for the file matchers including the special file matchers to make sure they work!
 
 ## Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

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

@@ -10,13 +10,13 @@ module RSpec::RailsApp::ArtifactFile
 
         handle_view artifact_type, names
 
-        self.artifact_type = artifact_type        
-        self.artifact_name = name.to_s
+        @artifact_type = artifact_type        
       end
 
       def matches?(root_path, &block)
-        names.to_strings.each do |name|          
-          self.artifact_name = get_artifact_name
+        names.to_strings.each do |name|       
+          @artifact_name = name
+          @artifact_name = get_artifact_name
           return false if !File.file?(artifact_name)
         end
         yield if block
@@ -28,6 +28,20 @@ module RSpec::RailsApp::ArtifactFile
       HaveRailsArtifactFiles.new(artifact_type, *names)
     end
     alias_method :contain_rails_artifact_files, :have_rails_artifact_files
+    
+    (::Rails3::Assist.artifacts - [:view]).each do |name|
+      class_eval %{
+        def have_#{name}_files *names
+          have_rails_artifact_files :#{name}, *names 
+        end
+        alias_method :contain_#{name}_files, :have_#{name}_files
+      }
+    end  
+    
+    def have_view_files *args
+      have_rails_artifact_files :view, *args
+    end
+    alias_method :contain_view_files, :have_view_files
   end
 end
 

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

@@ -5,32 +5,53 @@ end
 
 module ArtifactFile::Matcher
   module Helper
-    attr_accessor :name, :artifact_type, :artifact_name
-    attr_accessor :folder, :action, :view_ext
+    include ::Rails3::Assist::Artifact::View::FileName
+    
+    attr_reader :name, :artifact_type, :artifact_name
+    attr_reader :folder, :action, :view_ext
     attr_reader :names, :root_path    
     
     def set_view name
       view_options  = name
-      self.folder   = view_options[:folder]
-      self.action   = view_options[:action] 
-      self.view_ext = view_options[:view_ext] 
-      self.artifact_type = :view
+      puts "view_options: #{view_options}"
+      @folder   = view_options[:folder]
+      @action   = view_options[:action] 
+      @view_ext = view_options[:view_ext] 
+      @artifact_type = :view
     end
     
     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]          
-        self.folder = lang_option[:folder]
-        self.view_ext = lang_option[:lang] || {:lang => 'erb.html'}
+        @folder = lang_option[:folder]
+        @view_ext = get_view_ext(lang_option[:lang] || :erb)
+        
+        puts "folder: #{folder}, ext: #{view_ext}"
+      end
+    end
+    
+    def get_view_ext(ext)
+      case ext.to_sym
+      when :erb
+        'erb.html'
+      when :haml
+        'haml.html'
+      else
+        ext.to_s
       end
     end
     
     def get_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)          
+      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

@@ -10,9 +10,9 @@ module Artifact::Matcher
     attr_accessor :name, :type, :postfix           
     # subclass
     attr_accessor :superclass
-    attr_accessor :folder, :action, :view_ext    
-    attr_accessor :artifact_found
-    attr_reader :root_path
+    
+    attr_reader :folder, :action, :view_ext    
+    attr_reader :artifact_found, :root_path
 
     SUPERCLASS_MAP = {
       :observer   => 'ActiveRecord::Observer', 
@@ -27,34 +27,34 @@ module Artifact::Matcher
     end    
     
     def parse_type artifact_type
-      self.artifact_type = artifact_type      
-      self.postfix = artifact_type.to_s.camelize if has_postfix? artifact_type  
+      @artifact_type = artifact_type      
+      @postfix = artifact_type.to_s.camelize if has_postfix? artifact_type  
       case artifact_type
       when :helper, :controller
         # artifact class check 
-        self.class_type = :class
-        self.type = :class                          
+        @class_type = :class
+        @type = :class                          
       when :observer, :migration, :mailer
-        self.class_type = :subclass
+        @class_type = :subclass
         # artifact subclass check
-        self.superclass = SUPERCLASS_MAP[artifact_type]        
+        @superclass = SUPERCLASS_MAP[artifact_type]        
       when :model
         # check class == name
-        self.class_type = :class        
+        @class_type = :class        
       end
     end
 
     def parse_name name
       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
+        @folder   = view_options[:folder]
+        @action   = view_options[:action] 
+        @view_ext = view_options[:view_ext] 
+        @artifact_type = :view
         return nil
       end
-      self.artifact_name = name.to_s.downcase
-      self.name = name.to_s.camelize
+      @artifact_name = name.to_s.downcase
+      @name = name.to_s.camelize
     end        
 
     def find_artifact
@@ -77,7 +77,7 @@ module Artifact::Matcher
         end
       end
       if !artifact_found
-        self.artifact_found = '[unknown]'
+        @artifact_found = '[unknown]'
         return nil
       end
   

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

@@ -1,6 +1,8 @@
 module RSpec::RailsApp::Directory
   module Matchers    
     class HaveArtifactDirs    
+      extend Rails3::Assist::UseMacro
+      use_helper :directory
     
       attr_accessor :artifact_type, :dir, :dir_name, :dirs
 

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

@@ -1,6 +1,8 @@
 module RSpec::RailsApp::Directory
   module Matchers    
     class HaveRailsDir    
+      extend Rails3::Assist::UseMacro
+      use_helper :directory
     
       attr_accessor :dir, :type
 
@@ -26,15 +28,7 @@ module RSpec::RailsApp::Directory
       HaveRailsDir.new(type)
     end
 
-    ::Rails3::Assist::Directory::Root.root_directories.each do |name|
-      class_eval %{
-        def have_#{name}_dir
-          have_rails_dir :#{name}
-        end    
-      }
-    end
-
-    ::Rails3::Assist::Directory::App.app_directories.each do |name|
+    (Rails3::Assist.artifacts + Rails3::Assist.specials(:all) + Rails3::Assist::Directory::Root.root_directories).each do |name|
       class_eval %{
         def have_#{name}_dir
           have_rails_dir :#{name}

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

@@ -1,7 +1,9 @@
 module RSpec::RailsApp::Directory
   module Matchers    
     class HaveRailsDirs    
-    
+      extend Rails3::Assist::UseMacro
+      use_helper :directory
+      
       attr_accessor :dir, :dir_name, :dirs
 
       def initialize *dirs

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

@@ -4,6 +4,7 @@ module RSpec::RailsApp::File
   module Matchers    
     class HaveRailsFile
       include ::Rails3::Assist::Artifact
+      include ::Rails3::Assist::File
       include RailsFile::Matcher::Helper
     
       def initialize(name, type = nil)
@@ -17,8 +18,8 @@ module RSpec::RailsApp::File
       end  
     end
 
-    def have_rails_file(type = nil)
-      HaveRailsFile.new(type)
+    def have_rails_file(name, type=nil)
+      HaveRailsFile.new(name, type)
     end
 
     [:initializer, :db, :migration, :locale, :javascript, :stylesheet].each do |name|

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

@@ -4,6 +4,7 @@ module RSpec::RailsApp::File
   module Matchers    
     class HaveRailsFiles
       include ::Rails3::Assist::Artifact
+      include ::Rails3::Assist::File
       include RailsFile::Matcher::Helper
     
       attr_reader :names
@@ -14,8 +15,10 @@ 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)
         end

data/lib/rails_app_spec/matchers/special/have_app_config.rb

@@ -6,19 +6,21 @@ module RSpec::RailsApp::Content
     class HaveAppConfig
       extend Rails3::Assist::UseMacro
       use_helpers :file
+
+      include Rails3::Assist::File::Special
+      include Rails3::Assist::File::Application
     
       attr_reader :left_side, :right_side, :operator
 
-      def initialize statement_hash
-        @left_side, @right_side = *statement.first
-        @operator = statement.last[:op] || '='
+      def initialize args
+        @left_side, @right_side = *args.first
+        @operator = last_arg_value({:op => '='}, args)
       end
 
       # TODO: relative to root_path ?
       def matches?(root_path=nil)      
         content = read_application_file
-        return nil if content.empty?
-      
+        return nil if content.empty?      
         ls, rs, op = escape_all(left_side, right_side, operator)
         (content =~ /config.#{ls}\s*#{op}\s*#{rs}/)
       end

data/lib/rails_app_spec/matchers/special/have_gem.rb

@@ -8,6 +8,8 @@ module RSpec::RailsApp::Content
     class HaveGem
       extend Rails3::Assist::UseMacro
       use_helpers :file
+      
+      include Rails3::Assist::File::Special            
     
       attr_reader :name, :version, :options
 
@@ -26,7 +28,7 @@ module RSpec::RailsApp::Content
 
       # TODO: relative to root_path ?
       def matches?(root_path=nil)      
-        content = read_gemfile
+        content = read_gem_file
         return nil if content.empty?    
         (content =~ /gem\s+#{name_expr}#{version_expr}/)
       end

data/lib/rails_app_spec/matchers/special/have_gems.rb

@@ -9,6 +9,8 @@ module RSpec::RailsApp::Content
     class HaveGems
       extend Rails3::Assist::UseMacro
       use_helpers :file
+
+      include Rails3::Assist::File::Special
     
       attr_reader :names, :name
 
@@ -18,7 +20,7 @@ module RSpec::RailsApp::Content
 
       # TODO: relative to root_path ?
       def matches?(root_path=nil)      
-        content = read_gemfile
+        content = read_gem_file
         return nil if content.empty?    
         names.each do |name|
           (content =~ /gem\s+#{name_expr(name)}/)

data/rails-app-spec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails-app-spec}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-14}
+  s.date = %q{2010-09-15}
   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 = [

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 root_dir = Rails3::Assist::Directory.rails_root
 
 describe 'controller' do
-  use_helper :controller
+  use_helpers :controller, :app
   
   before :each do              
     create_empty_tmp :controller    

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

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+root_dir = Rails3::Assist::Directory.rails_root
+
+describe 'Rails matcher: have_rails_dir' do
+  use_helpers :directory, :app, :controller
+  
+  before :each do              
+    create_empty_tmp :controller    
+    create_empty_tmp :locale
+  end
+
+  it "should not have an model dir" do      
+    root_dir.should_not have_model_dir
+  end
+    
+  it "should have a controller dir" do      
+    root_dir.should have_controller_dir
+  end
+
+  it "should have a locale dir" do      
+    root_dir.should have_locale_dir
+  end
+end

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

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+root_dir = Rails3::Assist::Directory.rails_root
+
+describe 'Rails matcher: have_rails_dirs' do
+  use_helpers :directory, :app
+  
+  before :each do              
+    create_empty_tmp :controller    
+    create_empty_tmp :locale    
+  end
+
+  it "should have a rails dirs :locale and :controller" do      
+    root_dir.should have_rails_dirs :locale, :controller
+  end
+end

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

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+root_dir = Rails3::Assist::Directory.rails_root
+
+describe 'Rails matcher: have_rails_file' do
+  use_helpers :file, :controller
+  
+  before :each do              
+    create_controller :account do
+      %q{
+        def index
+        end
+      }
+    end    
+
+    create_javascript :effects do
+      '# effects '
+    end    
+  end
+
+  after :each do              
+    remove_controller :account
+    remove_javascript :effects
+  end
+
+  it "should not have initializer :hello" do      
+    root_dir.should_not have_initializer_file :hello
+  end
+    
+  it "should have a controller :account" do      
+    root_dir.should have_controller_file :account
+  end
+
+  it "should have a js :effects" do      
+    root_dir.should have_javascript_file :effects
+  end
+end

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

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+root_dir = Rails3::Assist::Directory.rails_root
+
+describe 'Rails matcher: have_rails_files' do
+  use_helpers :files, :file, :controller, :view
+  
+  before :each do                  
+    create_controller :account do
+      'blip'
+    end    
+
+    create_controller :person do
+      'blap'
+    end    
+
+    create_javascript :effects do
+      '# effects '
+    end    
+    
+    create_javascript :noise do
+      '# noise '
+    end    
+
+    create_view :person, :edit do
+      '# edit person '
+    end    
+    
+    create_view :person, :new do
+      '# new person '
+    end    
+  end
+
+  after :each do              
+    # remove_controller :account
+  end
+    
+  it "should have a controller :account, :person" do      
+    root_dir.should have_controller_files :account, :person
+  end
+
+  it "should have a js :effects, :noise" do      
+    root_dir.should have_javascript_files :effects, :noise
+  end
+
+  it "should not have a js files :effects, :sound" do      
+    root_dir.should_not have_javascript_files :effects, :sound
+  end
+  
+  it "should have a view :effects, :noise" do      
+    root_dir.should have_view_files :edit, :new, :folder => :person
+  end  
+end

data/spec/rails_app_spec/matchers/special/have_app_config_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+root_dir = Rails3::Assist::Directory.rails_root
+
+describe 'Rails matcher: have_app_config' do
+  use_helpers :directory, :file, :app
+  
+  before :each do
+    create_empty_tmp :config
+    Dir.chdir config_dir do
+      File.overwrite 'application.rb' do
+        %q{
+          config.root_dir = MY_ROOT
+        }
+      end    
+    end
+  end
+
+  it "should not have initializer :hello" do      
+    root_dir.should have_app_config :root_dir => 'MY_ROOT'
+  end    
+end

data/spec/rails_app_spec/matchers/special/have_gem_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+root = Rails3::Assist::Directory.rails_root
+
+describe 'Rails matcher: have_gem' do
+  use_helpers :directory, :file
+  
+  before :each do
+    puts "root: #{root_dir}"
+    Dir.chdir root_dir do
+      File.overwrite 'Gemfile' do
+        %q{
+          gem "cancan"
+          gem "devise", '1.1'
+        }
+      end    
+    end
+  end
+
+  it "should have gem 'cancan'" do      
+    root.should have_gem 'cancan'
+  end    
+
+  it "should have gem 'devise' version 1.1" do      
+    root.should have_gem 'cancan', '1.1'
+  end    
+
+  it "should not have gem 'devise' version 1" do      
+    root.should have_gem 'devise', '1'
+  end    
+end

data/spec/rails_app_spec/matchers/special/have_gems_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+root = Rails3::Assist::Directory.rails_root
+
+describe 'Rails matcher: have_gems' do
+  use_helpers :directory, :file
+  
+  before :each do
+    Dir.chdir root_dir do
+      File.overwrite 'Gemfile' do
+        %q{
+          gem "cancan"
+          gem "devise", '1.1'
+          gem "roles"
+        }
+      end    
+    end
+  end
+
+  it "should have gems 'cancan', 'devise', 'roles'" do      
+    root.should have_gems 'cancan', 'devise', 'roles'
+  end    
+
+  it "should not have gems 'cancan', 'devise', 'roles_are_us'" do      
+    root.should have_gems 'cancan', 'devise', 'roles_are_us'
+  end    
+end

data/spec/spec_helper.rb

@@ -8,8 +8,7 @@ RSpec.configure do |config|
 
   config.after do
     remove_temp_dir 'tmp_rails'
-  end
-   
+  end   
 end
 
 def project_dir

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 +02:00
+date: 2010-09-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency