comfortable_mexican_sofa 1.4.22 → 1.5.0

data/lib/comfortable_mexican_sofa/tags/collection.rb

@@ -47,10 +47,6 @@ class ComfortableMexicanSofa::Tag::Collection
     klass.respond_to?(:cms_collection) ? klass.cms_collection(*collection_params).all : klass.all
   end
   
-  def content=(value)
-    block.content = value
-  end
-  
   def content
     block.content
   end

data/lib/comfortable_mexican_sofa/tags/field_datetime.rb

@@ -6,10 +6,6 @@ class ComfortableMexicanSofa::Tag::FieldDateTime
     /\{\{\s*cms:field:(#{label}):datetime\s*\}\}/
   end
   
-  def content=(value)
-    block.content = value
-  end
-  
   def content
     block.content
   end

data/lib/comfortable_mexican_sofa/tags/field_integer.rb

@@ -6,10 +6,6 @@ class ComfortableMexicanSofa::Tag::FieldInteger
     /\{\{\s*cms:field:(#{label}):integer\s*\}\}/
   end
   
-  def content=(value)
-    block.content = value
-  end
-  
   def content
     block.content
   end

data/lib/comfortable_mexican_sofa/tags/field_string.rb

@@ -6,10 +6,6 @@ class ComfortableMexicanSofa::Tag::FieldString
     /\{\{\s*cms:field:(#{label}):?(?:string)?\s*\}\}/
   end
   
-  def content=(value)
-    block.content = value
-  end
-  
   def content
     block.content
   end

data/lib/comfortable_mexican_sofa/tags/field_text.rb

@@ -6,10 +6,6 @@ class ComfortableMexicanSofa::Tag::FieldText
     /\{\{\s*cms:field:(#{label}):?(?:text)?\s*?\}\}/
   end
   
-  def content=(value)
-    block.content = value
-  end
-  
   def content
     block.content
   end

data/lib/comfortable_mexican_sofa/tags/file.rb

@@ -6,6 +6,11 @@ class ComfortableMexicanSofa::Tag::File
     /\{\{\s*cms:file:(#{label}):?(.*?)\s*\}\}/
   end
   
+  # Initializing Cms::File object
+  def file
+    page.site.files.detect{|f| f.file_file_name == self.label.to_s}
+  end
+  
   def content
     return unless file
     

data/lib/comfortable_mexican_sofa/tags/page_datetime.rb

@@ -6,10 +6,6 @@ class ComfortableMexicanSofa::Tag::PageDateTime
     /\{\{\s*cms:page:(#{label}):datetime\s*\}\}/
   end
   
-  def content=(value)
-    block.content = value
-  end
-  
   def content
     block.content
   end

data/lib/comfortable_mexican_sofa/tags/page_file.rb

@@ -0,0 +1,44 @@
+class ComfortableMexicanSofa::Tag::PageFile
+  include ComfortableMexicanSofa::Tag
+  
+  # Signature of a tag:
+  #   {{ cms:page_file:some_label:type:params }}
+  # Simple tag can be:
+  #   {{ cms:page_file:some_label }}
+  def self.regex_tag_signature(label = nil)
+    label ||= /[\w\-]+/
+    /\{\{\s*cms:page_file:(#{label}):?(.*?)\s*\}\}/
+  end
+  
+  # Type of the tag controls how file is rendered
+  def type
+    %w(partial url image link).member?(params[0]) ? params[0] : 'url'
+  end
+  
+  def content
+    block.files.first
+  end
+  
+  def render
+    file = block.files.first
+    case self.type
+    when 'url'
+      return '' unless file
+      file.file.url
+    when 'link'
+      return '' unless file
+      text = params[1] || label
+      "<a href='#{file.file.url}' target='_blank'>#{text}</a>"
+    when 'image'
+      return '' unless file
+      text = params[1] || label
+      "<img src='#{file.file.url}' alt='#{text}' />"
+    when 'partial'
+      path = params[1] || 'partials/page_file'
+      ps = (self.params[2..-1] || []).collect_with_index{|p, i| ":param_#{i+1} => '#{p}'"}.join(', ')
+      ps = ps.present?? ", #{ps}" : ''
+      "<%= render :partial => '#{path}', :locals => {:identifier => #{file.try(:id) || 'nil'}#{ps}} %>"
+    end
+  end
+  
+end

data/lib/comfortable_mexican_sofa/tags/page_files.rb

@@ -0,0 +1,44 @@
+class ComfortableMexicanSofa::Tag::PageFiles
+  include ComfortableMexicanSofa::Tag
+  
+  def self.regex_tag_signature(label = nil)
+    label ||= /[\w\-]+/
+    /\{\{\s*cms:page_files:(#{label}):?(.*?)\s*\}\}/
+  end
+  
+  def type
+    %w(partial url image link).member?(params[0]) ? params[0] : 'url'
+  end
+  
+  def content
+    block.files
+  end
+  
+  def render
+    files = block.files
+    case self.type
+    when 'url'
+      return '' if files.blank?
+      files.collect do |file|
+        file.file.url
+      end.join(', ')
+    when 'link'
+      return '' if files.blank?
+      files.collect do |file|
+        "<a href='#{file.file.url}' target='_blank'>#{file.label}</a>"
+      end.join(' ')
+    when 'image'
+      return '' if files.blank?
+      files.collect do |file|
+        "<img src='#{file.file.url}' alt='#{file.label}' />"
+      end.join(' ')
+    when 'partial'
+      path = params[1] || 'partials/page_files'
+      ps = (self.params[2..-1] || []).collect_with_index{|p, i| ":param_#{i+1} => '#{p}'"}.join(', ')
+      ps = ps.present?? ", #{ps}" : ''
+      ids = files.present?? files.collect(&:id).join(',') : ''
+      "<%= render :partial => '#{path}', :locals => {:identifier => [#{ids}]#{ps}} %>"
+    end
+  end
+  
+end

data/lib/comfortable_mexican_sofa/tags/page_integer.rb

@@ -6,10 +6,6 @@ class ComfortableMexicanSofa::Tag::PageInteger
     /\{\{\s*cms:page:(#{label}):integer\s*\}\}/
   end
   
-  def content=(value)
-    block.content = value
-  end
-  
   def content
     block.content
   end

data/lib/comfortable_mexican_sofa/tags/page_rich_text.rb

@@ -6,10 +6,6 @@ class ComfortableMexicanSofa::Tag::PageRichText
     /\{\{\s*cms:page:(#{label}):rich_text\s*\}\}/
   end
   
-  def content=(value)
-    block.content = value
-  end
-  
   def content
     block.content
   end

data/lib/comfortable_mexican_sofa/tags/page_string.rb

@@ -6,10 +6,6 @@ class ComfortableMexicanSofa::Tag::PageString
     /\{\{\s*cms:page:(#{label}):string\s*\}\}/
   end
   
-  def content=(value)
-    block.content = value
-  end
-  
   def content
     block.content
   end

data/lib/comfortable_mexican_sofa/tags/page_text.rb

@@ -6,10 +6,6 @@ class ComfortableMexicanSofa::Tag::PageText
     /\{\{\s*cms:page:(#{label}):?(?:text)?\s*\}\}/
   end
   
-  def content=(value)
-    block.content = value
-  end
-  
   def content
     block.content
   end

data/lib/comfortable_mexican_sofa/tags/snippet.rb

@@ -6,6 +6,11 @@ class ComfortableMexicanSofa::Tag::Snippet
     /\{\{\s*cms:snippet:(#{label})\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
+  
   def content
     snippet.content
   end

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -19,7 +19,12 @@ module ComfortableMexicanSofa::ViewMethods
   #   cms_snippet_content(:my_snippet)
   def cms_snippet_content(snippet_slug, cms_site = nil)
     return '' unless cms_site ||= (@cms_site || Cms::Site.find_site(request.host.downcase, request.fullpath))
-    return '' unless snippet = cms_site.snippets.find_by_slug(snippet_slug)
+    case snippet_slug
+    when Cms::Snippet
+      snippet = snippet_slug
+    else
+      return '' unless snippet = cms_site.snippets.find_by_slug(snippet_slug)
+    end
     render :inline => ComfortableMexicanSofa::Tag.process_content(Cms::Page.new, snippet.content)
   end
   

data/test/fixtures/cms/files.yml

@@ -4,4 +4,5 @@ default:
   file_file_name: sample.jpg
   file_content_type: image/jpeg
   file_file_size: 20099
-  description: Description
+  description: Description
+  position: 0

data/test/fixtures/cms/layouts.yml

@@ -12,6 +12,7 @@ default:
     layout_content_c
   css: default_css
   js: default_js
+  position: 0
     
 nested:
   site: default
@@ -23,6 +24,7 @@ nested:
     {{cms:page:content}}
   css: nested_css
   js: nested_js
+  position: 0
     
 child:
   site: default
@@ -33,4 +35,5 @@ child:
     {{cms:page:left_column}}
     {{cms:page:right_column}}
   css: child_css
-  js: child_js
+  js: child_js
+  position: 0

data/test/fixtures/cms/snippets.yml

@@ -3,3 +3,4 @@ default:
   label: Default Snippet
   slug: default
   content: default_snippet_content
+  position: 0

data/test/functional/cms_admin/files_controller_test.rb

@@ -123,25 +123,6 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
     end
   end
   
-  def test_create_as_xhr_with_page_id
-    ComfortableMexicanSofa.config.auto_file_categorization = true
-    request.env['HTTP_X_FILE_NAME'] = 'test.pdf'
-    request.env['CONTENT_TYPE'] = 'application/pdf'
-    
-    assert_difference ['Cms::File.count', 'Cms::Category.count', 'Cms::Categorization.count'] do
-      xhr :post, :create, :site_id => cms_sites(:default), :file => {
-        :page_id => cms_pages(:default).id
-      }
-      assert_response :success
-      
-      file = Cms::File.last
-      assert_equal 'test.pdf', file.file_file_name
-      assert_equal 1, file.categories.count
-      assert_equal '[page] /',  file.categories.first.label
-      assert_equal 'Cms::File', file.categories.first.categorized_type
-    end
-  end
-  
   def test_update
     file = cms_files(:default)
     put :update, :site_id => file.site, :id => file, :file => {
@@ -184,4 +165,21 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
     end
   end
   
+  def test_reorder
+    file_one = cms_files(:default)
+    file_two = cms_sites(:default).files.create(
+      :file => fixture_file_upload('files/valid_image.jpg')
+    )
+    assert_equal 0, file_one.position
+    assert_equal 1, file_two.position
+
+    post :reorder, :site_id => cms_sites(:default), :cms_file => [file_two.id, file_one.id]
+    assert_response :success
+    file_one.reload
+    file_two.reload
+
+    assert_equal 1, file_one.position
+    assert_equal 0, file_two.position
+  end
+  
 end

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -34,7 +34,6 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     assert assigns(:layout)
     assert_template :edit
     assert_select "form[action=/cms-admin/sites/#{layout.site.id}/layouts/#{layout.id}]"
-    assert_select "form[action='/cms-admin/sites/#{layout.site.id}/files?file[layout_id]=#{layout.id}']"
   end
 
   def test_get_edit_failure
@@ -102,5 +101,23 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
       assert_equal 'Layout deleted', flash[:notice]
     end
   end
+  
+  def test_reorder
+    layout_one = cms_layouts(:default)
+    layout_two = cms_sites(:default).layouts.create!(
+      :label  => 'test',
+      :slug   => 'test'
+    )
+    assert_equal 0, layout_one.position
+    assert_equal 1, layout_two.position
+
+    post :reorder, :site_id => cms_sites(:default), :cms_layout => [layout_two.id, layout_one.id]
+    assert_response :success
+    layout_one.reload
+    layout_two.reload
+
+    assert_equal 1, layout_one.position
+    assert_equal 0, layout_two.position
+  end
 
 end

data/test/functional/cms_admin/pages_controller_test.rb

@@ -49,77 +49,119 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_get_new_with_field_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:datetime}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='datetime']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
+    assert_response :success
+    assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][class='datetime']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
   end
 
   def test_get_new_with_field_integer
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:integer}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "input[type='number'][name='page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
+    assert_response :success
+    assert_select "input[type='number'][name='page[blocks_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
   end
 
   def test_get_new_with_field_string
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:string}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "input[type='text'][name='page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
+    assert_response :success
+    assert_select "input[type='text'][name='page[blocks_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
   end
 
   def test_get_new_with_field_text
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:text}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "textarea[name='page[blocks_attributes][][content]'][class='code']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
   end
 
   def test_get_new_with_page_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:datetime}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "input[type='text'][name='page[blocks_attributes][][content]'][class='datetime']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
+    assert_response :success
+    assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][class='datetime']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
   end
 
   def test_get_new_with_page_integer
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:integer}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "input[type='number'][name='page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
+    assert_response :success
+    assert_select "input[type='number'][name='page[blocks_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
   end
 
   def test_get_new_with_page_string
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:string}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "input[type='text'][name='page[blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
+    assert_response :success
+    assert_select "input[type='text'][name='page[blocks_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
   end
 
   def test_get_new_with_page_text
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "textarea[name='page[blocks_attributes][][content]'][class='code']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+  end
+  
+  def test_get_new_with_page_file
+    cms_layouts(:default).update_attribute(:content, '{{cms:page_file:test_label}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "input[type='file'][name='page[blocks_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+  end
+  
+  def test_get_new_with_page_files
+    cms_layouts(:default).update_attribute(:content, '{{cms:page_files:test_label}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "input[type='file'][name='page[blocks_attributes][0][content][]'][multiple=multiple]"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
   end
   
   def test_get_new_with_collection
     snippet = cms_snippets(:default)
     cms_layouts(:default).update_attribute(:content, '{{cms:collection:snippet:cms/snippet}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "select[name='page[blocks_attributes][][content]']" do
+    assert_response :success
+    assert_select "select[name='page[blocks_attributes][0][content]']" do
       assert_select "option[value='']", :html => '---- Select Cms/Snippet ----'
       assert_select "option[value='#{snippet.id}']", :html => snippet.label
     end
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='snippet']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='snippet']"
   end
 
   def test_get_new_with_rich_page_text
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:rich_text}}')
     get :new, :site_id => cms_sites(:default)
-    assert_select "textarea[name='page[blocks_attributes][][content]'][class='rich_text']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][class='rich_text']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
   end
-
+  
+  def test_get_new_with_several_tag_fields
+    cms_layouts(:default).update_attribute(:content, '{{cms:page:label_a}}{{cms:page:label_b}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='label_a']"
+    assert_select "textarea[name='page[blocks_attributes][1][content]']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][1][label]'][value='label_b']"
+  end
+  
+  def test_get_new_with_crashy_tag
+    cms_layouts(:default).update_attribute(:content, '{{cms:collection:label:invalid}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+  end
+  
   def test_get_new_as_child_page
     get :new, :site_id => cms_sites(:default), :parent_id => cms_pages(:default)
     assert_response :success
@@ -136,7 +178,6 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_template :edit
     assert_select "form[action=/cms-admin/sites/#{page.site.id}/pages/#{page.id}]"
     assert_select "select[data-url=/cms-admin/sites/#{page.site.id}/pages/#{page.id}/form_blocks]"
-    assert_select "form[action='/cms-admin/sites/#{page.site.id}/files?file[page_id]=#{page.id}']"
   end
 
   def test_get_edit_failure