comfortable_mexican_sofa 1.5.11 → 1.6.0

data/db/migrate/upgrades/07_upgrade_to_1_6_0.rb

@@ -0,0 +1,25 @@
+class UpgradeTo150 < ActiveRecord::Migration
+  def self.up
+    add_column :cms_sites, :identifier, :string, :null => false
+    add_index :cms_sites, :identifier
+    
+    rename_column :cms_layouts, :slug, :identifier
+    rename_column :cms_blocks, :label, :identifier
+    rename_column :cms_snippets, :slug, :identifier
+    
+    add_column :cms_categories, :site_id, :integer, :null => :false
+    add_index :cms_categories, [:site_id, :categorized_type, :label], :unique => true
+  end
+  
+  def self.down
+    remove_index :cms_categories, [:site_id, :categorized_type, :label], :unique => true
+    remove_column :cms_categories, :site_id
+    
+    rename_column :cms_snippets, :identifier, :slug
+    rename_column :cms_blocks, :identifier, :label
+    rename_column :cms_layouts, :identifier, :slug
+    
+    remove_index :cms_sites, :identifier
+    remove_column :cms_sites, :identifier
+  end
+end

data/lib/comfortable_mexican_sofa/error.rb

@@ -4,14 +4,14 @@ module ComfortableMexicanSofa
   end
   
   class MissingSite < ComfortableMexicanSofa::Error
-    def initialize(slug)
-      super "Cannot find CMS Site with slug: #{slug}"
+    def initialize(identifier)
+      super "Cannot find CMS Site with identifier: #{identifier}"
     end
   end
   
   class MissingLayout < ComfortableMexicanSofa::Error
-    def initialize(slug)
-      super "Cannot find CMS Layout with slug: #{slug}"
+    def initialize(identifier)
+      super "Cannot find CMS Layout with identifier: #{identifier}"
     end
   end
   

data/lib/comfortable_mexican_sofa/extensions/is_categorized.rb

@@ -22,7 +22,9 @@ module ComfortableMexicanSofa::IsCategorized
       
       scope :for_category, lambda { |*categories|
         if (categories = [categories].flatten.compact).present?
-          select("DISTINCT #{table_name}.*").joins(:categorizations => :category).where('cms_categories.label' => categories)
+          select("DISTINCT #{table_name}.*").
+            joins(:categorizations => :category).
+            where('cms_categories.label' => categories)
         end
       }
     end

data/lib/comfortable_mexican_sofa/extensions/is_mirrored.rb

@@ -22,9 +22,9 @@ module ComfortableMexicanSofa::IsMirrored
       return [] unless self.site.is_mirrored?
       (Cms::Site.mirrored - [self.site]).collect do |site|
         case self
-          when Cms::Layout  then site.layouts.find_by_slug(self.slug)
+          when Cms::Layout  then site.layouts.find_by_identifier(self.identifier)
           when Cms::Page    then site.pages.find_by_full_path(self.full_path)
-          when Cms::Snippet then site.snippets.find_by_slug(self.slug)
+          when Cms::Snippet then site.snippets.find_by_identifier(self.identifier)
         end
       end.compact
     end
@@ -38,10 +38,10 @@ module ComfortableMexicanSofa::IsMirrored
       (Cms::Site.mirrored - [self.site]).each do |site|
         mirror = case self
         when Cms::Layout
-          m = site.layouts.find_by_slug(self.slug_was || self.slug) || site.layouts.new
+          m = site.layouts.find_by_identifier(self.identifier_was || self.identifier) || site.layouts.new
           m.attributes = {
-            :slug       => self.slug,
-            :parent_id  => site.layouts.find_by_slug(self.parent.try(:slug)).try(:id)
+            :identifier => self.identifier,
+            :parent_id  => site.layouts.find_by_identifier(self.parent.try(:identifier)).try(:id)
           }
           m
         when Cms::Page
