attachy 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba799d1c72c52b5e44034d297788610c44d4f123
-  data.tar.gz: 5797413a3e7f89ccdfb541e0852527c5f40d86aa
+  metadata.gz: 9b17baca7030f6514b35cd20a7e1c2eb95127ebe
+  data.tar.gz: 7bdd58b491d44169f5060283665da063f916a449
 SHA512:
-  metadata.gz: 594a1d513a5f0b412d326915b990a668f4b119f3cf6bde2d038aae588190bab585285cf92cb77e6508b6f075c69ac2493b922e848b4ac7a9a7dd71afd760e276
-  data.tar.gz: 924c8edbedcf1091852f4aa227e8b91524627d9f43580781a41481d35bfaae30a47aa342d4932deb978830487c9224d70454b57981653fe9b6b7f8436b266272
+  metadata.gz: 7f14ee66ab85811c760a75e9f19662751245403bb37ed83b7d9374696c5c41c992328e4f5a789bbed897c7e331bcd7d734f376fd28cd6369f40f9bed515492c6
+  data.tar.gz: 164c7b2ba9bead29c25a392c249fd551487a876f7b8256b9fd507364a74c025521547e1b1c08719f2aff4022f2fc580e380ce72e65d09a2bcef1fafe55d92494

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.1
+
+- Shows all element but image when it does not exists.
+
 # 0.4.0
 
 - Default image is returned only if you declare it on `attacy.yml`.

data/README.md

@@ -19,8 +19,8 @@ Add the following code on your `Gemfile` and run `bundle install`:
 gem 'attachy'
 ```
 
-So, extracts the necessary files including a migrate that create a table used
-to keep your file metadata. You can choose a [Default Image](#default-image) via params 'version', `public_id` and 'format'.
+So, extracts the necessary files including a migrate that create a table used to keep your file metadata.
+You can choose a [Default Image](#default-image) via params `version`, `public_id` and `format`.
 
 ```bash
 rails g attachy:install
@@ -86,10 +86,12 @@ Includes the `attachy.sass` on your css manifest:
 
 On your `attachy.yml` you can configure a default image to show when model has no file attached:
 
-```js
-format: jpg
-public_id: default
-version: 42
+```yml
+default:
+  image:
+    format: jpg
+    public_id: default
+    version: 42
 ```
 
 ## Transformations
@@ -100,7 +102,7 @@ To know more about transformations, check the [Cloudinary Doc](http://cloudinary
 
 ### Attachy
 
-```
+```html
 <%= f.attachy :avatar,
   t:      { width: 160, height: 160, crop: :fill },
   tl:     { width: 800, height: 600, crop: :scale },
@@ -112,7 +114,7 @@ To know more about transformations, check the [Cloudinary Doc](http://cloudinary
 + `tl`: linked image transformations;
 + `button.html`: button html attributes.
 
-```
+```html
 <div class="attachy">
   <ul class="attachy__content">
     <li class="attachy__node">
@@ -149,7 +151,7 @@ To know more about transformations, check the [Cloudinary Doc](http://cloudinary
 
 It draws the link with the image inside:
 
-```
+```html
 <%= attachy_link :avatar, @object
   t:    { width: 160, height: 160, crop: :fill },
   tl:   { width: 800, height: 600, crop: :scale },
@@ -161,7 +163,7 @@ It draws the link with the image inside:
 + `tl`: linked image transformations;
 + `html`: link html attributes.
 
-```
+```html
 <a class="attachy__link" href="">
   <img src="">
 </a>
@@ -169,9 +171,9 @@ It draws the link with the image inside:
 
 ### Image
 
-It draws the link with the image inside:
+It draws the image:
 
-```
+```html
 <%= attachy_image :avatar, @object
   t:    { width: 160, height: 160, crop: :fill },
   html: { alt: :me }
@@ -181,7 +183,7 @@ It draws the link with the image inside:
 + `t`: image transformations;
 + `html`: link html attributes.
 
-```
+```html
 <img src="https://res.cloudinary.com/account/image/upload/secret/version/hash.format">
 ```
 

data/lib/assets/javascripts/attachy.js

