uploadbox 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c26f587ffb76e97589fabfeccf5d0ce8303ecb15
-  data.tar.gz: 87df182c32e2947399ce4b6b019b4dab79a3266e
+  metadata.gz: 2c98593bc8ee77673827d0df2453c69faca92b38
+  data.tar.gz: 869dc96c133c8d37615901678a9c25fb2463daec
 SHA512:
-  metadata.gz: 4e6ae3bb264c4c80ca0f4495e282372301b1d88a5213e5188bef00fe30e7e0e29a76c0cd860cabd4e49e1c254256a3980b42a40fbda8e542d6af0e188a78b3e9
-  data.tar.gz: 47426e47bf77cd74207c2eb363d7b06e52144adf4ccff4ba7406efdaf4547a803e581c7e954bd5581f8e32d230f77b1a85474b027baf0b2d7ff8f927913f529d
+  metadata.gz: 1e230ef299e8a19bd3a58e98f9136c7e4bd41df72aeca4f3a53bcaa60f76d6dc6dbe072bf760031f890d4b9bbaf318cded27636b4d2f91f17f591c6f03d76c02
+  data.tar.gz: b4c694a45159cfd1785adfb26225d31b9313bccc23369e1a83b3e412dacff26a06b2d2815653912741c4ef4afaba720225383e031ba913869690c8a2bbcd1bc2

data/app/assets/javascripts/_image_uploader.coffee

@@ -2,11 +2,18 @@ class @ImageUploader
   constructor: (@container) ->
     @preview = @container.find('[data-provides="fileupload"]')
     @fileInput = @container.find('input[type="file"]')
+    @typeInput = @container.find('input[name="image[imageable_type]"]')
+    @uploadNameInput = @container.find('input[name="image[upload_name]"]')
     @idInput = @container.find('[data-item="id"]')
     @container.find('a.btn.fileupload-exists').bind('ajax:success', @delete)
+    @thumbContainer = @container.find('.fileupload-preview.thumbnail')
     @fileInput.fileupload
       dataType: 'json'
-      formData: {name: @fileInput.attr('name'), value: @fileInput.val()}
+      formData: [
+        {name: @fileInput.attr('name'), value: @fileInput.val()},
+        {name: @typeInput.attr('name'), value: @typeInput.val()}
+        {name: @uploadNameInput.attr('name'), value: @uploadNameInput.val()}
+      ]
       add: @add
       progress: @progress
       done: @done
@@ -25,11 +32,11 @@ class @ImageUploader
     @loader.detach()
     @idInput.val(image.id)
     @container.find('a.btn.fileupload-exists').attr('href', image.url)
-    @container.find('.fileupload-preview.thumbnail img').detach()
+    @thumbContainer.find('img').detach()
     img = $('<img/>')
-    img.attr('src', image.versions.regular)
-    img.attr('width', 50)
-    img.attr('height', 50)
+    img.attr('src', image.versions[@thumbContainer.data('version')])
+    img.attr('width', @thumbContainer.data('width'))
+    img.attr('height', @thumbContainer.data('height'))
     @container.find('.fileupload-preview.thumbnail').append(img)
     @container.find('.fileupload').removeClass('fileupload-new').addClass('fileupload-exists')
 

data/app/controllers/uploadbox/images_controller.rb

@@ -1,11 +1,11 @@
 module Uploadbox
   class ImagesController < ApplicationController
     def create
-      @image = Image.create!(image_params)
+      @image = Image.create_upload(image_params)
     end
 
     def update
-      @image = Image.create!(image_params)
+      @image = Image.create_upload(image_params)
     end
 
     def destroy
@@ -14,7 +14,7 @@ module Uploadbox
 
     private
       def image_params
-        params.require(:image).permit(:file)
+        params.require(:image).permit(:file, :imageable_type, :upload_name)
       end
   end
 end

data/app/helpers/uploadbox/img_helper.rb

@@ -0,0 +1,12 @@
+module Uploadbox
+  module ImgHelper
+    def img(*args)
+      upload = args[0]
+      if upload.is_a? CarrierWave::Uploader::Base
+        image_tag(upload.url, width: upload.width, height: upload.height)
+      else
+        image_tag(*args)
+      end
+    end
+  end
+end

data/app/models/image.rb

@@ -0,0 +1,8 @@
+class Image < ActiveRecord::Base
+  belongs_to :imageable, polymorphic: true
+
+  def self.create_upload(attributes)
+    upload_class_name = attributes[:imageable_type] + attributes[:upload_name].camelize
+    Uploadbox.const_get(upload_class_name).create!(attributes)
+  end
+end

