comfortable_mexican_sofa 1.4.22 → 1.5.0

data/app/views/cms_admin/pages/edit.html.erb

@@ -6,6 +6,6 @@
   <%= render :partial => 'cms_admin/sites/mirrors', :object => @page %>
 <% end %>
 
-<%= cms_form_for @page, :as => :page, :url => {:action => :update} do |form| %>
+<%= cms_form_for @page, :as => :page, :url => {:action => :update}, :html => {:multipart => true} do |form| %>
   <%= render :partial => 'form', :object => form %>
 <% end %>

data/app/views/cms_admin/pages/new.html.erb

@@ -1,5 +1,5 @@
 <h1><%= t('.title') %></h1>
 
-<%= cms_form_for @page, :as => :page, :url => {:action => :create} do |form| %>
+<%= cms_form_for @page, :as => :page, :url => {:action => :create}, :html => {:multipart => true} do |form| %>
   <%= render :partial => 'form', :object => form %>
 <% end %>

data/app/views/cms_admin/snippets/index.html.erb

@@ -7,11 +7,15 @@
 
 <%= render :partial => 'cms_admin/categories/index', :object => 'Cms::Snippet' %>
 
-<ul class='list'>
+<ul class='list sortable'>
   <% @snippets.each do |snippet| %>
     <li id='cms_snippet_<%= snippet.id %>'>
       <div class='item'>
-        <div class='icon'></div>
+        <div class='icon'>
+          <% if !params[:category].present? %>
+            <div class='dragger'><span><%= t('cms.views.pages.drag') %></span></div>
+          <% end %>
+        </div>
         <div class='action_links'>
           <%= link_to t('.edit'), edit_cms_admin_site_snippet_path(@site, snippet) %>
           <%= link_to t('.delete'), cms_admin_site_snippet_path(@site, snippet), :method => :delete, :confirm => t('.are_you_sure') %>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.4.22"
+  s.version = "1.5.0"
 
   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 = "2011-09-26"
+  s.date = "2011-09-28"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -129,6 +129,7 @@ Gem::Specification.new do |s|
     "app/views/cms_admin/files/_file.html.erb",
     "app/views/cms_admin/files/_form.html.erb",
     "app/views/cms_admin/files/_index.html.erb",
+    "app/views/cms_admin/files/_page_form.html.erb",
     "app/views/cms_admin/files/create.js.erb",
     "app/views/cms_admin/files/destroy.js.erb",
     "app/views/cms_admin/files/edit.html.erb",
@@ -197,11 +198,10 @@ Gem::Specification.new do |s|
     "db/migrate/upgrades/03_upgrade_to_1_2_0.rb",
     "db/migrate/upgrades/04_upgrade_to_1_3_0.rb",
     "db/migrate/upgrades/05_upgrade_to_1_4_0.rb",
+    "db/migrate/upgrades/06_upgrade_to_1_5_0.rb",
     "db/seeds.rb",
     "doc/preview.png",
     "doc/sofa.png",
-    "gemfiles/Gemfile.rails-3.0.x",
-    "gemfiles/Gemfile.rails-3.1.x",
     "lib/comfortable_mexican_sofa.rb",
     "lib/comfortable_mexican_sofa/authentication/dummy_auth.rb",
     "lib/comfortable_mexican_sofa/authentication/http_auth.rb",
@@ -226,6 +226,8 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/tags/file.rb",
     "lib/comfortable_mexican_sofa/tags/helper.rb",
     "lib/comfortable_mexican_sofa/tags/page_datetime.rb",
+    "lib/comfortable_mexican_sofa/tags/page_file.rb",
+    "lib/comfortable_mexican_sofa/tags/page_files.rb",
     "lib/comfortable_mexican_sofa/tags/page_integer.rb",
     "lib/comfortable_mexican_sofa/tags/page_rich_text.rb",
     "lib/comfortable_mexican_sofa/tags/page_string.rb",
@@ -261,6 +263,8 @@ Gem::Specification.new do |s|
     "test/functional/cms_admin/sites_controller_test.rb",
     "test/functional/cms_admin/snippets_controller_test.rb",
     "test/functional/cms_content_controller_test.rb",
+    "test/gemfiles/Gemfile.rails-3.0.x",
+    "test/gemfiles/Gemfile.rails-3.1.x",
     "test/integration/authentication_test.rb",
     "test/integration/fixtures_test.rb",
     "test/integration/mirrors_test.rb",
@@ -292,6 +296,8 @@ Gem::Specification.new do |s|
     "test/unit/tags/file_test.rb",
     "test/unit/tags/helper_test.rb",
     "test/unit/tags/page_datetime_test.rb",
+    "test/unit/tags/page_file_test.rb",
+    "test/unit/tags/page_files_test.rb",
     "test/unit/tags/page_integer_test.rb",
     "test/unit/tags/page_rich_text_test.rb",
     "test/unit/tags/page_string_test.rb",
@@ -310,17 +316,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<active_link_to>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.14"])
+      s.add_runtime_dependency(%q<active_link_to>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<paperclip>, ["~> 2.4.2"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<active_link_to>, [">= 1.0.0"])
-      s.add_dependency(%q<paperclip>, [">= 2.3.14"])
+      s.add_dependency(%q<active_link_to>, ["~> 1.0.0"])
+      s.add_dependency(%q<paperclip>, ["~> 2.4.2"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<active_link_to>, [">= 1.0.0"])
-    s.add_dependency(%q<paperclip>, [">= 2.3.14"])
+    s.add_dependency(%q<active_link_to>, ["~> 1.0.0"])
+    s.add_dependency(%q<paperclip>, ["~> 2.4.2"])
   end
 end
 

data/config/initializers/comfortable_mexican_sofa.rb

@@ -59,10 +59,6 @@ ComfortableMexicanSofa.configure do |config|
   # definition in your database.yml file
   #   config.database_config = nil
   
-  # When enabled files upload via the side widget will get automatically categorized for
-  # the current layout/page/snippet (as long as it's already saved). It's disabled by default.
-  #   config.auto_file_categorization = false
-  
 end
 
 # Default credentials for ComfortableMexicanSofa::HttpAuth

data/config/initializers/paperclip.rb

@@ -1,3 +1,28 @@
 Paperclip.options[:command_path] = case Rails.env
   when 'development' then "/usr/local/bin"  
+end
+
+if Rails.env.test?
+  class Paperclip::Attachment
+    def self.default_options 
+      @default_options = {
+        :url                    => "/system/:attachment/:id/:style/:filename",
+        :path                   => ":rails_root/public:url",
+        :styles                 => {},
+        :only_process           => [],
+        :processors             => [:thumbnail],
+        :convert_options        => {},
+        :source_file_options    => {},
+        :default_url            => "/:attachment/:style/missing.png",
+        :default_style          => :original,
+        :storage                => :filesystem,
+        :use_timestamp          => false,
+        :whiny                  => Paperclip.options[:whiny] || Paperclip.options[:whiny_thumbnails],
+        :use_default_time_zone  => true,
+        :hash_digest            => "SHA1",
+        :hash_data              => ":class/:attachment/:id/:style/:updated_at",
+        :preserve_files         => false
+      }
+    end
+  end
 end

data/config/locales/en.yml

@@ -197,6 +197,8 @@ en:
       form:
         create: Upload File
         update: Update File
+      page_form:
+        are_you_sure: Are you sure?
         
     categories:
       index:

data/config/locales/es.yml

@@ -197,6 +197,8 @@ es:
       form:
         create: Subir Archivo
         update: Actualizar Archivo
+      page_form:
+        are_you_sure: ¿Estás seguro?
           
     categories:
       index:

data/config/routes.rb

@@ -4,24 +4,24 @@ Rails.application.routes.draw do
     get '/', :to => 'base#jump'
     resources :sites do
       resources :pages do
-        member do 
-          match :form_blocks
-          match :toggle_branch
-        end
-        collection do
-          match :reorder
-        end
+        get  :form_blocks,    :on => :member
+        get  :toggle_branch,  :on => :member
+        post :reorder,        :on => :collection
         resources :revisions, :only => [:index, :show, :revert] do
           put :revert, :on => :member
         end
       end
-      resources :files
+      resources :files do
+        post :reorder, :on => :collection
+      end
       resources :layouts do
+        post :reorder, :on => :collection
         resources :revisions, :only => [:index, :show, :revert] do
           put :revert, :on => :member
         end
       end
       resources :snippets do
+        post :reorder, :on => :collection
         resources :revisions, :only => [:index, :show, :revert] do
           put :revert, :on => :member
         end

data/db/migrate/01_create_cms.rb

@@ -63,23 +63,29 @@ class CreateCms < ActiveRecord::Migration
       t.string  :label
       t.string  :slug
       t.text    :content
+      t.integer :position,  :null => false, :default => 0
       t.boolean :is_shared, :null => false, :default => false
       t.timestamps
     end
     add_index :cms_snippets, [:site_id, :slug], :unique => true
+    add_index :cms_snippets, [:site_id, :position]
     
     # -- Files --------------------------------------------------------------
     create_table :cms_files do |t|
       t.integer :site_id
+      t.integer :block_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.integer :position,    :null => false, :default => 0
       t.timestamps
     end
     add_index :cms_files, [:site_id, :label]
     add_index :cms_files, [:site_id, :file_file_name]
+    add_index :cms_files, [:site_id, :position]
+    add_index :cms_files, [:site_id, :block_id]
     
     # -- Revisions -----------------------------------------------------------
     create_table :cms_revisions, :force => true do |t|

data/db/migrate/upgrades/06_upgrade_to_1_5_0.rb

@@ -0,0 +1,21 @@
+class UpgradeTo150 < ActiveRecord::Migration
+  def self.up
+    add_column :cms_snippets, :position,  :integer, :null => false, :default => 0
+    add_column :cms_files, :position,     :integer, :null => false, :default => 0
+    add_column :cms_files, :block_id,     :integer
+    
+    add_index :cms_snippets, [:site_id, :position]
+    add_index :cms_files, [:site_id, :position]
+    add_index :cms_files, [:site_id, :block_id]
+  end
+  
+  def self.down
+    remove_index :cms_snippets, [:site_id, :position]
+    remove_index :cms_files, [:site_id, :position]
+    remove_index :cms_files, [:site_id, :block_id]
+    
+    remove_column :cms_snippets, :position
+    remove_column :cms_files, :position
+    remove_column :cms_files, :block_id
+  end
+end

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -49,27 +49,22 @@ class ComfortableMexicanSofa::Configuration
   # in your database.yml file
   attr_accessor :database_config
   
-  # When enabled files upload via the side widget will get automatically categorized for
-  # the current layout/page/snippet (as long as it's already saved). It's disabled by default.
-  attr_accessor :auto_file_categorization
-  
   # Configuration defaults
   def initialize
-    @cms_title                = 'ComfortableMexicanSofa MicroCMS'
-    @admin_auth               = 'ComfortableMexicanSofa::HttpAuth'
-    @public_auth              = 'ComfortableMexicanSofa::DummyAuth'
-    @seed_data_path           = nil
-    @admin_route_prefix       = 'cms-admin'
-    @admin_route_redirect     = ''
-    @allow_irb                = false
-    @upload_file_options      = {}
-    @enable_fixtures          = false
-    @fixtures_path            = File.expand_path('db/cms_fixtures', Rails.root)
-    @revisions_limit          = 25
-    @locales                  = { :en => 'English', :es => 'Español' }
-    @admin_locale             = nil
-    @database_config          = nil
-    @auto_file_categorization = false
+    @cms_title            = 'ComfortableMexicanSofa MicroCMS'
+    @admin_auth           = 'ComfortableMexicanSofa::HttpAuth'
+    @public_auth          = 'ComfortableMexicanSofa::DummyAuth'
+    @seed_data_path       = nil
+    @admin_route_prefix   = 'cms-admin'
+    @admin_route_redirect = ''
+    @allow_irb            = false
+    @upload_file_options  = {}
+    @enable_fixtures      = false
+    @fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
+    @revisions_limit      = 25
+    @locales              = { :en => 'English', :es => 'Español' }
+    @admin_locale         = nil
+    @database_config      = nil
   end
   
 end

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -55,11 +55,13 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   end
   
   # -- Tag Field Fields -----------------------------------------------------
-  def default_tag_field(tag, options = {})
-    label     = options[:label] || tag.label.to_s.titleize
-    css_class = options[:css_class] || tag.class.to_s.demodulize.underscore
+  def default_tag_field(tag, index, options = {})
+    method    = options.delete(:method) || :text_field_tag
+    label     = tag.label.to_s.titleize
+    css_class = tag.class.to_s.demodulize.underscore
+    content   = ''
     
-    field_css_class = case tag
+    input_class = case tag
     when ComfortableMexicanSofa::Tag::PageDateTime, ComfortableMexicanSofa::Tag::FieldDateTime
       'datetime'
     when ComfortableMexicanSofa::Tag::PageText, ComfortableMexicanSofa::Tag::FieldText
@@ -68,68 +70,78 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
       'rich_text'
     end
     
-    options[:content_field_method] ||= :text_field_tag
-    field = 
-      options[:field] || 
-      @template.send(
-        options[:content_field_method],
-        'page[blocks_attributes][][content]',
-        tag.content,
-        :id     => nil, 
-        :class  => field_css_class
-      )
-    content = "#{field} #{@template.hidden_field_tag('page[blocks_attributes][][label]', tag.label, :id => nil)}"
+    case method
+    when :file_field_tag
+      input_params = {:id => nil, :class => input_class}
+      input_params.merge!(:multiple => true) if options[:multiple]
+      name = "page[blocks_attributes][#{index}][content]"
+      name << '[]' if options[:multiple]
+      content << @template.send(method, name, input_params)
+      content << @template.render(:partial => 'cms_admin/files/page_form', :object => tag.block)
+    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)
+    
     simple_field(label, content, :class => css_class)
   end
   
-  def field_date_time(tag)
-    default_tag_field(tag)
+  def field_date_time(tag, index)
+    default_tag_field(tag, index)
+  end
+  
+  def field_integer(tag, index)
+    default_tag_field(tag, index, :method => :number_field_tag)
+  end
+  
+  def field_string(tag, index)
+    default_tag_field(tag, index)
   end
   
-  def field_integer(tag)
-    default_tag_field(tag, :content_field_method => :number_field_tag)
+  def field_text(tag, index)
+    default_tag_field(tag, index, :method => :text_area_tag)
   end
   
-  def field_string(tag)
-    default_tag_field(tag)
+  def page_date_time(tag, index)
+    default_tag_field(tag, index)
   end
   
-  def field_text(tag)
-    default_tag_field(tag, :content_field_method => :text_area_tag)
+  def page_integer(tag, index)
+    default_tag_field(tag, index, :method => :number_field_tag)
   end
   
-  def page_date_time(tag)
-    default_tag_field(tag)
+  def page_string(tag, index)
+    default_tag_field(tag, index)
   end
   
-  def page_integer(tag)
-    default_tag_field(tag, :content_field_method => :number_field_tag)
+  def page_text(tag, index)
+    default_tag_field(tag, index, :method => :text_area_tag)
   end
   
-  def page_string(tag)
-    default_tag_field(tag)
+  def page_rich_text(tag, index)
+    default_tag_field(tag, index, :method => :text_area_tag)
   end
   
-  def page_text(tag)
-    default_tag_field(tag, :content_field_method => :text_area_tag)
+  def page_file(tag, index)
+    default_tag_field(tag, index, :method => :file_field_tag)
   end
   
-  def page_rich_text(tag)
-    default_tag_field(tag, :content_field_method => :text_area_tag)
+  def page_files(tag, index)
+    default_tag_field(tag, index, :method => :file_field_tag, :multiple => true)
   end
   
-  def collection(tag)
+  def collection(tag, index)
     options = [["---- Select #{tag.collection_class.titleize} ----", nil]] + 
       tag.collection_objects.collect do |m| 
         [m.send(tag.collection_title), m.send(tag.collection_identifier)]
       end
       
     content = @template.select_tag(
-      'page[blocks_attributes][][content]',
+      "page[blocks_attributes][#{index}][content]",
       @template.options_for_select(options, :selected => tag.content),
       :id => nil
     )
-    content << @template.hidden_field_tag('page[blocks_attributes][][label]', tag.label, :id => nil)
+    content << @template.hidden_field_tag("page[blocks_attributes][#{index}][label]", tag.label, :id => nil)
     simple_field(tag.label, content, :class => tag.class.to_s.demodulize.underscore )
   end
   

data/lib/comfortable_mexican_sofa/tag.rb

@@ -3,7 +3,7 @@
 # This module provides all Tag classes with neccessary methods.
 # Example class that will behave as a Tag:
 #   class MySpecialTag
-#     include CmsTag
+#     include ComfortableMexicanSofa::Tag
 #     ...
 #   end
 module ComfortableMexicanSofa::Tag
@@ -76,19 +76,9 @@ module ComfortableMexicanSofa::Tag
       page.blocks.detect{|b| b.label == self.label.to_s} || page.blocks.build(:label => self.label.to_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
-    
-    # Initializing Cms::Upload object
-    def file
-      page.site.files.detect{|f| f.file_file_name == self.label.to_s}
-    end
-    
     # Checks if this tag is using Cms::Block
     def is_cms_block?
-      %w(page field collection).member?(self.class.to_s.demodulize.underscore.split(/_/).first)
+      %w(page field collection file).member?(self.class.to_s.demodulize.underscore.split(/_/).first)
     end
     
     # Used in displaying form elements for Cms::Block