comfortable_mexican_sofa 1.11.2 → 1.12.0

data/lib/comfortable_mexican_sofa/fixture.rb

@@ -11,7 +11,7 @@ module ComfortableMexicanSofa::Fixture
     def initialize(from, to = from, force_import = false)
       self.from         = from
       self.to           = to
-      self.site         = Cms::Site.where(:identifier => to).first!
+      self.site         = Comfy::Cms::Site.where(:identifier => to).first!
       self.fixture_ids  = []
       self.force_import = force_import
       
@@ -40,13 +40,6 @@ module ComfortableMexicanSofa::Fixture
       end
     end
     
-    def read_as_haml(path)
-      content = ::File.open(path).read
-      Haml::Engine.new(content).render.rstrip
-    rescue # Bad haml, calls to helpers, who knows?
-      content
-    end
-    
     def import!
       ComfortableMexicanSofa::Fixture::Category::Importer.new(from, to, force_import).import!
       ComfortableMexicanSofa::Fixture::File::Importer.new(    from, to, force_import).import!
@@ -65,7 +58,7 @@ module ComfortableMexicanSofa::Fixture
     def initialize(from, to = from)
       self.from = from
       self.to   = to
-      self.site = Cms::Site.where(:identifier => from).first!
+      self.site = Comfy::Cms::Site.where(:identifier => from).first!
       dir = self.class.name.split('::')[2].downcase.pluralize
       self.path = ::File.join(ComfortableMexicanSofa.config.fixtures_path, to, dir)
     end

data/lib/comfortable_mexican_sofa/fixture/category.rb

@@ -2,9 +2,9 @@ module ComfortableMexicanSofa::Fixture::Category
   class Importer < ComfortableMexicanSofa::Fixture::Importer
     def import!
       {
-        'files'     => 'Cms::File',
-        'pages'     => 'Cms::Page',
-        'snippets'  => 'Cms::Snippet'
+        'files'     => 'Comfy::Cms::File',
+        'pages'     => 'Comfy::Cms::Page',
+        'snippets'  => 'Comfy::Cms::Snippet'
       }.each do |file, type|
         if File.exists?(attrs_path = File.join(path, "#{file}.yml"))
           categories = get_attributes(attrs_path)
@@ -20,9 +20,9 @@ module ComfortableMexicanSofa::Fixture::Category
     def export!
       prepare_folder!(self.path)
       {
-        'files'     => 'Cms::File',
-        'pages'     => 'Cms::Page',
-        'snippets'  => 'Cms::Snippet'
+        'files'     => 'Comfy::Cms::File',
+        'pages'     => 'Comfy::Cms::Page',
+        'snippets'  => 'Comfy::Cms::Snippet'
       }.each do |file, type|
         if (categories = self.site.categories.of_type(type)).present?
           open(File.join(self.path, "#{file}.yml"), 'w') do |f|

data/lib/comfortable_mexican_sofa/fixture/file.rb

@@ -34,7 +34,7 @@ module ComfortableMexicanSofa::Fixture::File
       end
       
       # cleaning up
-      self.site.files.where('id NOT IN (?)', fixture_ids).each{ |s| s.destroy }
+      self.site.files.where('id NOT IN (?) AND block_id IS NULL', fixture_ids).each{ |s| s.destroy }
     end
   end
   

data/lib/comfortable_mexican_sofa/fixture/layout.rb

@@ -19,11 +19,16 @@ module ComfortableMexicanSofa::Fixture::Layout
         end
         
         # setting content
-        if File.exists?(content_path = File.join(path, 'content.html'))
-          if fresh_fixture?(layout, content_path)
-            layout.content = read_as_haml(content_path)
+        %w(html haml).each do |extension|
+          if File.exists?(content_path = File.join(path, "content.#{extension}"))
+            if fresh_fixture?(layout, content_path)
+              layout.content = extension == "html" ? 
+                ::File.open(content_path).read : 
+                Haml::Engine.new(::File.open(content_path).read).render.rstrip
+            end
           end
         end
+        
         if File.exists?(content_path = File.join(path, 'stylesheet.css'))
           if fresh_fixture?(layout, content_path)
             layout.css = File.open(content_path).read

data/lib/comfortable_mexican_sofa/fixture/page.rb

