trusty-clipped-extension 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0f7e2fbb77337dab6ed69bce384fc481e248523
-  data.tar.gz: a11a10b0f8d511e1625296d038d3532da092a482
+  metadata.gz: 67a5398a2a5ac0dd6a16a76d8ded3131c8d73cc4
+  data.tar.gz: 80d287a7f7bb5edc95fd9cd582986262a28b2fa2
 SHA512:
-  metadata.gz: 3f9469774d156389987291efb0f9c3a0c689e544832458910941c54e1d11f47d07828444bef137d7f341cacb3bd24bb927042ec8229a5ab1f5f8b3a4dea3b6b8
-  data.tar.gz: 5eb2bcdcb657f0475c5eeb3567b1eb82213b0336a348399b59110aecfcfe3617845437e6191f5b1c6aaad6e2502e22d6e893aa8246d54c2b063eb13f7617dfa0
+  metadata.gz: cbd388ef9270419b628e991c85a87a103e7785e1182e28ad9f6c1e0348cc62915b77c15bfa021db03b4bb91c1a46ba07e4972f38584349467fb68c9ae4f79733
+  data.tar.gz: 0923f2581dca2e67bba4fbac9fbbf89a48d4ce4d93666b1c628f85a3d2cc5f13365414ed9611f7057abc1053a78ae1eb6d4dd3a387be2a8f163ffabe8a2ecb09

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-clipped-extension (2.0.6)
+    trusty-clipped-extension (2.0.7)
       acts_as_list (~> 0.4.0)
       cocaine (~> 0.5)
       paperclip (~> 4.2)
@@ -141,7 +141,7 @@ GEM
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     orm_adapter (0.5.0)
-    paperclip (4.3.5)
+    paperclip (4.3.6)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
@@ -247,7 +247,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    trusty-cms (2.0.16)
+    trusty-cms (2.0.17)
       RedCloth (~> 4.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
@@ -265,6 +265,7 @@ GEM
       rack-cache (~> 1.2)
       radius (~> 0.7)
       rails (~> 4.2)
+      rake (< 11.0)
       rdoc (~> 3.9)
       stringex (~> 1.3)
       therubyracer (~> 0.12)

data/app/controllers/admin/assets_controller.rb

@@ -31,12 +31,16 @@ class Admin::AssetsController < Admin::ResourceController
   def create
     @assets, @page_attachments = [], []
     params[:asset][:asset].to_a.each do |uploaded_asset|
-      @asset = Asset.create(:asset => uploaded_asset, :title => params[:asset][:title], :caption => params[:asset][:caption])
-      if params[:for_attachment]
-        @page = Page.find_by_id(params[:page_id]) || Page.new
-        @page_attachments << @page_attachment = @asset.page_attachments.build(:page => @page)
+      if uploaded_asset.content_type == "application/octet-stream"
+        flash[:notice] = "Please only upload assets that have a valid extension in the name."
+      else
+        @asset = Asset.create(:asset => uploaded_asset, :caption => params[:asset][:caption])
+        if params[:for_attachment]
+          @page = Page.find_by_id(params[:page_id]) || Page.new
+          @page_attachments << @page_attachment = @asset.page_attachments.build(:page => @page)
+        end
+        @assets << @asset
       end
-      @assets << @asset
     end
     if params[:for_attachment]
       render :partial => 'admin/page_attachments/attachment', :collection => @page_attachments

data/app/models/asset.rb

@@ -62,6 +62,8 @@ class Asset < ActiveRecord::Base
   validates_attachment_presence :asset, :message => "You must choose a file to upload!"
   if TrustyCms.config["paperclip.skip_filetype_validation"] != "true" && TrustyCms.config['paperclip.content_types']
     validates_attachment_content_type :asset, :content_type => TrustyCms.config["paperclip.content_types"].gsub(' ','').split(',')
+  else
+    validates_attachment_presence :asset, :message => "Your uploaded file must have an extension in its name!"
   end
   validates_attachment_size :asset, :less_than => ( TrustyCms.config["assets.max_asset_size"] || 5 ).to_i.megabytes
 
@@ -183,7 +185,7 @@ private
   end
 
   def assign_title
-    self.title = basename unless title?
+    self.title = self.asset_file_name
   end
 
   def assign_uuid

data/app/views/admin/assets/_form.html.haml

@@ -2,9 +2,6 @@
 - render_region :form do |form|
   - form.edit_title do
     %fieldset.title
-      %label{ :for => "asset_title" }
-        = t("clipped_extension.title")
-      = f.text_field :title, :class => 'textbox', :maxlength => 100
   - form.edit_metadata do
     .drawer
       .drawer_contents#attributes

data/app/views/admin/pages/_asset_popups.html.haml

@@ -17,26 +17,7 @@
           %p
             %a#attach-popup{:href=>"#attach_asset", :style => 'color: #666; font-size: .8em'}= t('clipped_extension.attach_existing')
 
-
-      = form_tag('/admin/assets/', :id=> 'update_asset', :class => 'upload_asset') do |f|
-        = hidden_field_tag "for_attachment", 1
-        = hidden_field_tag "page_id", @page.id
-        = hidden_field_tag "asset_id", ""
-
-        #update-controls
-          %p
-            %strong
-              = label_tag :title, t("clipped_extension.alt_text_or_title")
-          %p
-            = text_field_tag :title, nil, {:name => "asset[title]", :class => "textbox big"}
-
-          .buttons
-            = button_tag "Set Title", {:id => 'update-asset', :class => "button"}
-            #update-status{:style => 'display: none;'}
-              %img{:src => "/assets/admin/spinner.gif"}
-            = t('or')
-            %a.close_popup{:href=>"#"}= 'Continue'
-    #upload_holders
+      %a.close_popup{:href=>"#"}= 'Upload Complete. Click to Close.'
     
   - popups.attach_asset do
     #attach_asset.popup.textured{:style=>"display: none;"}
@@ -53,4 +34,4 @@
       .busy{:style => "display: none"}= image('spinner.gif', :alt => "")
       .buttons
         %a.cancel.close_popup{:href=>"#"}= t('close')
-        %a.upload-popup{:href=>"#upload_asset", :id=> "upload_asset_link", :style => 'color: #666; float: left'}= t('clipped_extension.upload_asset')
+        %a{:href=>"#upload_asset", :id=> "upload_asset_link", :style => 'color: #666; float: left'}= t('clipped_extension.upload_asset')

data/lib/trusty-clipped-extension.rb

@@ -1,5 +1,5 @@
 module TrustyCmsClippedExtension
-  VERSION     = "2.0.6"
+  VERSION     = "2.0.7"
   SUMMARY     = %q{Assets for TrustyCms CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
   URL         = "https://github.com/pgharts/trusty-clipped-extension"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-clipped-extension
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Keith Bingman
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list