comfortable_mexican_sofa 1.12.2 → 1.12.3

data/lib/comfortable_mexican_sofa/engine.rb

@@ -15,6 +15,7 @@ require 'codemirror-rails'
 require 'kaminari'
 require 'tinymce-rails'
 require 'bootstrap-sass'
+require 'plupload-rails'
 
 module ComfortableMexicanSofa
   class Engine < ::Rails::Engine

data/lib/comfortable_mexican_sofa/fixture.rb

@@ -29,14 +29,16 @@ module ComfortableMexicanSofa::Fixture
     
     def save_categorizations!(object, categories)
       object.categorizations.delete_all
+      
       [categories].flatten.compact.each do |label|
-        category = self.site.categories.find_or_create_by(
+        category = self.site.categories.where(
           :label            => label,
           :categorized_type => object.class.to_s
-        )
-        category.categorizations.create!(
-          :categorized => object
-        )
+        ).first
+        
+        next unless category
+        
+        category.categorizations.create!(:categorized => object)
       end
     end
     

data/lib/comfortable_mexican_sofa/fixture/category.rb

@@ -7,9 +7,16 @@ module ComfortableMexicanSofa::Fixture::Category
         'snippets'  => 'Comfy::Cms::Snippet'
       }.each do |file, type|
         if File.exists?(attrs_path = File.join(path, "#{file}.yml"))
-          categories = get_attributes(attrs_path)
-          [categories].flatten.each do |label|
-            self.site.categories.find_or_create_by(:label => label, :categorized_type => type)
+          categories = [get_attributes(attrs_path)].flatten
+          existing_categories = self.site.categories.where(:categorized_type => type).map(&:label)
+          
+          self.site.categories.where(
+            :categorized_type => type,
+            :label            => existing_categories - categories
+          ).destroy_all
+          
+          (categories - existing_categories).each do |label|
+            self.site.categories.create(:label => label, :categorized_type => type)
           end
         end
       end

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -59,7 +59,7 @@ class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
     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 
+    form_group :label => {:text => (tag.blockable.class.human_attribute_name(tag.identifier.to_s) || tag.identifier.titleize + "?")} do 
       content
     end
   end

data/lib/comfortable_mexican_sofa/routes/cms.rb

@@ -1,6 +1,9 @@
 class ActionDispatch::Routing::Mapper
 
   def comfy_route_cms(options = {})
+    
+    ComfortableMexicanSofa.configuration.public_cms_path = options[:path]
+    
     scope :module => :comfy, :as => :comfy do
       namespace :cms, :path => options[:path] do
         get 'cms-css/:site_id/:identifier(/:cache_buster)' => 'assets#render_css', :as => 'render_css'

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.12.2"
+  VERSION = "1.12.3"
 end

data/lib/generators/comfy/cms/assets_generator.rb

@@ -0,0 +1,15 @@
+module Comfy
+  module Generators
+    module Cms
+      class AssetsGenerator < Rails::Generators::Base
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/assets'))
+
+        def generate_assets
+          directory 'images/comfortable_mexican_sofa',      'app/assets/images/comfortable_mexican_sofa'
+          directory 'javascripts/comfortable_mexican_sofa', 'app/assets/javascripts/comfortable_mexican_sofa'
+          directory 'stylesheets/comfortable_mexican_sofa', 'app/assets/stylesheets/comfortable_mexican_sofa'
+        end
+      end
+    end
+  end
+end

data/lib/generators/comfy/cms/cms_generator.rb

@@ -3,55 +3,62 @@ require 'rails/generators/active_record'
 module Comfy
   module Generators
     class CmsGenerator < Rails::Generators::Base
-      
+
       include Rails::Generators::Migration
       include Thor::Actions
-      
+
       source_root File.expand_path('../../../../..', __FILE__)
-      
+
       def generate_migration
         destination   = File.expand_path('db/migrate/01_create_cms.rb', self.destination_root)
         migration_dir = File.dirname(destination)
         destination   = self.class.migration_exists?(migration_dir, 'create_cms')
-        
+
         if destination
           puts "\e[0m\e[31mFound existing cms_create.rb migration. Remove it if you want to regenerate.\e[0m"
         else
           migration_template 'db/migrate/01_create_cms.rb', 'db/migrate/create_cms.rb'
         end
       end
