comfortable_mexican_sofa 1.4.18 → 1.4.19

data/VERSION

@@ -1 +1 @@
-1.4.18
+1.4.19

data/app/models/cms/page.rb

@@ -100,7 +100,14 @@ class Cms::Page < ActiveRecord::Base
     @content = nil if force_reload
     @content ||= begin
       self.tags = [] # resetting
-      layout ? ComfortableMexicanSofa::Tag.process_content(self, layout.merged_content) : ''
+      if layout
+        ComfortableMexicanSofa::Tag.process_content(
+          self,
+          ComfortableMexicanSofa::Tag.sanitize_irb(layout.merged_content)
+        )
+      else
+        ''
+      end
     end
   end
   

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.18"
+  s.version = "1.4.19"
 
   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-09-21}
+  s.date = %q{2011-09-22}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/lib/comfortable_mexican_sofa/tag.rb

@@ -67,13 +67,8 @@ module ComfortableMexicanSofa::Tag
     # Content that is used during page rendering. Outputting existing content
     # as a default.
     def render
-      # cleaning content from possible irb stuff. Partial and Helper tags are OK.
-      if !ComfortableMexicanSofa.config.allow_irb && 
-          ![ComfortableMexicanSofa::Tag::Partial, ComfortableMexicanSofa::Tag::Helper].member?(self.class)
-        content.to_s.gsub('<%', '&lt;%').gsub('%>', '%&gt;')
-      else
-        content.to_s
-      end
+      ignore = [ComfortableMexicanSofa::Tag::Partial, ComfortableMexicanSofa::Tag::Helper].member?(self.class)
+      ComfortableMexicanSofa::Tag.sanitize_irb(content, ignore)
     end
     
     # Find or initialize Cms::Block object
@@ -131,6 +126,15 @@ private
     end.join('')
   end
   
+  # Cleaning content from possible irb stuff. Partial and Helper tags are OK.
+  def self.sanitize_irb(content, ignore = false)
+    if ComfortableMexicanSofa.config.allow_irb || ignore
+      content.to_s
+    else
+      content.to_s.gsub('<%', '&lt;%').gsub('%>', '%&gt;')
+    end
+  end
+  
   def self.included(tag)
     tag.send(:include, ComfortableMexicanSofa::Tag::InstanceMethods)
     tag.send(:extend, ComfortableMexicanSofa::Tag::ClassMethods)

data/test/unit/tag_test.rb

@@ -220,4 +220,52 @@ class TagTest < ActiveSupport::TestCase
     assert !tag.is_cms_block?
   end
   
+  def test_content_with_irb_disabled
+    assert_equal false, ComfortableMexicanSofa.config.allow_irb
+    
+    site = cms_sites(:default)
+    layout = site.layouts.create!(
+      :slug     => 'no-irb-layout',
+      :content  => '<% 1 + 1 %> {{cms:page:content}} <%= 1 + 1 %>'
+    )
+    snippet = site.snippets.create!(
+      :slug     => 'no-irb-snippet',
+      :content  => '<% 2 + 2 %> snippet <%= 2 + 2 %>'
+    )
+    page = site.pages.create!(
+      :slug       => 'no-irb-page',
+      :parent_id  => cms_pages(:default).id,
+      :layout_id  => layout.id,
+      :blocks_attributes => [
+        { :label    => 'content',
+          :content  => 'text {{ cms:snippet:no-irb-snippet }} {{ cms:partial:path/to }} {{ cms:helper:method }} text' }
+      ]
+    )
+    assert_equal "&lt;% 1 + 1 %&gt; text &lt;% 2 + 2 %&gt; snippet &lt;%= 2 + 2 %&gt; <%= render :partial => 'path/to' %> <%= method() %> text &lt;%= 1 + 1 %&gt;", page.content
+  end
+  
+  def test_content_with_irb_enabled
+    ComfortableMexicanSofa.config.allow_irb = true
+    
+    site = cms_sites(:default)
+    layout = site.layouts.create!(
+      :slug     => 'irb-layout',
+      :content  => '<% 1 + 1 %> {{cms:page:content}} <%= 1 + 1 %>'
+    )
+    snippet = site.snippets.create!(
+      :slug     => 'irb-snippet',
+      :content  => '<% 2 + 2 %> snippet <%= 2 + 2 %>'
+    )
+    page = site.pages.create!(
+      :slug       => 'irb-page',
+      :parent_id  => cms_pages(:default).id,
+      :layout_id  => layout.id,
+      :blocks_attributes => [
+        { :label    => 'content',
+          :content  => 'text {{ cms:snippet:irb-snippet }} {{ cms:partial:path/to }} {{ cms:helper:method }} text' }
+      ]
+    )
+    assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= 1 + 1 %>", page.content
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.18
+  version: 1.4.19
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000 -04:00
+date: 2011-09-22 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70197712792820 !ruby/object:Gem::Requirement
+  requirement: &70343682601860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70197712792820
+  version_requirements: *70343682601860
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70197712791920 !ruby/object:Gem::Requirement
+  requirement: &70343682597740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70197712791920
+  version_requirements: *70343682597740
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70197712791440 !ruby/object:Gem::Requirement
+  requirement: &70343682597140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70197712791440
+  version_requirements: *70343682597140
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1469996073004586426
+      hash: 467182363861644455
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: