effective_assets 0.1 → 1.0.0

data/app/views/asset_box_input/_attachment_as_thumbnail.html.haml

@@ -0,0 +1,20 @@
+- uid = (attachment.persisted? ? attachment.id : Time.now.to_f.to_s.split('.')[1] + Random.rand(10000).to_s)
+- hidden ||= false
+
+.col-sm-3.attachment
+  .thumbnail{:style => "#{(attachment.marked_for_destruction? || hidden) ? 'display: none;' : ''}", :title => effective_asset_title(attachment.asset)}
+    = effective_asset_image_tag(attachment.asset)
+
+    .attachment-title.caption
+      = link_to attachment.asset.title, attachment.asset.url, :target => '_blank'
+
+    - if attachment_actions.include?('remove')
+      %a.attachment-remove{:href => '#'}
+        %img{:src => asset_path('effective_assets/icon_close.png'), :alt => 'Remove'}
+
+    - if attachment.persisted?
+      = hidden_field_tag(attachable_object_name + "[attachments_attributes][#{uid}][id]", attachment.id)
+    = hidden_field_tag(attachable_object_name + "[attachments_attributes][#{uid}][asset_id]", attachment.asset_id)
+    = hidden_field_tag(attachable_object_name + "[attachments_attributes][#{uid}][box]", attachment.box)
+    = hidden_field_tag(attachable_object_name + "[attachments_attributes][#{uid}][_destroy]", attachment.marked_for_destruction? ? 1 : nil, :class => 'asset-box-remove')
+    = hidden_field_tag(attachable_object_name + "[attachments_attributes][#{uid}][position]", 1)

data/app/views/asset_box_input/_dialog.html.haml

@@ -0,0 +1,18 @@
+%button.asset-box-dialog{:href => '#', 'data-dialog-url' => dialog_url} Attach...
+
+.asset-box-modal.modal.fade
+  .modal-dialog.modal-lg
+    .modal-content
+      .modal-header
+        %button{:type => 'button', :class => 'close', 'data-dismiss' => 'modal'}
+          %span{'aria-hidden' => true} ×
+          %span.sr-only Close
+        %h4.modal-title Attach / Upload Asset
+      .modal-body
+        %iframe#effective_assets_iframe{:src => dialog_url, :width => '100%', :height => '100%', :marginWidth => 0, :marginHeight => 0, :frameBorder => 0, :scrolling => :auto, :title => 'Attach / Upload Asset'}
+
+      .modal-footer
+        %button{:type => 'button', :class => 'btn btn-default', 'data-dismiss' => 'modal'} Close
+
+
+

data/app/views/asset_box_input/_progress_bar_template.html.haml

@@ -0,0 +1,8 @@
+%script{:type => 'text/x-tmpl'}
+  .upload
+    = "{%=o.name%}"
+    .progress
+      %span
+        %img{:src => asset_path('effective_assets/spinner.gif'), :class => 'spinner'}
+        Uploading...
+      .bar{:style => 'width: 0%'}

data/app/views/asset_box_input/_uploader.html.haml

@@ -1,119 +1,25 @@
-.asset_box_uploader{:style => "#{uploader_visible ? '' : 'display: none;'}"}
-  .file_lists
-    %ul.file_done_list.file_list
-    %ul.file_todo_list.file_list
-  .queue_size
-    %span.numerator
-    %span.denominator
-  .overall
-    %span.progress
-      %span.amount
-    %span.status
+.uploads
+.asset-box-uploader{:id => "s3_#{uid}"}
+  = s3_uploader_fields(:aws_acl => aws_acl)
 
-  %script{:type => 'text/javascript'}
-    :erb
-
-      $("div.asset_box_input[data-swf='s3_swf_<%= uid %>'][data-mode='multiple']").find('div.attachments').first().sortable();
-      preload_spinner = new Image();
-      preload_spinner.src = '/assets/effective_assets/spinner.gif';
+  - if limit > 1
+    %input{:type => 'file', :name => 'file', :multiple => 'multiple', :disabled => disabled}
+  - else
+    %input{:type => 'file', :name => 'file', :disabled => disabled}
 