-      
-      def generate_initialization
+
+      def generate_initializer
         copy_file 'config/initializers/comfortable_mexican_sofa.rb',
           'config/initializers/comfortable_mexican_sofa.rb'
       end
-      
+
+      def generate_mime_types
+        create_file 'config/initializers/mime_types.rb'
+        append_to_file 'config/initializers/mime_types.rb' do
+          "Mime::Type.register 'text/plupload', :plupload"
+        end
+      end
+
       def generate_routing
         route_string  = "  comfy_route :cms_admin, :path => '/admin'\n\n"
         route_string << "  # Make sure this routeset is defined last\n"
         route_string << "  comfy_route :cms, :path => '/', :sitemap => false\n"
         route route_string[2..-1]
       end
-      
+
       def generate_cms_seeds
         directory 'db/cms_fixtures', 'db/cms_fixtures'
       end
-      
+
       def generate_assets
         directory 'app/assets/javascripts/comfortable_mexican_sofa/admin',
           'app/assets/javascripts/comfortable_mexican_sofa/admin'
         directory 'app/assets/stylesheets/comfortable_mexican_sofa/admin',
           'app/assets/stylesheets/comfortable_mexican_sofa/admin'
       end
-      
+
       def show_readme
         readme 'lib/generators/comfy/cms/README'
       end
-      
+
       def self.next_migration_number(dirname)
         ActiveRecord::Generators::Base.next_migration_number(dirname)
       end
-      
+
     end
   end
 end

data/lib/generators/comfy/cms/controllers_generator.rb

@@ -0,0 +1,13 @@
+module Comfy
+  module Generators
+    module Cms
+      class ControllersGenerator < Rails::Generators::Base
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/controllers'))
+
+        def generate_controllers
+          directory 'comfy', 'app/controllers/comfy'
+        end
+      end
+    end
+  end
+end

data/lib/generators/comfy/cms/models_generator.rb

@@ -0,0 +1,13 @@
+module Comfy
+  module Generators
+    module Cms
+      class ModelsGenerator < Rails::Generators::Base
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/models'))
+
+        def generate_models
+          directory 'comfy', 'app/models/comfy'
+        end
+      end
+    end
+  end
+end

data/lib/generators/comfy/cms/views_generator.rb

@@ -0,0 +1,13 @@
+module Comfy
+  module Generators
+    module Cms
+      class ViewsGenerator < Rails::Generators::Base
+        source_root File.expand_path(File.join(File.dirname(__FILE__), '../../../../app/views'))
+
+        def generate_views
+          directory 'comfy', 'app/views/comfy'
+        end
+      end
+    end
+  end
+end

data/test/controllers/comfy/admin/cms/files_controller_test.rb

@@ -1,21 +1,14 @@
 require_relative '../../../../test_helper'
 
 class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
-  
+
   def test_get_index
     get :index, :site_id => comfy_cms_sites(:default)
     assert_response :success
     assert assigns(:files)
     assert_template :index
   end
-  
-  def test_get_index_with_no_files
-    Comfy::Cms::File.delete_all
-    get :index, :site_id => comfy_cms_sites(:default)
-    assert_response :redirect
-    assert_redirected_to :action => :new
-  end
-  
+
   def test_get_index_with_category
     get :index, :site_id => comfy_cms_sites(:default), :category => comfy_cms_categories(:default).label
     assert_response :success
@@ -23,38 +16,14 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
     assert_equal 1, assigns(:files).count
     assert assigns(:files).first.categories.member? comfy_cms_categories(:default)
   end
-  
+
   def test_get_index_with_category_invalid
     get :index, :site_id => comfy_cms_sites(:default), :category => 'invalid'
     assert_response :success
     assert assigns(:files)
     assert_equal 0, assigns(:files).count
   end
-  
-  def test_get_index_as_ajax
-    get :index, :site_id => comfy_cms_sites(:default), :ajax => true
-    assert_response :success
-    r = JSON.parse(response.body)
-    file = comfy_cms_files(:default)
-    assert_equal [{
-      'thumb' => file.file.url(:cms_thumb),
-      'image' => file.file.url
-    }], r
-  end
 
