comfortable_mexican_sofa 1.3.8 → 1.4.0

data/config/routes.rb

@@ -15,17 +15,18 @@ Rails.application.routes.draw do
           put :revert, :on => :member
         end
       end
-      resources :uploads, :only => [:create, :destroy]
+      resources :files
       resources :layouts do
         resources :revisions, :only => [:index, :show, :revert] do
           put :revert, :on => :member
         end
       end
-      resources :snippets do 
+      resources :snippets do
         resources :revisions, :only => [:index, :show, :revert] do
           put :revert, :on => :member
         end
       end
+      resources :categories
     end
   end unless ComfortableMexicanSofa.config.admin_route_prefix.blank?
   

data/db/migrate/01_create_cms.rb

@@ -68,15 +68,18 @@ class CreateCms < ActiveRecord::Migration
     end
     add_index :cms_snippets, [:site_id, :slug], :unique => true
     
-    # -- Assets -------------------------------------------------------------
-    create_table :cms_uploads do |t|
+    # -- Files --------------------------------------------------------------
+    create_table :cms_files do |t|
       t.integer :site_id
+      t.string  :label
       t.string  :file_file_name
       t.string  :file_content_type
       t.integer :file_file_size
+      t.string  :description, :limit => 2048
       t.timestamps
     end
-    add_index :cms_uploads, [:site_id, :file_file_name]
+    add_index :cms_files, [:site_id, :label]
+    add_index :cms_files, [:site_id, :file_file_name]
     
     # -- Revisions -----------------------------------------------------------
     create_table :cms_revisions, :force => true do |t|
@@ -87,6 +90,20 @@ class CreateCms < ActiveRecord::Migration
     end
     add_index :cms_revisions, [:record_type, :record_id, :created_at]
     
+    # -- Categories ---------------------------------------------------------
+    create_table :cms_categories, :force => true do |t|
+      t.string :label
+      t.string :categorized_type
+    end
+    add_index :cms_categories, [:categorized_type, :label], :unique => true
+    
+    create_table :cms_categorizations, :force => true do |t|
+      t.integer :category_id
+      t.string :categorized_type
+      t.integer :categorized_id
+    end
+    add_index :cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
+      :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
   end
   
   def self.down
@@ -95,7 +112,9 @@ class CreateCms < ActiveRecord::Migration
     drop_table :cms_pages
     drop_table :cms_snippets
     drop_table :cms_blocks
-    drop_table :cms_uploads
+    drop_table :cms_files
     drop_table :cms_revisions
+    drop_table :cms_categories
+    drop_table :cms_categorizations
   end
 end

data/db/migrate/upgrades/05_upgrade_to_1_4_0.rb

@@ -0,0 +1,33 @@
+class UpgradeTo140 < ActiveRecord::Migration
+  def self.up
+    rename_table :cms_uploads, :cms_files
+    add_column :cms_files, :label, :string
+    add_column :cms_files, :description, :string, :limit => 2048
+    add_index :cms_files, [:site_id, :label]
+    
+    # -- Categories ---------------------------------------------------------
+    create_table :cms_categories, :force => true do |t|
+      t.string :label
+      t.string :categorized_type
+    end
+    add_index :cms_categories, [:categorized_type, :label], :unique => true
+    
+    create_table :cms_categorizations, :force => true do |t|
+      t.integer :category_id
+      t.string :categorized_type
+      t.integer :categorized_id
+    end
+    add_index :cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
+      :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
+  end
+  
+  def self.down
+    remove_index :cms_files, [:site_id, :label]
+    remove_column :cms_files, :description
+    remove_column :cms_files, :label
+    rename_table :cms_files, :cms_uploads
+    
+    drop_table :cms_categories
+    drop_table :cms_categorizations
+  end
+end

data/lib/comfortable_mexican_sofa.rb

@@ -7,16 +7,17 @@ end
   'comfortable_mexican_sofa/error',
   'comfortable_mexican_sofa/configuration',
   'comfortable_mexican_sofa/http_auth',
