administrate-field-carrierwave 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e06215467cf2202c2c081140fb7676b891de7e3a7e5f4d971ef78144f8b5bcd
-  data.tar.gz: f9ef96c25f4705381150fc96f7098bd617e8faef81c717f39abd606c57e060f0
+  metadata.gz: 5e943fb6e75cee528c4c7535105a3b44033d062356b16f125ff7181440a83199
+  data.tar.gz: 4251ee8e513bd2e958833b0cec3fd7cc600a17752a6d91738ae01c43e5e0e260
 SHA512:
-  metadata.gz: ddcbfba35becd5eedb7c3a07427df242a1351c7a070438f378c7dfbf47d18a5ee8eea39747503dfbeb234d102072a764719a6f268a84472bd10801817daf9335
-  data.tar.gz: 719e67c4a90194e28156f7dea326a8d8c587af9649c59c67378ed5b1468e9b68981d53c9c7380c18357eecb63232d062a6a539c3027675af0d40ca072de27631
+  metadata.gz: eda77052d25c80887b0ea7e964772634b5f79fc3781c15f3037ca225c262c8c6ae657e331ea1db83a9c524c06809a900109a108dde1b3bf7d6f1610fcc02fcf6
+  data.tar.gz: 73be66e26b6327e808a0d2e08ccd5f424542dc511b89be7369eefa1410ca4db3508acadf95ebf5f4f03f52400d5f4c40653a8ecb9fb907c34d828236fa7b3ea3

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.5.3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [v0.3.4](https://github.com/zooppa/administrate-field-carrierwave/tree/v0.3.4) (2018-10-23)
+
+[Full Changelog](https://github.com/zooppa/administrate-field-carrierwave/compare/v0.3.3...v0.3.4)
+
+* Check for version only if option is specified (thanks @00dav00)
+
 ## [v0.3.3](https://github.com/zooppa/administrate-field-carrierwave/tree/v0.3.3) (2018-10-11)
 
 [Full Changelog](https://github.com/zooppa/administrate-field-carrierwave/compare/v0.3.2...v0.3.3)

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.3.3'
+gem 'administrate-field-carrierwave', '~> 0.3.4'
 ```
 
 Run:
@@ -52,7 +52,7 @@ end
 
 ## About
 
-`Administrate::Field::Carrierwave` is maintained by [zooppa].
+`Administrate::Field::Carrierwave` is maintained by [Zooppa].
 
 See also the list of [contributors](https://github.com/zooppa/administrate-field-carrierwave/contributors) who participated in this project.
 

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.3.3'
+  gem.version = '0.3.4'
   gem.authors = ['Michele Gerarduzzi']
   gem.email = ['michele.gerarduzzi@gmail.com']
   gem.homepage = 'https://github.com/zooppa/administrate-field-carrierwave'

data/lib/administrate/field/carrierwave.rb

@@ -9,7 +9,7 @@ module Administrate
       class Engine < ::Rails::Engine; end
 
       def image
-        options.fetch(:image, '')
+        options.fetch(:image, nil)
       end
 
       def image_on_index?
@@ -36,10 +36,13 @@ module Administrate
         files.first
       end
 
+      def model
+        data.try(:model)
+      end
+
       def show_preview?
-        data&.model&.persisted? &&
-          data&.file.present? &&
-          file.version_exists?(image)
+        has_file = model.try(:persisted?) && file.present?
+        has_file && (image ? file.version_exists?(image) : true)
       end
 
       def show_file?

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

@@ -13,6 +13,10 @@ describe Administrate::Field::Carrierwave do
   let(:cw_no_file) do
     double 'CW without file', model: model, file: nil, version_exists?: true
   end
+  let(:cw_no_version) do
+    double 'CW with file, no version', model: model, file: file,
+                                       version_exists?: false
+  end
 
   let(:data) { cw_file }
   let(:options) { {} }
@@ -34,8 +38,8 @@ describe Administrate::Field::Carrierwave do
         allow(subject).to receive(:options).and_return(options)
       end
 
-      it 'returns an empty string' do
-        expect(output).to eq ''
+      it 'returns nil' do
+        expect(output).to be_nil
       end
     end
 
@@ -167,6 +171,14 @@ describe Administrate::Field::Carrierwave do
         expect(output).to be_falsey
       end
     end
+
+    context 'when there is an unversioned image to show' do
+      let(:data) { cw_no_version }
+
+      it 'returns true' do
+        expect(output).to be_truthy
+      end
+    end
   end
 
   describe '#show_file?' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Michele Gerarduzzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate