brightcontent-attachments 2.0.7 → 2.0.8

data/.gitignore

@@ -1,6 +1,7 @@
 .bundle/
 log/*.log
 pkg/
+spec/dummy/public/system
 spec/dummy/db/migrate/*.brightcontent.rb
 spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log

data/Gemfile.lock

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

data/app/models/brightcontent/attachment.rb

@@ -3,9 +3,26 @@ module Brightcontent
     attr_accessible :attachable_id, :attachable_type, :asset
 
     belongs_to :attachable, polymorphic: true
-    has_attached_file :asset
+    has_attached_file :asset, styles: ->(a){ a.instance.attachment_styles }
     delegate :url, to: :asset
 
     validates :asset, attachment_presence: true
+
+    def attachment_styles
+      user_defined_styles.merge(default_attachment_styles)
+    end
+
+    private
+
+    def user_defined_styles
+      if attachable && attachable.respond_to?(:attachment_styles)
+        attachable.attachment_styles
+      end || {}
+    end
+
+    def default_attachment_styles
+      { brightcontent: "100x100#" }
+    end
+
   end
 end

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

@@ -1,3 +1,3 @@
 <% @attachments.each do |attachment| %>
-  <%= image_tag attachment.url %>
+  <%= image_tag attachment.url(:brightcontent) %>
 <% end %>

data/app/views/brightcontent/base/_form_field_attachments.html.erb

@@ -1,15 +1,20 @@
-<% if item.persisted? %>
-  <div id="attachments">
-    <% item.attachments.each do |attachment| %>
-      <%= image_tag attachment.url %>
-    <% end %>
-  </div>
+<div class="control-group optional">
+  <label class="optional control-label">Attachments</label>
+  <div class="controls">
+    <% if item.persisted? %>
+      <div id="attachments">
+        <% item.attachments.each do |attachment| %>
+          <%= image_tag attachment.url(:brightcontent) %>
+        <% end %>
+      </div>
 
-  <input id="fileupload" type="file" name="asset" data-url="<%= new_attachment_path %>" multiple>
-  <%= hidden_field_tag "attachable_id", item.id %>
-  <%= hidden_field_tag "attachable_type", item.class.to_s %>
-  <%= hidden_field_tag "attachable_url", attachments_path(item.class.to_s, item.id) %>
+      <input id="fileupload" type="file" name="asset" data-url="<%= new_attachment_path %>" multiple>
+      <%= hidden_field_tag "attachable_id", item.id %>
+      <%= hidden_field_tag "attachable_type", item.class.to_s %>
+      <%= hidden_field_tag "attachable_url", attachments_path(item.class.to_s, item.id) %>
 
-<% else %>
-  First save to enable uploads
-<% end %>
+    <% else %>
+      First save to enable uploads
+    <% end %>
+  </div>
+</div>

data/spec/dummy/app/models/blog.rb

@@ -1,4 +1,8 @@
 class Blog < ActiveRecord::Base
   attr_accessible :body, :name, :featured
   include Brightcontent::Attachable
+
+  def attachment_styles
+    { test: "200x200" }
+  end
 end

data/spec/models/brightcontent/attachment_spec.rb

@@ -2,5 +2,18 @@ require 'spec_helper'
 
 module Brightcontent
   describe Attachment do
+    subject(:attachment) { Attachment.new }
+
+    describe ".attachment_styles" do
+      context "without extra options" do
+        its(:attachment_styles) { should == { brightcontent: "100x100#" } }
+      end
+      context "with extra options" do
+        let(:blog) { build_stubbed(:blog) }
+        before { attachment.attachable = blog }
+
+        its(:attachment_styles) { should == { test: "200x200", brightcontent: "100x100#" } }
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-attachments
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -212,9 +212,6 @@ files:
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/007/original/iphone.png
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/008/original/logo.png
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/009/original/menu-button.png
-- spec/dummy/public/system/brightcontent/assets/assets/000/000/010/original/bestuur.jpg
-- spec/dummy/public/system/brightcontent/attachments/assets/000/000/001/original/bestuur.jpg
-- spec/dummy/public/system/brightcontent/attachments/assets/000/000/002/original/carousel.jpg
 - spec/dummy/public/system/brightcontent/attachments/assets/000/000/003/original/icon-socialmedia.png
 - spec/dummy/public/system/brightcontent/attachments/assets/000/000/004/original/icon-calendar.png
 - spec/dummy/public/system/brightcontent/attachments/assets/000/000/005/original/bg_direction_nav.png
@@ -239,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 496967867413148045
+      hash: -2125101471738240797
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 496967867413148045
+      hash: -2125101471738240797
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -303,9 +300,6 @@ test_files:
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/007/original/iphone.png
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/008/original/logo.png
 - spec/dummy/public/system/brightcontent/assets/assets/000/000/009/original/menu-button.png
-- spec/dummy/public/system/brightcontent/assets/assets/000/000/010/original/bestuur.jpg
-- spec/dummy/public/system/brightcontent/attachments/assets/000/000/001/original/bestuur.jpg
-- spec/dummy/public/system/brightcontent/attachments/assets/000/000/002/original/carousel.jpg
 - spec/dummy/public/system/brightcontent/attachments/assets/000/000/003/original/icon-socialmedia.png
 - spec/dummy/public/system/brightcontent/attachments/assets/000/000/004/original/icon-calendar.png
 - spec/dummy/public/system/brightcontent/attachments/assets/000/000/005/original/bg_direction_nav.png