attachy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a405801b1f0c5c745e3723b97320273d1768ba2f
-  data.tar.gz: 3f2174490f3404f21a3d3f4adefe663f28789aa4
+  metadata.gz: c10bc66de882f1201aba52a87e64c5ac48e46a34
+  data.tar.gz: fc2c4995faa82011745592e90dc0ab9387571a05
 SHA512:
-  metadata.gz: 33f314c8a0bc058f7ea0f315296d8088a77ae1c256114e8a964cd70f7748c018fad658095bcc0dae82d7bbbeed789cfed0ff42b8dfa102756b4238768387344e
-  data.tar.gz: cc7264176e05f9947037cf0fe79914738dcb391276fb1395b8f3a63417a565ae76df49ee1b84ea7ae2d593c537c58695bd7861263473d54f2054ac9fc4956d50
+  metadata.gz: 611a2c9b85a28674a0a026719bc743bbdc37774502ce87c3676732e651a60b87ca6463abb74c6334cf0ad3a3c03f9d0b83898b35f7ae2bbb023569cc0772bb3e
+  data.tar.gz: ab8e16ae400ee56ec645d18acd1cdbd52e9ce3ceffb3f85ac2e4f8f50306e86ffa19278afb04021228e8b58caf623ae1d4d4fe3904e16ba026c945f6b9dbdd3e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.1.1
+
+- When a blank value is assigned on attachment relation, it is skipped to avoid error on JSON parser.
+
 # 0.1.0
 
 - Release.

data/README.md

@@ -1,8 +1,8 @@
 # Attachy
 
-Attachments handler for Rails via Cloudinary
+Attachments handler for Rails via http://cloudinary.com
 
-## Desciption
+## Description
 
 Send files from your browser directly to Cloudinary.
 Attachy will generate a `has_one` or `has_many` files (photos) to your model
@@ -48,42 +48,34 @@ end
 Expose your Cloudinary credentials on your layout:
 
 ```html
-<%= cloudinary_js_config %>s
+<%= cloudinary_js_config %>
 ```
 
-Into your form the upload field:
+Into your form, add the upload field:
 
 ```html
 <%= f.attachy :avatar %>
 ```
 
-If you want just show your uploaded image, use:
-
-```html
-<%= attachy_link :avatar, @object %>
-```
-
-It will generate a link to your image with the image inside.
-
 ### Assets
 
 Includes the `attachy.js` on your js manifest:
 
 ```js
-//= require vendor/attachy
+//= require attachy
 ```
 
 Includes the `attachy.sass` on your css manifest:
 
 ```js
 /*
- *= require vendor/attachy
+ *= require attachy
  */
 ```
 
 ### <a name="default-image"></a> Configurations
 
-On your `attachy.yml` configure a default image to show when model has no one:
+On your `attachy.yml` you can configure a default image to show when model has no file attached:
 
 ```js
 format: jpg
@@ -91,6 +83,34 @@ public_id: default
 version: 42
 ```
 
