comfortable_mexican_sofa 1.0.1 → 1.0.2

data/test/unit/cms_block_test.rb

@@ -23,6 +23,7 @@ class CmsBlockTest < ActiveSupport::TestCase
   def test_new_with_cast_via_page_nested_attributes
     assert_difference ['CmsPage.count', 'CmsBlock.count'] do
       page = CmsPage.create!(
+        :cms_site   => cms_sites(:default),
         :cms_layout => cms_layouts(:default),
         :label      => 'test page',
         :slug       => 'test_page',

data/test/unit/cms_configuration_test.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CmsConfigurationTest < ActiveSupport::TestCase
+  
+  def test_configuration_presense
+    assert config = ComfortableMexicanSofa.configuration
+    assert_equal 'ComfortableMexicanSofa', config.cms_title
+    assert_equal 'ComfortableMexicanSofa::HttpAuth', config.authentication
+  end
+  
+  def test_initialization_overrides
+    ComfortableMexicanSofa.configuration.cms_title = 'New Title'
+    assert_equal 'New Title', ComfortableMexicanSofa.configuration.cms_title
+  end
+  
+end

data/test/unit/cms_layout_test.rb

@@ -15,9 +15,9 @@ class CmsLayoutTest < ActiveSupport::TestCase
   end
   
   def test_options_for_select
-    assert_equal ['Default Layout', 'Nested Layout', '. . Child Layout'], CmsLayout.options_for_select.collect{|t| t.first}
-    assert_equal ['Default Layout', 'Nested Layout'], CmsLayout.options_for_select(cms_layouts(:child)).collect{|t| t.first}
-    assert_equal ['Default Layout'], CmsLayout.options_for_select(cms_layouts(:nested)).collect{|t| t.first}
+    assert_equal ['Default Layout', 'Nested Layout', '. . Child Layout'], CmsLayout.options_for_select(cms_sites(:default)).collect{|t| t.first}
+    assert_equal ['Default Layout', 'Nested Layout'], CmsLayout.options_for_select(cms_sites(:default), cms_layouts(:child)).collect{|t| t.first}
+    assert_equal ['Default Layout'], CmsLayout.options_for_select(cms_sites(:default), cms_layouts(:nested)).collect{|t| t.first}
   end
   
   def test_app_layouts_for_select

data/test/unit/cms_page_test.rb

@@ -26,31 +26,41 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_has_errors_on page, :parent_id
   end
   
+  def test_validation_of_target_page
+    page = cms_pages(:child)
+    page.target_page = cms_pages(:default)
+    page.save!
+    assert_equal cms_pages(:default), page.target_page
+    page.target_page = page
+    assert page.invalid?
+    assert_has_errors_on page, :target_page_id
+  end
+  
   def test_initialization_of_full_path
     page = CmsPage.new(new_params)
     assert page.invalid?
-    assert_has_errors_on page, :full_path
+    assert_has_errors_on page, :cms_site_id
     
-    page = CmsPage.new(new_params(:parent => cms_pages(:default)))
+    page = cms_sites(:default).cms_pages.new(new_params(:parent => cms_pages(:default)))
     assert page.valid?
     assert_equal '/test-page', page.full_path
     
-    page = CmsPage.new(new_params(:parent => cms_pages(:child)))
+    page = cms_sites(:default).cms_pages.new(new_params(:parent => cms_pages(:child)))
     assert page.valid?
     assert_equal '/child-page/test-page', page.full_path
     
     CmsPage.destroy_all
-    page = CmsPage.new(new_params)
+    page = cms_sites(:default).cms_pages.new(new_params)
     assert page.valid?
     assert_equal '/', page.full_path
   end
   
   def test_sync_child_pages
     page = cms_pages(:child)
-    page_1 = CmsPage.create!(new_params(:parent => page, :slug => 'test-page-1'))
-    page_2 = CmsPage.create!(new_params(:parent => page, :slug => 'test-page-2'))
-    page_3 = CmsPage.create!(new_params(:parent => page_2, :slug => 'test-page-3'))
-    page_4 = CmsPage.create!(new_params(:parent => page_1, :slug => 'test-page-4'))
+    page_1 = cms_sites(:default).cms_pages.create!(new_params(:parent => page, :slug => 'test-page-1'))
+    page_2 = cms_sites(:default).cms_pages.create!(new_params(:parent => page, :slug => 'test-page-2'))
+    page_3 = cms_sites(:default).cms_pages.create!(new_params(:parent => page_2, :slug => 'test-page-3'))
+    page_4 = cms_sites(:default).cms_pages.create!(new_params(:parent => page_1, :slug => 'test-page-4'))
     assert_equal '/child-page/test-page-1', page_1.full_path
     assert_equal '/child-page/test-page-2', page_2.full_path
     assert_equal '/child-page/test-page-2/test-page-3', page_3.full_path
@@ -78,7 +88,7 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_equal 1, page_1.children_count
     assert_equal 0, page_2.children_count
     
-    page_3 = CmsPage.create!(new_params(:parent => page_2))
+    page_3 = cms_sites(:default).cms_pages.create!(new_params(:parent => page_2))
     page_1.reload; page_2.reload
     assert_equal 1, page_1.children_count
     assert_equal 1, page_2.children_count
@@ -102,12 +112,12 @@ class CmsPageTest < ActiveSupport::TestCase
   end
   
   def test_options_for_select
-    assert_equal ['Default Page', '. . Child Page'], CmsPage.options_for_select.collect{|t| t.first }
-    assert_equal ['Default Page'], CmsPage.options_for_select(cms_pages(:child)).collect{|t| t.first }
-    assert_equal [], CmsPage.options_for_select(cms_pages(:default))
+    assert_equal ['Default Page', '. . Child Page'], CmsPage.options_for_select(cms_sites(:default)).collect{|t| t.first }
+    assert_equal ['Default Page'], CmsPage.options_for_select(cms_sites(:default), cms_pages(:child)).collect{|t| t.first }
+    assert_equal [], CmsPage.options_for_select(cms_sites(:default), cms_pages(:default))
     
     page = CmsPage.new(new_params(:parent => cms_pages(:default)))
-    assert_equal ['Default Page', '. . Child Page'], CmsPage.options_for_select(page).collect{|t| t.first }
+    assert_equal ['Default Page', '. . Child Page'], CmsPage.options_for_select(cms_sites(:default), page).collect{|t| t.first }
   end
   
 protected

data/test/unit/cms_site_test.rb

@@ -0,0 +1,41 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class CmsSiteTest < ActiveSupport::TestCase
+  
+  def test_fixtures_validity
+    CmsSite.all.each do |site|
+      assert site.valid?, site.errors.full_messages
+    end
+  end
+  
+  def test_validation
+    site = CmsSite.new
+    assert site.invalid?
+    assert_has_errors_on site, [:label, :hostname]
+    
+    site = CmsSite.new(:label => 'My Site', :hostname => 'http://mysite.com')
+    assert site.invalid?
+    assert_has_errors_on site, :hostname
+    
+    site = CmsSite.new(:label => 'My Site', :hostname => 'mysite.com')
+    assert site.valid?
+  end
+  
+  def test_cascading_destroy
+    assert_difference 'CmsSite.count', -1 do
+      assert_difference 'CmsLayout.count', -3 do
+        assert_difference 'CmsPage.count', -2 do
+          assert_difference 'CmsSnippet.count', -1 do
+            cms_sites(:default).destroy
+          end
+        end
+      end
+    end
+  end
+  
+  def test_options_for_select
+    assert_equal 1, CmsSite.options_for_select.size
+    assert_equal 'Default Site (test.host)', CmsSite.options_for_select[0][0]
+  end
+  
+end

data/test/unit/cms_snippet_test.rb

@@ -12,7 +12,7 @@ class CmsSnippetTest < ActiveSupport::TestCase
     snippet = CmsSnippet.new
     snippet.save
     assert snippet.invalid?
-    assert_has_errors_on snippet, :label
+    assert_has_errors_on snippet, [:label, :slug]
   end
   
   def test_method_content

data/test/unit/cms_tags/snippet_test.rb

@@ -8,7 +8,7 @@ class SnippetTest < ActiveSupport::TestCase
       <cms:snippet:label>
     ).each do |tag_signature|
       assert tag = CmsTag::Snippet.initialize_tag(cms_pages(:default), tag_signature)
-      assert_equal 'label', tag.label
+      assert_equal 'label', tag.slug
     end
   end
   

data/test/unit/cms_upload_test.rb

@@ -11,20 +11,21 @@ class CmsUploadTest < ActiveSupport::TestCase
   end
   
   def test_create
-    assert_difference 'CmsUpload.count', 2 do
-      upload = CmsUpload.create(:file => fixture_file_upload('files/valid_image.jpg', 'image/jpeg'))
-      assert upload.image?
-      upload = CmsUpload.create(:uploaded_file => fixture_file_upload('files/valid_image.jpg'))
+    assert_difference 'CmsUpload.count' do
+      upload = cms_sites(:default).cms_uploads.create(
+        :uploaded_file => fixture_file_upload('files/valid_image.jpg')
+      )
       assert upload.image?
     end
   end
   
   def test_create_fails_on_invalid_file
     assert_no_difference 'CmsUpload.count' do
-      upload = CmsUpload.create(:file => fixture_file_upload('files/invalid_file.gif', 'image/gif'))
+      upload = cms_sites(:default).cms_uploads.create(
+        :file => fixture_file_upload('files/invalid_file.gif', 'image/gif')
+      )
       assert upload.errors.present?
       assert_has_errors_on upload, :file
     end
   end
-  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 -04:00
+date: 2010-10-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,12 +86,14 @@ files:
 - app/controllers/cms_admin/base_controller.rb
 - app/controllers/cms_admin/layouts_controller.rb
 - app/controllers/cms_admin/pages_controller.rb