data/app/uploaders/uploadbox/image_processing_uploader.rb

@@ -0,0 +1,27 @@
+module Uploadbox
+  class ImageProcessingUploader < CarrierWave::Uploader::Base
+    include CarrierWave::MimeTypes
+    include CarrierWave::MiniMagick
+    include CarrierWave::Processing::MiniMagick
+
+    process :set_content_type
+    process :strip
+
+    def store_dir
+      # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+      "uploads/image/#{mounted_as}/#{model.id}"
+    end
+
+    def extension_white_list
+      %w(jpg jpeg gif png)
+    end
+
+    def filename
+      if original_filename
+        extension = File.extname(original_filename)
+        name = File.basename(original_filename, extension).parameterize.dasherize
+        "#{name}#{extension}"
+      end
+    end
+  end
+end

data/app/views/uploadbox/images/_uploader.html.slim

@@ -1,16 +1,18 @@
 = form.fields_for :image do
   div data-component="ImageUploader"
-    input name="image_id" data-item="id" type="hidden"
-    .fileupload data-provides="fileupload" class="fileupload-#{resource.image? ? 'exists' : 'new'}"
-      .fileupload-preview.thumbnail style="width: 50px; height: 50px;"
-        = image_tag resource.image.file.regular, width: 50, height: 50 if resource.image?
+    input name="#{upload_name}_id" data-item="id" type="hidden"
+    .fileupload data-provides="fileupload" class="fileupload-#{resource.send(upload_name).present? ? 'exists' : 'new'}"
+      .fileupload-preview.thumbnail data-version="#{version}" data-width="#{width}" data-height="#{height}" style="width: #{width}px; height: #{height}px;"
+        = img resource.send(upload_name).send(version) if resource.send(upload_name).present?
       div
         span.btn.btn-file
-          span.fileupload-new Escolher imagem
+          span.fileupload-new Escolher
           span.fileupload-exists Alterar
           input type="file" data-url="#{uploadbox.images_path}" name="image[file]"
-        - if resource.image?
-          = link_to 'Excluir', uploadbox.image_path(resource.image), class: 'btn fileupload-exists', remote: true, method: :delete
+          input type="hidden" name="image[imageable_type]" value="#{resource.class}"
+          input type="hidden" name="image[upload_name]" value="#{upload_name}"
+        - if resource.send(upload_name).present?
+          = link_to 'Excluir', uploadbox.image_path(resource.send(upload_name)), class: 'btn fileupload-exists', remote: true, method: :delete
         - else
           = link_to 'Excluir', '#', class: 'btn fileupload-exists', remote: true, method: :delete
 

data/app/views/uploadbox/images/create.json.jbuilder

@@ -1,6 +1,7 @@
 json.(@image, :id)
 json.versions do
-  json.original @image.file.url
-  json.regular @image.file.regular.url
+  @image.class.versions.keys.each do |version|
+    json.set! version, @image.send(version).url
+  end
 end
 json.url image_path(@image)

data/lib/generators/uploadbox/image/image_generator.rb

@@ -4,35 +4,26 @@ module Uploadbox
 
     source_root File.expand_path('../templates', __FILE__)
 
-    def create_initializer
+    def create_initializers
       copy_file 'initializers/carrierwave.rb', 'config/initializers/carrierwave.rb'
+      copy_file 'initializers/uploadbox.rb', 'config/initializers/uploadbox.rb'
     end
 
     def update_gitignore
       append_to_file '.gitignore', 'public/uploads'
     end
 
-    def create_uploader
-      copy_file 'uploaders/image_uploader.rb', 'app/uploaders/image_uploader.rb'
-    end
-
-    def create_model
-      copy_file 'models/image.rb', 'app/models/image.rb'
-    end
-
     def create_migration
       migration_template 'migrate/create_images.rb', 'db/migrate/create_images.rb'
     end
 
-
     private
-
-    def self.next_migration_number(dirname)
-      if ActiveRecord::Base.timestamped_migrations
-        Time.now.utc.strftime('%Y%m%d%H%M%S')
-      else
-        '%.3d' % (current_migration_number(dirname) + 1)
+      def self.next_migration_number(dirname)
+        if ActiveRecord::Base.timestamped_migrations
+          Time.now.utc.strftime('%Y%m%d%H%M%S')
+        else
+          '%.3d' % (current_migration_number(dirname) + 1)
+        end
       end
-    end
   end
 end