-  'comfortable_mexican_sofa/rails_extensions',
   'comfortable_mexican_sofa/controller_methods',
   'comfortable_mexican_sofa/view_hooks',
   'comfortable_mexican_sofa/view_methods',
   'comfortable_mexican_sofa/form_builder',
-  'comfortable_mexican_sofa/acts_as_tree',
-  'comfortable_mexican_sofa/has_revisions',
-  'comfortable_mexican_sofa/is_mirrored',
   'comfortable_mexican_sofa/tag',
-  'comfortable_mexican_sofa/fixtures'
+  'comfortable_mexican_sofa/fixtures',
+  'comfortable_mexican_sofa/extensions/rails',
+  'comfortable_mexican_sofa/extensions/acts_as_tree',
+  'comfortable_mexican_sofa/extensions/has_revisions',
+  'comfortable_mexican_sofa/extensions/is_mirrored',
+  'comfortable_mexican_sofa/extensions/is_categorized'
 ].each do |path|
   require File.expand_path(path, File.dirname(__FILE__))
 end

data/lib/comfortable_mexican_sofa/extensions/is_categorized.rb

@@ -0,0 +1,45 @@
+module ComfortableMexicanSofa::IsCategorized
+  
+  def self.included(base)
+    base.send :extend, ClassMethods
+  end
+  
+  module ClassMethods
+    def cms_is_categorized
+      include ComfortableMexicanSofa::IsCategorized::InstanceMethods
+      
+      has_many :categorizations,
+        :as         => :categorized,
+        :dependent  => :destroy
+      has_many :categories,
+        :through    => :categorizations
+        
+      attr_accessor :category_ids
+      
+      after_save :sync_categories
+      
+      scope :for_category, lambda { |*categories|
+        if (categories = [categories].flatten.compact).present?
+          select("DISTINCT #{table_name}.*").joins(:categorizations => :category).where('cms_categories.label' => categories)
+        end
+      }
+    end
+  end
+  
+  module InstanceMethods
+    def sync_categories
+      (self.category_ids || {}).each do |category_id, flag|
+        case flag.to_i
+        when 1
+          if category = Cms::Category.find_by_id(category_id)
+            category.categorizations.create(:categorized => self)
+          end
+        when 0
+          self.categorizations.where(:category_id => category_id).destroy_all
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send :include, ComfortableMexicanSofa::IsCategorized

data/lib/comfortable_mexican_sofa/tag.rb

@@ -85,8 +85,8 @@ module ComfortableMexicanSofa::Tag
     end
     
     # Initializing Cms::Upload object
-    def upload
-      page.site.uploads.detect{|s| s.file_file_name == self.label.to_s}
+    def file
+      page.site.files.detect{|f| f.file_file_name == self.label.to_s}
     end
     
     # Checks if this tag is using Cms::Block

data/lib/comfortable_mexican_sofa/tags/{upload.rb → file.rb}

@@ -1,24 +1,24 @@
-class ComfortableMexicanSofa::Tag::Upload
+class ComfortableMexicanSofa::Tag::File
   include ComfortableMexicanSofa::Tag
   
   def self.regex_tag_signature(label = nil)
     label ||= /[\w\-\.]+/
