administrate-field-carrierwave 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c35090dece6d63d2beefce56064a76702435f65d1e6f402a5b874cca13cc038
-  data.tar.gz: c4607f596d442f8df41b698734b59e7a356b8ff84a4cefae60bc02ef19b4f4e2
+  metadata.gz: ef2f6523eac7e56aaed689c5ce635e362861b2190c574eae04b7007fabd990fb
+  data.tar.gz: 953cca09fe43b84c4c9a18b8376b9de262fc340df32bbcb988d234135dd32228
 SHA512:
-  metadata.gz: 190d25074a08a85535fd4e26c5fc5fe7011380a3715efc0c475db8d5544e3070c4fd1c96ec5112078dbc2365cd0cb90fd0b2e258275bb2fd924b9c4379cd5822
-  data.tar.gz: d66ab4a9de0a128a6e2d2c500da233c9c2b614741fc09b7f304f3c906117c33e7cd7eefe63509838ef712b6698467ba8736368ab913a613064cb6548b3495ff5
+  metadata.gz: 9bf1c3759d2ae920c3ad5d6dc4405835879c50ce42ccd315e2ca8a86e84132fefb1929241e3779769cc7e190fedc9ba300c05641c787c503699081bfd55c02c8
+  data.tar.gz: a3afd875fbad56c571babab7a5cc4d61504d5cdc46651172f749546c9245c7581ffe19390a6a261db2ba110a5c7e47a75911fa3fbed57984fd231dc5751e31b8

data/.ruby-version

@@ -1 +1 @@
-2.6.0
+2.6.2

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [v0.4.1](https://github.com/zooppa/administrate-field-carrierwave/tree/v0.4.1) (2019-04-13)
+
+[Full Changelog](https://github.com/zooppa/administrate-field-carrierwave/compare/v0.4.0...v0.4.1)
+
+* Fix display error when no file uploaded yet
+
 ## [v0.4.0](https://github.com/zooppa/administrate-field-carrierwave/tree/v0.4.0) (2019-03-04)
 
 [Full Changelog](https://github.com/zooppa/administrate-field-carrierwave/compare/v0.3.4...v0.4.0)

data/README.md

@@ -10,7 +10,7 @@ A plugin to upload and preview Carrierwave attachments in [Administrate].
 Add it to your `Gemfile`:
 
 ```ruby
-gem 'administrate-field-carrierwave', '~> 0.4.0'
+gem 'administrate-field-carrierwave', '~> 0.4.1'
 ```
 
 Run:
@@ -26,7 +26,6 @@ ATTRIBUTE_TYPES = {
   bar: Field::Carrierwave.with_options(
     image: :standard,
     multiple: true,
-    image_on_index: true,
     remove: false,
     remote_url: false
   )
@@ -45,7 +44,6 @@ end
 ### Options
 
 * `image` (default: `nil`): a [version] that will be displayed in an `<img>` element.
-* `image_on_index` (default: `false`): whether or not to show the image itself on the index list view. The default behavior (when false) is to display a "View" link that opens the image in a new tab/window when clicked.
 * `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.
 * `remove` (default: `false`): allow to remove previously uploaded files. **ATTENTION 🚨** extend [`permitted_attributes`](https://github.com/thoughtbot/administrate/issues/990#issuecomment-339066788) by `remove_FIELD`
 * `remote_url` (default: `false`): allow uploading files from a remote location. **ATTENTION 🚨** extend [`permitted_attributes`](https://github.com/thoughtbot/administrate/issues/990#issuecomment-339066788) by `remote_FIELD_url`

data/administrate-field-carrierwave.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |gem|
   gem.name = 'administrate-field-carrierwave'
-  gem.version = '0.4.0'
+  gem.version = '0.4.1'
   gem.authors = ['Zooppa']
   gem.email = ['dev@zooppa.com']
   gem.homepage = 'https://github.com/zooppa/administrate-field-carrierwave'

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

@@ -14,11 +14,7 @@ opens in a new window/tab, or the total number of attached files
 <% if field.multiple? %>
   <%= pluralize(field.files.size, field.attribute.to_s.humanize.downcase) %>
 <% elsif field.file.present? %>
-  <% if field.image_on_index? %>
-    <%= render 'fields/carrierwave/preview', file: field.file, field: field %>
-  <% else %>
-    <%= link_to 'View', field.file.url, title: field.file.filename, target: '_blank' %>
-  <% end %>
+  <%= link_to 'View', field.file.url, title: field.file.filename, target: '_blank' %>
 <% else %>
   -
 <% end %>

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

@@ -15,7 +15,13 @@ for this attribute
   <% if field.files.any? %>
     <ul>
       <%- field.files.each do |file| %>
-        <li><%= render 'fields/carrierwave/file', file: file %></li>
+        <li>
+          <% if field.show_file? %>
+            <%= render 'fields/carrierwave/file', file: file %>
+          <% else %>
+            -
+          <% end %>
+        </li>
       <% end %>
     </ul>
   <% else %>

data/lib/administrate/field/carrierwave.rb

@@ -12,10 +12,6 @@ module Administrate
         options.fetch(:image, nil)
       end
 
-      def image_on_index?
-        options.fetch(:image_on_index, false)
-      end
-
       def multiple?
         options.fetch(:multiple, false)
       end
@@ -41,7 +37,7 @@ module Administrate
       end
 
       def show_file?
-        file.present?
+        file.present? && (file.filename || file.path)
       end
     end
   end

data/spec/lib/administrate/field/carrierwave_spec.rb

@@ -8,7 +8,8 @@ describe Administrate::Field::Carrierwave do
   let(:file) { double 'File' }
 
   let(:cw_file) do
-    double 'CW with file', model: model, file: file, version_exists?: true
+    double 'CW with file', model: model, file: file, version_exists?: true,
+      filename: 'file.txt', path: '/path/to/file'
   end
   let(:cw_no_file) do
     double 'CW without file', model: model, file: nil, version_exists?: true
@@ -52,24 +53,6 @@ describe Administrate::Field::Carrierwave do
     end
   end
 
-  describe '#image_on_index?' do
-    let(:output) { subject.image_on_index? }
-
-    context 'with nil' do
-      it 'returns false' do
-        expect(output).to be false
-      end
-    end
-
-    context 'with a valid option' do
-      let(:options) { { image_on_index: true } }
-
-      it 'returns the value' do
-        expect(output).to be true
-      end
-    end
-  end
-
   describe '#multiple?' do
     let(:output) { subject.multiple? }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Zooppa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Carrierwave field plugin for Administrate