attachy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c10bc66de882f1201aba52a87e64c5ac48e46a34
-  data.tar.gz: fc2c4995faa82011745592e90dc0ab9387571a05
+  metadata.gz: a029ab515bf4b323047c5231ecfe7e30d90e552e
+  data.tar.gz: f1454ca82ee9055a1214562d743d9ff0db114e9f
 SHA512:
-  metadata.gz: 611a2c9b85a28674a0a026719bc743bbdc37774502ce87c3676732e651a60b87ca6463abb74c6334cf0ad3a3c03f9d0b83898b35f7ae2bbb023569cc0772bb3e
-  data.tar.gz: ab8e16ae400ee56ec645d18acd1cdbd52e9ce3ceffb3f85ac2e4f8f50306e86ffa19278afb04021228e8b58caf623ae1d4d4fe3904e16ba026c945f6b9dbdd3e
+  metadata.gz: b349429b795c329775229fe57f2ade6f7dd12b49458a63354c688b74aeb1fe5b1b6e3aacf34acad947d6082b8fee611d579b7e412f3049dc4acee66dea146c81
+  data.tar.gz: 47f608b456d919a95b0bbb555788c972ef86d861b7f3c0abcc10b8267771cd031372c1782b54fc4c4fb7a4639621bbecd2b72195527fd232cfed927f1b8feec0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.1.2
+
+- Added `ruby-version`;
+- Added `ruby-gemset`;
+- Fix the possibility to pass the button label options;
+- Now an empty message can be showed or hidden.
+
 # 0.1.1
 
 - When a blank value is assigned on attachment relation, it is skipped to avoid error on JSON parser.

data/README.md

@@ -83,32 +83,97 @@ public_id: default
 version: 42
 ```
 
-## Showing
+## Transformations
 
-If you want just show your uploaded image, use:
+To know more about transformations, check the [Cloudinary Doc](http://cloudinary.com/documentation/image_transformations).
 
-```html
-<%= attachy_link :avatar, @object %>
+## Helpers
+
+### Attachy
+
+```
+<%= f.attachy :avatar,
+  t:      { width: 160, height: 160, crop: :fill },
+  tl:     { width: 800, height: 600, crop: :scale },
+  button: { html: { text: 'Upload' } }
+%>
 ```
 
-It will generate a link to your image with the image inside.
++ `t`: image transformations;
++ `tl`: linked image transformations;
++ `button.html`: button html attributes.
 
-## Transformation
+```
+<div class="attachy">
+  <ul class="attachy__content">
+    <li class="attachy__node">
+      <a class="attachy__link" href="">
+        <img src="">
+      </a>
 
-You can manipulate the image using the `t` attribute:
+      <span class="attachy__remove">×</span>
+    </li>
+  </ul>
 
+  <div class="attachy__button">
+    <span>...</span>
+
+    <input type="file" class="attachy__fileupload">
+
+    <input value="[]" type="hidden">
+  </div>
+</div>
 ```
-<%= f.attachy :avatar, t: { width: 160, height: 160, crop: :fill } %>
+
++ `attachy`: wrapper;
++ `attachy__content`: the file content;
++ `attachy__node`: each file of the content;
++ `attachy__link`: the link of some file;
++ `img`: the uploaded file;
++ `attachy__remove`: button to remove the image;
++ `attachy__button`: pseudo button to access the upload file button;
++ `span`: the label of the button;
++ `attachy__fileupload`: the upload file field;
++ `hidden`: the field that keeps hidden the files metadata as JSON.
+
+## Link
+
+It draws the link with the image inside:
+
+```
+<%= attachy_link :avatar, @object
+  t:    { width: 160, height: 160, crop: :fill },
+  tl:   { width: 800, height: 600, crop: :scale },
+  html: { class: :added_custom }
+%>
 ```
 
-To know more about transformations, check the [Cloudinary Doc](http://cloudinary.com/documentation/image_transformations).
++ `t`: image transformations;
++ `tl`: linked image transformations;
++ `html`: link html attributes.
+
+```
+<a class="attachy__link" href="">
+  <img src="">
+</a>
+```
+
+### Image
+
+It draws the link with the image inside:
 
-## HTML
+```
+<%= attachy_image :avatar, @object
+  t:    { width: 160, height: 160, crop: :fill },
+  html: { alt: :me }
+%>
+```
 
-For HTML attributes, just use `html`:
++ `t`: image transformations;
++ `html`: link html attributes.
 
 ```
-<%= f.attachy :avatar, html: { width: 160, height: 160, alt: 'Image' } %>
+<img src="https://res.cloudinary.com/account/image/upload/secret/version/hash.format">
 ```
 
 ## Test

data/lib/assets/javascripts/attachy.js

@@ -5,7 +5,7 @@
  *
  * @author  : Washington Botelho
  * @doc     : http://wbotelhos.com/attachy
- * @version : 0.1.1
+ * @version : 0.1.2
  *
  */
 
@@ -109,6 +109,8 @@
             link   = that.link(file, image, json),
             remove = that.removeButton();
 
+          that.hideEmpty();
+
           if (that.multiple) {
             var node = $('<li />', { html: link, 'class': 'attachy__node' }).append(remove);
 
@@ -119,6 +121,10 @@
         });
       },
 
