comfortable_mexican_sofa 1.0.46 → 1.0.47

data/README.md

@@ -115,6 +115,8 @@ Similarly you can access **Snippet** content:
     
     cms_snippet_content(:snippet_slug)
     
+You can also directly access `@cms_site`, `@cms_layout` and `@cms_page` objects from helpers, partials and application layouts used in rendering of a CMS page.
+    
 Extending Admin Area
 --------------------
 
@@ -157,7 +159,7 @@ There's a rake task that makes moving seeds into database (and vice-versa) easy:
     # from seeds into database
     rake comfortable_mexican_sofa:import:all FROM=your-site.local TO=your-site.com SEED_PATH=/path/to/seeds
     
-    # from database to seeds    
+    # from database to seeds
     rake comfortable_mexican_sofa:export:all FROM=your-site.com TO=your-site.local SEED_PATH=/path/to/seeds
     
 Active Components
@@ -166,7 +168,7 @@ Comfortable Mexican Sofa utilizes the following:
 
 * **[https://github.com/rails/rails](https://github.com/rails/rails)** - Ruby on Rails 3.*, of course
 * **[https://github.com/thoughtbot/paperclip](https://github.com/thoughtbot/paperclip)** - Paperclip to handle file uploads
-* **[https://github.com/theworkinggroup/active_link_to](https://github.com/theworkinggroup/active_link_to)** - Easy method to handle logic behind 'active' links
+* **[https://github.com/twg/active_link_to](https://github.com/twg/active_link_to)** - Easy method to handle logic behind 'active' links
 
 * * *
 

data/VERSION

@@ -1 +1 @@
-1.0.46
+1.0.47

data/app/controllers/cms_content_controller.rb

@@ -4,7 +4,7 @@ class CmsContentController < ApplicationController
   before_filter :load_cms_page,   :only => :render_html
   before_filter :load_cms_layout, :only => [:render_css, :render_js]
   
-  caches_page :render_css, :render_js, :if => ComfortableMexicanSofa.config.enable_caching
+  caches_page :render_css, :render_js, :if => Proc.new { |c| ComfortableMexicanSofa.config.enable_caching }
   
   def render_html(status = 200)
     layout = @cms_page.cms_layout.app_layout.blank?? false : @cms_page.cms_layout.app_layout

data/app/views/cms_admin/pages/_form.html.erb

@@ -22,7 +22,7 @@
     <%= form.select :parent_id, options %>
   <% end %>
   <% if (options = CmsPage.options_for_select(@cms_site, @cms_page, nil, 0, false)).present? %>
-    <%= form.select :target_page_id, options, :include_blank => true, :label => 'Redirect To Page' %>
+    <%= form.select :target_page_id, [['---- No Redirect ----', nil]] + options, :label => 'Redirect To Page' %>
   <% end %>
   <%= cms_hook :page_form, :object => form %>
 </div>

data/comfortable_mexican_sofa.gemspec

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

data/lib/comfortable_mexican_sofa/cms_tag.rb

@@ -18,7 +18,7 @@ module CmsTag
     #   /\{\{\s*?cms:page:(\w+)\}\}/
     # will match tags like these:
     #   {{cms:page:my_label}}
-    def regex_tag_signature
+    def regex_tag_signature(label = nil)
       nil
     end
     
@@ -56,7 +56,7 @@ module CmsTag
     # Example:
     #   /<\{\s*?cms:page:tag_label\}/
     def regex_tag_signature
-      nil
+      self.class.regex_tag_signature(label)
     end
     
     # Content that is accociated with Tag instance.

data/lib/comfortable_mexican_sofa/cms_tag/field_datetime.rb

@@ -7,10 +7,6 @@ class CmsTag::FieldDateTime < CmsBlock
     /\{\{\s*cms:field:(#{label}):datetime\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/comfortable_mexican_sofa/cms_tag/field_integer.rb

@@ -7,10 +7,6 @@ class CmsTag::FieldInteger < CmsBlock
     /\{\{\s*cms:field:(#{label}):integer\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/comfortable_mexican_sofa/cms_tag/field_string.rb

@@ -7,10 +7,6 @@ class CmsTag::FieldString < CmsBlock
     /\{\{\s*cms:field:(#{label}):?(?:string)?\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/comfortable_mexican_sofa/cms_tag/field_text.rb

@@ -7,10 +7,6 @@ class CmsTag::FieldText < CmsBlock
     /\{\{\s*cms:field:(#{label}):?(?:text)?\s*?\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/comfortable_mexican_sofa/cms_tag/helper.rb

@@ -9,10 +9,6 @@ class CmsTag::Helper
     /\{\{\s*cms:helper:(#{label}):?(.*?)\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content
     "<%= #{label}(#{params.split(':').collect{|p| "'#{p}'"}.join(', ')}) %>"
   end

data/lib/comfortable_mexican_sofa/cms_tag/page_datetime.rb

@@ -7,10 +7,6 @@ class CmsTag::PageDateTime < CmsBlock
     /\{\{\s*cms:page:(#{label}):datetime\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/comfortable_mexican_sofa/cms_tag/page_integer.rb

@@ -7,10 +7,6 @@ class CmsTag::PageInteger < CmsBlock
     /\{\{\s*cms:page:(#{label}):integer\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/comfortable_mexican_sofa/cms_tag/page_rich_text.rb

@@ -7,10 +7,6 @@ class CmsTag::PageRichText < CmsBlock
     /\{\{\s*cms:page:(#{label}):rich_text\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/comfortable_mexican_sofa/cms_tag/page_string.rb

@@ -7,10 +7,6 @@ class CmsTag::PageString < CmsBlock
     /\{\{\s*cms:page:(#{label}):string\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/comfortable_mexican_sofa/cms_tag/page_text.rb

@@ -7,10 +7,6 @@ class CmsTag::PageText < CmsBlock
     /\{\{\s*cms:page:(#{label}):?(?:text)?\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content=(value)
     write_attribute(:content, value)
   end

data/lib/comfortable_mexican_sofa/cms_tag/partial.rb

@@ -9,10 +9,6 @@ class CmsTag::Partial
     /\{\{\s*cms:partial:(#{label}):?(.*?)\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content
     ps = params.split(':').collect_with_index{|p, i| ":param_#{i+1} => '#{p}'"}.join(', ')
     "<%= render :partial => '#{label}'#{ps.blank?? nil : ", :locals => {#{ps}}"} %>"

data/lib/comfortable_mexican_sofa/cms_tag/snippet.rb

@@ -11,10 +11,6 @@ class CmsTag::Snippet < CmsSnippet
     /\{\{\s*cms:snippet:(#{label})\s*\}\}/
   end
   
-  def regex_tag_signature
-    self.class.regex_tag_signature(label)
-  end
-  
   def content
     self.read_attribute(:content)
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 46
-  version: 1.0.46
+  - 47
+  version: 1.0.47
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -05:00
+date: 2011-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -384,7 +384,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 680801473721567613
+      hash: 4181913889619670678
       segments: 
       - 0
       version: "0"