+- app/controllers/cms_admin/sites_controller.rb
 - app/controllers/cms_admin/snippets_controller.rb
 - app/controllers/cms_admin/uploads_controller.rb
 - app/controllers/cms_content_controller.rb
 - app/models/cms_block.rb
 - app/models/cms_layout.rb
 - app/models/cms_page.rb
+- app/models/cms_site.rb
 - app/models/cms_snippet.rb
 - app/models/cms_upload.rb
 - app/views/cms_admin/layouts/_form.html.erb
@@ -106,6 +108,10 @@ files:
 - app/views/cms_admin/pages/form_blocks.js.erb
 - app/views/cms_admin/pages/index.html.erb
 - app/views/cms_admin/pages/new.html.erb
+- app/views/cms_admin/sites/_form.html.erb
+- app/views/cms_admin/sites/edit.html.erb
+- app/views/cms_admin/sites/index.html.erb
+- app/views/cms_admin/sites/new.html.erb
 - app/views/cms_admin/snippets/_form.html.erb
 - app/views/cms_admin/snippets/edit.html.erb
 - app/views/cms_admin/snippets/index.html.erb
@@ -124,6 +130,7 @@ files:
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
+- config/initializers/comfortable_mexican_sofa.rb
 - config/initializers/mime_types.rb
 - config/initializers/paperclip.rb
 - config/locales/en.yml
@@ -132,10 +139,7 @@ files:
 - db/seeds.rb
 - doc/README_FOR_APP
 - lib/comfortable_mexican_sofa.rb
-- lib/comfortable_mexican_sofa/cms_acts_as_tree.rb
-- lib/comfortable_mexican_sofa/cms_engine.rb
-- lib/comfortable_mexican_sofa/cms_form_builder.rb
-- lib/comfortable_mexican_sofa/cms_rails_extensions.rb
+- lib/comfortable_mexican_sofa/acts_as_tree.rb
 - lib/comfortable_mexican_sofa/cms_tag.rb
 - lib/comfortable_mexican_sofa/cms_tag/field_datetime.rb
 - lib/comfortable_mexican_sofa/cms_tag/field_integer.rb
@@ -147,6 +151,13 @@ files:
 - lib/comfortable_mexican_sofa/cms_tag/page_text.rb
 - lib/comfortable_mexican_sofa/cms_tag/partial.rb
 - lib/comfortable_mexican_sofa/cms_tag/snippet.rb
+- lib/comfortable_mexican_sofa/configuration.rb
+- lib/comfortable_mexican_sofa/controller_methods.rb
+- lib/comfortable_mexican_sofa/engine.rb
+- lib/comfortable_mexican_sofa/form_builder.rb
+- lib/comfortable_mexican_sofa/http_auth.rb
+- lib/comfortable_mexican_sofa/rails_extensions.rb
+- lib/comfortable_mexican_sofa/view_methods.rb
 - lib/generators/README
 - lib/generators/cms_generator.rb
 - public/404.html
@@ -173,20 +184,26 @@ files:
 - test/fixtures/cms_blocks.yml
 - test/fixtures/cms_layouts.yml
 - test/fixtures/cms_pages.yml
+- test/fixtures/cms_sites.yml
 - test/fixtures/cms_snippets.yml
 - test/fixtures/cms_uploads.yml
 - test/fixtures/files/invalid_file.gif
 - test/fixtures/files/valid_image.jpg
-- test/functional/cms_admin/base_controller_test.rb
 - test/functional/cms_admin/layouts_controller_test.rb
 - test/functional/cms_admin/pages_controller_test.rb
+- test/functional/cms_admin/sites_controller_test.rb
 - test/functional/cms_admin/snippets_controller_test.rb
 - test/functional/cms_admin/uploads_controller_test.rb
 - test/functional/cms_content_controller_test.rb
+- test/integration/authentication_test.rb
+- test/integration/render_cms_test.rb
+- test/integration/sites_test.rb
 - test/test_helper.rb
 - test/unit/cms_block_test.rb
+- test/unit/cms_configuration_test.rb
 - test/unit/cms_layout_test.rb
 - test/unit/cms_page_test.rb
+- test/unit/cms_site_test.rb
 - test/unit/cms_snippet_test.rb
 - test/unit/cms_tag_test.rb
 - test/unit/cms_tags/field_datetime_test.rb
@@ -236,16 +253,21 @@ signing_key:
 specification_version: 3
 summary: ComfortableMexicanSofa is a Rails Engine CMS gem
 test_files: 