@@ -116,7 +116,13 @@
 
             that.content.append(node);
           } else {
-            that.content.find('li').empty().append(link, remove);
+            var item = that.content.find('li');
+console.log(item.length);
+            if (!item.length) {
+              item = $('<li />', { html: link + remove, 'class': 'attachy__node' }).appendTo(that.content);
+            }
+
+            item.empty().append(link, remove);
           }
         });
       },

data/lib/attachy/models/attachy/file.rb

@@ -37,10 +37,12 @@ module Attachy
     end
 
     def self.config
-      ::Rails.application.config_for :attachy
+      ::Rails.application&.config_for :attachy
     end
 
     def self.default
+      return if config.nil?
+
       image = config.dig('default', 'image')
 
       return if image.nil?

data/lib/attachy/models/attachy/viewer.rb

@@ -12,7 +12,7 @@ module Attachy
     end
 
     def attachments
-      [criteria].flatten
+      [criteria].flatten.compact
     end
 
     def button_label_options
@@ -93,6 +93,8 @@ module Attachy
     end
 
     def image(file = criteria, t: transform, html: htm)
+      return if file.nil?
+
       url         = file.url(t)
       html        = html.reverse_merge(height: t[:height], width: t[:width])
       html[:data] = file.transform(t)
@@ -144,7 +146,7 @@ module Attachy
     end
 
     def value
-      [(default? ? [] : criteria)].flatten.to_json
+      default? ? '[]' : attachments.to_json
     end
 
     private
@@ -154,7 +156,7 @@ module Attachy
     end
 
     def default?
-      attachments.size == 1 && attachments.last.public_id == Attachy::File.default.public_id
+      attachments.size == 1 && attachments.last.public_id == Attachy::File.default&.public_id
     end
 
     def htm(path = [])

data/lib/attachy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Attachy
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'
 end

data/spec/models/attachy/extension/user/avatar_spec.rb

@@ -50,13 +50,7 @@ RSpec.describe User, ':avatar' do
     let!(:user) { create :user }
 
     context 'with no file' do
-      before do
-        allow(Attachy::File).to receive(:default) { :default }
-      end
-
-      it 'returns a default file' do
-        expect(user.avatar).to eq :default
-      end
+      specify { expect(user.avatar).to eq nil }
     end
 
     context 'with file' do

data/spec/models/attachy/extension/user/photos_spec.rb

@@ -50,12 +50,10 @@ RSpec.describe User, ':photos' do
     let!(:user) { create :user }
 
     context 'with no file' do
-      it 'returns empty' do
-        expect(user.photos).to eq []
-      end
+      specify { expect(user.photos).to eq [] }
     end
 
-    context 'with file' do
+    context 'with files' do
       let!(:photo_1) { create :file, scope: :photos, attachable: user }
       let!(:photo_2) { create :file, scope: :photos, attachable: user }
 

data/spec/models/attachy/file/config_spec.rb

@@ -3,11 +3,22 @@
 require 'rails_helper'
 
 RSpec.describe Attachy::File, '#config' do
-  before do
-    allow(Rails.application).to receive(:config_for).with(:attachy) { :config }
+  context 'when config does not exist' do
+    it 'returns the config data' do
+      expect(described_class.config).to eq nil
+    end
   end
 
-  it 'returns the config data' do
-    expect(described_class.config).to eq :config
+  context 'when config exists' do
+    let!(:application) { double }
+
+    before do
+      allow(Rails).to receive(:application) { application }
+      allow(application).to receive(:config_for).with(:attachy) { :config }
+    end
+
+    it 'returns the config data' do
+      expect(described_class.config).to eq :config
+    end
   end
 end

data/spec/models/attachy/file/default_spec.rb

@@ -3,6 +3,14 @@
 require 'rails_helper'
 
 RSpec.describe Attachy::File, '#default' do
+  context 'when config is missing' do
+    before do
+      allow(::Rails).to receive_message_chain(:application, :config_for) { nil }
+    end
+
+    specify { expect(described_class.default).to eq nil }
+  end
+
   context 'when default image is present' do
     before do
       allow(::Rails).to receive_message_chain(:application, :config_for).with(:attachy) do

data/spec/models/attachy/viewer/attachments_spec.rb

@@ -3,28 +3,50 @@
 require 'rails_helper'
 
 RSpec.describe Attachy::Viewer, '.attachments' do
-  subject { described_class.new method, object }
-
   let!(:object) { create :user }
 
   before { allow(Cloudinary::Uploader).to receive(:remove_tag) }
 
