comfortable_mexican_sofa 1.4.13 → 1.4.14

data/VERSION

@@ -1 +1 @@
-1.4.13
+1.4.14

data/app/controllers/cms_admin/files_controller.rb

@@ -36,7 +36,9 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
         io.class.class_eval { attr_accessor :original_filename, :content_type }
         io.original_filename  = request.env['HTTP_X_FILE_NAME']
         io.content_type       = request.env['CONTENT_TYPE']
-        @file = @site.files.create!(:file => io)
+        @file = @site.files.create!(
+          (params[:file] || { }).merge(:file => io)
+        )
       end
     end
   rescue ActiveRecord::RecordInvalid

data/app/models/cms/file.rb

@@ -6,6 +6,10 @@ class Cms::File < ActiveRecord::Base
   
   cms_is_categorized
   
+  attr_accessor :layout_id,
+                :page_id,
+                :snippet_id
+  
   # -- AR Extensions --------------------------------------------------------
   has_attached_file :file, ComfortableMexicanSofa.config.upload_file_options
   
@@ -20,7 +24,8 @@ class Cms::File < ActiveRecord::Base
     :scope => :site_id
   
   # -- Callbacks ------------------------------------------------------------
-  before_save :assign_label
+  before_save :assign_label,
+              :categorize_file
   
 protected
   
@@ -28,4 +33,15 @@ protected
     self.label = self.label.blank?? self.file_file_name.gsub(/\.[^\.]*?$/, '').titleize : self.label
   end
   
+  def categorize_file
+    category = if layout_id && layout = site.layouts.find_by_id(layout_id)
+      Cms::Category.find_or_create_by_label_and_categorized_type("[layout] #{layout.slug}", 'Cms::File')
+    elsif page_id && page = site.pages.find_by_id(page_id)
+      Cms::Category.find_or_create_by_label_and_categorized_type("[page] #{page.full_path}", 'Cms::File')
+    elsif snippet_id && snippet = site.snippets.find_by_id(snippet_id)
+      Cms::Category.find_or_create_by_label_and_categorized_type("[snippet] #{snippet.slug}", 'Cms::File')
+    end
+    self.category_ids = { category.id => 1 } if category
+  end
+  
 end

data/app/views/cms_admin/files/_index.html.erb

@@ -1,6 +1,17 @@
 <div id='file_uploads' class='box'>
   
-  <%= form_for :file, :url => cms_admin_site_files_path(@site), :html => {:multipart => true} do |form| %>
+  <%
+    key, id = if @layout && !@layout.new_record?
+      [:layout_id, @layout.id]
+    elsif @page && !@page.new_record?
+      [:page_id, @page.id]
+    elsif @snippet && !@snippet.new_record?
+      [:snippet_id, @snippet.id]
+    end
+    url_param = key.present?? "?file[#{key}]=#{id}" : ''
+  %>
+  
+  <%= form_for :file, :url => cms_admin_site_files_path(@site) + url_param, :html => {:multipart => true} do |form| %>
     <a id='uploader_button' href='#' class='big button'><%= t('.button') %></a>
     <%= form.file_field :file, :multiple => true %>
   <% end %>
@@ -10,4 +21,4 @@
       <%= render :partial => 'cms_admin/files/file', :object => file %>
     <% end %>
   </div>
-</div>
+</div>

data/comfortable_mexican_sofa.gemspec

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

data/test/functional/cms_admin/files_controller_test.rb

@@ -123,6 +123,24 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
     end
   end
   
+  def test_create_as_xhr_with_page_id
+    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 => {

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -24,6 +24,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
     assert_equal '{{ cms:page:content:text }}', assigns(:layout).content
     assert_template :new
     assert_select "form[action=/cms-admin/sites/#{site.id}/layouts]"
+    assert_select "form[action='/cms-admin/sites/#{site.id}/files']"
   end
 
   def test_get_edit
@@ -33,6 +34,7 @@ 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

data/test/functional/cms_admin/pages_controller_test.rb

@@ -43,6 +43,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_template :new
     assert_select "form[action=/cms-admin/sites/#{site.id}/pages]"
     assert_select "select[data-url=/cms-admin/sites/#{site.id}/pages/0/form_blocks]"
+    assert_select "form[action='/cms-admin/sites/#{site.id}/files']"
   end
 
   def test_get_new_with_field_datetime
@@ -124,6 +125,7 @@ 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

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -41,6 +41,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
     assert assigns(:snippet)
     assert_template :new
     assert_select "form[action=/cms-admin/sites/#{site.id}/snippets]"
+    assert_select "form[action='/cms-admin/sites/#{site.id}/files']"
   end
 
   def test_get_edit
@@ -50,6 +51,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
     assert assigns(:snippet)
     assert_template :edit
     assert_select "form[action=/cms-admin/sites/#{snippet.site.id}/snippets/#{snippet.id}]"
+    assert_select "form[action='/cms-admin/sites/#{snippet.site.id}/files?file[snippet_id]=#{snippet.id}']"
   end
 
   def test_get_edit_failure

data/test/unit/models/file_test.rb

@@ -25,6 +25,42 @@ class CmsFileTest < ActiveSupport::TestCase
     end
   end
   
+  def test_creation_with_layout_link
+    assert_difference ['Cms::File.count', 'Cms::Category.count', 'Cms::Categorization.count'] do
+      file = cms_sites(:default).files.create(
+        :file       => fixture_file_upload('files/valid_image.jpg'),
+        :layout_id  => cms_layouts(:default)
+      )
+      assert_equal 1, file.categories.count
+      assert_equal '[layout] default',  file.categories.first.label
+      assert_equal 'Cms::File', file.categories.first.categorized_type
+    end
+  end
+  
+  def test_creation_with_page_link
+    assert_difference ['Cms::File.count', 'Cms::Category.count', 'Cms::Categorization.count'] do
+      file = cms_sites(:default).files.create(
+        :file     => fixture_file_upload('files/valid_image.jpg'),
+        :page_id  => cms_pages(:default)
+      )
+      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_creation_with_snippet_link
+    assert_difference ['Cms::File.count', 'Cms::Category.count', 'Cms::Categorization.count'] do
+      file = cms_sites(:default).files.create(
+        :file       => fixture_file_upload('files/valid_image.jpg'),
+        :snippet_id => cms_snippets(:default)
+      )
+      assert_equal 1, file.categories.count
+      assert_equal '[snippet] default',  file.categories.first.label
+      assert_equal 'Cms::File', file.categories.first.categorized_type
+    end
+  end
+  
   def test_create_failure
     assert_no_difference 'Cms::File.count' do
       cms_sites(:default).files.create(:file => '')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.4.14
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-19 00:00:00.000000000 -04:00
+date: 2011-09-20 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70312533718100 !ruby/object:Gem::Requirement
+  requirement: &70246633386860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70312533718100
+  version_requirements: *70246633386860
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70312533717260 !ruby/object:Gem::Requirement
+  requirement: &70246633385460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70312533717260
+  version_requirements: *70246633385460
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70312533716220 !ruby/object:Gem::Requirement
+  requirement: &70246633384540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70312533716220
+  version_requirements: *70246633384540
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3297284522108590513
+      hash: 3075297949995048561
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: