rails3_artifactor 0.1.5 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.1

data/lib/rails3_artifactor/artifact/crud.rb

@@ -45,9 +45,13 @@ module Rails3::Assist::Artifact
         alias_method :#{name}_file?, :has_#{name}?
 
         def #{name}_file name, &block
-          found = existing_file_name(name, :#{name}).path
-          yield found if block && found
-          found
+          begin
+            found = existing_file_name(name, :#{name}).path
+            yield found if block && found
+            found
+          rescue
+            nil
+          end
         end
         
         def create_#{name} name, options={}, &block
@@ -55,11 +59,20 @@ module Rails3::Assist::Artifact
         end          
       
         def insert_into_#{name}(name, options={}, &block)
-          insert_into_artifact(name, set(options, :#{name}), &block)      
+          begin
+            insert_into_artifact(name, set(options, :#{name}), &block)      
+            true
+          rescue
+            nil
+          end
         end
         
         def read_#{name}(name, options={}, &block)
-          read_artifact(name, set(options, :#{name}), &block)      
+          begin
+            read_artifact(name, set(options, :#{name}), &block)
+          rescue
+            nil
+          end
         end
 
         def remove_#{name} name
@@ -71,14 +84,17 @@ module Rails3::Assist::Artifact
         end  
         
         def remove_all_#{plural_name}
-          Rails3::Assist::Artifact::Files.#{name}_files.each{|f| ::File.delete_file! f}
+          Rails3::Assist::Artifact::Files.#{name}_files.each do |file_name| 
+            ::File.delete_file! file_name if ::File.file?(file_name)
+          end
         end
         alias_method :delete_all_#{plural_name}, :remove_all_#{plural_name}           
     
         def remove_#{plural_name} *names
           return remove_all_#{plural_name} if names.empty? 
           names.to_strings.each do |name|
-            ::File.delete #{name}_file(name)
+            file_name = #{name}_file(name)
+            ::File.delete!(file_name) if file_name && ::File.file?(file_name)
           end
         end
         alias_method :delete_#{plural_name}, :remove_#{plural_name} 

data/lib/rails3_artifactor/base/file_name.rb

@@ -19,7 +19,7 @@ module Rails3::Assist::Artifact
         end
         return result
       elsif type == :migration
-        raise "The method #find_#{type} to find the migration is not available!"
+        raise StandardError, "The method #find_#{type} to find the migration is not available!"
       end
       
       # default for non-migration

data/rails3_artifactor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails3_artifactor}
-  s.version = "0.1.5"
+  s.version = "0.2.1"
 
   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-16}
   s.description = %q{Helpers for handling Rails 3 artifacts in general, such as CRUD operations etc.}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -51,14 +51,7 @@ Gem::Specification.new do |s|
      "lib/rails3_artifactor/rspec/macro.rb",
      "rails3_artifactor.gemspec",
      "spec/fixtures.rb",
-     "spec/fixtures/app/controllers/account_controller.rb",
-     "spec/fixtures/app/helpers/account_helper.rb",
-     "spec/fixtures/app/mailers/account_mailer.rb",
-     "spec/fixtures/app/models/account.rb",
-     "spec/fixtures/app/models/account_observer.rb",
      "spec/fixtures/app/views/account/edit.html.erb",
-     "spec/fixtures/app/views/account/show.html.erb",
-     "spec/fixtures/db/migrations/20100913162614_create_account.rb",
      "spec/rails3_artifactor/artifact/base_spec.rb",
      "spec/rails3_artifactor/artifact/crud/controller_spec.rb",
      "spec/rails3_artifactor/artifact/crud/helper_spec.rb",
@@ -91,13 +84,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Helpers for handling Rails 3 artifacts}
   s.test_files = [
-    "spec/fixtures/app/controllers/account_controller.rb",
-     "spec/fixtures/app/helpers/account_helper.rb",
-     "spec/fixtures/app/mailers/account_mailer.rb",
-     "spec/fixtures/app/models/account.rb",
-     "spec/fixtures/app/models/account_observer.rb",
-     "spec/fixtures/db/migrations/20100913162614_create_account.rb",
-     "spec/fixtures.rb",
+    "spec/fixtures.rb",
      "spec/rails3_artifactor/artifact/base_spec.rb",
      "spec/rails3_artifactor/artifact/crud/controller_spec.rb",
      "spec/rails3_artifactor/artifact/crud/helper_spec.rb",

data/spec/fixtures/app/views/account/edit.html.erb

@@ -1,5 +1,3 @@
 
-        # hello
-  # goodbye
-  <h1><%= title %></h1>
+        <h1><%= title %></h1>
       

data/spec/rails3_artifactor/artifact/crud/controller_spec.rb

@@ -6,17 +6,47 @@ describe 'controller' do
   before :each do
     Rails3::Assist::Directory.rails_root = fixtures_dir
     
-    remove_controller :account if has_controller? :account        
+    remove_controller :account # if has_controller? :account 
     create_controller :account do
       %q{
         def index
         end
       }
-    end    
+    end
+  end
+
+  after :each do
+    remove_controller :account
   end
 
-  after :each do              
-    # remove_controller :account
+  context "Non-existant controller(s)" do
+    it "should not fail trying to remove non-existant controllers" do
+      remove_controllers :person, :user
+      remove_artifacts :controller, :person, :user
+
+      remove_controller :person
+      remove_artifact :controller, :person
+
+    end
+  
+    it "should not find a non-existant controller" do
+      controller_file :person do |person|
+        fail "should not find person controller!"
+      end                                       
+    
+      has_controller?(:person).should be_false
+      has_controllers?(:person, :user).should be_false
+    end
+     
+    it "should not insert into non-existant controller" do
+      insert_into_controller(:person, :after => 'Hello', :content => 'Yes').should_not be_true
+    end
+  
+    it "should not read from non-existant controller" do
+      read_controller :person do |content|
+        fail "should not find person content!"
+      end.should_not be_true
+    end   
   end
     
   it "should have an account_controller file that contains an index method and two inserted comments" do

data/spec/rails3_artifactor/artifact/crud/helper_spec.rb

@@ -6,7 +6,7 @@ describe 'helper' do
   before :each do              
     Rails3::Assist::Directory.rails_root = fixtures_dir
     
-    # remove_helper :account if has_helper? :account        
+    remove_helper :account
     create_helper :account do
       %q{
         def index
@@ -16,15 +16,44 @@ describe 'helper' do
   end
 
   after :each do              
-    # remove_helper :account
+    remove_helper :account
+  end
+
+  context "Non-existant helper(s)" do
+    it "should not fail trying to remove non-existant helpers" do
+      remove_helpers :person, :user
+      remove_artifacts :helper, :person, :user
+
+      remove_helper :person
+      remove_artifact :helper, :person
+    end
+  
+    it "should not find a non-existant helper" do
+      helper_file :person do |person|
+        fail "should not find person helper!"
+      end                                       
+    
+      has_helper?(:person).should be_false
+      has_helpers?(:person, :user).should be_false
+    end
+     
+    it "should not insert into non-existant helper" do
+      insert_into_helper(:person, :after => 'Hello', :content => 'Yes').should_not be_true
+    end
+  
+    it "should not read from non-existant helper" do
+      read_helper :person do |content|
+        fail "should not find person content!"
+      end.should_not be_true
+    end   
   end
     
   it "should have an account_helper file that contains an index method and two inserted comments" do
-    # insert_into_helper :account, :content => '# hello'
-    # insert_into_helper :account do
-    #   '# goodbye'
-    # end
-    # read_helper(:account).should have_comment 'hello'
+    insert_into_helper :account, :content => '# hello'
+    insert_into_helper :account do
+      '# goodbye'
+    end
+    read_helper(:account).should have_comment 'hello'
     # puts read_helper(:account)
     # root_dir.should have_helper :account do |helper_file|
     #   helper_file.should have_method :index

data/spec/rails3_artifactor/artifact/crud/mailer_spec.rb

@@ -6,7 +6,7 @@ describe 'mailer' do
   before :each do              
     Rails3::Assist::Directory.rails_root = fixtures_dir
     
-    # remove_helper :account if has_helper? :account        
+    remove_mailer :account if has_mailer? :account        
     create_mailer :account do
       %q{  def mail_it
   end}
@@ -14,7 +14,36 @@ describe 'mailer' do
   end
 
   after :each do              
-    # remove_helper :account
+    remove_mailer :account
+  end
+
+  context "Non-existant mailer(s)" do
+    it "should not fail trying to remove non-existant mailers" do
+      remove_mailers :person, :user
+      remove_artifacts :mailer, :person, :user
+
+      remove_mailer :person
+      remove_artifact :mailer, :person
+    end
+  
+    it "should not find a non-existant mailer" do
+      mailer_file :person do |person|
+        fail "should not find person mailer!"
+      end                                       
+    
+      has_mailer?(:person).should be_false
+      has_mailers?(:person, :user).should be_false
+    end
+     
+    it "should not insert into non-existant mailer" do
+      insert_into_mailer(:person, :after => 'Hello', :content => 'Yes').should_not be_true
+    end
+  
+    it "should not read from non-existant mailer" do
+      read_mailer :person do |content|
+        fail "should not find person content!"
+      end.should_not be_true
+    end   
   end
     
   it "should have an account_mailer file that contains a #mail_it method and two inserted comments" do
@@ -24,10 +53,10 @@ describe 'mailer' do
     end
     read_mailer(:account).should have_comment 'hello'
     puts read_mailer(:account)
-    # root_dir.should have_mailer :account do |helper_file|
-    #   helper_file.should have_method :index
-    #   helper_file.should have_comment 'hello'
-    #   helper_file.should have_comment 'goodbye'
+    # root_dir.should have_mailer :account do |mailer_file|
+    #   mailer_file.should have_method :index
+    #   mailer_file.should have_comment 'hello'
+    #   mailer_file.should have_comment 'goodbye'
     # end
   end
 end

data/spec/rails3_artifactor/artifact/crud/migration_spec.rb

@@ -23,7 +23,36 @@ describe 'migration' do
   end
 
   after :each do              
-    # remove_migration :create_account
+    remove_migration :create_account
+  end
+
+  context "Non-existant migration(s)" do
+    it "should not fail trying to remove non-existant migrations" do
+      remove_migrations :person, :user
+      remove_artifacts :migration, :person, :user
+
+      remove_migration :person
+      remove_artifact :migration, :person
+    end
+  
+    it "should not find a non-existant migration" do
+      migration_file :person do |person|
+        fail "should not find person migration!"
+      end                                       
+    
+      has_migration?(:person).should be_false
+      has_migrations?(:person, :user).should be_false
+    end
+     
+    it "should not insert into non-existant migration" do
+      insert_into_migration(:person, :after => 'Hello', :content => 'Yes').should_not be_true
+    end
+  
+    it "should not read from non-existant migration" do
+      read_migration :person do |content|
+        fail "should not find person content!"
+      end.should_not be_true
+    end   
   end
     
   it "should have an create_account_migration file that contains an index method and two inserted comments" do

data/spec/rails3_artifactor/artifact/crud/model_spec.rb

@@ -6,7 +6,7 @@ describe 'model without orm' do
   before :each do  
     Rails3::Assist::Directory.rails_root = fixtures_dir
     
-    delete_model(:account) if has_model? :account                
+    delete_model(:account) # if has_model? :account                
     create_model :account do
       %q{def index
   end}
@@ -14,7 +14,36 @@ describe 'model without orm' do
   end
 
   after :each do              
-    # remove_model :account
+    remove_model :account
+  end
+
+  context "Non-existant model(s)" do
+    it "should not fail trying to remove non-existant models" do
+      remove_models :person, :user
+      remove_artifacts :model, :person, :user
+
+      remove_model :person
+      remove_artifact :model, :person
+    end
+  
+    it "should not find a non-existant model" do
+      model_file :person do |person|
+        fail "should not find person model!"
+      end                                       
+    
+      has_model?(:person).should be_false
+      has_models?(:person, :user).should be_false
+    end
+     
+    it "should not insert into non-existant model" do
+      insert_into_model(:person, :after => 'Hello', :content => 'Yes').should_not be_true
+    end
+  
+    it "should not read from non-existant model" do
+      read_model :person do |content|
+        fail "should not find person content!"
+      end.should_not be_true
+    end   
   end
     
   it "should have an account_model file that contains an index method and two inserted comments" do

data/spec/rails3_artifactor/artifact/crud/observer_spec.rb

@@ -16,7 +16,36 @@ describe 'observer' do
   end
 
   after :each do              
-    # remove_observer :account
+    remove_observer :account
+  end
+
+  context "Non-existant observer(s)" do
+    it "should not fail trying to remove non-existant observers" do
+      remove_observers :person, :user
+      remove_artifacts :observer, :person, :user
+
+      remove_observer :person
+      remove_artifact :observer, :person
+    end
+  
+    it "should not find a non-existant observer" do
+      observer_file :person do |person|
+        fail "should not find person observer!"
+      end                                       
+    
+      has_observer?(:person).should be_false
+      has_observers?(:person, :user).should be_false
+    end
+     
+    it "should not insert into non-existant observer" do
+      insert_into_observer(:person, :after => 'Hello', :content => 'Yes').should_not be_true
+    end
+  
+    it "should not read from non-existant observer" do
+      read_observer :person do |content|
+        fail "should not find person content!"
+      end.should_not be_true
+    end   
   end
     
   it "should have an account_observer file that contains an index method and two inserted comments" do

data/spec/rails3_artifactor/artifact/crud/view_controller_action_spec.rb

@@ -15,7 +15,45 @@ describe 'view API - symbols' do
   end
 
   after :each do              
-    # remove_view :account
+    remove_view :account
+  end
+
+  context "Non-existant view(s)" do
+
+    it "should not fail trying to remove non-existant views" do
+      pending "TODO"
+
+      remove_views :edit, :show, :folder => :person
+      remove_artifacts :view, :edit, :show, :folder => :person
+
+      remove_view :show, :folder => :person
+      remove_artifact :view, :show, :folder => :person
+    end
+  
+    it "should not find a non-existant view" do
+      pending "TODO"
+
+      view_file :show, :folder => :person do |person|
+        fail "should not find person view!"
+      end                                       
+    
+      has_view?(:show, :folder => :person).should be_false
+      has_views?(:show, :folder => :person).should be_false
+    end
+     
+    it "should not insert into non-existant view" do
+      pending "TODO"
+
+      insert_into_view(:show, :folder => :person, :after => 'Hello', :content => 'Yes').should_not be_true
+    end
+  
+    it "should not read from non-existant view" do
+      pending "TODO"
+
+      read_view :show, :folder => :person do |content|
+        fail "should not find person content!"
+      end.should_not be_true
+    end   
   end
     
   it "should have an account_view file that contains an index method and two inserted comments" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 5
-  version: 0.1.5
+  version: 0.2.1
 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-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -140,14 +140,7 @@ files:
 - lib/rails3_artifactor/rspec/macro.rb
 - rails3_artifactor.gemspec
 - spec/fixtures.rb
-- spec/fixtures/app/controllers/account_controller.rb
-- spec/fixtures/app/helpers/account_helper.rb
-- spec/fixtures/app/mailers/account_mailer.rb
-- spec/fixtures/app/models/account.rb
-- spec/fixtures/app/models/account_observer.rb
 - spec/fixtures/app/views/account/edit.html.erb
-- spec/fixtures/app/views/account/show.html.erb
-- spec/fixtures/db/migrations/20100913162614_create_account.rb
 - spec/rails3_artifactor/artifact/base_spec.rb
 - spec/rails3_artifactor/artifact/crud/controller_spec.rb
 - spec/rails3_artifactor/artifact/crud/helper_spec.rb
@@ -206,12 +199,6 @@ signing_key:
 specification_version: 3
 summary: Helpers for handling Rails 3 artifacts
 test_files: 
-- spec/fixtures/app/controllers/account_controller.rb
-- spec/fixtures/app/helpers/account_helper.rb
-- spec/fixtures/app/mailers/account_mailer.rb
-- spec/fixtures/app/models/account.rb
-- spec/fixtures/app/models/account_observer.rb
-- spec/fixtures/db/migrations/20100913162614_create_account.rb
 - spec/fixtures.rb
 - spec/rails3_artifactor/artifact/base_spec.rb
 - spec/rails3_artifactor/artifact/crud/controller_spec.rb

data/spec/fixtures/app/controllers/account_controller.rb

@@ -1,8 +0,0 @@
-class AccountController < ActionController::Base
-  # goodbye
-  # hello
-  
-        def index
-        end
-      
-end

data/spec/fixtures/app/helpers/account_helper.rb

@@ -1,6 +0,0 @@
-class AccountHelper
-  
-        def index
-        end
-      
-end

data/spec/fixtures/app/mailers/account_mailer.rb

@@ -1,6 +0,0 @@
-class AccountMailer < ActionMailer::Base
-  # goodbye
-  # hello
-    def mail_it
-  end
-end

data/spec/fixtures/app/models/account.rb

@@ -1,6 +0,0 @@
-class Account
-  # goodbye
-  # hello
-  def index
-  end
-end

data/spec/fixtures/app/models/account_observer.rb

@@ -1,8 +0,0 @@
-class AccountObserver < ActiveRecord::Observer
-  # goodbye
-  # hello
-  
-        def index
-        end
-      
-end

data/spec/fixtures/app/views/account/show.html.erb

@@ -1,4 +0,0 @@
-  # hello
-  # goodbye
-  def index
-  end

data/spec/fixtures/db/migrations/20100913162614_create_account.rb

@@ -1,11 +0,0 @@
-class CreateAccount < ActiveRecord::Migration
-  # goodbye
-  # hello
-  
-        def self.up
-        end
-
-        def self.down
-        end
-      
-end