-  def test_get_index_as_ajax_with_no_images
-    file = comfy_cms_files(:default)
-    file.update_attribute(:file_content_type, 'text/plain')
-    get :index, :site_id => comfy_cms_sites(:default), :not_images => 1, :ajax => true
-    assert_response :success
-    r = JSON.parse(response.body)
-    assert_equal [{
-      'label'    => file.label,
-      'filename' => file.file_file_name,
-      'url'      => file.file.url
-    }], r
-  end
-  
   def test_get_index_with_page_files
     file = comfy_cms_files(:default)
     file.update_column(:block_id, comfy_cms_blocks(:default_field_text).id)
@@ -71,7 +40,7 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
     assert_template :new
     assert_select "form[action=/admin/sites/#{site.id}/files][enctype=multipart/form-data]"
   end
-  
+
   def test_get_edit
     file = comfy_cms_files(:default)
     get :edit, :site_id => file.site, :id => file
@@ -80,20 +49,20 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
     assert_template :edit
     assert_select "form[action=/admin/sites/#{file.site.id}/files/#{file.id}]"
   end
-  
+
   def test_get_edit_failure
     get :edit, :site_id => comfy_cms_sites(:default), :id => 'not_found'
     assert_response :redirect
     assert_redirected_to :action => :index
     assert_equal 'File not found', flash[:danger]
   end
-  
+
   def test_create
     assert_difference ['Comfy::Cms::File.count', 'Comfy::Cms::Categorization.count'] do
       post :create, :site_id => comfy_cms_sites(:default), :file => {
         :label        => 'Test File',
         :description  => 'Test Description',
-        :file         => [fixture_file_upload('files/image.jpg', 'image/jpeg')],
+        :file         => fixture_file_upload('files/image.jpg', 'image/jpeg'),
         :category_ids => {comfy_cms_categories(:default).id => '1'}
       }
       assert_response :redirect
@@ -105,7 +74,7 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
       assert_equal 'Files uploaded', flash[:success]
     end
   end
-  
+
   def test_create_failure
     assert_no_difference 'Comfy::Cms::File.count' do
       post :create, :site_id => comfy_cms_sites(:default), :file => { }
@@ -114,69 +83,28 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
       assert_equal 'Failed to upload files', flash[:danger]
     end
   end
-  
-  def test_create_multiple
-    Comfy::Cms::File.delete_all
-    
-    assert_difference 'Comfy::Cms::File.count', 2 do
-      post :create, :site_id => comfy_cms_sites(:default), :file => {
-        :label        => 'Test File',
-        :description  => 'Test Description',
-        :file         => [
-          fixture_file_upload('files/image.jpg', 'image/jpeg'),
-          fixture_file_upload('files/image.gif', 'image/gif')
-        ]
-      }
-      assert_response :redirect
-      file_a, file_b = Comfy::Cms::File.all
-      assert_equal comfy_cms_sites(:default), file_a.site
-      
-      assert_equal 'image.jpg', file_a.file_file_name
-      assert_equal 'image.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[:success]
-    end
-  end
-  
-  def test_create_as_ajax
+
+  def test_create_as_plupload
     assert_difference 'Comfy::Cms::File.count' do
       post :create,
-        :ajax     => true,
+        :format   => :plupload,
         :site_id  => comfy_cms_sites(:default),
         :file     => {
-          :file => [fixture_file_upload('files/image.jpg', 'image/jpeg')]
+          :file => fixture_file_upload('files/image.jpg', 'image/jpeg')
         }
       assert_response :success
-      file = Comfy::Cms::File.last
-      r = JSON.parse(response.body)
-      assert_equal file.file.url, r['filelink']
-      assert_equal file.file_file_name, r['filename']
-      assert r['view'].present?
+      assert_no_select "body"
+      assert_select "tr[id=comfy_cms_file_#{Comfy::Cms::File.last.id}]"
     end
   end
-  
-  def test_create_as_ajax_failure
+
+  def test_create_as_plupload_failure
     assert_no_difference 'Comfy::Cms::File.count' do
-      post :create, :ajax => true, :site_id => comfy_cms_sites(:default), :file => { }
+      post :create, :format => :plupload, :site_id => comfy_cms_sites(:default), :file => { }
       assert_response :unprocessable_entity
     end
   end