+      hideEmpty: function() {
+        this.empty.hide();
+      },
+
       image: function(file, json) {
         var
           config     = this.imageConfig(file),
@@ -222,9 +228,9 @@
 
         this.updateHidden();
 
-        // if (this.defaultAvatar) {
-        //   this.container.html(this.defaultAvatar.clone());
-        // }
+        if (!this.files.length) {
+          this.showEmpty();
+        }
       },
 
       onUploading: function() {
@@ -274,11 +280,16 @@
         this.wrapper = this.field.closest('.attachy');
         this.button  = this.wrapper.find('.attachy__button span');
         this.content = this.wrapper.find('.attachy__content');
-        this.hidden  = this.wrapper.find('input[type="hidden"]')
+        this.empty   = this.wrapper.find('.attachy__empty');
+        this.hidden  = this.wrapper.find('input[type="hidden"]');
         this.remove  = this.wrapper.find('.attachy__remove');
         this.submit  = this.wrapper.closest('form').find(':submit');
       },
 
+      showEmpty: function() {
+        this.empty.show();
+      },
+
       updateHidden: function() {
         this.hidden.val(JSON.stringify(this.files));
       }

data/lib/attachy/helpers/attachy/view_helper.rb

@@ -8,23 +8,23 @@ module Attachy
       viewer.field
     end
 
-    def attachy_content(method, object, options)
+    def attachy_content(method, object, options = {})
       Viewer.new(method, object, options, self).content
     end
 
-    def attachy_file_field(method, object, options)
+    def attachy_file_field(method, object, options = {})
       Viewer.new(method, object, options, self).file_field
     end
 
-    def attachy_image(method, object, options)
+    def attachy_image(method, object, options = {})
       Viewer.new(method, object, options, self).image
     end
 
-    def attachy_link(method, object, options)
+    def attachy_link(method, object, options = {})
       Viewer.new(method, object, options, self).link
     end
 
-    def attachy_node(method, object, options)
+    def attachy_node(method, object, options = {})
       Viewer.new(method, object, options, self).node
     end
   end

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

@@ -17,8 +17,8 @@ module Attachy
       { text: '...' }
     end
 
-    def button_label(html: button_label_options)
-      html = htm(:button).merge(html)
+    def button_label(html: htm(:button))
+      html = button_label_options.merge(html)
 
       @view.content_tag :span, html.delete(:text), html
     end
@@ -103,7 +103,7 @@ module Attachy
     end
 
     def link(file = criteria, t: transform, tl: { crop: :none }, html: {})
-      html = html.reverse_merge(link_options.merge(data: tl))
+      html = link_options.merge(data: tl).merge(html)
 
       return yield(html, attachments) if block_given?
 
@@ -155,16 +155,16 @@ module Attachy
       attachments.size == 1 && attachments.last.public_id == Attachy::File.default.public_id
     end
 
-    def htm(resource_type = :image)
-      @options.dig(resource_type, :html) || {}
+    def htm(path = [])
+      @options.dig(*[path, :html].flatten) || {}
     end
 
     def metadata
       @metadata ||= @object.send("#{@method}_metadata")
     end
 
-    def transform(path = [:t])
-      @options.dig(*path) || {}
+    def transform(path = [])
+      @options.dig(*[path, :t].flatten) || {}
     end
   end
 end

data/lib/attachy/version.rb

@@ -1,3 +1,3 @@
 module Attachy
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/spec/factories/attachy/file.rb

@@ -6,7 +6,6 @@ FactoryGirl.define do
     width  800
 
     sequence(:public_id) { |i| "PublicId#{i}" }
-
-    sequence :version, &:to_s
+    sequence(:version)   { |i| "v#{i}" }
   end
 end

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

@@ -3,7 +3,6 @@ require 'rails_helper'
 RSpec.describe Attachy::Viewer, '.image' do
   let!(:method)       { :avatar }
   let!(:object)       { create :user }
-  let!(:viewer)       { described_class.new method, object, options }
   let!(:default_html) { { alt: :image, height: 50, width: 150 } }
   let!(:default_t)    { { height: 100, width: 200 } }
   let!(:options)      { { t: default_t, html: default_html } }
