comfortable_mexican_sofa 1.0.41 → 1.0.42

data/VERSION

@@ -1 +1 @@
-1.0.41
+1.0.42

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.41"
+  s.version = "1.0.42"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2011-02-01}
+  s.date = %q{2011-02-03}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
     "README.md"
   ]
   s.files = [
+    ".gemtest",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE",

data/config/initializers/comfortable_mexican_sofa.rb

@@ -20,6 +20,11 @@ ComfortableMexicanSofa.configure do |config|
   
   # Let CMS handle site creation and management. Enabled by default.
   #   config.auto_manage_sites = true
+  
+  # By default you cannot have irb code inside your layouts/pages/snippets.
+  # Generally this is to prevent putting something like this:
+  # <% User.delete_all %> but if you really want to allow it...
+  #   config.disable_irb = true
 end
 
 # Default credentials for ComfortableMexicanSofa::HttpAuth

data/lib/comfortable_mexican_sofa/cms_tag.rb

@@ -67,7 +67,12 @@ module CmsTag
     # Content that is used during page rendering. Outputting existing content
     # as a default.
     def render
-      content.to_s
+      # cleaning content from possible irb stuff. Partial and Helper tags are OK.
+      if ComfortableMexicanSofa.config.disable_irb && ![CmsTag::Partial, CmsTag::Helper].member?(self.class)
+        content.to_s.gsub('<%', '&lt;%').gsub('%>', '%&gt;')
+      else
+        content.to_s
+      end
     end
   end
   

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -21,14 +21,18 @@ class ComfortableMexicanSofa::Configuration
   # Let CMS handle site creation and management. Enabled by default.
   attr_accessor :auto_manage_sites
   
+  # Not allowing irb code to be run inside page content. True by default.
+  attr_accessor :disable_irb
+  
   # Configuration defaults
   def initialize
-    @cms_title            = 'ComfortableMexicanSofa'
+    @cms_title            = 'ComfortableMexicanSofa MicroCMS'
     @authentication       = 'ComfortableMexicanSofa::HttpAuth'
     @seed_data_path       = nil
     @admin_route_prefix   = 'cms-admin'
     @admin_route_redirect = "/#{@admin_route_prefix}/pages"
     @auto_manage_sites    = true
+    @disable_irb          = true
   end
   
 end

data/test/functional/cms_content_controller_test.rb

@@ -67,6 +67,46 @@ class CmsContentControllerTest < ActionController::TestCase
     assert_response 404
   end
   
+  def test_render_page_with_irb_disabled
+    assert ComfortableMexicanSofa.config.disable_irb
+    
+    irb_page = cms_sites(:default).cms_pages.create!(
+      :label          => 'irb',
+      :slug           => 'irb',
+      :parent_id      => cms_pages(:default).id,
+      :cms_layout_id  => cms_layouts(:default).id,
+      :is_published   => '1',
+      :cms_blocks_attributes => [
+        { :label    => 'default_page_text',
+          :type     => 'CmsTag::PageText',
+          :content  => 'text <%= 2 + 2 %> text' }
+      ]
+    )
+    get :render_html, :cms_path => 'irb'
+    assert_response :success
+    assert_match "text &lt;%= 2 + 2 %&gt; text", response.body
+  end
+  
+  def test_render_page_with_irb_enabled
+    ComfortableMexicanSofa.config.disable_irb = false
+    
+    irb_page = cms_sites(:default).cms_pages.create!(
+      :label          => 'irb',
+      :slug           => 'irb',
+      :parent_id      => cms_pages(:default).id,
+      :cms_layout_id  => cms_layouts(:default).id,
+      :is_published   => '1',
+      :cms_blocks_attributes => [
+        { :label    => 'default_page_text',
+          :type     => 'CmsTag::PageText',
+          :content  => 'text <%= 2 + 2 %> text' }
+      ]
+    )
+    get :render_html, :cms_path => 'irb'
+    assert_response :success
+    assert_match "text 4 text", response.body
+  end
+  
   def test_render_css
     get :render_css, :id => cms_layouts(:default).slug
     assert_response :success

data/test/test_helper.rb

@@ -14,12 +14,13 @@ class ActiveSupport::TestCase
   # resetting default configuration
   def reset_config
     ComfortableMexicanSofa.configure do |config|
-      config.cms_title            = 'ComfortableMexicanSofa'
+      config.cms_title            = 'ComfortableMexicanSofa MicroCMS'
       config.authentication       = 'ComfortableMexicanSofa::HttpAuth'
       config.seed_data_path       = nil
       config.admin_route_prefix   = 'cms-admin'
       config.admin_route_redirect = "/cms-admin/pages"
       config.auto_manage_sites    = true
+      config.disable_irb          = true
     end
     ComfortableMexicanSofa::HttpAuth.username = 'username'
     ComfortableMexicanSofa::HttpAuth.password = 'password'

data/test/unit/cms_configuration_test.rb

@@ -4,11 +4,12 @@ class CmsConfigurationTest < ActiveSupport::TestCase
   
   def test_configuration_presense
     assert config = ComfortableMexicanSofa.configuration
-    assert_equal 'ComfortableMexicanSofa', config.cms_title
+    assert_equal 'ComfortableMexicanSofa MicroCMS', config.cms_title
     assert_equal 'ComfortableMexicanSofa::HttpAuth', config.authentication
     assert_equal nil, config.seed_data_path
     assert_equal 'cms-admin', config.admin_route_prefix
     assert_equal '/cms-admin/pages', config.admin_route_redirect
+    assert_equal true, config.disable_irb
   end
   
   def test_initialization_overrides

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 41
-  version: 1.0.41
+  - 42
+  version: 1.0.42
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -05:00
+date: 2011-02-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,6 +144,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
+- .gemtest
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -376,7 +377,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1503786614433025882
+      hash: -1540326834008141182
       segments: 
       - 0
       version: "0"