@@ -50,13 +50,13 @@ module ComfortableMexicanSofa::IsMirrored
             :slug       => self.slug,
             :label      => self.slug.blank?? self.label : m.label,
             :parent_id  => site.pages.find_by_full_path(self.parent.try(:full_path)).try(:id),
-            :layout     => site.layouts.find_by_slug(self.layout.slug)
+            :layout     => site.layouts.find_by_identifier(self.layout.identifier)
           }
           m
         when Cms::Snippet
-          m = site.snippets.find_by_slug(self.slug_was || self.slug) || site.snippets.new
+          m = site.snippets.find_by_identifier(self.identifier_was || self.identifier) || site.snippets.new
           m.attributes = {
-            :slug => self.slug
+            :identifier => self.identifier
           }
           m
         end

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -20,11 +20,11 @@ module ComfortableMexicanSofa::Fixtures
     end
     
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
-      slug = path.split('/').last
-      layout = site.layouts.find_by_slug(slug) || site.layouts.new(:slug => slug)
+      identifier = path.split('/').last
+      layout = site.layouts.find_by_identifier(identifier) || site.layouts.new(:identifier => identifier)
       
       # updating attributes
-      if File.exists?(file_path = File.join(path, "_#{slug}.yml"))
+      if File.exists?(file_path = File.join(path, "_#{identifier}.yml"))
         if layout.new_record? || File.mtime(file_path) > layout.updated_at
           attributes = YAML.load_file(file_path).symbolize_keys!
           layout.label      = attributes[:label] || slug.titleize
@@ -56,7 +56,7 @@ module ComfortableMexicanSofa::Fixtures
       layout.parent = parent
       if layout.changed?
         layout.save!
-        Rails.logger.debug "[Fixtures] Saved Layout {#{layout.slug}}"
+        Rails.logger.debug "[Fixtures] Saved Layout {#{layout.identifier}}"
       end
       layout_ids << layout.id
       
@@ -94,7 +94,7 @@ module ComfortableMexicanSofa::Fixtures
         if page.new_record? || File.mtime(file_path) > page.updated_at
           attributes = YAML.load_file(file_path).symbolize_keys!
           page.label = attributes[:label] || slug.titleize
-          page.layout = site.layouts.find_by_slug(attributes[:layout]) || parent.try(:layout)
+          page.layout = site.layouts.find_by_identifier(attributes[:layout]) || parent.try(:layout)
           page.target_page = site.pages.find_by_full_path(attributes[:target_page])
           page.is_published = attributes[:is_published].present?? attributes[:is_published] : true
         end
@@ -107,10 +107,10 @@ module ComfortableMexicanSofa::Fixtures
       blocks_attributes = [ ]
       Dir.glob("#{path}/*.html").each do |file_path|
         if page.new_record? || File.mtime(file_path) > page.updated_at
-          label = file_path.split('/').last.split('.').first
+          identifier = file_path.split('/').last.split('.').first
           blocks_attributes << {
-            :label    => label,
-            :content  => File.open(file_path, 'rb').read
+            :identifier => identifier,
+            :content    => File.open(file_path, 'rb').read
           }
         end
       end
@@ -146,11 +146,11 @@ module ComfortableMexicanSofa::Fixtures
     
     snippet_ids = []
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
-      slug = path.split('/').last
-      snippet = site.snippets.find_by_slug(slug) || site.snippets.new(:slug => slug)
+      identifier = path.split('/').last
+      snippet = site.snippets.find_by_identifier(identifier) || site.snippets.new(:identifier => identifier)
       
       # updating attributes
-      if File.exists?(file_path = File.join(path, "_#{slug}.yml"))
+      if File.exists?(file_path = File.join(path, "_#{identifier}.yml"))
         if snippet.new_record? || File.mtime(file_path) > snippet.updated_at
           attributes = YAML.load_file(file_path).symbolize_keys!
           snippet.label = attributes[:label] || slug.titleize
@@ -169,7 +169,7 @@ module ComfortableMexicanSofa::Fixtures
       # saving
       if snippet.changed?
         snippet.save!
