Fixing block and article delegate

Rodrigo Souto
1 parent 95b2c3fc
Showing 6 changed files with 6 additions and 4 deletions Show diff stats
app/models/article.rb
app/models/block.rb
app/models/box.rb
app/sweepers/article_sweeper.rb
app/sweepers/block_sweeper.rb
test/unit/article_test.rb
@@ -665,7 +665,7 @@ class Article &lt; ActiveRecord::Base
     self.categories.collect(&:name)
   end
  
-  delegate :region, :region_id, :environment, :environment_id, :to => :profile
+  delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
   def name_sortable # give a different name for solr
     name
   end
@@ -7,7 +7,7 @@ class Block &lt; ActiveRecord::Base
   # Block-specific stuff
   include BlockHelper
  
-  delegate :environment, :to => :box
+  delegate :environment, :to => :box, :allow_nil => true
  
   acts_as_list :scope => :box
   belongs_to :box
@@ -4,6 +4,6 @@ class Box &lt; ActiveRecord::Base
   has_many :blocks, :dependent => :destroy, :order => 'position'
  
   def environment
-    owner.kind_of?(Environment) ? owner : owner.environment
+    owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
   end
 end
@@ -13,6 +13,7 @@ class ArticleSweeper &lt; ActiveRecord::Observer
 protected
  
   def expire_caches(article)
+    return if !article.environment
     article.hierarchy.each { |a| a.touch if a != article }
     blocks = article.profile.blocks
     blocks += article.profile.environment.blocks if article.profile.environment
@@ -7,6 +7,7 @@ class BlockSweeper &lt; ActiveRecord::Observer
  
     # Expire block's all languages cache
     def expire_block(block)
+      return if !block.environment
       regex = '-[a-z]*$'
       clean_ck = block.cache_key.gsub(/#{regex}/,'')
  
@@ -1210,7 +1210,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_nothing_raised { a.language = 'en' }
   end
  
-  should 'validade inclusion of language' do
+  should 'validate inclusion of language' do
     a = build(Article, :profile_id => fast_create(Profile).id)
     a.language = '12'
     a.valid?
...	...	@@ -665,7 +665,7 @@ class Article < ActiveRecord::Base
665	665	self.categories.collect(&:name)
666	666	end
667	667
668		- delegate :region, :region_id, :environment, :environment_id, :to => :profile
	668	+ delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
669	669	def name_sortable # give a different name for solr
670	670	name
671	671	end
...	...
...	...	@@ -7,7 +7,7 @@ class Block < ActiveRecord::Base
7	7	# Block-specific stuff
8	8	include BlockHelper
9	9
10		- delegate :environment, :to => :box
	10	+ delegate :environment, :to => :box, :allow_nil => true
11	11
12	12	acts_as_list :scope => :box
13	13	belongs_to :box
...	...
...	...	@@ -4,6 +4,6 @@ class Box < ActiveRecord::Base
4	4	has_many :blocks, :dependent => :destroy, :order => 'position'
5	5
6	6	def environment
7		- owner.kind_of?(Environment) ? owner : owner.environment
	7	+ owner ? (owner.kind_of?(Environment) ? owner : owner.environment) : nil
8	8	end
9	9	end
...	...
...	...	@@ -13,6 +13,7 @@ class ArticleSweeper < ActiveRecord::Observer
13	13	protected
14	14
15	15	def expire_caches(article)
	16	+ return if !article.environment
16	17	article.hierarchy.each { \|a\| a.touch if a != article }
17	18	blocks = article.profile.blocks
18	19	blocks += article.profile.environment.blocks if article.profile.environment
...	...
...	...	@@ -7,6 +7,7 @@ class BlockSweeper < ActiveRecord::Observer
7	7
8	8	# Expire block's all languages cache
9	9	def expire_block(block)
	10	+ return if !block.environment
10	11	regex = '-[a-z]*$'
11	12	clean_ck = block.cache_key.gsub(/#{regex}/,'')
12	13
...	...
...	...	@@ -1210,7 +1210,7 @@ class ArticleTest < ActiveSupport::TestCase
1210	1210	assert_nothing_raised { a.language = 'en' }
1211	1211	end
1212	1212
1213		- should 'validade inclusion of language' do
	1213	+ should 'validate inclusion of language' do
1214	1214	a = build(Article, :profile_id => fast_create(Profile).id)
1215	1215	a.language = '12'
1216	1216	a.valid?
...	...