teagles/comfortable-mexican-sofa

fixed issue by changing require calls

Oleg committed Aug 31, 2010

commit c6c58d34ddb828be02c82d993ce734fbed6dd675

Showing 3 changed files with 9 additions and 15 deletions

Gemfile +4 -5

@@	@@ -1,8 +1,7 @@
	source 'http://rubygems.org'

-	gem 'rails', '3.0.0'
-
-	gem 'sqlite3-ruby', :require => 'sqlite3'
+	gem 'rails', '3.0.0'
+	gem 'sqlite3-ruby', :require => 'sqlite3'
	gem 'active_link_to', '>=0.0.6'
-	gem 'paperclip', '>=2.3.3'
-	gem 'mime-types', :require => 'mime/types'
+	gem 'paperclip', '>=2.3.3'
+	gem 'mime-types', :require => 'mime/types'

comfortable_mexican_sofa.rb b/lib/comfortable_mexican_sofa.rb +4 -4

@@	@@ -1,8 +1,8 @@
-	require File.join(File.dirname(__FILE__), 'comfortable_mexican_sofa', 'cms_form_builder')
+	require File.expand_path('comfortable_mexican_sofa/cms_form_builder', File.dirname(__FILE__))
+	require File.expand_path('../app/models/cms_block', File.dirname(__FILE__))
+	require File.expand_path('comfortable_mexican_sofa/cms_tag', File.dirname(__FILE__))

-	require File.join(File.dirname(__FILE__), '..', 'app', 'models', 'cms_block')
-	require File.join(File.dirname(__FILE__), 'comfortable_mexican_sofa', 'cms_tag')
-	Dir.glob(File.join(File.dirname(__FILE__), 'comfortable_mexican_sofa', 'cms_tag', '*.rb')).each do \|tag\|
+	Dir.glob(File.expand_path('comfortable_mexican_sofa/cms_tag/*.rb', File.dirname(__FILE__))).each do \|tag\|
	require tag
	end

test/unit/cms_tag_test.rb +1 -6

@@	@@ -22,12 +22,7 @@ class CmsTagTest < ActiveSupport::TestCase
	end

	def test_initialize_tags_for_a_page
-	@cms_page = CmsPage.new
-	@cms_page.cms_layout \|\|= CmsLayout.first
-	tags = @cms_page.initialize_tags
-
-
-	# tags = CmsTag.initialize_tags(cms_pages(:default))
+	tags = CmsTag.initialize_tags(cms_pages(:default))
	assert_equal 3, tags.size
	assert_equal 3, (cms_blocks = tags.select{\|t\| t.class.superclass == CmsBlock}).count
	cms_blocks.each do \|block\|