+## Showing
+
+If you want just show your uploaded image, use:
+
+```html
+<%= attachy_link :avatar, @object %>
+```
+
+It will generate a link to your image with the image inside.
+
+## Transformation
+
+You can manipulate the image using the `t` attribute:
+
+```
+<%= f.attachy :avatar, t: { width: 160, height: 160, crop: :fill } %>
+```
+
+To know more about transformations, check the [Cloudinary Doc](http://cloudinary.com/documentation/image_transformations).
+
+## HTML
+
+For HTML attributes, just use `html`:
+
+```
+<%= f.attachy :avatar, html: { width: 160, height: 160, alt: 'Image' } %>
+```
+
 ## Test
 
 Before send pull request, check if specs is passing.

data/lib/assets/javascripts/attachy.js

@@ -5,7 +5,7 @@
  *
  * @author  : Washington Botelho
  * @doc     : http://wbotelhos.com/attachy
- * @version : 0.1.0
+ * @version : 0.1.1
  *
  */
 

data/lib/attachy/models/attachy/extension.rb

@@ -57,6 +57,8 @@ module Attachy
         end
 
         define_method "#{scope}=" do |data|
+          return if data.blank?
+
           attachies = attachies_for(data, scope)
 
           if attachies.present?

data/lib/attachy/version.rb

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

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

@@ -17,22 +17,26 @@ RSpec.describe User, ':avatar' do
   end
 
   describe ':avatar_files=' do
-    let!(:user)     { create :user }
-    let!(:avatar_1) { create :file, scope: :avatar }
-    let!(:avatar_2) { create :file, scope: :avatar }
+    let!(:user) { create :user }
 
     context 'when given records' do
-      before { user.avatar_files = [avatar_1, avatar_2] }
+      context 'already persisted' do
+        let!(:avatar_1) { create :file, scope: :avatar }
+        let!(:avatar_2) { create :file, scope: :avatar }
+
+        before { user.avatar_files = [avatar_1, avatar_2] }
 
-      it 'is saved' do
-        expect(user.avatar_files).to match_array [avatar_1, avatar_2]
+        it 'references all' do
+          expect(user.avatar_files).to match_array [avatar_1, avatar_2]
+        end
       end
     end
 
     context 'when given no records' do
-      before { user.avatar_files = [avatar_1, avatar_2] }
+      let!(:avatar_1) { create :file, scope: :avatar, attachable: user }
+      let!(:avatar_2) { create :file, scope: :avatar, attachable: user }
 
-      it 'clears the existents' do
+      it 'clears all' do
         user.avatar_files = []
 
         expect(user.avatar_files).to eq []
@@ -63,6 +67,114 @@ RSpec.describe User, ':avatar' do
     end
   end
 
+  describe ':avatar=' do
+    let!(:user) { create :user }
+
+    context 'with persisted record' do
+      let!(:avatar) { create :file, scope: :avatar }
+
+      context 'as a json' do
+        let!(:json) { avatar.to_json }
+
+        it 'does not creates a new one' do
+          user.avatar = json
+
+          expect { user.avatar_files }.to_not change(Attachy::File, :count)
+        end
+
+        it 'is referenced' do
+          user.avatar = json
+
+          expect(user.avatar_files).to eq [avatar]
+        end
+      end
+
+      context 'as an array of json' do
+        let!(:json) { [avatar].to_json }
+
+        it 'does not creates a new one' do
+          user.avatar = json
+
+          expect { user.avatar_files }.to_not change(Attachy::File, :count)
+        end
+
+        it 'is referenced' do
+          user.avatar = json
+
+          expect(user.avatar_files).to eq [avatar]
+        end
+      end
+    end
+
+    context 'with no persisted record' do
+      let!(:avatar) do
+        build(:file,
+          format:    :jpg,
+          height:    600,
+          public_id: :public_id,
+          scope:     :avatar,
+          width:     800
+        )
+      end
+
+      context 'as a json' do
+        let!(:json) { avatar.to_json }
+
+        it 'is saved and referenced' do
+          user.avatar = json
+
+          expect(user.avatar_files.size).to eq 1
+
+          file = user.avatar_files[0]
+
+          expect(file.format).to    eq 'jpg'
+          expect(file.height).to    eq 600
+          expect(file.public_id).to eq 'public_id'
+          expect(file.scope).to     eq 'avatar'
+          expect(file.width).to     eq 800
+        end
+      end
+
+      context 'as an array of json' do
+        let!(:json) { [avatar].to_json }
+
+        it 'is saved and referenced' do
+          user.avatar = json
+
+          expect(user.avatar_files.size).to eq 1
+
+          file = user.avatar_files[0]
+
+          expect(file.format).to    eq 'jpg'
+          expect(file.height).to    eq 600
+          expect(file.public_id).to eq 'public_id'
+          expect(file.scope).to     eq 'avatar'
+          expect(file.width).to     eq 800
+        end
+      end
+    end
+
+    context 'with an empty string' do
+      let!(:avatar) { create :file, scope: :avatar, attachable: user }
+
+      it 'does nothing' do
+        user.avatar = ''
+
+        expect(user.avatar_files).to eq [avatar]
+      end
+    end
+
+    context 'with an empty array as string' do
+      let!(:avatar) { create :file, scope: :avatar, attachable: user }
+
+      it 'clears the records' do
+        user.avatar = '[]'
+
+        expect(user.avatar_files).to eq []
+      end
+    end
+  end
+
   describe ':avatar?' do
     let!(:user) { create :user }
 

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

@@ -17,22 +17,26 @@ RSpec.describe User, ':photos' do
   end
 
   describe ':photos_files=' do
-    let!(:user)    { create :user }
-    let!(:photo_1) { create :file, scope: :photo }
-    let!(:photo_2) { create :file, scope: :photo }
+    let!(:user) { create :user }
 
     context 'when given records' do
-      before { user.photos_files = [photo_1, photo_2] }
+      context 'already persisted' do
+        let!(:photo_1) { create :file, scope: :photos }
+        let!(:photo_2) { create :file, scope: :photos }
+
+        before { user.photos_files = [photo_1, photo_2] }
 
-      it 'is saved' do
-        expect(user.photos_files).to match_array [photo_1, photo_2]
+        it 'references all' do
+          expect(user.photos_files).to match_array [photo_1, photo_2]
+        end
       end
     end
 
     context 'when given no records' do
-      before { user.photos_files = [photo_1, photo_2] }
+      let!(:photo_1) { create :file, scope: :photo, attachable: user }
+      let!(:photo_2) { create :file, scope: :photo, attachable: user }
 
-      it 'clears the existents' do
+      it 'clears all' do
         user.photos_files = []
 
         expect(user.photos_files).to eq []
@@ -59,6 +63,114 @@ RSpec.describe User, ':photos' do
     end
   end
 
+  describe ':photos=' do
+    let!(:user) { create :user }
+
+    context 'with persisted record' do
+      let!(:photo) { create :file, scope: :photos }
+
+      context 'as a json' do
+        let!(:json) { photo.to_json }
+
+        it 'does not creates a new one' do
+          user.photos = json
+
+          expect { user.photos_files }.to_not change(Attachy::File, :count)
+        end
+
+        it 'is referenced' do
+          user.photos = json
+
+          expect(user.photos_files).to eq [photo]
+        end
+      end
+
+      context 'as an array of json' do
+        let!(:json) { [photo].to_json }
+
+        it 'does not creates a new one' do
+          user.photos = json
+
+          expect { user.photos_files }.to_not change(Attachy::File, :count)
+        end
+
+        it 'is referenced' do
+          user.photos = json
+
+          expect(user.photos_files).to eq [photo]
+        end
+      end
+    end
+
+    context 'with no persisted record' do
+      let!(:photo) do
+        build(:file,
+          format:    :jpg,
+          height:    600,
+          public_id: :public_id,
+          scope:     :photo,
+          width:     800
+        )
+      end
+
+      context 'as a json' do
+        let!(:json) { photo.to_json }
+
+        it 'is saved and referenced' do
+          user.photos = json
+
+          expect(user.photos_files.size).to eq 1
+
+          file = user.photos_files[0]
+
+          expect(file.format).to    eq 'jpg'
+          expect(file.height).to    eq 600
+          expect(file.public_id).to eq 'public_id'
+          expect(file.scope).to     eq 'photos'
+          expect(file.width).to     eq 800
+        end
+      end
+
+      context 'as an array of json' do
+        let!(:json) { [photo].to_json }
+
+        it 'is saved and referenced' do
+          user.photos = json
+
+          expect(user.photos_files.size).to eq 1
+
+          file = user.photos_files[0]
+
+          expect(file.format).to    eq 'jpg'
+          expect(file.height).to    eq 600
+          expect(file.public_id).to eq 'public_id'
+          expect(file.scope).to     eq 'photos'
+          expect(file.width).to     eq 800
+        end
+      end
+    end
+
+    context 'with an empty string' do
+      let!(:photo) { create :file, scope: :photos, attachable: user }
+
+      it 'does nothing' do
+        user.photos = ''
+
+        expect(user.photos_files).to eq [photo]
+      end
+    end
+
+    context 'with an empty array as string' do
+      let!(:photo) { create :file, scope: :photo, attachable: user }
+
+      it 'clears the records' do
+        user.photos = '[]'
+
+        expect(user.photos_files).to eq []
+      end
+    end
+  end
+
   describe ':photo?' do
     let!(:user) { create :user }
 

metadata

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