-      var s3_swf_<%= uid %>_object = s3_swf_init('s3_swf_<%= uid %>', {
-        buttonWidth: 100,
-        buttonHeight: 30,
-        flashVersion: '9.0.0',
-        queueSizeLimit: <%= limit %>,
-        fileSizeLimit: 524288000,
-        fileTypes: '<%= file_types.present? ? file_types.map { |t| "*.#{t.to_s}"}.join(';') : '*.*' %>',
-        fileTypeDescs: 'Uploadable Files',
-        selectMultipleFiles: <%= limit > 1 ? 'true' : 'false' %>,
-        keyPrefix: '<%= "#{EffectiveAssets.aws_upload_path.chomp('/')}" + '/' %>',
-        signaturePath: '/s3_uploads.xml',
-        swfFilePath: '/assets/effective_assets/s3_upload.swf',
-        buttonUpPath: '/assets/effective_assets/s3_up_button.gif',
-        buttonOverPath: '/assets/effective_assets/s3_over_button.gif',
-        buttonDownPath: '/assets/effective_assets/s3_down_button.gif',
-        swfVarObj: 's3_swf_<%= uid %>_object',
-          onFileSizeLimitReached: function(file) {
-            alert('That file is too big');
-          },
-          onQueueSizeLimitReached: function(queue) {
-            alert('There are too many files in the queue');
-          },
-          onQueueEmpty: function(queue) {
-            alert('You gotta have at least one file in there');
-          },
-          onSignatureSecurityError: function(file,security_error_event) {
-            alert('There was an error');
-          },
-          onSignatureIOError: function(file,io_error_event) {
-            alert('There was an error');
-          },
-          onSignatureXMLError: function(file,error_message) {
-            alert('There was an error');
-          },
-          onUploadError: function(upload_options,error) {
-            alert('There was an error');
-          },
-          onUploadIOError: function(upload_options,io_error_event) {
-            alert('There was an error');
-          },
-          onUploadSecurityError: function(upload_options,security_error_event) {
-            alert('There was an error');
-          },
-          onQueueClear: function(queue) {
-            s3_queueClearHandler('s3_swf_<%= uid %>', queue);
-          },
-          onUploadingFinish: function() {
-            s3_uploadingFinishHandler('s3_swf_<%= uid %>');
-          },
-          onUploadingStart: function() {
-            s3_uploadingStartHandler('s3_swf_<%= uid %>');
-          },
-          onQueueChange: function(queue) {
-            s3_queueChangeHandler('s3_swf_<%= uid %>', queue);
-          },
-          onUploadProgress: function(upload_options,progress_event) {
-            s3_progressHandler('s3_swf_<%= uid %>', progress_event);
-          },
-          onUploadComplete: function(upload_options,event) {
-            var obj         = $("div.asset_box_input[data-swf='s3_swf_<%= uid %>']").find('div.asset_box_uploader').first();
-            var one_file    = obj.find('.file_todo_list').find("li.file_to_upload").first()
-            var title       = one_file.find('input.title').val();
-            var description = one_file.find('input.description').val();
-            var tags        = one_file.find('input.tags').val();
+  = render :partial => progress_bar_partial
 
-            s3_addFileToDoneList('s3_swf_<%= uid %>', upload_options.FileName, upload_options.FileSize);
-
-            $.ajax({
-              url: '<%= s3_uploads_path %>',
-              beforeSend: function(jqXHR, settings) {
-                s3_showAttachmentLoading('s3_swf_<%= uid %>', title);
-              },
-              complete: function(jqXHR, textStatus) {
-                s3_loadAttachmentHtml('s3_swf_<%= uid %>', jqXHR.responseText);
-              },
-              global: false,
-              type: 'POST',
-              dataType: 'script',
-              data: {
-                'authenticity_token' : '<%= form_authenticity_token %>',
-                'file_name' : upload_options.FileName,
-                'file_path' : upload_options.key,
-                'file_size' : upload_options.FileSize,
-                'box'       : '<%= box %>',
-                'attachable_type' : '<%= attachable_type %>',
-                'attachable_id' : '<%= attachable_id %>',
-                'content_type' : upload_options.ContentType,
-                'title' : title,
-                'description' : description,
-                'tags' : tags
-              }
-            })
-          }
-        });
-  %div{:id => "s3_swf_#{uid}"}
+  %script{:type => 'text/javascript'}
+    :erb
 
