comfortable_mexican_sofa 1.0.51 → 1.1.1

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -59,22 +59,24 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     css_class = options[:css_class] || tag.class.name.underscore.downcase.idify
     
     field_css_class = case tag
-      when CmsTag::PageRichText                 then 'rich_text'
-      when CmsTag::PageText, CmsTag::FieldText  then 'code'
+    when ComfortableMexicanSofa::Tag::PageRichText
+      'rich_text'
+    when ComfortableMexicanSofa::Tag::PageText, ComfortableMexicanSofa::Tag::FieldText
+      'code'
     end
     
     options[:content_field_method] ||= :text_field_tag
     field = 
       options[:field] || 
-      @template.send(options[:content_field_method], 'cms_page[cms_blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class)
+      @template.send(options[:content_field_method], 'cms_page[blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class)
     
     %(
       <div class='form_element #{css_class}'>
         <div class='label'>#{label}</div>
         <div class='value'>
           #{field}
-          #{@template.hidden_field_tag('cms_page[cms_blocks_attributes][][label]', tag.label, :id => nil)}
-          #{@template.hidden_field_tag('cms_page[cms_blocks_attributes][][id]', tag.record_id, :id => nil) if tag.record_id}
+          #{@template.hidden_field_tag('cms_page[blocks_attributes][][label]', tag.label, :id => nil)}
+          #{@template.hidden_field_tag('cms_page[blocks_attributes][][id]', tag.record_id, :id => nil) if tag.record_id}
         </div>
       </div>
     ).html_safe
@@ -116,14 +118,4 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     default_tag_field(tag, :content_field_method => :text_area_tag)
   end
   
-  # Capturing all calls of cms_tag_* type. For those we'll try to render
-  # a form element. Everything else can trigger MethodNotFound error.
-  def method_missing(method_name, *args)
-    if m = method_name.to_s.match(/^cms_tag_(\w+)$/)
-      send(m[1], *args) if respond_to?(m[1])
-    else
-      super
-    end
-  end
-  
 end

data/lib/comfortable_mexican_sofa/{cms_tag.rb → tag.rb}

@@ -4,13 +4,14 @@
 #     include CmsTag
 #     ...
 #   end
-module CmsTag
+module ComfortableMexicanSofa::Tag
   
   TOKENIZER_REGEX = /(\{\{\s*cms:[^{}]*\}\})|((?:\{?[^{])+|\{+)/
   
-  attr_accessor :params,
-                :parent,
-                :record_id
+  attr_accessor :page,
+                :label,
+                :params,
+                :parent
   
   module ClassMethods
     # Regex that is used to match tags in the content
@@ -24,16 +25,13 @@ module CmsTag
     
     # Initializing tag object for a particular Tag type
     # First capture group in the regex is the tag label
-    def initialize_tag(cms_page, tag_signature)
+    def initialize_tag(page, tag_signature)
       if match = tag_signature.match(regex_tag_signature)
-        if self.respond_to?(:initialize_or_find)
-          self.initialize_or_find(cms_page, match[1])
-        else
-          tag = self.new
-          tag.label   = match[1]
-          tag.params  = match[2]
-          tag
-        end
+        tag = self.new
+        tag.page    = page
+        tag.label   = match[1]
+        tag.params  = match[2]
+        tag
       end
     end
   end
@@ -42,7 +40,7 @@ module CmsTag
     
     # String indentifier of the tag
     def identifier
-      "#{self.class.name.underscore}_#{self.label}"
+      "#{self.class.to_s.demodulize.underscore}_#{self.label}"
     end
     
     # Ancestors of this tag constructed during rendering process.
@@ -68,35 +66,56 @@ module CmsTag
     # as a default.
     def render
       # cleaning content from possible irb stuff. Partial and Helper tags are OK.
-      if ComfortableMexicanSofa.config.disable_irb && ![CmsTag::Partial, CmsTag::Helper].member?(self.class)
+      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
     end
+    
+    # Find or initialize Cms::Block object
+    def block
+      page.blocks.detect{|b| b.label == self.label.to_s} || page.blocks.build(:label => self.label.to_s)
+    end
+    
+    # Find or initialize Cms::Snippet object
+    def snippet
+      page.site.snippets.detect{|s| s.slug == self.label.to_s} || page.site.snippets.build(:slug => self.label.to_s)
+    end
+    
+    # Checks if this tag is using Cms::Block
+    def is_cms_block?
+      %w(page field).member?(self.class.to_s.demodulize.underscore.split(/_/).first)
+    end
+    
+    # Used in displaying form elements for Cms::Block
+    def record_id
+      block.id
+    end
   end
   
 private
   
   # Initializes a tag. It's handled by one of the tag classes
-  def self.initialize_tag(cms_page, tag_signature)
+  def self.initialize_tag(page, tag_signature)
     tag_instance = nil
-    tag_classes.find{ |c| tag_instance = c.initialize_tag(cms_page, tag_signature) }
+    tag_classes.find{ |c| tag_instance = c.initialize_tag(page, tag_signature) }
     tag_instance
   end
   
   # Scanning provided content and splitting it into [tag, text] tuples.
   # Tags are processed further and their content is expanded in the same way.
   # Tags are defined in the parent tags are ignored and not rendered.
-  def self.process_content(cms_page, content = '', parent_tag = nil)
+  def self.process_content(page, content = '', parent_tag = nil)
     tokens = content.to_s.scan(TOKENIZER_REGEX)
     tokens.collect do |tag_signature, text|
       if tag_signature
-        if tag = self.initialize_tag(cms_page, tag_signature)
+        if tag = self.initialize_tag(page, tag_signature)
           tag.parent = parent_tag if parent_tag
           if tag.ancestors.select{|a| a.identifier == tag.identifier}.blank?
-            cms_page.cms_tags << tag
-            self.process_content(cms_page, tag.render, tag)
+            page.tags << tag
+            self.process_content(page, tag.render, tag)
           end
         end
       else
@@ -106,8 +125,8 @@ private
   end
   
   def self.included(tag)
-    tag.send(:include, CmsTag::InstanceMethods)
-    tag.send(:extend, CmsTag::ClassMethods)
+    tag.send(:include, ComfortableMexicanSofa::Tag::InstanceMethods)
+    tag.send(:extend, ComfortableMexicanSofa::Tag::ClassMethods)
     @@tag_classes ||= []
     @@tag_classes << tag
   end

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/field_datetime.rb

@@ -1,6 +1,5 @@
-class CmsTag::FieldDateTime < CmsBlock
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::FieldDateTime
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-]+/
@@ -8,11 +7,11 @@ class CmsTag::FieldDateTime < CmsBlock
   end
   
   def content=(value)
-    write_attribute(:content, value)
+    block.content = value
   end
   
   def content
-    read_attribute(:content)
+    block.content
   end
   
   def render

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/field_integer.rb

@@ -1,6 +1,5 @@
-class CmsTag::FieldInteger < CmsBlock
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::FieldInteger
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-]+/
@@ -8,11 +7,11 @@ class CmsTag::FieldInteger < CmsBlock
   end
   
   def content=(value)
-    write_attribute(:content, value)
+    block.content = value
   end
   
   def content
-    read_attribute(:content)
+    block.content
   end
   
   def render

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/field_string.rb

@@ -1,6 +1,5 @@
-class CmsTag::FieldString < CmsBlock
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::FieldString
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-]+/
@@ -8,11 +7,11 @@ class CmsTag::FieldString < CmsBlock
   end
   
   def content=(value)
-    write_attribute(:content, value)
+    block.content = value
   end
   
   def content
-    read_attribute(:content)
+    block.content
   end
   
   def render

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/field_text.rb

@@ -1,6 +1,5 @@
-class CmsTag::FieldText < CmsBlock
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::FieldText
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-]+/
@@ -8,11 +7,11 @@ class CmsTag::FieldText < CmsBlock
   end
   
   def content=(value)
-    write_attribute(:content, value)
+    block.content = value
   end
   
   def content
-    read_attribute(:content)
+    block.content
   end
   
   def render

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/helper.rb

@@ -1,8 +1,5 @@
-class CmsTag::Helper
-  
-  attr_accessor :label
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::Helper
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-]+/

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/page_datetime.rb