-        Rails.logger.debug "[Fixtures] Saved Snippet {#{snippet.slug}}"
+        Rails.logger.debug "[Fixtures] Saved Snippet {#{snippet.identifier}}"
       end
       snippet_ids << snippet.id
     end
@@ -186,14 +186,14 @@ module ComfortableMexicanSofa::Fixtures
     FileUtils.mkdir_p(path)
     
     site.layouts.each do |layout|
-      layout_path = File.join(path, layout.ancestors.reverse.collect{|l| l.slug}, layout.slug)
+      layout_path = File.join(path, layout.ancestors.reverse.collect{|l| l.identifier}, layout.identifier)
       FileUtils.mkdir_p(layout_path)
       
-      open(File.join(layout_path, "_#{layout.slug}.yml"), 'w') do |f|
+      open(File.join(layout_path, "_#{layout.identifier}.yml"), 'w') do |f|
         f.write({
           'label'       => layout.label,
           'app_layout'  => layout.app_layout,
-          'parent'      => layout.parent.try(:slug)
+          'parent'      => layout.parent.try(:identifier)
         }.to_yaml)
       end
       open(File.join(layout_path, 'content.html'), 'w') do |f|
@@ -222,14 +222,14 @@ module ComfortableMexicanSofa::Fixtures
       open(File.join(page_path, "_#{page.slug}.yml"), 'w') do |f|
         f.write({
           'label'         => page.label,
-          'layout'        => page.layout.try(:slug),
+          'layout'        => page.layout.try(:identifier),
           'parent'        => page.parent && (page.parent.slug.present?? page.parent.slug : 'index'),
           'target_page'   => page.target_page.try(:slug),
           'is_published'  => page.is_published
         }.to_yaml)
       end
       page.blocks_attributes.each do |block|
-        open(File.join(page_path, "#{block[:label]}.html"), 'w') do |f|
+        open(File.join(page_path, "#{block[:identifier]}.html"), 'w') do |f|
           f.write(block[:content])
         end
       end
@@ -243,8 +243,8 @@ module ComfortableMexicanSofa::Fixtures
     FileUtils.mkdir_p(path)
     
     site.snippets.each do |snippet|
-      FileUtils.mkdir_p(snippet_path = File.join(path, snippet.slug))
-      open(File.join(snippet_path, "_#{snippet.slug}.yml"), 'w') do |f|
+      FileUtils.mkdir_p(snippet_path = File.join(path, snippet.identifier))
+      open(File.join(snippet_path, "_#{snippet.identifier}.yml"), 'w') do |f|
         f.write({'label' => snippet.label}.to_yaml)
       end
       open(File.join(snippet_path, 'content.html'), 'w') do |f|

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -57,7 +57,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   # -- Tag Field Fields -----------------------------------------------------
   def default_tag_field(tag, index, options = {})
     method    = options.delete(:method) || :text_field_tag
-    label     = tag.label.to_s.titleize
+    label     = tag.identifier.to_s.titleize
     css_class = tag.class.to_s.demodulize.underscore
     content   = ''
     
@@ -81,7 +81,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
     else
       content << @template.send(method, "page[blocks_attributes][#{index}][content]", tag.content, :id => nil, :class => input_class)
     end
-    content << @template.hidden_field_tag("page[blocks_attributes][#{index}][label]", tag.label, :id => nil)
+    content << @template.hidden_field_tag("page[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
     
     simple_field(label, content, :class => css_class)
   end
@@ -141,8 +141,8 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
       @template.options_for_select(options, :selected => tag.content),
       :id => nil
     )