-  %div
-    %input.StartButton{:onclick => "s3_swf_#{uid}_object.startUploading(); return false;", :type => "submit", :value => "Start Uploading"}
-    %input.ResetButton{:onclick => "s3_swf_#{uid}_object.clearQueue(); return false;", :type => "submit", :value => "Clear Queue"}
-    %input.StopButton{:onclick => "s3_swf_#{uid}_object.stopUploading(); return false;", :type => "submit", :value => "Stop Uploading"}
+      $("#s3_<%= uid %>").S3Uploader({
+        url: '<%= s3_uploader_url %>',
+        progress_bar_target: $("#s3_<%= uid %>").siblings('.uploads').first(),
+        progress_bar_template: $("#s3_<%= uid %>").children("script[type='text/x-tmpl']").first(),
+        remove_completed_progress_bar: true,
+        allow_multiple_files: <%= limit > 1 %>,
+        file_types: '<%= [file_types].flatten.join('|').to_s %>',
+        create_asset_url: '<%= effective_assets.s3_uploads_url %>',
+        update_asset_url: '<%= effective_assets.s3_uploads_url %>/:id',
+        dropZone: $("#s3_<%= uid %>").parent()
+      });

data/app/views/effective/assets/iframe.html.haml

@@ -0,0 +1,17 @@
+!!!
+%html
+  %head
+    %title Insert / Upload
+    %meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1'}
+    %meta{:charset => 'utf-8'}
+    %meta{:name => 'viewport', :content => 'width=device-width, initial-scale=1, maximum-scale=1'}
+
+    = javascript_include_tag '//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js'
+    = javascript_include_tag 'effective_assets'
+    = javascript_include_tag 'effective_assets_iframe'
+    = stylesheet_link_tag 'effective_assets_iframe'
+    = csrf_meta_tags
+
+  %body
+    = simple_form_for @user_uploads, :url => '/' do |f|
+      = f.input :uploads, :as => :asset_box, :label => false, :uploader => true, :attachment_style => :table, :table_filter_bar => true, :attachment_actions => [:insert, :delete], :file_types => (@file_types || :any), :aws_acl => (@aws_acl || 'public-read')

data/app/views/effective/snippets/_effective_asset.html.haml

@@ -0,0 +1,8 @@
+- asset = effective_asset.asset
+
+- if asset.nil?
+  %img{:src => '#'}
+- elsif asset.image?
+  = effective_asset_image_tag(asset, nil, :class => effective_asset.html_class)
+- else
+  = effective_asset_link_to(asset, nil, :class => effective_asset.html_class)

data/config/routes.rb

@@ -1,6 +1,12 @@
 Rails.application.routes.draw do
+  mount EffectiveAssets::Engine => '/', :as => 'effective_assets'
+end
+
+EffectiveAssets::Engine.routes.draw do
   scope :module => 'effective' do
-    resources :attachments, :only => [:show]
-    resources :s3_uploads, :only => [:index, :create]
+    resources :s3_uploads, :only => [:create, :update]
+
+    match '/effective/assets', :to => 'assets#index', :via => [:get], :as => 'effective_assets'
+    match '/effective/assets/:id', :to => 'assets#destroy', :via => [:delete], :as => 'effective_asset'
   end
 end

data/db/migrate/01_create_effective_assets.rb.erb

@@ -4,6 +4,7 @@ class CreateEffectiveAssets < ActiveRecord::Migration
       t.string  :title
       t.text    :description
       t.string  :tags
+      t.text    :extra
 
       t.integer :user_id
 