@@ -1,6 +1,5 @@
-class CmsTag::PageDateTime < CmsBlock
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::PageDateTime
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-]+/
@@ -8,11 +7,11 @@ class CmsTag::PageDateTime < CmsBlock
   end
   
   def content=(value)
-    write_attribute(:content, value)
+    block.content = value
   end
   
   def content
-    read_attribute(:content)
+    block.content
   end
   
 end

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/page_integer.rb

@@ -1,6 +1,5 @@
-class CmsTag::PageInteger < CmsBlock
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::PageInteger
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-]+/
@@ -8,11 +7,11 @@ class CmsTag::PageInteger < CmsBlock
   end
   
   def content=(value)
-    write_attribute(:content, value)
+    block.content = value
   end
   
   def content
-    read_attribute(:content)
+    block.content
   end
   
 end

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/page_rich_text.rb

@@ -1,6 +1,5 @@
-class CmsTag::PageRichText < CmsBlock
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::PageRichText
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-]+/
@@ -8,11 +7,11 @@ class CmsTag::PageRichText < CmsBlock
   end
   
   def content=(value)
-    write_attribute(:content, value)
+    block.content = value
   end
   
   def content
-    read_attribute(:content)
+    block.content
   end
   
 end

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/page_string.rb

@@ -1,6 +1,5 @@
-class CmsTag::PageString < CmsBlock
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::PageString
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-]+/
@@ -8,11 +7,11 @@ class CmsTag::PageString < CmsBlock
   end
   
   def content=(value)
