comfortable_mexican_sofa 1.9.0 → 1.9.1

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 before_install:
   - gem update --system
   - gem --version
-script:
+before_script:
   - rake db:migrate
 rvm:
   - 1.9.3

data/Gemfile

@@ -2,6 +2,13 @@ source 'http://rubygems.org'
 
 gemspec
 
+group :development do
+  gem 'awesome_print'
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'quiet_assets'
+end
+
 group :test do
   gem 'sqlite3',                          :platform => [:ruby, :mswin, :mingw]
   gem 'jdbc-sqlite3',                     :platform => :jruby

data/app/controllers/cms_admin/files_controller.rb

@@ -9,9 +9,17 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
     @files = @site.files.includes(:categories).for_category(params[:category]).order('cms_files.position')
     
     if params[:ajax]
-      files = @files.images.collect do |file|
-        { :thumb => file.file.url(:cms_thumb),
-          :image => file.file.url }
+      if params[:not_images]
+        files = @files.not_images.collect do |file|
+          { :label    => file.label,
+            :filename => file.file_file_name,
+            :url      => file.file.url }
+        end
+      else
+        files = @files.images.collect do |file|
+          { :thumb  => file.file.url(:cms_thumb),
+            :image  => file.file.url }
+        end
       end
       render :json => files
     else
@@ -41,7 +49,7 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
     
     if params[:ajax]
       view = render_to_string(:partial => 'cms_admin/files/file', :collection => @files, :layout => false)
-      render :json => {:filelink => @file.file.url, :view => view.gsub("\n", '')}
+      render :json => {:filelink => @file.file.url, :filename => @file.file_file_name, :view => view.gsub("\n", '')}
     else
       flash[:success] = I18n.t('cms.files.created')
       redirect_to :action => :edit, :id => @file

data/app/views/cms_admin/revisions/show.html.haml

@@ -10,7 +10,6 @@
     - @record.revisions.each do |revision|
       = active_link_to l(revision.created_at), :id => revision.id
       
-
 %table.table
   %tr
     %th

data/comfortable_mexican_sofa.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email         = ["oleg@khabarov.ca"]
   s.homepage      = "http://github.com/comfy/comfortable-mexican-sofa"
   s.summary       = "CMS Engine for Rails 4 apps"
-  s.description   = "ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications"
+  s.description   = "ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails applications"
   
   s.files         = `git ls-files`.split("\n")
   s.platform      = Gem::Platform::RUBY

data/lib/comfortable_mexican_sofa/routing.rb

@@ -12,22 +12,22 @@ module ComfortableMexicanSofa::Routing
             get  :toggle_branch,  :on => :member
             put :reorder,         :on => :collection
             resources :revisions, :only => [:index, :show, :revert] do
-              put :revert, :on => :member
+              patch :revert, :on => :member
             end
           end
           resources :files do
-            put :reorder, :on => :collection
+            post :reorder, :on => :collection
           end
           resources :layouts do
             put :reorder, :on => :collection
             resources :revisions, :only => [:index, :show, :revert] do
-              put :revert, :on => :member
+              patch :revert, :on => :member
             end
           end
           resources :snippets do
             put :reorder, :on => :collection
             resources :revisions, :only => [:index, :show, :revert] do
-              put :revert, :on => :member
+              patch :revert, :on => :member
             end
           end
           resources :categories

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

data/test/controllers/cms_admin/files_controller_test.rb

@@ -41,7 +41,20 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
       'image' => file.file.url
     }], r
   end
-  
+
+  def test_get_index_as_ajax_with_no_images
+    file = cms_files(:default)
+    file.update_attribute(:file_content_type, 'text/plain')
+    get :index, :site_id => 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_new
     site = cms_sites(:default)
     get :new, :site_id => site
@@ -133,6 +146,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
       file = 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?
     end
   end

data/test/gemfiles/Gemfile.rails.4.0

@@ -13,5 +13,6 @@ gem 'coffee-rails',     '>= 3.1.0'
 
 group :test do
   gem 'sqlite3'
-  gem 'coveralls', :require => false
+  gem 'coveralls',  :require => false
+  gem 'mocha',      :require => false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,7 +172,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
-description: ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications
+description: ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails applications
 email:
 - oleg@khabarov.ca
 executables: []