administrate-field-carrierwave 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1717d7fe72c576d5abfa8bf124e4d06aa287ff4
-  data.tar.gz: d42a7557e8138438a623b5e5a772b81ce544f0f6
+  metadata.gz: 7be62a38a3fac45a480819d4857ff3fa59e60d9b
+  data.tar.gz: 7d12584f15145b96a35d959ab74e198003076c36
 SHA512:
-  metadata.gz: 676084a803681761b6034240d7c090bf0c013ec65f10b755537a5591154a340d5fcfa75b72677fdcf817a8bdcf964f6427fae8cc3e359fefe3c1bab63dd3d01b
-  data.tar.gz: 473f01457a42b5f521fa925b5b912696f4e323262c0d8cdaac5f2dbfb8afe757f39e0fe66c76514207fe0208015bbebb95425fb39a8abcef8908fcc731c67927
+  metadata.gz: a95819b7c3b8f5a3d6944a1f9f558b83425a8cf3ff02c435bec54c3dbf116760250722f8a06f3df35abc9363d0c5665d26fa0f06c42c4d571a4538926bede6e7
+  data.tar.gz: 32d07b5b76e3bf6e4b776f3d067c71b6b8f4b0fb208dbe1dbc147d522b18ecec87cd17b0544b48df9638cf363442ea4b6573e5ad6445456e9fa07a9bd258a6c1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [v0.1.0](https://github.com/z-productions/administrate-field-carrierwave/tree/v0.1.0) (2016-11-30)
+[Full Changelog](https://github.com/z-productions/administrate-field-carrierwave/compare/v0.0.3...v0.1.0)
+
+* Add support for multiple files
+
 ## [v0.0.3](https://github.com/z-productions/administrate-field-carrierwave/tree/v0.0.3) (2016-11-29)
 [Full Changelog](https://github.com/z-productions/administrate-field-carrierwave/compare/v0.0.2...v0.0.3)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    administrate-field-carrierwave (0.0.3)
+    administrate-field-carrierwave (0.1.0)
       administrate (~> 0.3.0)
       rails (>= 4.2)
 

data/README.md

@@ -9,7 +9,7 @@ A plugin to upload and preview Carrierwave attachments in [Administrate].
 Add it to your `Gemfile`:
 
 ```ruby
-gem 'administrate-field-carrierwave', '~> 0.0.3'
+gem 'administrate-field-carrierwave', '~> 0.1.0'
 ```
 
 Run:
@@ -22,12 +22,13 @@ Add to your `FooDashboard`:
 
 ```ruby
 ATTRIBUTE_TYPES = {
-  bar: Field::Carrierwave.with_options(image: :standard)
+  bar: Field::Carrierwave.with_options(image: :standard, multiple: true)
 }.freeze
 ```
 ### Options
 
 * `image` (default: `nil`): a [version] that will be displayed in an `<img>` element.
+* `multiple` (default: `false`): allows uploading of multiple files. **ATTENTION 🚨**: [requires CarrierWave’s `master` branch](https://github.com/carrierwaveuploader/carrierwave#multiple-file-uploads). Uploaded files will replace the current ones – if present – and not add to them.
 
 ## About
 

data/administrate-field-carrierwave.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name = 'administrate-field-carrierwave'
-  gem.version = '0.0.3'
+  gem.version = '0.1.0'
   gem.authors = ['Michele Gerarduzzi']
   gem.email = ['michele.gerarduzzi@gmail.com']
   gem.homepage = 'https://github.com/z-productions/administrate-field-carrierwave'

data/app/views/fields/carrierwave/_file.html.erb

@@ -0,0 +1 @@
+<%= link_to (file.filename || file.path).split('/').last, file.url, target: '_blank' %>

data/app/views/fields/carrierwave/_form.html.erb

@@ -1,7 +1,8 @@
 <%#
 # Carrierwave Form Partial
 
-This partial renders a file input field.
+This partial renders a file input field and a summary of the current
+attachment(s) for this attribute
 
 ## Local variables:
 
@@ -16,12 +17,7 @@ This partial renders a file input field.
   <%= f.label field.attribute %>
 </div>
 <div class="field-unit__field">
-  <%= f.file_field field.attribute %>
+  <%= f.file_field field.attribute, multiple: field.multiple? %>
   <br />
-  <%- if field.uploaded? -%>
-    <%= render 'fields/carrierwave/preview', field: field %>
-    <%= link_to field.basename, field.url, title: field.filename, target: '_blank' %>
-  <%- else -%>
-    <span>No file uploaded yet</span>
-  <%- end -%>
+  <%= render 'fields/carrierwave/show', field: field %>
 </div>

data/app/views/fields/carrierwave/_index.html.erb

@@ -2,7 +2,7 @@
 # Carrierwave Index Partial
 
 This partial renders the URL of the attachment as a link that
-opens in a new window/tab
+opens in a new window/tab, or the total number of attached files
 
 ## Local variables:
 
@@ -11,4 +11,8 @@ opens in a new window/tab
   A wrapper around the attribute pulled from the database.
 %>
 
-<%= link_to 'View', field.url, title: field.filename, target: '_blank' %>
+<% if field.multiple? %>
+  <%= pluralize(field.files.size, field.attribute.to_s.humanize.downcase) %>
+<% else %>
+  <%= link_to 'View', field.file.url, title: field.file.filename, target: '_blank' %>
+<% end %>

data/app/views/fields/carrierwave/_preview.html.erb

@@ -1,3 +1 @@
-<% if field.image %>
-  <p><%= image_tag field.url(field.image), alt: field.basename %></p>
-<% end %>
+<%= link_to image_tag(file.url(field.image), alt: file.filename), file.url, target: '_blank' %>

data/app/views/fields/carrierwave/_show.html.erb

@@ -1,8 +1,8 @@
 <%#
 # Carrierwave Show Partial
 
-This partial renders the URL of the attachment as a link that
-opens in a new window/tab, and an optional image preview
+This partial renders a summary of the current attachment(s)
+for this attribute
 
 ## Local variables:
 
@@ -11,5 +11,20 @@ opens in a new window/tab, and an optional image preview
   A wrapper around the attribute pulled from the database.
 %>
 
-<%= render 'fields/carrierwave/preview', field: field %>
-<%= link_to field.basename, field.url, title: field.filename, target: '_blank' %>
+<% if field.multiple? %>
+  <% if field.files.any? %>
+    <ul>
+      <%- field.files.each do |file| %>
+        <li><%= render 'fields/carrierwave/file', file: file %></li>
+      <% end %>
+    </ul>
+  <% else %>
+    <span>No file(s) uploaded yet</span>
+  <% end %>
+<% else %>
+  <% if field.image.present? %>
+    <%= render 'fields/carrierwave/preview', file: field.file, field: field %>
+  <% else %>
+    <%= render 'fields/carrierwave/file', file: field.file %>
+  <% end %>
+<% end %>

data/lib/administrate/field/carrierwave.rb

@@ -6,18 +6,21 @@ module Administrate
     class Carrierwave < Administrate::Field::Base
       class Engine < ::Rails::Engine; end
 
-      delegate :url, :filename, to: :data, allow_nil: true
-
       def image
         options.fetch(:image, nil)
       end
 
-      def uploaded?
-        url.present?
+      def multiple?
+        options.fetch(:multiple, false)
+      end
+
+      # One-element array when single file field, array of files when multiple
+      def files
+        Array[*data]
       end
 
-      def basename
-        File.basename(data.path)
+      def file
+        files.first
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Michele Gerarduzzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -52,6 +52,7 @@ files:
 - LICENSE.md
 - README.md
 - administrate-field-carrierwave.gemspec
+- app/views/fields/carrierwave/_file.html.erb
 - app/views/fields/carrierwave/_form.html.erb
 - app/views/fields/carrierwave/_index.html.erb
 - app/views/fields/carrierwave/_preview.html.erb