data/lib/generators/uploadbox/image/templates/initializers/uploadbox.rb

@@ -0,0 +1,4 @@
+Uploadbox.retina         = true
+Uploadbox.retina_quality = 30
+Uploadbox.image_quality  = 70
+

data/lib/generators/uploadbox/image/templates/migrate/create_images.rb

@@ -3,6 +3,10 @@ class CreateImages < ActiveRecord::Migration
     create_table :images do |t|
       t.string :file
       t.references :imageable, polymorphic: true, index: true
+      t.integer :width
+      t.integer :height
+      t.boolean :retina, default: false
+      t.string :upload_name
 
       t.timestamps
     end

data/lib/uploadbox/engine.rb

@@ -7,16 +7,31 @@ require 'carrierwave-processing'
 require 'mini_magick'
 require 'jbuilder'
 
-
 module Uploadbox
   class Engine < ::Rails::Engine
-    config.autoload_paths << File.expand_path('../../../app/uploaders/concerns', __FILE__)
+    initializer 'uploadbox.action_controller' do |app|
+      ActiveSupport.on_load :action_controller do
+        helper Uploadbox::ImgHelper
+      end
+    end
     isolate_namespace Uploadbox
   end
 end
 
 class ActionView::Helpers::FormBuilder
-  def image_uploader
-    @template.render partial: 'uploadbox/images/uploader', locals: {resource: @object, form: self}
+  def uploader(upload_name, options={})
+    upload_model_class = "Uploadbox::#{@object.class.to_s + upload_name.to_s.camelize}".constantize
+    options.reverse_merge!(preview: upload_model_class.versions.keys.first)
+    dimensions = upload_model_class.versions[options[:preview]]
+    @template.render partial: 'uploadbox/images/uploader', locals: {
+      upload_name: upload_name,
+      resource: @object,
+      form: self,
+      version: options[:preview],
+      width: dimensions[0],
+      height: dimensions[1]
+    }
   end
 end
+
+require 'uploadbox/image_uploader'

data/lib/uploadbox/image_uploader.rb

@@ -0,0 +1,81 @@
+module Uploadbox
+  module ImageUploader
+    def uploads_one(upload_name, options={})
+      default_options = {
+        default: false,
+        retina: Uploadbox.retina,
+        quality: Uploadbox.retina ? (Uploadbox.retina_quality || 40) : (Uploadbox.image_quality || 80)
+      }
+      options = options.reverse_merge(default_options)
+      upload_versions = options.select{ |key| default_options.keys.exclude? key }
+      options = options.select{ |key| default_options.keys.include? key }
+
+      imageable_type = self.to_s
+      upload_class_name = imageable_type + upload_name.to_s.camelize
+      upload_class = Class.new(Image)
+      Uploadbox.const_set(upload_class_name, upload_class)
+
+      # picture?
+      define_method("#{upload_name}?") { send(upload_name) and send(upload_name).file? }
+
+      # attach_picture
+      define_method("attach_#{upload_name}") do |upload_id|
+        if upload_id.present?
+          self.send("attach_#{upload_name}!", upload_id)
+        end
+      end
+
+      # attach_picture!
+      define_method("attach_#{upload_name}!") do |upload_id|
+        self.send("#{upload_name}=", upload_class.find(upload_id))
+      end
+
+      # Uploadbox::PostPicture < Image
+      upload_class.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def self.versions
+          #{upload_versions}
+        end
+      RUBY
+
+      upload_class.instance_eval do
+        delegate *upload_versions.keys, to: :file
+
+        default_scope -> { where(imageable_type: imageable_type).where(upload_name: upload_name.to_s) }
+
+        # Uploabox::PostPictureUploader < UploadBox::ImgProcessing < CarrierWave
+        dynamic_uploader = Class.new(Uploadbox::ImageProcessingUploader)
+        Uploadbox.const_set(self.class.to_s + upload_name.to_s.camelize + 'Uploader', dynamic_uploader)
+        dynamic_uploader.class_eval do
+          upload_versions.each do |version_name, dimensions|
+            if options[:retina]
+              dimensions = dimensions.map{ |d| d * 2 }
+            end
+
+            version version_name do
+              process resize_to_fill: dimensions
+              process quality: quality = options[:quality]
+            end
+
+            def dimensions
+              model.class.versions[version_name]
+            end
+
+            def width
+              dimensions[0]
+            end
+
+            def height
+              dimensions[1]
+            end
+          end
+        end
+        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}"
+    end
+
+  end
+end
+ActiveRecord::Base.extend Uploadbox::ImageUploader
+