-- test/functional/cms_admin/base_controller_test.rb
 - test/functional/cms_admin/layouts_controller_test.rb
 - test/functional/cms_admin/pages_controller_test.rb
+- test/functional/cms_admin/sites_controller_test.rb
 - test/functional/cms_admin/snippets_controller_test.rb
 - test/functional/cms_admin/uploads_controller_test.rb
 - test/functional/cms_content_controller_test.rb
+- test/integration/authentication_test.rb
+- test/integration/render_cms_test.rb
+- test/integration/sites_test.rb
 - test/test_helper.rb
 - test/unit/cms_block_test.rb
+- test/unit/cms_configuration_test.rb
 - test/unit/cms_layout_test.rb
 - test/unit/cms_page_test.rb
+- test/unit/cms_site_test.rb
 - test/unit/cms_snippet_test.rb
 - test/unit/cms_tag_test.rb
 - test/unit/cms_tags/field_datetime_test.rb

data/lib/comfortable_mexican_sofa/cms_acts_as_tree.rb

@@ -1,101 +0,0 @@
-module ActiveRecord
-  module Acts
-    module Tree
-      
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-      
-      module ClassMethods
-        def acts_as_tree(options = {})
-          configuration = {
-            :foreign_key    => 'parent_id', 
-            :order          => nil, 
-            :counter_cache  => nil,
-            :dependent      => :destroy,
-            :touch          => false }
-          configuration.update(options) if options.is_a?(Hash)
-          
-          belongs_to :parent,
-            :class_name     => name, 
-            :foreign_key    => configuration[:foreign_key],
-            :counter_cache  => configuration[:counter_cache],
-            :touch          => configuration[:touch]
-            
-          has_many :children,
-            :class_name     => name, 
-            :foreign_key    => configuration[:foreign_key],
-            :order          => configuration[:order],
-            :dependent      => configuration[:dependent]
-            
-          class_eval <<-EOV
-            include ActiveRecord::Acts::Tree::InstanceMethods
-            
-            scope :roots,
-              :conditions => "#{configuration[:foreign_key]} IS NULL",
-              :order      => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}}
-            
-            def self.root
-              roots.first
-            end
-            
-            validates_each "#{configuration[:foreign_key]}" do |record, attr, value|
-              if value
-                if record.id == value
-                  record.errors.add attr, "cannot be it's own id"
-                elsif record.descendants.map {|c| c.id}.include?(value)
-                  record.errors.add attr, "cannot be a descendant's id"
-                end
-              end
-            end
-            
-          EOV
-        end
-      end
-      
-      module InstanceMethods
-        # Returns list of ancestors, starting from parent until root.
-        #
-        #   subchild1.ancestors # => [child1, root]
-        def ancestors
-          node, nodes = self, []
-          nodes << node = node.parent while node.parent
-          nodes
-        end
-        
-        # Returns all children and children of children
-        def descendants
-          nodes = []
-          self.children.each do |c|
-            nodes << c
-            nodes << c.descendants
-          end
-          nodes.flatten
-        end
-        
-        # Returns the root node of the tree.
-        def root
-          node = self
-          node = node.parent while node.parent
-          node
-        end
-        
-        # Returns all siblings of the current node.
-        #
-        #   subchild1.siblings # => [subchild2]
-        def siblings
-          self_and_siblings - [self]
-        end
-        
-        # Returns all siblings and a reference to the current node.
-        #
-        #   subchild1.self_and_siblings # => [subchild1, subchild2]
-        def self_and_siblings
-          parent ? parent.children : self.class.roots
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, ActiveRecord::Acts::Tree

data/lib/comfortable_mexican_sofa/cms_rails_extensions.rb

@@ -1,32 +0,0 @@
-class String
-  # Converts string to something suitable to be used as an element id
-  def idify
-    self.strip.gsub(/\W/, '_').gsub(/\s|^_*|_*$/, '').squeeze('_')
-  end
-  
-  # Capitalize all words in the string
-  def capitalize_all(delimiter = ' ')
-    self.split(delimiter).collect{|w| w.capitalize }.join(' ')
-  end
-end
-
-module CmsViewHelpers
-  
-  # Wrapper around CmsFormBuilder
-  def cms_form_for(record_or_name_or_array, *args, &proc)
-    options = args.extract_options!
-    form_for(record_or_name_or_array, *(args << options.merge(:builder => CmsFormBuilder)), &proc)
-  end
-  
-  # Wrapper for <span>
-  def span_tag(*args)
-    content_tag(:span, *args)
-  end
-  
-  # Rails 3.0 doesn't have this helper defined
-  def datetime_field_tag(name, value = nil, options = {})
-    text_field_tag(name, value, options.stringify_keys.update('type' => 'datetime'))
-  end
-end
-
-ActionView::Base.send :include, CmsViewHelpers