-    write_attribute(:content, value)
+    block.content = value
   end
   
   def content
-    read_attribute(:content)
+    block.content
   end
   
 end

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/page_text.rb

@@ -1,6 +1,5 @@
-class CmsTag::PageText < CmsBlock
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::PageText
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-]+/
@@ -8,11 +7,11 @@ class CmsTag::PageText < CmsBlock
   end
   
   def content=(value)
-    write_attribute(:content, value)
+    block.content = value
   end
   
   def content
-    read_attribute(:content)
+    block.content
   end
   
 end

data/lib/comfortable_mexican_sofa/{cms_tag → tags}/partial.rb

@@ -1,8 +1,5 @@
-class CmsTag::Partial
-  
-  attr_accessor :label
-  
-  include CmsTag
+class ComfortableMexicanSofa::Tag::Partial
+  include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\/\-]+/

data/lib/comfortable_mexican_sofa/tags/snippet.rb

@@ -0,0 +1,13 @@
+class ComfortableMexicanSofa::Tag::Snippet
+  include ComfortableMexicanSofa::Tag
+  
+  def self.regex_tag_signature(label = nil)
+    label ||= /[\w\-]+/
+    /\{\{\s*cms:snippet:(#{label})\s*\}\}/
+  end
+  
+  def content
+    snippet.content
+  end
+  
+end

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -22,8 +22,9 @@ module ComfortableMexicanSofa::ViewMethods
   
   # Content of a snippet. Example:
   #   cms_snippet_content(:my_snippet)
-  def cms_snippet_content(snippet_slug)
-    return '' unless snippet = CmsSnippet.load_for_slug(@cms_site, snippet_slug)
+  def cms_snippet_content(snippet_slug, cms_site = nil)
+    return '' unless cms_site ||= (@cms_site || Cms::Site.find_by_hostname!(request.host.downcase))
+    return '' unless snippet = cms_site.snippets.find_by_slug(snippet_slug)
     snippet.content.to_s.html_safe
   end
   
@@ -33,7 +34,7 @@ module ComfortableMexicanSofa::ViewMethods
   #   cms_page_content(:left_column) # if @cms_page is present
   def cms_page_content(block_label, page = nil)
     return '' unless page ||= @cms_page
-    return '' unless block = page.cms_blocks.select{|b| b.label == block_label}.first
+    return '' unless block = page.blocks.find_by_label(block_label)
     block.content.to_s.html_safe
   end
 end

data/lib/generators/cms_generator.rb

@@ -28,7 +28,7 @@ class CmsGenerator < Rails::Generators::Base
   end
   
   def generate_cms_seeds
-    directory 'db/cms_seeds', 'db/cms_seeds'
+    directory 'db/cms_fixtures', 'db/cms_fixtures'
   end
   
   def show_readme