data/lib/uploadbox/version.rb

@@ -1,3 +1,3 @@
 module Uploadbox
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/uploadbox.rb

@@ -1,4 +1,7 @@
 require "uploadbox/engine"
 
 module Uploadbox
+  mattr_accessor :retina
+  mattr_accessor :image_quality
+  mattr_accessor :retina_quality
 end

data/test/dummy/app/views/posts/show.html.erb

@@ -6,8 +6,10 @@
 </p>
 
 <p>
-  <strong>Image:</strong>
-  <%= image_tag @post.image.file.regular.url, width: 50, height: 50 if @post.image? %>
+  <strong>Regular:</strong>
+  <%= image_tag @post.image.file.regular.url if @post.image? %>
+  <strong>Thumb:</strong>
+  <%= image_tag @post.image.file.thumb.url if @post.image? %>
 </p>
 
 <p>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uploadbox
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Julio Protzek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -211,26 +211,27 @@ files:
 - app/controllers/uploadbox/application_controller.rb
 - app/controllers/uploadbox/images_controller.rb
 - app/helpers/uploadbox/application_helper.rb
-- app/models/concerns/image_uploadable.rb
-- app/models/concerns/uploadable.rb
-- app/uploaders/concerns/image_processing.rb
+- app/helpers/uploadbox/img_helper.rb
+- app/models/image.rb
+- app/uploaders/uploadbox/image_processing_uploader.rb
 - app/views/layouts/uploadbox/application.html.erb
 - app/views/uploadbox/images/_uploader.html.slim
 - app/views/uploadbox/images/create.json.jbuilder
 - config/routes.rb
+- lib/form_builder.rb
 - lib/generators/uploadbox/image/image_generator.rb
 - lib/generators/uploadbox/image/templates/initializers/carrierwave.rb
+- lib/generators/uploadbox/image/templates/initializers/uploadbox.rb
 - lib/generators/uploadbox/image/templates/migrate/create_images.rb
 - lib/generators/uploadbox/image/templates/models/image.rb
-- lib/generators/uploadbox/image/templates/uploaders/image_uploader.rb
 - lib/generators/uploadbox/image/USAGE
 - lib/tasks/uploadbox_tasks.rake
 - lib/uploadbox/engine.rb
+- lib/uploadbox/image_uploader.rb
 - lib/uploadbox/version.rb
 - lib/uploadbox.rb
 - MIT-LICENSE
 - Rakefile
-- README.rdoc
 - test/dummy/app/assets/javascripts/application.coffee
 - test/dummy/app/assets/stylesheets/application.sass
 - test/dummy/app/assets/stylesheets/scaffold.css
@@ -300,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.4
 signing_key: 
 specification_version: 4
 summary: Ajax file uploader for Rails applications.

data/README.rdoc

@@ -1,3 +0,0 @@
-= Uploadbox
-
-This project rocks and uses MIT-LICENSE.

data/app/models/concerns/image_uploadable.rb

@@ -1,11 +0,0 @@
-module ImageUploadable
-  extend ActiveSupport::Concern
-
-  included do
-    has_one :image, as: :imageable, dependent: :destroy
-  end
-
-  def image?
-    image and image.file?
-  end
-end

data/app/models/concerns/uploadable.rb

@@ -1,9 +0,0 @@
-module Uploadable
-  extend ActiveSupport::Concern
-
-  included do
-    belongs_to :imageable, polymorphic: true
-    mount_uploader :file, ImageUploader
-    delegate :regular, to: :file
-  end
-end

data/app/uploaders/concerns/image_processing.rb

@@ -1,33 +0,0 @@
-module ImageProcessing
-  extend ActiveSupport::Concern
-
-  include CarrierWave::MimeTypes
-  include CarrierWave::MiniMagick
-  include CarrierWave::Processing::MiniMagick
-
-  included do
-    process :set_content_type
-    process :strip
-
-    version :regular do
-      process resize_to_fill: [100, 100]
-      process quality: 30
-    end
-  end
-
-  def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
-  end
-
-  def extension_white_list
-    %w(jpg jpeg gif png)
-  end
-
-  def filename
-    if original_filename
-      extension = File.extname(original_filename)
-      name = File.basename(original_filename, extension).parameterize.dasherize
-      "#{name}#{extension}"
-    end
-  end
-end

data/lib/generators/uploadbox/image/templates/uploaders/image_uploader.rb

@@ -1,3 +0,0 @@
-class ImageUploader < CarrierWave::Uploader::Base
-  include ImageProcessing
-end