-    /\{\{\s*cms:upload:(#{label}):?(.*?)\s*\}\}/
+    /\{\{\s*cms:file:(#{label}):?(.*?)\s*\}\}/
   end
   
   def content
-    return unless upload
+    return unless file
     
     format  = params[0]
     text    = params[1] || label
     
     case format
     when 'link'
-      "<a href='#{upload.file.url}' target='_blank'>#{text}</a>"
+      "<a href='#{file.file.url}' target='_blank'>#{text}</a>"
     when 'image'
-      "<img src='#{upload.file.url}' alt='#{text}' />"
+      "<img src='#{file.file.url}' alt='#{text}' />"
     else
-      upload.file.url
+      file.file.url
     end
   end
 end

data/test/fixtures/cms/categories.yml

@@ -0,0 +1,3 @@
+default:
+  label: Default
+  categorized_type: Cms::File

data/test/fixtures/cms/categorizations.yml

@@ -0,0 +1,3 @@
+default:
+  category: default
+  categorized: default (Cms::File)

data/test/fixtures/cms/{uploads.yml → files.yml}

@@ -1,5 +1,7 @@
 default:
   site: default
+  label: Sample
   file_file_name: sample.jpg
   file_content_type: image/jpeg
-  file_file_size: 20099
+  file_file_size: 20099
+  description: Description

data/test/functional/cms_admin/categories_controller_test.rb

@@ -0,0 +1,70 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsAdmin::CategoriesControllerTest < ActionController::TestCase
+  
+  def test_get_edit
+    xhr :get, :edit, :site_id => cms_sites(:default), :id => cms_categories(:default)
+    assert_response :success
+    assert_template :edit
+    assert assigns(:category)
+  end
+  
+  def test_get_edit_failure
+    xhr :get, :edit, :site_id => cms_sites(:default), :id => 'invalid'
+    assert_response :success
+    assert response.body.blank?
+  end
+  
+  def test_creation
+    assert_difference 'Cms::Category.count' do
+      xhr :post, :create, :site_id => cms_sites(:default), :category => {
+        :label            => 'Test Label',
+        :categorized_type => 'Cms::Snippet'
+      }
+      assert_response :success
+      assert_template :create
+      assert assigns(:category)
+    end
+  end
+  
+  def test_creation_failure
+    assert_no_difference 'Cms::Category.count' do
+      xhr :post, :create, :site_id => cms_sites(:default), :category => { }
+      assert_response :success
+      assert response.body.blank?
+    end
+  end
+  
+  def test_update
+    category = cms_categories(:default)
+    xhr :put, :update, :site_id => cms_sites(:default), :id => category, :category => {
+      :label => 'Updated Label'
+    }
+    assert_response :success
+    assert_template :update
+    assert assigns(:category)
+    category.reload
+    assert_equal 'Updated Label', category.label
+  end
+  
+  def test_update_failure
+    category = cms_categories(:default)
+    xhr :put, :update, :site_id => cms_sites(:default), :id => category, :category => {
+      :label => ''
+    }
+    assert_response :success
+    assert response.body.blank?
+    category.reload
+    assert_not_equal '', category.label
+  end
+  
+  def test_destroy
+    assert_difference 'Cms::Category.count', -1 do
+      xhr :delete, :destroy, :site_id => cms_sites(:default), :id => cms_categories(:default)
+      assert assigns(:category)
+      assert_response :success
+      assert_template :destroy
+    end
+  end
+  
+end

data/test/functional/cms_admin/files_controller_test.rb

@@ -0,0 +1,168 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsAdmin::FilesControllerTest < ActionController::TestCase
+  
+  def test_get_index
+    get :index, :site_id => cms_sites(:default)
+    assert_response :success
+    assert assigns(:files)
+    assert_template :index
+  end
+  
+  def test_get_index_with_no_files
+    Cms::File.delete_all
+    get :index, :site_id => cms_sites(:default)
+    assert_response :redirect
+    assert_redirected_to :action => :new
+  end
+  
+  def test_get_index_with_category
+    get :index, :site_id => cms_sites(:default), :category => cms_categories(:default).label
+    assert_response :success
+    assert assigns(:files)
+    assert_equal 1, assigns(:files).count
+    assert assigns(:files).first.categories.member? cms_categories(:default)
+  end
+  
+  def test_get_index_with_category_invalid
+    get :index, :site_id => cms_sites(:default), :category => 'invalid'
+    assert_response :success
+    assert assigns(:files)
+    assert_equal 0, assigns(:files).count
+  end
+  
+  def test_get_new
+    site = cms_sites(:default)
+    get :new, :site_id => site
+    assert_response :success
+    assert assigns(:file)
+    assert_template :new
+    assert_select "form[action=/cms-admin/sites/#{site.id}/files]"
+  end
+  
+  def test_get_edit
+    file = cms_files(:default)
+    get :edit, :site_id => file.site, :id => file
+    assert_response :success
+    assert assigns(:file)
+    assert_template :edit
+    assert_select "form[action=/cms-admin/sites/#{file.site.id}/files/#{file.id}]"
+  end
+  
+  def test_get_edit_failure
+    get :edit, :site_id => cms_sites(:default), :id => 'not_found'
+    assert_response :redirect
+    assert_redirected_to :action => :index
+    assert_equal 'File not found', flash[:error]
+  end
+  
+  def test_create
+    assert_difference 'Cms::File.count' do
+      post :create, :site_id => cms_sites(:default), :file => {
+        :label        => 'Test File',
+        :description  => 'Test Description',
+        :file         => [fixture_file_upload('files/valid_image.jpg')]
+      }
+      assert_response :redirect
+      file = Cms::File.last
+      assert_equal cms_sites(:default), file.site
+      assert_equal 'Test File', file.label
+      assert_equal 'Test Description', file.description
+      assert_redirected_to :action => :edit, :id => file
+      assert_equal 'Files uploaded', flash[:notice]
+    end
+  end
+  
+  def test_create_failure
+    assert_no_difference 'Cms::File.count' do
+      post :create, :site_id => cms_sites(:default), :file => { }
+      assert_response :success
+      assert_template :new
+      assert_equal 'Failed to upload files', flash[:error]
+    end
+  end
+  
+  def test_create_multiple
+    Cms::File.delete_all
+    
+    assert_difference 'Cms::File.count', 2 do
+      post :create, :site_id => cms_sites(:default), :file => {
+        :label        => 'Test File',
+        :description  => 'Test Description',
+        :file         => [
+          fixture_file_upload('files/valid_image.jpg'),
+          fixture_file_upload('files/invalid_file.gif')
+        ]
+      }
+      assert_response :redirect
+      file_a, file_b = Cms::File.all
+      assert_equal cms_sites(:default), file_a.site
+      
+      assert_equal 'valid_image.jpg', file_a.file_file_name
+      assert_equal 'invalid_file.gif', file_b.file_file_name
+      assert_equal 'Test File 1', file_a.label
+      assert_equal 'Test File 2', file_b.label
+      assert_equal 'Test Description', file_a.description
+      assert_equal 'Test Description', file_b.description
+      
+      assert_redirected_to :action => :edit, :id => file_b
+      assert_equal 'Files uploaded', flash[:notice]
+    end
+  end
+  
+  def test_create_as_xhr
+    request.env['HTTP_X_FILE_NAME'] = 'test.pdf'
+    request.env['CONTENT_TYPE'] = 'application/pdf'
+    
+    assert_difference 'Cms::File.count' do
+      xhr :post, :create, :site_id => cms_sites(:default)
+      assert_response :success
+      
+      file = Cms::File.last
+      assert_equal 'test.pdf', file.file_file_name
+    end
+  end
+  
+  def test_update
+    file = cms_files(:default)
+    put :update, :site_id => file.site, :id => file, :file => {
+      :label        => 'New File',
+      :description  => 'New Description'
+    }
+    assert_response :redirect
+    assert_redirected_to :action => :edit, :site_id => file.site, :id => file
+    assert_equal 'File updated', flash[:notice]
+    file.reload
+    assert_equal 'New File', file.label
+    assert_equal 'New Description', file.description
+  end
+  
+  def test_update_failure
+    file = cms_files(:default)
+    put :update, :site_id => file.site, :id => file, :file => {
+      :file         => nil
+    }
+    assert_response :success
+    assert_template :edit
+    file.reload
+    assert_not_equal nil, file.file
+    assert_equal 'Failed to update file', flash[:error]
+  end
+  
+  def test_destroy
+    assert_difference 'Cms::File.count', -1 do
+      delete :destroy, :site_id => cms_sites(:default), :id => cms_files(:default)
+      assert_response :redirect
+      assert_redirected_to :action => :index
+      assert_equal 'File deleted', flash[:notice]
+    end
+  end
+  
+  def test_destroy_as_xhr
+    assert_difference 'Cms::File.count', -1 do
+      xhr :delete, :destroy, :site_id => cms_sites(:default), :id => cms_files(:default)
+      assert_response :success
+    end
+  end
+  
+end