-  
-  def test_create_as_ajax_as_single_file
-    assert_difference 'Comfy::Cms::File.count' do
-      post :create,
-        :ajax     => true,
-        :site_id  => comfy_cms_sites(:default),
-        :file     => fixture_file_upload('files/image.jpg', 'image/jpeg')
-      assert_response :success
-    end
-  end
-  
+
   def test_update
     file = comfy_cms_files(:default)
     put :update, :site_id => file.site, :id => file, :file => {
@@ -191,7 +119,7 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
     assert_equal 'New File', file.label
     assert_equal 'New Description', file.description
   end
-  
+
   def test_update_failure
     file = comfy_cms_files(:default)
     put :update, :site_id => file.site, :id => file, :file => {
@@ -203,7 +131,7 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
     assert_not_equal nil, file.file
     assert_equal 'Failed to update file', flash[:danger]
   end
-  
+
   def test_destroy
     assert_difference 'Comfy::Cms::File.count', -1 do
       delete :destroy, :site_id => comfy_cms_sites(:default), :id => comfy_cms_files(:default)
@@ -212,14 +140,14 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
       assert_equal 'File deleted', flash[:success]
     end
   end
-  
+
   def test_destroy_as_xhr
     assert_difference 'Comfy::Cms::File.count', -1 do
       xhr :delete, :destroy, :site_id => comfy_cms_sites(:default), :id => comfy_cms_files(:default)
       assert_response :success
     end
   end
-  
+
   def test_reorder
     file_one = comfy_cms_files(:default)
     file_two = comfy_cms_sites(:default).files.create(
@@ -236,5 +164,4 @@ class Comfy::Admin::Cms::FilesControllerTest < ActionController::TestCase
     assert_equal 1, file_one.position
     assert_equal 0, file_two.position
   end
-  
 end

data/test/controllers/comfy/admin/cms/layouts_controller_test.rb

@@ -11,7 +11,7 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
 
   def test_get_index_with_no_layouts
     Comfy::Cms::Layout.delete_all
-    get :index, :site_id => comfy_cms_sites(:default) 
+    get :index, :site_id => comfy_cms_sites(:default)
     assert_response :redirect
     assert_redirected_to :action => :new
   end
@@ -24,9 +24,8 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
     assert_equal '{{ cms:page:content:rich_text }}', assigns(:layout).content
     assert_template :new
     assert_select "form[action=/admin/sites/#{site.id}/layouts]"
-    assert_select "form[action='/admin/sites/#{site.id}/files?ajax=true']"
   end
-  
+
   def test_get_new_with_parent
     site    = comfy_cms_sites(:default)
     layout  = comfy_cms_layouts(:default)
@@ -51,7 +50,7 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
     assert_redirected_to :action => :index
     assert_equal 'Layout not found', flash[:danger]
   end
-  
+
   def test_creation
     assert_difference 'Comfy::Cms::Layout.count' do
       post :create, :site_id => comfy_cms_sites(:default), :layout => {
@@ -66,7 +65,7 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
       assert_equal 'Layout created', flash[:success]
     end
   end
-  
+
   def test_creation_failure
     assert_no_difference 'Comfy::Cms::Layout.count' do
       post :create, :site_id => comfy_cms_sites(:default), :layout => { }
@@ -75,7 +74,7 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
       assert_equal 'Failed to create layout', flash[:danger]
     end
   end
-  
+
   def test_update
     layout = comfy_cms_layouts(:default)
     put :update, :site_id => comfy_cms_sites(:default), :id => layout, :layout => {
@@ -89,7 +88,7 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
     assert_equal 'New Label', layout.label
     assert_equal 'New {{cms:page:content}}', layout.content
   end
-  
+
   def test_update_failure
     layout = comfy_cms_layouts(:default)
     put :update, :site_id => comfy_cms_sites(:default), :id => layout, :layout => {
@@ -101,7 +100,7 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
     assert_not_equal '', layout.identifier
     assert_equal 'Failed to update layout', flash[:danger]
   end
-  
+
   def test_destroy
     assert_difference 'Comfy::Cms::Layout.count', -1 do
       delete :destroy, :site_id => comfy_cms_sites(:default), :id => comfy_cms_layouts(:default)
@@ -110,7 +109,7 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
       assert_equal 'Layout deleted', flash[:success]
     end
   end
-  
+
   def test_reorder
     layout_one = comfy_cms_layouts(:default)
     layout_two = comfy_cms_sites(:default).layouts.create!(
@@ -129,4 +128,4 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
     assert_equal 0, layout_two.position
   end
 
-end
+end