rails3_artifactor 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/rails3_artifactor/artifact/orm/active_record.rb

@@ -7,7 +7,7 @@ module Rails3::Assist::Orm
     end
 
     def new_model_content name, options={}, &block        
-      content = options[:content] || yield if block
+      content = block ? yield : options[:content]
       file_w_inherit(name, orm_marker_name(name, options)) { content }
     end
   end

data/lib/rails3_artifactor/artifact/orm/data_mapper.rb

@@ -11,7 +11,7 @@ module Rails3::Assist::Orm
     end
 
     def new_model_content name, options={}, &block        
-      content = options[:content] || yield if block
+      content = block ? yield : options[:content]
       file_w_include(name, orm_marker_name(name, options)) { content }
     end
 

data/lib/rails3_artifactor/artifact/orm/mongo_mapper.rb

@@ -7,7 +7,7 @@ module Rails3::Assist::Orm
     end      
   
     def new_model_content name, options={}, &block        
-      content = options[:content] || yield if block
+      content = block ? yield : options[:content]
       file_w_include(name, orm_marker_name(name, options)) { content }
     end
 

data/lib/rails3_artifactor/artifact/orm/mongoid.rb

@@ -11,7 +11,7 @@ module Rails3::Assist::Orm
     end
 
     def new_model_content name, options={}, &block        
-      content = options[:content] || yield if block
+      content = block ? yield : options[:content]
       file_w_include(name, orm_marker_name(name, options)) { content }
     end
 

data/rails3_artifactor.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails3_artifactor}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -57,6 +57,7 @@ Gem::Specification.new do |s|
      "spec/rails3_artifactor/artifact/crud/helper_spec.rb",
      "spec/rails3_artifactor/artifact/crud/mailer_spec.rb",
      "spec/rails3_artifactor/artifact/crud/migration_spec.rb",
+     "spec/rails3_artifactor/artifact/crud/model_active_record_spec.rb",
      "spec/rails3_artifactor/artifact/crud/model_spec.rb",
      "spec/rails3_artifactor/artifact/crud/observer_spec.rb",
      "spec/rails3_artifactor/artifact/crud/view_controller_action_spec.rb",
@@ -90,6 +91,7 @@ Gem::Specification.new do |s|
      "spec/rails3_artifactor/artifact/crud/helper_spec.rb",
      "spec/rails3_artifactor/artifact/crud/mailer_spec.rb",
      "spec/rails3_artifactor/artifact/crud/migration_spec.rb",
+     "spec/rails3_artifactor/artifact/crud/model_active_record_spec.rb",
      "spec/rails3_artifactor/artifact/crud/model_spec.rb",
      "spec/rails3_artifactor/artifact/crud/observer_spec.rb",
      "spec/rails3_artifactor/artifact/crud/view_controller_action_spec.rb",

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

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe 'model without orm' do
+  use_orm :active_record
+
+  before :each do  
+    Rails3::Assist::Directory.rails_root = fixtures_dir
+    
+    delete_model(:account) # if has_model? :account                
+    create_model :account do
+      %q{def index
+  end}
+    end    
+  end
+
+  after :each do              
+    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 #index method in :account model' do
+    read_model(:account).should have_method :index
+  end
+    
+  it "should have an account_model file that contains an index method and two inserted comments" do
+    insert_into_model :account, :content => '# hello'
+    insert_into_model :account do
+      '# goodbye'
+    end
+    puts read_model(:account)
+    read_model(:account).should have_comment 'hello'
+
+    # root_dir.should have_model :account do |model_file|
+    #   model_file.should have_method :index
+    #   model_file.should have_comment 'hello'
+    #   model_file.should have_comment 'goodbye'
+    # end
+  end
+end
+

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

@@ -45,6 +45,10 @@ describe 'model without orm' do
       end.should_not be_true
     end   
   end
+
+  it 'should have #index method in :account model' do
+    read_model(:account).should have_method :index
+  end
     
   it "should have an account_model file that contains an index method and two inserted comments" do
     insert_into_model :account, :content => '# hello'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -146,6 +146,7 @@ files:
 - spec/rails3_artifactor/artifact/crud/helper_spec.rb
 - spec/rails3_artifactor/artifact/crud/mailer_spec.rb
 - spec/rails3_artifactor/artifact/crud/migration_spec.rb
+- spec/rails3_artifactor/artifact/crud/model_active_record_spec.rb
 - spec/rails3_artifactor/artifact/crud/model_spec.rb
 - spec/rails3_artifactor/artifact/crud/observer_spec.rb
 - spec/rails3_artifactor/artifact/crud/view_controller_action_spec.rb
@@ -205,6 +206,7 @@ test_files:
 - spec/rails3_artifactor/artifact/crud/helper_spec.rb
 - spec/rails3_artifactor/artifact/crud/mailer_spec.rb
 - spec/rails3_artifactor/artifact/crud/migration_spec.rb
+- spec/rails3_artifactor/artifact/crud/model_active_record_spec.rb
 - spec/rails3_artifactor/artifact/crud/model_spec.rb
 - spec/rails3_artifactor/artifact/crud/observer_spec.rb
 - spec/rails3_artifactor/artifact/crud/view_controller_action_spec.rb