brightcontent-attachments 2.0.15 → 2.0.16

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    brightcontent-attachments (2.0.15)
-      brightcontent-core (= 2.0.15)
+    brightcontent-attachments (2.0.16)
+      brightcontent-core (= 2.0.16)
       jquery-fileupload-rails
       paperclip
 
 PATH
   remote: ../core
   specs:
-    brightcontent-core (2.0.15)
+    brightcontent-core (2.0.16)
       bcrypt-ruby
       bootstrap-wysihtml5-rails
       has_scope

data/app/models/brightcontent/attachment.rb

@@ -4,24 +4,34 @@ module Brightcontent
 
     belongs_to :attachable, polymorphic: true
     has_attached_file :asset, :styles => lambda {|attachment| attachment.instance.attachment_styles }
+    before_post_process :resize_images
+
     delegate :url, to: :asset
 
     validates :asset, attachment_presence: true
 
     def attachment_styles
-      user_defined_styles.merge(default_attachment_styles)
+      default_attachment_styles.merge(user_defined_styles)
+    end
+
+    def image?
+      asset_content_type =~ %r{^(image|(x-)?application)/(bmp|gif|jpeg|jpg|pjpeg|png|x-png)$}
     end
 
     private
 
     def user_defined_styles
-      if attachable && attachable.respond_to?(:attachment_styles)
+      if attachable && attachable.respond_to?(:attachment_styles) && image?
         attachable.attachment_styles
       end || {}
     end
 
     def default_attachment_styles
-      { brightcontent: "100x100#" }
+      { brightcontent: "100x100#", main: "200x200#" }
+    end
+
+    def resize_images
+      return false unless image?
     end
 
   end

data/app/views/brightcontent/attachments/_attachment.html.erb

@@ -1,4 +1,10 @@
 <%= div_for attachment do %>
-  <%= image_tag attachment.url(:brightcontent) %>
-  <%= link_to "Delete", destroy_attachment_path(attachment.id), method: :delete, confirm: "Are you sure?", class: "btn btn-danger btn-mini" %>
+  <% if attachment.image? %>
+    <%= image_tag attachment.url(:brightcontent) %>
+    <%= link_to "Insert", nil, class: "insert insert_image btn btn-mini", data: { insert_image: attachment.url(:main) } %>
+  <% else %>
+    <div class="attachment-file"><%= attachment.asset_file_name %></div>
+    <%= link_to "Insert", nil, class: "insert insert_link btn btn-mini", data: { insert_url: attachment.url(:original), insert_name: attachment.asset_file_name } %>
+  <% end %>
+  <%= link_to "Delete", destroy_attachment_path(attachment.id), method: :delete, confirm: "Are you sure?", class: "delete btn btn-danger btn-mini" %>
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-attachments
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.15
+        version: 2.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.15
+        version: 2.0.16
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4365656323654046573
+      hash: 2383915157100861141
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4365656323654046573
+      hash: 2383915157100861141
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24