@@ -11,6 +12,7 @@ class CreateEffectiveAssets < ActiveRecord::Migration
       t.string  :upload_file
       t.string  :data
       t.boolean :processed, :default => false
+      t.string  :aws_acl, :default => 'public-read'
 
       t.integer :data_size
       t.integer :height
@@ -21,6 +23,7 @@ class CreateEffectiveAssets < ActiveRecord::Migration
     end
 
     add_index <%= @assets_table_name %>, :content_type
+    add_index <%= @assets_table_name %>, :user_id
 
     create_table <%= @attachments_table_name %> do |t|
       t.integer :asset_id

data/lib/effective_assets.rb

@@ -2,6 +2,7 @@ require "effective_assets/engine"
 require 'carrierwave'
 require 'delayed_job_active_record'
 require 'migrant'     # Required for rspec to run properly
+require 'jquery-fileupload-rails'
 
 module EffectiveAssets
   # The following are all valid config keys
@@ -14,18 +15,48 @@ module EffectiveAssets
   mattr_accessor :aws_access_key_id
   mattr_accessor :aws_secret_access_key
 
-  mattr_accessor :aws_upload_path  # This directory is where the flash s3 uploader first places files
-  mattr_accessor :aws_final_path # We then authenticate and use Fog to copy the object from upload_path to final_path
+  mattr_accessor :aws_path  # This directory is where we upload files to
   mattr_accessor :aws_acl
 
   mattr_accessor :authorization_method
 
+  mattr_accessor :use_active_admin
+
   def self.setup
     yield self
+
+    configure_carrierwave
+  end
+
+  def self.permitted_params
+    {:attachments_attributes => [:id, :asset_id, :attachable_type, :attachable_id, :position, :box, :_destroy]}
   end
 
   def self.authorized?(controller, action, resource)
-    raise ActiveResource::UnauthorizedAccess.new('') unless (controller || self).instance_exec(controller, action, resource, &EffectiveAssets.authorization_method)
+    if authorization_method.respond_to?(:call) || authorization_method.kind_of?(Symbol)
+      raise Effective::AccessDenied.new() unless (controller || self).instance_exec(controller, action, resource, &authorization_method)
+    end
     true
   end
+
+  private
+
+  def self.configure_carrierwave
+    if (@carrierwave_configured != true) && EffectiveAssets.uploader.present? && EffectiveAssets.aws_bucket.present?
+      CarrierWave.configure do |config|
+        config.fog_credentials = {
+          :provider               => 'AWS',
+          :aws_access_key_id      => EffectiveAssets.aws_access_key_id,
+          :aws_secret_access_key  => EffectiveAssets.aws_secret_access_key
+        }
+        config.fog_directory  = EffectiveAssets.aws_bucket
+        config.fog_public     = EffectiveAssets.aws_acl.to_s.include?('public')
+        config.fog_attributes = {'Cache-Control'=>'max-age=315576000'}
+        config.cache_dir      = "#{Rails.root}/tmp/uploads" # For heroku
+      end
+
+      @carrierwave_configured = true
+    end
+  end
+
 end

data/lib/effective_assets/engine.rb

@@ -2,15 +2,13 @@ module EffectiveAssets
   class Engine < ::Rails::Engine
     engine_name 'effective_assets'
 
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/inputs"]
-    config.autoload_paths += Dir["#{config.root}/app/models/validators"]
-    config.autoload_paths += Dir["#{config.root}/app/models/uploaders"]
+    config.autoload_paths += Dir["#{config.root}/app/models/**/"]
 
     # Include Helpers to base application
     initializer 'effective_assets.action_controller' do |app|
       ActiveSupport.on_load :action_controller do
         helper EffectiveAssetsHelper
+        helper EffectiveAssetsS3Helper
       end
     end
 
@@ -21,15 +19,20 @@ module EffectiveAssets
       end
     end
 
