uploadbox 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d912686ada135705f14bfc97ee37a94e33d3dd35
-  data.tar.gz: 243b0106d9f5dadba7c043d65f9ec4ac759e85ba
+  metadata.gz: 52e67bd33d5d1a517c147e1220c50de325994091
+  data.tar.gz: 1a75ed1144f8b7957afb5171227809fb1346e62a
 SHA512:
-  metadata.gz: 1be0a1a86f1ef35c00df7c0c97a56793ab201b5d8b694d958af8b287c2adfc9123650915499331ef5586066e98c47b9b2f80297af5a886e511bc94d17cc01879
-  data.tar.gz: 5082e057fa011c399043364cf571d418c967e2c945860a3e211c8f800096983ecf69b2cf68bcaf9ec9998b18abff82d2295659741af08e19dea2840ed3d23983
+  metadata.gz: b000d2b6cce30d44614441f51341628d5881864a4e900e8d253287c20be9c4472297a3559e7b951393e2e37193d365d3c300375f0250f32d8bb26805fee13977
+  data.tar.gz: fc091d97575dd2226d83f159a584a680a6074a9b271250592aa07fcfc48b02dc092c0bed124cab996622183b49d57f0d970b3526d4e817d41a373953d9c0848e

data/README.md

@@ -60,10 +60,13 @@ Edit CORS config for the bucket
 Add `uploads_one` to your model
 ```
 class Post < ActiveRecord::Base
-  uploads_one :picture, thumb: [100, 100], regular: [600, 300]
+  uploads_one :picture, thumb: [100, 100], regular: [600, 300], placeholder: 'default.png'
 end
 ```
 
+If `placeholder` is set posts without uploads will render the placeholder.
+Empty `@post.picture.thumb` will render `app/assets/images/thumb_default.png`
+
 Add field to form
 ```
 <%= f.uploader :picture %>

data/app/helpers/uploadbox/img_helper.rb

@@ -15,12 +15,11 @@ module Uploadbox
       ).gsub("\n", "")
     end
 
-    def img(*args)
-      upload = args[0]
-      if upload.is_a? CarrierWave::Uploader::Base
-        image_tag(upload.url, width: upload.width, height: upload.height)
+    def img(source, options={})
+      if source.respond_to?(:url) and source.respond_to?(:width) and source.respond_to?(:height)
+        image_tag(source.url, {width: source.width, height: source.height}.merge(options))
       else
-        image_tag(*args)
+        image_tag(source, options)
       end
     end
 

data/lib/uploadbox/image_uploader.rb

@@ -3,6 +3,7 @@ module Uploadbox
     def uploads_one(upload_name, options={})
       default_options = {
         default: false,
+        placeholder: false,
         removable: true,
         retina: Uploadbox.retina,
         quality: Uploadbox.retina ? (Uploadbox.retina_quality || 40) : (Uploadbox.image_quality || 80)
@@ -17,7 +18,35 @@ module Uploadbox
       Uploadbox.const_set(upload_class_name, upload_class)
 
       # @post.picture?
-      define_method("#{upload_name}?") { send(upload_name) and send(upload_name).file? }
+      define_method("#{upload_name}?") do 
+        upload = send("#{upload_name}_upload")
+        upload and upload.file?
+      end
+
+      define_method(upload_name) do
+        upload = send("#{upload_name}_upload")
+
+        if upload
+          upload
+        else
+          image = Struct.new(:url, :width, :height) do
+            def to_s
+              url
+            end
+          end
+
+          placeholder = Class.new do
+            upload_versions.keys.each do |version|
+              define_method(version) do
+                width = upload_versions[version][0]
+                height = upload_versions[version][1]
+                image.new("#{version}_#{options[:placeholder]}", width, height)
+              end
+            end
+          end
+          placeholder.new
+        end
+      end
 
       # @post.attach_picture
       define_method("attach_#{upload_name}") do |upload_id|
@@ -86,7 +115,7 @@ module Uploadbox
         mount_uploader :file, dynamic_uploader
       end
 
-      has_one upload_name, as: :imageable, dependent: :destroy, class_name: "Uploadbox::#{self.to_s + upload_name.to_s.camelize}"
+      has_one "#{upload_name}_upload".to_sym, as: :imageable, dependent: :destroy, class_name: "Uploadbox::#{self.to_s + upload_name.to_s.camelize}"
     end
 
   end

data/lib/uploadbox/version.rb

@@ -1,3 +1,3 @@
 module Uploadbox
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadbox
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Julio Protzek
@@ -333,6 +333,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: pry-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 description: Uploadbox makes easy to manage files in your Rails application.
 email:
 - julio@startae.com.br