@@ -36,13 +36,23 @@ module ComfortableMexicanSofa::Fixture::Page
         # setting content
         blocks_to_clear = page.blocks.collect(&:identifier)
         blocks_attributes = [ ]
-        Dir.glob("#{path}/*.html").each do |block_path|
-          identifier = block_path.split('/').last.gsub(/\.html\z/, '')
+        file_extentions = %w(html haml jpg png gif)
+        Dir.glob("#{path}/*.{#{file_extentions.join(',')}}").each do |block_path|
+          extention = File.extname(block_path)[1..-1]
+          identifier = block_path.split('/').last.gsub(/\.(#{file_extentions.join('|')})\z/, '')
           blocks_to_clear.delete(identifier)
           if fresh_fixture?(page, block_path)
+            content = case extention
+            when 'jpg', 'png', 'gif'
+              ::File.open(block_path)
+            when 'haml'
+              Haml::Engine.new(::File.open(block_path).read).render.rstrip
+            else
+              ::File.open(block_path).read
+            end
             blocks_attributes << {
               :identifier => identifier,
-              :content    => read_as_haml(block_path)
+              :content    => content
             }
           end
         end

data/lib/comfortable_mexican_sofa/fixture/snippet.rb

@@ -18,9 +18,13 @@ module ComfortableMexicanSofa::Fixture::Snippet
         end
         
         # setting content
-        if File.exists?(content_path = File.join(path, 'content.html'))
-          if fresh_fixture?(snippet, content_path)
-            snippet.content = read_as_haml(content_path)
+        %w(html haml).each do |extension|
+          if File.exists?(content_path = File.join(path, "content.#{extension}"))
+            if fresh_fixture?(snippet, content_path)
+              snippet.content = extension == "html" ? 
+                ::File.open(content_path).read : 
+                Haml::Engine.new(::File.open(content_path).read).render.rstrip
+            end
           end
         end
         

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -1,16 +1,20 @@
-class ComfortableMexicanSofa::FormBuilder < FormattedForm::FormBuilder
+class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
+
+  def field_name_for(tag)
+    tag.blockable.class.name.demodulize.underscore.gsub(/\//,'_')
+  end
 
   # -- Tag Field Fields -----------------------------------------------------
   def default_tag_field(tag, index, method = :text_field_tag, options = {})
 
-    label     = tag.page.class.human_attribute_name(tag.identifier.to_s)
-    css_class = tag.class.to_s.demodulize.underscore
-    content   = ''
-
+    label       = tag.blockable.class.human_attribute_name(tag.identifier.to_s)
+    css_class   = tag.class.to_s.demodulize.underscore
+    content     = ''
+    fieldname   = field_name_for(tag)
     case method
     when :file_field_tag
       input_params = {:id => nil}
-      name = "page[blocks_attributes][#{index}][content]"
+      name = "#{fieldname}[blocks_attributes][#{index}][content]"
 
       if options.delete(:multiple)
         input_params.merge!(:multiple => true)
@@ -18,13 +22,16 @@ class ComfortableMexicanSofa::FormBuilder < FormattedForm::FormBuilder
       end
 
       content << @template.send(method, name, input_params)
-      content << @template.render(:partial => 'admin/cms/files/page_form', :object => tag.block)
+      content << @template.render(:partial => 'comfy/admin/cms/files/page_form', :object => tag.block)
     else
-      content << @template.send(method, "page[blocks_attributes][#{index}][content]", tag.content, options)
+      options[:class] = ' form-control'
+      content << @template.send(method, "#{fieldname}[blocks_attributes][#{index}][content]", tag.content, options)
     end
-    content << @template.hidden_field_tag("page[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
+    content << @template.hidden_field_tag("#{fieldname}[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
 
-    element(label, content.html_safe)
+    form_group :label => {:text => label} do 
+      content.html_safe
+    end
   end
 
   def field_date_time(tag, index)
@@ -48,10 +55,13 @@ class ComfortableMexicanSofa::FormBuilder < FormattedForm::FormBuilder
   end
 
   def field_boolean(tag, index)
-    content = @template.hidden_field_tag("page[blocks_attributes][#{index}][content]", '', :id => nil)
-    content << @template.check_box_tag("page[blocks_attributes][#{index}][content]", '1', tag.content.present?, :id => nil)
-    content << @template.hidden_field_tag("page[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
-    element(tag.identifier.titleize + "?", content)
+    fieldname = field_name_for(tag)
+    content = @template.hidden_field_tag("#{fieldname}[blocks_attributes][#{index}][content]", '', :id => nil)
+    content << @template.check_box_tag("#{fieldname}[blocks_attributes][#{index}][content]", '1', tag.content.present?, :id => nil)
+    content << @template.hidden_field_tag("#{fieldname}[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
+    form_group :label => {:text => tag.identifier.titleize + "?"} do 
+      content
+    end
   end
 
   def page_date_time(tag, index)
@@ -92,13 +102,16 @@ class ComfortableMexicanSofa::FormBuilder < FormattedForm::FormBuilder
         [m.send(tag.collection_title), m.send(tag.collection_identifier)]
       end
 
+    fieldname = field_name_for(tag)
     content = @template.select_tag(
-      "page[blocks_attributes][#{index}][content]",
+      "#{fieldname}[blocks_attributes][#{index}][content]",
       @template.options_for_select(options, :selected => tag.content),
       :id => nil
     )
-    content << @template.hidden_field_tag("page[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
-    element(tag.identifier.titleize, content, :class => tag.class.to_s.demodulize.underscore )
+    content << @template.hidden_field_tag("#{fieldname}[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
+    form_group :label => {:text => tag.identifier.titleize}, :class => tag.class.to_s.demodulize.underscore do
+      content
+    end
   end
 
 end

data/lib/comfortable_mexican_sofa/render_methods.rb

@@ -36,63 +36,71 @@ module ComfortableMexicanSofa::RenderMethods
     # 
     def render(options = {}, locals = {}, &block)
       
-      if options.is_a?(Hash) && identifier = options.delete(:cms_site)
-        unless @cms_site = Cms::Site.find_by_identifier(identifier)
-          raise ComfortableMexicanSofa::MissingSite.new(identifier)
+      return super unless options.is_a?(Hash)
+      
+      if site_identifier = options.delete(:cms_site)
+        unless @cms_site = Comfy::Cms::Site.find_by_identifier(site_identifier)
+          raise ComfortableMexicanSofa::MissingSite.new(site_identifier)
         end
       end
       
-      if options.is_a?(Hash) && path = options.delete(:cms_page)
-        @cms_site ||= Cms::Site.find_site(request.host.downcase, request.fullpath)
-        path.gsub!(/^\/#{@cms_site.path}/, '') if @cms_site && @cms_site.path.present?
-        
-        if @cms_page = @cms_site && @cms_site.pages.find_by_full_path(path)
-          @cms_layout = @cms_page.layout
-          if (cms_blocks = options.delete(:cms_blocks)).present?
-            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
-              page_block = @cms_page.blocks.detect{|b| b.identifier == identifier.to_s} ||
-                @cms_page.blocks.build(:identifier => identifier.to_s)
-              page_block.content = content
-            end
-          end
-          cms_app_layout = @cms_layout.try(:app_layout)
-          options[:layout] ||= cms_app_layout.blank?? nil : cms_app_layout
-          options[:inline] = @cms_page.render
-          super(options, locals, &block)
-        else
-          raise ComfortableMexicanSofa::MissingPage.new(path)
-        end
-        
-      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_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 }.merge(options)) }
-          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(:identifier => identifier.to_s, :content => content)
-          end
-          options[:layout] ||= cms_app_layout.blank?? nil : cms_app_layout
-          options[:inline] = cms_page.render
-          super(options, locals, &block)
-        else
-          raise ComfortableMexicanSofa::MissingLayout.new(identifier)
+      if (page_path = options.delete(:cms_page)) || (layout_identifier = options.delete(:cms_layout))
+        unless @cms_site ||= Comfy::Cms::Site.find_site(request.host.downcase, request.fullpath)
+          raise ComfortableMexicanSofa::MissingSite.new("#{request.host.downcase}/#{request.fullpath}")
         end
-        
+      end
+      
+      if page_path
+        render_cms_page(page_path, options, locals, &block)
+      elsif layout_identifier
+        render_cms_layout(layout_identifier, options, locals, &block)
       else
-        super(options, locals, &block)
+        super
+      end
+    end
+    
+    def render_cms_page(path, options = {}, locals = {}, &block)
+      path.gsub!(/^\/#{@cms_site.path}/, '') if @cms_site.path.present?
+      
+      unless @cms_page = @cms_site.pages.find_by_full_path(path)
+        raise ComfortableMexicanSofa::MissingPage.new(path)
+      end
+      
+      @cms_layout = @cms_page.layout
+      if (cms_blocks = options.delete(:cms_blocks)).present?
+        cms_blocks.each do |identifier, value|
+          content = value.is_a?(Hash) ? render_to_string(value.merge(:layout => false)) : value.to_s
+          page_block  = @cms_page.blocks.detect{|b| b.identifier == identifier.to_s} ||
+                        @cms_page.blocks.build(:identifier => identifier.to_s)
+          page_block.content = content
+        end
+      end
+      cms_app_layout = @cms_layout.app_layout
+      options[:layout] ||= cms_app_layout.blank?? nil : cms_app_layout
+      options[:inline] = @cms_page.render
+      
+      render(options, locals, &block)
+    end
+    
+    def render_cms_layout(identifier, options = {}, locals = {}, &block)
+      
+      unless @cms_layout = @cms_site.layouts.find_by_identifier(identifier)
+        raise ComfortableMexicanSofa::MissingLayout.new(identifier)
+      end
+      
+      cms_app_layout = @cms_layout.app_layout
+      cms_page = @cms_site.pages.build(:layout => @cms_layout)
+      cms_blocks = options.delete(:cms_blocks) || { :content => render_to_string({ :layout => false }.merge(options)) }
+      cms_blocks.each do |identifier, value|
+        content = value.is_a?(Hash) ? render_to_string(value.merge(:layout => false)) : value.to_s
+        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.render
+      
+      render(options, locals, &block)
     end
+    
   end
 end
 

data/lib/comfortable_mexican_sofa/routes/cms.rb

@@ -1,18 +1,20 @@
 class ActionDispatch::Routing::Mapper
 
   def comfy_route_cms(options = {})
-    namespace :cms, :path => options[:path] do
-      get 'cms-css/:site_id/:identifier' => 'assets#render_css', :as => 'render_css'
-      get 'cms-js/:site_id/:identifier'  => 'assets#render_js',  :as => 'render_js'
+    scope :module => :comfy, :as => :comfy do
+      namespace :cms, :path => options[:path] do
+        get 'cms-css/:site_id/:identifier' => 'assets#render_css', :as => 'render_css'
+        get 'cms-js/:site_id/:identifier'  => 'assets#render_js',  :as => 'render_js'
 
-      if options[:sitemap]
-        get '(:cms_path)/sitemap' => 'content#render_sitemap',
-          :as           => 'render_sitemap',
-          :constraints  => {:format => /xml/},
-          :format       => :xml
-      end
+        if options[:sitemap]
+          get '(:cms_path)/sitemap' => 'content#render_sitemap',
+            :as           => 'render_sitemap',
+            :constraints  => {:format => /xml/},
+            :format       => :xml
+        end
 
-      get '/:format' => 'content#show', :as => 'render_page', :path => "(*cms_path)"
+        get '/:format' => 'content#show', :as => 'render_page', :path => "(*cms_path)"
+      end
     end
   end
 end

data/lib/comfortable_mexican_sofa/routes/cms_admin.rb

@@ -3,34 +3,36 @@ class ActionDispatch::Routing::Mapper
   def comfy_route_cms_admin(options = {})
     options[:path] ||= 'admin'
 
-    scope :module => :admin do
-      namespace :cms, :as => :admin_cms, :path => options[:path], :except => :show do
-        get '/', :to => 'base#jump'
-        resources :sites do
-          resources :pages do
-            get  :form_blocks,    :on => :member
-            get  :toggle_branch,  :on => :member
-            put :reorder,         :on => :collection
-            resources :revisions, :only => [:index, :show, :revert] do
-              patch :revert, :on => :member
+    scope :module => :comfy, :as => :comfy do
+      scope :module => :admin do
+        namespace :cms, :as => :admin_cms, :path => options[:path], :except => :show do
+          get '/', :to => 'base#jump'
+          resources :sites do
+            resources :pages do
+              get  :form_blocks,    :on => :member
+              get  :toggle_branch,  :on => :member
+              put :reorder,         :on => :collection
+              resources :revisions, :only => [:index, :show, :revert] do
+                patch :revert, :on => :member
+              end
             end
-          end
-          resources :files do
-            post :reorder, :on => :collection
-          end
-          resources :layouts do
-            put :reorder, :on => :collection
-            resources :revisions, :only => [:index, :show, :revert] do
-              patch :revert, :on => :member
+            resources :files do
+              post :reorder, :on => :collection
             end
-          end
-          resources :snippets do
-            put :reorder, :on => :collection
-            resources :revisions, :only => [:index, :show, :revert] do
-              patch :revert, :on => :member
+            resources :layouts do
+              put :reorder, :on => :collection
+              resources :revisions, :only => [:index, :show, :revert] do
+                patch :revert, :on => :member
+              end
+            end
+            resources :snippets do
+              put :reorder, :on => :collection
+              resources :revisions, :only => [:index, :show, :revert] do
+                patch :revert, :on => :member
+              end
             end
+            resources :categories
           end
-          resources :categories
         end
       end
     end

data/lib/comfortable_mexican_sofa/tag.rb

@@ -13,7 +13,7 @@ module ComfortableMexicanSofa::Tag
   TOKENIZER_REGEX   = /(\{\{\s*cms:[^{}]*\}\})|((?:\{?[^{])+|\{+)/
   IDENTIFIER_REGEX  = /\w+[\-\.\w]+\w+/
   
-  attr_accessor :page,
+  attr_accessor :blockable,
                 :identifier,
                 :namespace,
                 :params,
@@ -33,7 +33,7 @@ module ComfortableMexicanSofa::Tag
     # First capture group in the regex is the tag identifier
     # Namespace is the string separated by a dot. So if identifier is:
     # 'sidebar.about' namespace is: 'sidebar'
-    def initialize_tag(page, tag_signature)
+    def initialize_tag(blockable, tag_signature)
       if match = tag_signature.match(regex_tag_signature)
         
         params = begin
@@ -43,7 +43,7 @@ module ComfortableMexicanSofa::Tag
         end.map{|p| p.gsub(/\\|'/) { |c| "\\#{c}" } }
         
         tag = self.new
-        tag.page        = page
+        tag.blockable   = blockable
         tag.identifier  = match[1]
         tag.namespace   = (ns = tag.identifier.split('.')[0...-1].join('.')).blank?? nil : ns
         tag.params      = params
@@ -85,18 +85,18 @@ module ComfortableMexicanSofa::Tag
       ComfortableMexicanSofa::Tag.sanitize_irb(content, ignore)
     end
     
-    # Find or initialize Cms::Block object
+    # Find or initialize Comfy::Cms::Block object
     def block
-      page.blocks.detect{|b| b.identifier == self.identifier.to_s} || 
-      page.blocks.build(:identifier => self.identifier.to_s)
+      blockable.blocks.detect{|b| b.identifier == self.identifier.to_s} || 
+      blockable.blocks.build(:identifier => self.identifier.to_s)
     end
     
-    # Checks if this tag is using Cms::Block
+    # Checks if this tag is using Comfy::Cms::Block
     def is_cms_block?
       %w(page field collection).member?(self.class.to_s.demodulize.underscore.split(/_/).first)
     end
     
-    # Used in displaying form elements for Cms::Block
+    # Used in displaying form elements for Comfy::Cms::Block
     def record_id
       block.id
     end
@@ -105,24 +105,24 @@ module ComfortableMexicanSofa::Tag
 private
   
   # Initializes a tag. It's handled by one of the tag classes
-  def self.initialize_tag(page, tag_signature)
+  def self.initialize_tag(blockable, tag_signature)
     tag_instance = nil
-    tag_classes.find{ |c| tag_instance = c.initialize_tag(page, tag_signature) }
+    tag_classes.find{ |c| tag_instance = c.initialize_tag(blockable, 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(page, content = '', parent_tag = nil)
+  def self.process_content(blockable, 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(page, tag_signature)
+        if tag = self.initialize_tag(blockable, tag_signature)
           tag.parent = parent_tag if parent_tag
           if tag.ancestors.select{|a| a.id == tag.id}.blank?
-            page.tags << tag
-            self.process_content(page, tag.render, tag)
+            blockable.tags << tag
+            self.process_content(blockable, tag.render, tag)
           end
         end
       else