-  context 'with one file' do
+  context 'with no files' do
+    subject { described_class.new :avatar, object }
+
+    specify { expect(subject.attachments).to eq [] }
+  end
+
+  context 'when is has one' do
+    subject { described_class.new method, object }
+
     let!(:method) { :avatar }
-    let!(:file)   { create :file, attachable: object, scope: method }
 
-    it 'returns an array' do
-      expect(subject.attachments).to eq [file]
+    context 'and has no files' do
+      specify { expect(subject.attachments).to eq [] }
+    end
+
+    context 'and has file' do
+      let!(:file) { create :file, attachable: object, scope: method }
+
+      it 'returns an array with this file' do
+        expect(subject.attachments).to eq [file]
+      end
     end
   end
 
-  context 'with more than one files' do
+  context 'when is has many' do
+    subject { described_class.new method, object }
+
     let!(:method) { :photos }
-    let!(:file_1) { create :file, attachable: object, scope: method }
-    let!(:file_2) { create :file, attachable: object, scope: method }
 
-    it 'returns an array' do
-      expect(subject.attachments).to eq [file_1, file_2]
+    context 'and has no files' do
+      specify { expect(subject.attachments).to eq [] }
+    end
+
+    context 'and has files' do
+      let!(:file_1) { create :file, attachable: object, scope: method }
+      let!(:file_2) { create :file, attachable: object, scope: method }
+
+      it 'returns an array with this files' do
+        expect(subject.attachments).to eq [file_1, file_2]
+      end
     end
   end
 end

data/spec/models/attachy/viewer/image_spec.rb

@@ -161,7 +161,13 @@ RSpec.describe Attachy::Viewer, '.image' do
     end
   end
 
-  context 'when given a :file' do
+  context 'when :file is nil' do
+    let!(:file) { nil }
+
+    specify { expect(subject.image(file)).to eq nil }
+  end
+
+  context 'when :file is present' do
     let!(:file) { build :file, format: :png, version: 7 }
 
     it 'is used' do

data/spec/models/attachy/viewer/value_spec.rb

@@ -7,6 +7,22 @@ RSpec.describe Attachy::Viewer, '.value' do
 
   before { allow(Cloudinary::Uploader).to receive(:remove_tag) }
 
+  context 'when has no attachments' do
+    subject { described_class.new method, object }
+
+    context 'as attachament' do
+      let!(:method) { :avatar }
+
+      specify { expect(subject.value).to eq '[]' }
+    end
+
+    context 'as attachaments' do
+      let!(:method) { :photos }
+
+      specify { expect(subject.value).to eq '[]' }
+    end
+  end
+
   context 'when has one result' do
     context 'as attachament' do
       subject { described_class.new method, object }
@@ -14,27 +30,35 @@ RSpec.describe Attachy::Viewer, '.value' do
       let!(:method) { :avatar }
       let!(:file)   { create :file, attachable: object, scope: method }
 
-      context 'and it is not default' do
-        let!(:default) { Attachy::File.new public_id: 0 }
-
-        before do
-          allow(Attachy::File).to receive(:default) { default }
-        end
-
-        it 'is represented as an array of one json' do
+      context 'with no default image configured' do
+        it 'does not gives error trying to look :public_id and returns the file' do
           expect(subject.value).to eq [file].to_json
         end
       end
 
-      context 'and it is default' do
-        let!(:default) { Attachy::File.new public_id: file.public_id }
+      context 'with default image configured' do
+        let!(:default) { Attachy::File.new public_id: 0 }
 
-        before do
-          allow(Attachy::File).to receive(:default) { default }
+        context 'and it is not default' do
+          before do
+            allow(Attachy::File).to receive(:default) { default }
+          end
+
+          it 'is represented as an array of one json' do
+            expect(subject.value).to eq [file].to_json
+          end
         end
 
-        it 'ignores the virtual default value and returns an empty data' do
-          expect(subject.value).to eq '[]'
+        context 'and it is default' do
+          let!(:default) { Attachy::File.new public_id: file.public_id }
+
+          before do
+            allow(Attachy::File).to receive(:default) { default }
+          end
+
+          it 'ignores the virtual default value and returns an empty data' do
+            expect(subject.value).to eq '[]'
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attachy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Washington Botelho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-19 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cloudinary