administrate-field-carrierwave 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0785bcefc7b18191135609c7c948db105ed2196fd32b5c174ee4aa22c5ddf474'
-  data.tar.gz: 73d8f9701de8c05b1eedadf77bebd7fca865763a15591e1220216dc0f440ae72
+  metadata.gz: 505ff07bb8b8dc13a7926c9a327bf73068de8564d6fe89b7cc84f5236e7c1bde
+  data.tar.gz: 19bc883f883ecdb2f70156c58083f0067fed395259e148b1e000a42a41321223
 SHA512:
-  metadata.gz: fe1612084d140a5d5cd047a8279360d08afbb60bd2381b620b16beb24ef87cb9f4e2774640055769aefc627f05cc759adb508162602ff4385e34ee0138e70501
-  data.tar.gz: 1eab103c7a587e173bed291ce4c7accc0b0849198d35aaeecd80082a213b917eb659c1b7ae305d3bfa8b069e5749083fe6e2071caa2cd65798163a0cb7bddab3
+  metadata.gz: 7ffbfa4ac815083b73c806a26089d8f43499a8022a52c2cf3650b844c5f566d7a33514cf4c4b8ba3ec8f4fd3c32cd078d5546076caefcdac6e3cc03d66801180
+  data.tar.gz: e11d1584a89a28f1dbffe2030696c9061e426b5c8538e5d18fe377f979c381fc7f80ed2693cf9d32d6b660442aa72fe89545a12d9ba9495a95bee7269191e115

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
-## [v0.3.0](https://github.com/zooppa/administrate-field-carrierwave/tree/v0.2.0) (2018-01-29)
+## [v0.3.2](https://github.com/zooppa/administrate-field-carrierwave/tree/v0.3.2) (2018-03-06)
+
+[Full Changelog](https://github.com/zooppa/administrate-field-carrierwave/compare/v0.3.1...v0.3.2)
+
+* Fix bug in view
+
+## [v0.3.1](https://github.com/zooppa/administrate-field-carrierwave/tree/v0.3.1) (2018-03-06)
+
+[Full Changelog](https://github.com/zooppa/administrate-field-carrierwave/compare/v0.3.0...v0.3.1)
+
+* Fix errors when no uploaded image exists (thanks @evrimfeyyaz)
+
+## [v0.3.0](https://github.com/zooppa/administrate-field-carrierwave/tree/v0.3.0) (2018-01-29)
 
 [Full Changelog](https://github.com/zooppa/administrate-field-carrierwave/compare/v0.2.0...v0.3.0)
 

data/LICENSE.md

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2015-2016 Zooppa.com Inc.
+Copyright (c) 2018 Zooppa
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,6 +1,7 @@
 # Administrate::Field::Carrierwave
 
 [![Code Climate](https://codeclimate.com/github/zooppa/administrate-field-carrierwave/badges/gpa.svg)](https://codeclimate.com/github/zooppa/administrate-field-carrierwave)
+[![Build Status](https://semaphoreci.com/api/v1/zooppa/administrate-field-carrierwave/branches/master/badge.svg)](https://semaphoreci.com/zooppa/administrate-field-carrierwave)
 
 A plugin to upload and preview Carrierwave attachments in [Administrate].
 
@@ -9,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.0'
+gem 'administrate-field-carrierwave', '~> 0.3.2'
 ```
 
 Run:
@@ -51,10 +52,10 @@ end
 
 ## About
 
-`Administrate::Field::Carrierwave` is maintained by [z.productions].
+`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.
 
 [administrate]: https://github.com/thoughtbot/administrate
 [version]: https://github.com/carrierwaveuploader/carrierwave#adding-versions
-[z.productions]: https://www.z.productions/
+[zooppa]: https://www.zooppa.com/

data/Rakefile

@@ -0,0 +1,6 @@
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

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.3.0'
+  gem.version = '0.3.2'
   gem.authors = ['Michele Gerarduzzi']
   gem.email = ['michele.gerarduzzi@gmail.com']
   gem.homepage = 'https://github.com/zooppa/administrate-field-carrierwave'
@@ -16,4 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'administrate', '< 1.0.0'
   gem.add_runtime_dependency 'rails', '>= 4.2', '< 6'
+
+  gem.add_development_dependency 'rake', '~> 12.3'
+  gem.add_development_dependency 'rspec', '~> 3.7'
 end

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

@@ -22,9 +22,9 @@ for this attribute
     <span>No file(s) uploaded yet</span>
   <% end %>
 <% else %>
-  <% if field.image.present? && field.data.model.persisted? && field.file.version_exists?(field.image) %>
+  <% if field.show_preview? %>
     <%= render 'fields/carrierwave/preview', file: field.file, field: field %>
-  <% elsif field.file.present? %>
+  <% elsif field.show_file? %>
     <%= render 'fields/carrierwave/file', file: field.file %>
   <% else %>
       -

data/lib/administrate/field/carrierwave.rb

@@ -7,7 +7,7 @@ module Administrate
       class Engine < ::Rails::Engine; end
 
       def image
-        options.fetch(:image, nil)
+        options.fetch(:image, '')
       end
 
       def image_on_index?
@@ -26,7 +26,6 @@ module Administrate
         options.fetch(:remote_url, false)
       end
 
-      # One-element array when single file field, array of files when multiple
       def files
         Array[*data]
       end
@@ -34,6 +33,14 @@ module Administrate
       def file
         files.first
       end
+
+      def show_preview?
+        data.model.persisted? && file.version_exists?(image) && data.file.present?
+      end
+
+      def show_file?
+        file.present?
+      end
     end
   end
 end

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

@@ -0,0 +1,183 @@
+require 'spec_helper'
+
+describe Administrate::Field::Carrierwave do
+  subject { Administrate::Field::Carrierwave.new(:field, data, :show) }
+  let(:model) { double 'Model', persisted?: true }
+  let(:file) { double 'File' }
+
+  let(:cw_file) { double 'CW with file', model: model, file: file, version_exists?: true }
+  let(:cw_no_file) { double 'CW without file', model: model, file: nil, version_exists?: true }
+
+  let(:data) { cw_file }
+  let(:options) { {} }
+
+  before { allow(subject).to receive(:options).and_return(options) }
+
+  describe '#to_partial_path' do
+    it 'returns a partial based on the page being rendered' do
+      path = subject.to_partial_path
+      expect(path).to eq('/fields/carrierwave/show')
+    end
+  end
+
+  describe '#image' do
+    let(:output) { subject.image }
+
+    context 'with nil' do
+      before do
+        allow(subject).to receive(:options).and_return(options)
+      end
+
+      it 'returns an empty string' do
+        expect(output).to eq ''
+      end
+    end
+
+    context 'with a valid option' do
+      let(:options) { { image: :standard } }
+
+      it 'returns the value' do
+        expect(output).to eq :standard
+      end
+    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? }
+
+    context 'with nil' do
+      it 'returns false' do
+        expect(output).to be false
+      end
+    end
+
+    context 'with a valid option' do
+      let(:options) { { multiple: true } }
+
+      it 'returns the value' do
+        expect(output).to be true
+      end
+    end
+  end
+
+  describe '#remove?' do
+    let(:output) { subject.remove? }
+
+    context 'with nil' do
+      it 'returns false' do
+        expect(output).to be false
+      end
+    end
+
+    context 'with a valid option' do
+      let(:options) { { remove: true } }
+
+      it 'returns the value' do
+        expect(output).to be true
+      end
+    end
+  end
+
+  describe '#remote_url?' do
+    let(:output) { subject.remote_url? }
+
+    context 'with nil' do
+      it 'returns false' do
+        expect(output).to be false
+      end
+    end
+
+    context 'with a valid option' do
+      let(:options) { { remote_url: true } }
+
+      it 'returns the value' do
+        expect(output).to be true
+      end
+    end
+  end
+
+  describe '#files' do
+    let(:output) { subject.files }
+
+    it 'returns an array' do
+      expect(output).to be_an(Array)
+    end
+
+    context 'when single file' do
+      it 'returns an array with one element' do
+        expect(output.length).to eq 1
+      end
+    end
+
+    context 'when multiple files' do
+      let(:data) { [cw_file, cw_file] }
+
+      it 'returns a multi-element array' do
+        expect(output.length).to eq 2
+      end
+    end
+  end
+
+  describe '#file' do
+    let(:output) { subject.file }
+    let(:data) { [cw_file, cw_file] }
+
+    it 'returns the first file in the array' do
+      expect(output).to eq cw_file
+    end
+  end
+
+  describe '#show_preview?' do
+    let(:output) { subject.show_preview? }
+
+    context 'when there is an image to show' do
+      it 'returns true' do
+        expect(output).to be_truthy
+      end
+    end
+
+    context 'when there is no image to show' do
+      let(:model) { double 'Model', persisted?: false }
+
+      it 'returns false' do
+        expect(output).to be_falsey
+      end
+    end
+  end
+
+  describe '#show_file?' do
+    let(:output) { subject.show_file? }
+
+    context 'when there is a file to show' do
+      it 'returns true' do
+        expect(output).to be_truthy
+      end
+    end
+
+    context 'when there is no file to show' do
+      let(:data) { nil }
+
+      it 'returns false' do
+        expect(output).to be_falsey
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'administrate/field/carrierwave'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administrate-field-carrierwave
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Michele Gerarduzzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: administrate
@@ -44,6 +44,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 description: A plugin to manage Carrierwave attachments in Administrate
 email:
 - michele.gerarduzzi@gmail.com
@@ -52,10 +80,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.md
 - README.md
+- Rakefile
 - administrate-field-carrierwave.gemspec
 - app/views/fields/carrierwave/_file.html.erb
 - app/views/fields/carrierwave/_form.html.erb
@@ -63,6 +93,8 @@ files:
 - app/views/fields/carrierwave/_preview.html.erb
 - app/views/fields/carrierwave/_show.html.erb
 - lib/administrate/field/carrierwave.rb
+- spec/lib/administrate/field/carrierwave_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/zooppa/administrate-field-carrierwave
 licenses:
 - MIT
@@ -83,8 +115,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Carrierwave field plugin for Administrate
-test_files: []
+test_files:
+- spec/lib/administrate/field/carrierwave_spec.rb
+- spec/spec_helper.rb