-    # Set up our default configuration options.
-    initializer "effective_assets.defaults", :before => :load_config_initializers do |app|
-      eval File.read("#{config.root}/lib/generators/templates/effective_assets.rb")
+    initializer 'effective_assets.action_view' do |app|
+      ActiveSupport.on_load :action_view do
+        ActionView::Helpers::FormBuilder.send(:include, Inputs::AssetBoxFormInput)
+      end
+    end
+
+    initializer "effective_assets.append_precompiled_assets" do |app|
+      Rails.application.config.assets.precompile += ['effective_assets.js', 'effective_assets_iframe.js', 'effective_assets_iframe.css']
     end
 
     # ActiveAdmin (optional)
     # This prepends the load path so someone can override the assets.rb if they want.
     initializer 'effective_assets.active_admin' do
-      if defined?(ActiveAdmin)
+      if defined?(ActiveAdmin) && EffectiveAssets.use_active_admin == true
         ActiveAdmin.application.load_paths.unshift Dir["#{config.root}/active_admin"]
       end
     end

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = "0.1"
+  VERSION = '1.0.0'.freeze
 end

data/lib/generators/templates/asset_uploader.rb

@@ -20,6 +20,41 @@ class AssetUploader < EffectiveAssetsUploader
   version :thumb, :if => :image? do
     process :resize_to_fit => [70, 70]
     process :record_info => :thumb
+    # process :watermark! => [70, 70]
+    # process :grayscale!
+    # process :transparent! => ['#3F7F42', '12%']
   end
 
+  # If you want to do a watermark, you can use something like this
+  # def watermark!(width, height)
+  #   manipulate! do |image|
+  #     logo = MiniMagick::Image.open("#{ Rails.root }/app/assets/images/watermark.png")
+  #     logo.resize("#{ width }x#{ height }>")
+  #     result = image.composite(logo) do |comp|
+  #       comp.gravity "center"
+  #     end
+  #   end
+  # end
+
+  # If you want to Grayscale images, you can use something like this
+  # def grayscale!
+  #   manipulate! do |image|
+  #     image.colorspace("Gray")
+  #     image = yield(image) if block_given?
+  #     image
+  #   end
+  # end
+
+  # If you want to make a certain color in the image transparent (assumes gif or png), you can use something like this
+  # def transparent!(color, fuzz)
+  #   manipulate! do |image|
+  #     image.transparent(color) do |cmd|
+  #       cmd.fuzz fuzz
+  #     end
+  #
+  #     image = yield(image) if block_given?
+  #     image
+  #   end
+  # end
+
 end

data/lib/generators/templates/effective_assets.rb

@@ -4,16 +4,43 @@ EffectiveAssets.setup do |config|
   config.assets_table_name = :assets
   config.attachments_table_name = :attachments
 
-  config.uploader = AssetUploader
+  config.uploader = AssetUploader   # Must extend from EffectiveAssetsUploader
+
+  # Authorization Method
+  #
+  # This method is called by all controller actions with the appropriate action and resource
+  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
+  #
+  # Use via Proc (and with CanCan):
+  # config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) }
+  #
+  # Use via custom method:
+  # config.authorization_method = :my_authorization_method
+  #
+  # And then in your application_controller.rb:
+  #
+  # def my_authorization_method(action, resource)
+  #   current_user.is?(:admin)
+  # end
+  #
+  # Or disable the check completely:
+  # config.authorization_method = false
+  config.authorization_method = Proc.new { |controller, action, resource| true } # All users can see every screen
+
 
   # This is your S3 bucket information
   config.aws_bucket = ''
   config.aws_access_key_id = ''
   config.aws_secret_access_key = ''
 
-  config.aws_final_path = 'assets/'
-  config.aws_upload_path = 'uploads/'
+  config.aws_path = 'assets/'
+
+  # This is the default aws_acl all assets will be created with
+  # Unless you override the value by passing :aws_acl => '' to the asset_box_input, Asset.create_from_url, or Asset.create_from_string
+  # Valid settings are public-read, authenticated-read
   config.aws_acl = 'public-read'
 
-  config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) }
+
+  # Register Effective::Asset with ActiveAdmin if ActiveAdmin is present
+  config.use_active_admin = true
 end