@@ -14,6 +13,8 @@ RSpec.describe Attachy::Viewer, '.image' do
     create :file, attachable: object
   end
 
+  subject { described_class.new method, object, options }
+
   context 'when :html is present' do
     let!(:html_attributes) { { alt: :alt, invalid: :invalid, height: 11, width: 22 } }
 
@@ -25,7 +26,7 @@ RSpec.describe Attachy::Viewer, '.image' do
       end
 
       it 'adds all attributes on image' do
-        el = viewer.image(t: t_attributes, html: html_attributes)
+        el = subject.image(t: t_attributes, html: html_attributes)
 
         expect(el).to have_tag 'img', with: html_attributes
       end
@@ -37,7 +38,7 @@ RSpec.describe Attachy::Viewer, '.image' do
       before { allow_any_instance_of(Attachy::File).to receive(:url).with(t_attributes) { 'http://example.org' } }
 
       it 'gives priority to :html' do
-        el = viewer.image(t: t_attributes, html: html_attributes)
+        el = subject.image(t: t_attributes, html: html_attributes)
 
         expect(el).to have_tag 'img', with: html_attributes
       end
@@ -47,7 +48,7 @@ RSpec.describe Attachy::Viewer, '.image' do
       before { allow_any_instance_of(Attachy::File).to receive(:url).with(default_t) { 'http://example.org' } }
 
       it 'uses the :html attributes and transform with default :t' do
-        el = viewer.image(html: html_attributes)
+        el = subject.image(html: html_attributes)
 
         expect(el).to have_tag 'img', with: {
           'data-crop'     => 'fill',
@@ -76,7 +77,7 @@ RSpec.describe Attachy::Viewer, '.image' do
       before { allow_any_instance_of(Attachy::File).to receive(:url).with(t_attributes) { 'http://example.org' } }
 
       it 'adds only the default transformation with file attributes' do
-        el = viewer.image(t: t_attributes, html: html_attributes)
+        el = subject.image(t: t_attributes, html: html_attributes)
 
         expect(el).to have_tag 'img', with: {
           'data-format'   => file.format,
@@ -93,7 +94,7 @@ RSpec.describe Attachy::Viewer, '.image' do
       before { allow_any_instance_of(Attachy::File).to receive(:url).with(t_attributes) { 'http://example.org' } }
 
       it 'adds the :t attributes on html attributes with default data' do
-        el = viewer.image(t: t_attributes, html: html_attributes)
+        el = subject.image(t: t_attributes, html: html_attributes)
 
         expect(el).to have_tag 'img', with: {
           'data-format'    => file.format,
@@ -113,10 +114,10 @@ RSpec.describe Attachy::Viewer, '.image' do
       before { allow_any_instance_of(Attachy::File).to receive(:url).with(default_t) { 'http://example.org' } }
 
       it 'uses the default :html with default :t' do
-        el = viewer.image
+        el = subject.image
 
         expect(el).to have_tag 'img', with: {
-          'alt'            => 'Example',
+          'alt'            => 'image',
           'data-crop'      => 'fill',
           'data-format'    => file.format,
           'data-height'    => 100,
@@ -125,9 +126,9 @@ RSpec.describe Attachy::Viewer, '.image' do
           'data-sign-url'  => true,
           'data-version'   => file.version,
           'data-width'     => 200,
-          'height'         => 100,
+          'height'         => 50,
           'src'            => 'http://example.org',
-          'width'          => 200
+          'width'          => 150
         }
       end
     end
@@ -138,10 +139,10 @@ RSpec.describe Attachy::Viewer, '.image' do
       before { allow_any_instance_of(Attachy::File).to receive(:url).with(t_attributes) { 'http://example.org' } }
 
       it 'uses the default :html with given :t overriding the default :t' do
-        el = viewer.image(t: t_attributes)
+        el = subject.image(t: t_attributes)
 
         expect(el).to have_tag 'img', with: {
-          'alt'            => 'Example',
+          'alt'            => 'image',
           'data-crop'      => 'fill',
           'data-format'    => file.format,
           'data-height'    => 1,
@@ -150,9 +151,9 @@ RSpec.describe Attachy::Viewer, '.image' do
           'data-sign-url'  => true,
           'data-version'   => file.version,
           'data-width'     => 2,
-          'height'         => 1,
+          'height'         => 50,
           'src'            => 'http://example.org',
-          'width'          => 2
+          'width'          => 150
         }
       end
     end
@@ -164,7 +165,7 @@ RSpec.describe Attachy::Viewer, '.image' do
     it 'is used' do
       expect(file).to receive(:url).with(default_t) { 'http://example.org' }
 
-      viewer.image file
+      subject.image file
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attachy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Washington Botelho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cloudinary