-    content << @template.hidden_field_tag("page[blocks_attributes][#{index}][label]", tag.label, :id => nil)
-    simple_field(tag.label.titleize, content, :class => tag.class.to_s.demodulize.underscore )
+    content << @template.hidden_field_tag("page[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
+    simple_field(tag.identifier.titleize, content, :class => tag.class.to_s.demodulize.underscore )
   end
   
 end

data/lib/comfortable_mexican_sofa/render_methods.rb

@@ -37,9 +37,9 @@ module ComfortableMexicanSofa::RenderMethods
     def render(options = {}, locals = {}, &block)
       
       # TODO: add slug to Cms::Site as well
-      if options.is_a?(Hash) && site_slug = options.delete(:cms_site)
-        unless @cms_site = Cms::Site.find_by_label(site_slug)
-          raise ComfortableMexicanSofa::MissingSite.new(site_slug)
+      if options.is_a?(Hash) && identifier = options.delete(:cms_site)
+        unless @cms_site = Cms::Site.find_by_identifier(identifier)
+          raise ComfortableMexicanSofa::MissingSite.new(identifier)
         end
       end
       
@@ -55,25 +55,25 @@ module ComfortableMexicanSofa::RenderMethods
           raise ComfortableMexicanSofa::MissingPage.new(path)
         end
         
-      elsif options.is_a?(Hash) && slug = options.delete(:cms_layout)
+      elsif options.is_a?(Hash) && identifier = options.delete(:cms_layout)
         @cms_site ||= Cms::Site.find_site(request.host.downcase, request.fullpath)
-        if @cms_layout = @cms_site && @cms_site.layouts.find_by_slug(slug)
+        if @cms_layout = @cms_site && @cms_site.layouts.find_by_identifier(identifier)
           cms_app_layout = @cms_layout.try(:app_layout)
           cms_page = @cms_site.pages.build(:layout => @cms_layout)
           cms_blocks = options.delete(:cms_blocks) || { :content => render_to_string(:layout => false)}
-          cms_blocks.each do |block_label, value|
+          cms_blocks.each do |identifier, value|
             content = if value.is_a?(Hash)
               render_to_string(value.keys.first.to_sym => value[value.keys.first], :layout => false)
             else
               value.to_s
             end
-            cms_page.blocks.build(:label => block_label.to_s, :content => content)
+            cms_page.blocks.build(:identifier => identifier.to_s, :content => content)
           end
           options[:layout] ||= cms_app_layout.blank?? nil : cms_app_layout
           options[:inline] = cms_page.content(true)
           super(options, locals, &block)
         else
-          raise ComfortableMexicanSofa::MissingLayout.new(slug)
+          raise ComfortableMexicanSofa::MissingLayout.new(identifier)
         end
         
       else

data/lib/comfortable_mexican_sofa/tag.rb

@@ -11,7 +11,7 @@ module ComfortableMexicanSofa::Tag
   TOKENIZER_REGEX = /(\{\{\s*cms:[^{}]*\}\})|((?:\{?[^{])+|\{+)/
   
   attr_accessor :page,
-                :label,
+                :identifier,
                 :params,
                 :parent
   
@@ -20,19 +20,19 @@ module ComfortableMexicanSofa::Tag
     # Example:
     #   /\{\{\s*?cms:page:(\w+)\}\}/
     # will match tags like these:
-    #   {{cms:page:my_label}}
-    def regex_tag_signature(label = nil)
+    #   {{cms:page:my_identifier}}
+    def regex_tag_signature(identifier = nil)
       nil
     end
     
     # Initializing tag object for a particular Tag type
-    # First capture group in the regex is the tag label
+    # First capture group in the regex is the tag identifier
     def initialize_tag(page, tag_signature)
       if match = tag_signature.match(regex_tag_signature)
         tag = self.new
-        tag.page    = page
-        tag.label   = match[1]
-        tag.params  = match[2].to_s.split(':')
+        tag.page        = page
+        tag.identifier  = match[1]
+        tag.params      = match[2].to_s.split(':')
         tag
       end
     end
@@ -41,8 +41,8 @@ module ComfortableMexicanSofa::Tag
   module InstanceMethods
     
     # String indentifier of the tag
-    def identifier
-      "#{self.class.to_s.demodulize.underscore}_#{self.label}"
+    def id
+      "#{self.class.to_s.demodulize.underscore}_#{self.identifier}"
     end
     
     # Ancestors of this tag constructed during rendering process.
@@ -54,9 +54,9 @@ module ComfortableMexicanSofa::Tag
     
     # Regex that is used to identify instance of the tag
     # Example:
-    #   /<\{\s*?cms:page:tag_label\}/
+    #   /<\{\s*?cms:page:tag_identifier\}/
     def regex_tag_signature
-      self.class.regex_tag_signature(label)
+      self.class.regex_tag_signature(identifier)
     end
     
     # Content that is accociated with Tag instance.
@@ -73,7 +73,8 @@ module ComfortableMexicanSofa::Tag
     
     # 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)
+      page.blocks.detect{|b| b.identifier == self.identifier.to_s} || 
+      page.blocks.build(:identifier => self.identifier.to_s)
     end
     
     # Checks if this tag is using Cms::Block
@@ -105,7 +106,7 @@ private
       if 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?
+          if tag.ancestors.select{|a| a.id == tag.id}.blank?
             page.tags << tag
             self.process_content(page, tag.render, tag)
           end

data/lib/comfortable_mexican_sofa/tags/asset.rb

@@ -1,23 +1,23 @@
 class ComfortableMexicanSofa::Tag::Asset
   include ComfortableMexicanSofa::Tag
 
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:asset:(#{label}):?(.*?)\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:asset:(#{identifier}):?(.*?)\s*\}\}/
   end
 
   def content
-    return unless (layout = Cms::Layout.find_by_slug(label))
+    return unless (layout = Cms::Layout.find_by_identifier(identifier))
     type    = params[0]
     format  = params[1]
     
     case type
     when 'css'
-      out = "/cms-css/#{page.site.id}/#{label}.css"
+      out = "/cms-css/#{page.site.id}/#{identifier}.css"
       out = "<link href='#{out}' media='screen' rel='stylesheet' type='text/css' />" if format == 'html_tag'
       out
     when 'js'
-      out = "/cms-js/#{page.site.id}/#{label}.js"
+      out = "/cms-js/#{page.site.id}/#{identifier}.js"
       out = "<script src='#{out}' type='text/javascript'></script>" if format == 'html_tag'
       out
     end

data/lib/comfortable_mexican_sofa/tags/collection.rb

@@ -7,9 +7,9 @@ class ComfortableMexicanSofa::Tag::Collection
   #   {{ cms:collection:album:foo/my_album }}
   # A more complete example of the above:
   #   {{ cms:collection:album:foo/my_album:albums/show:title:slug:param_a:param_b }}
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\/\-]+/
-    /\{\{\s*cms:collection:(#{label}):(.*?)\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\/\-]+/
+    /\{\{\s*cms:collection:(#{identifier}):(.*?)\s*\}\}/
   end
   
   # Class definitition. It's basically `Herp::DerpityDerp.undescore` so an example

data/lib/comfortable_mexican_sofa/tags/field_datetime.rb

@@ -1,9 +1,9 @@
 class ComfortableMexicanSofa::Tag::FieldDateTime
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:field:(#{label}):datetime\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:field:(#{identifier}):datetime\s*\}\}/
   end
   
   def content

data/lib/comfortable_mexican_sofa/tags/field_integer.rb

@@ -1,9 +1,9 @@
 class ComfortableMexicanSofa::Tag::FieldInteger
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:field:(#{label}):integer\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:field:(#{identifier}):integer\s*\}\}/
   end
   
   def content

data/lib/comfortable_mexican_sofa/tags/field_string.rb

@@ -1,9 +1,9 @@
 class ComfortableMexicanSofa::Tag::FieldString
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:field:(#{label}):?(?:string)?\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:field:(#{identifier}):?(?:string)?\s*\}\}/
   end
   
   def content

data/lib/comfortable_mexican_sofa/tags/field_text.rb

@@ -1,9 +1,9 @@
 class ComfortableMexicanSofa::Tag::FieldText
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:field:(#{label}):?(?:text)?\s*?\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:field:(#{identifier}):?(?:text)?\s*?\}\}/
   end
   
   def content