media_magick 0.2.0 → 0.3.0

data/.gitignore

@@ -7,4 +7,5 @@ spec/dummy/public/uploads
 spec/dummy/.sass-cache
 uploads
 .DS_Store
-.rvmrc
+.rvmrc
+*.gem

data/CHANGELOG.md

@@ -1,4 +1,56 @@
-## Next Release (branch: master)
+## Next Release (branch: v0.4)
+
+* support rails 4
+
+## 0.3.0 - July 1, 2013
+
+### Helpers
+
+* `attachment_container` and `attachment_container_for_video` are deprecated. please use `attachment_uploader` (for upload) and `attachment_loader` for rendering resources
+
+* new option for custom partial render after upload `attachment_uploader(model, relation, type, {loader_partial: 'path/to/custom_loader'})`
+
+### Libraries
+
+* carrierwave ~> 0.8
+
+* mongoid >= 3.0
+
+* mini_magick ~> 3.5 (now is a gem dependency)
+
+* updates jquery - 1.9.1
+
+### Bugs found
+
+* attaches_many :videos - 'videos' is a reserved word
+
+* attachments for models inside a module [fixed]
+
+
+## branch v0.3 untill 12.2012
+
+Helpers:
+
+* `attachment_container_for_video` doesn't render resources (images or videos)
+
+* updates carrierwave (~> 0.7.0)
+
+* store image dimensions in mongodb to avoid unnecessary file reads (when call method size - lazy behaviour)
+
+### Resolved Issues
+
+* #2 - video upload for attaches one relation
+
+
+## 0.1.1 - October 11, 2012
+
+## 0.2.0 - November 19, 2012
+
+### Improvements
+
+* Update carrierwave to 0.7.0.
+
+## 0.1.1 - October 11, 2012
 
 ## 0.2.0 - November 19, 2012
 

data/Gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in media_magick.gemspec
 gemspec
 
-# jquery-rails is used by the dummy application
 gem 'jquery-rails'

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# MediaMagick [![Build Status](https://secure.travis-ci.org/nudesign/media_magick.png?branch=master)](http://travis-ci.org/nudesign/media_magick) [![Build Status](https://gemnasium.com/nudesign/media_magick.png)](http://gemnasium.com/nudesign/media_magick) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/nudesign/media_magick)
+# MediaMagick [![Build Status](https://secure.travis-ci.org/nudesign/media_magick.png?branch=master)](http://travis-ci.org/nudesign/media_magick) [![Build Status](https://gemnasium.com/nudesign/media_magick.png)](http://gemnasium.com/nudesign/media_magick) [![Code Climate](https://codeclimate.com/github/nudesign/media_magick.png)](https://codeclimate.com/github/nudesign/media_magick)
 
 MediaMagick aims to make dealing with multimedia resources a very easy task – like magic. It wraps up robust solutions for upload, associate and display images, videos, audios and files to any model in your rails app.
 
@@ -6,7 +6,7 @@ MediaMagick aims to make dealing with multimedia resources a very easy task –
 
 Add this line to your application's Gemfile:
 
-    gem 'media_magick'
+    gem 'media_magick', '~> 0.3.0'
 
 And then execute:
 
@@ -14,6 +14,15 @@ And then execute:
 
 ## Getting Started
 
+### Assets
+
+Add these lines after `//= require jquery` in `app/assets/javascripts/application.js`:
+
+```
+//= require media_magick/plupload_it
+//= require media_magick/toggleSortable
+```
+
 ### Model
 
 ``` ruby
@@ -21,7 +30,7 @@ class Album
   include Mongoid::Document
   include MediaMagick::Model
 
-  attachs_many :photos
+  attaches_many :photos, type: :image
 end
 ```
 
@@ -36,7 +45,8 @@ end
 ### View
 
 ``` erb
-<%= attachment_container @album, :files %>
+<%= attachment_uploader(@album, :photos, :image) %>
+<%= attachment_loader(@album, :photos) %>
 ```
 
 ### Javascript
@@ -47,6 +57,23 @@ $(document).ready(function () {
 });
 ```
 
+### Allow Videos (youtube/vimeo)
+
+``` ruby
+class Album
+  include Mongoid::Document
+  include MediaMagick::Model
+
+  attaches_many :photos, type: :image, allow_videos: true
+end
+```
+
+``` erb
+<%= attachment_uploader(@album, :photos, :video) %>
+<%= attachment_uploader(@album, :photos, :image) %>
+<%= attachment_loader(@album, :photos) %>
+```
+
 ## Configuring
 
 ### Model
@@ -133,25 +160,8 @@ album.reload.photos.first.thumb.url
 
 ### Form View
 
-``` erb
-<%= attachment_container @album, :files %>
-
-<%= attachment_container @album, :files, newAttachments: { class: 'thumbnails' }, loadedAttachments: { class: 'span3' } %>
-```
-
-or use a custom layout:
+coming soon
 
-``` html
-<%= attachment_container @album, :photos do %>
-
-  <a class="pickAttachments btn" href="javascript://">select files</a>
-  <a class="uploadAttachments btn" href="javascript://">upload files</a>
-
-  <ul class="loadedAttachments">
-    <%= render :partial => 'photos', :collection => @album.photos, :as => 'photo' %>
-  </ul>
-<% end %>
-```
 
 ## Contributing
 

data/Rakefile

@@ -1,18 +1,6 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-Bundler::GemHelper.install_tasks
-
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => 'spec'
+task default: 'spec'

data/app/assets/javascripts/media_magick/plupload_it.js

@@ -18,14 +18,14 @@
 (function($) {
 
   $.fn.pluploadIt = function (options) {
-    
+
     var settings = $.extend({
       browse_button:        'pickAttachments', // triggers modal to select files
       container:            'attachmentUploader',
       drop_element:         'dropAttachments',
       flash_swf_url:        '/assets/plupload.flash.swf',
       max_file_size:        '10mb',
-      queue_element:        'attachmentQueue', 
+      queue_element:        'attachmentQueue',
       resize:               false,
       runtimes:             'gears,html5,flash,browserplus,html4',
       silverlight_xap_url:  '/assets/plupload.silverlight.xap',
@@ -39,14 +39,15 @@
 
       var $container = $(this);
       settings.container = $container.attr('id');
-      
+      var modelAndRelation = $container.data('model').replace('::','-') + "-" + $container.data('relation');
+
       // setup unique ids from classes
       $container.find('.' + settings.browse_button).attr('id', settings.container + '-' + settings.browse_button);
       $container.find('.' + settings.drop_element).attr('id', settings.container + '-' + settings.drop_element);
       $container.find('.' + settings.queue_element).attr('id', settings.container + '-' + settings.queue_element);
       $container.find('.' + settings.target_list).attr('id', settings.container + '-' + settings.target_list);
       $container.find('.' + settings.upload_button).attr('id', settings.container + '-' + settings.upload_button);
-      
+
       var uploader = new plupload.Uploader({
         browse_button:        settings.container + '-' + settings.browse_button,
         container:            settings.container,
@@ -58,6 +59,7 @@
           relation:           $container.data('relation'),
           model:              $container.data('model'),
           partial:            $container.data('partial') === undefined ? '' : $container.data('partial'),
+          loader_partial:     $container.data('loader-partial') === undefined ? '' : $container.data('loader-partial'),
           embedded_in_model:  $container.data('embedded-in-model') === undefined ? '' : $container.data('embedded-in-model'),
           embedded_in_id:     $container.data('embedded-in-id') === undefined ? '' : $container.data('embedded-in-id')
         },
@@ -70,45 +72,6 @@
 
       uploader.bind('Init', function(up, params) {
         if ($('#' + settings.container + '-runtimeInfo').length > 0) $('#' + settings.container + '-runtimeInfo').text("Current runtime: " + params.runtime);
-        // if ($container.find("dt").length > 0 && $container.find("dt").text() == "") $container.find("dt").text($container.attr('id'));
-
-        var modelAndRelation = $container.data('model') + "-" + $container.data('relation');
-
-        $("#" + $container.attr("id") + " a.remove").live('click', function() {
-          var $attachment = $(this).parents('.attachment');
-          var $attachmentUploader = $(this).parents('.attachmentUploader');
-          
-          $.get('/remove', {
-            model: $container.data('model'),
-            id: $container.data('id'),
-            relation: $container.data('relation'),
-            relation_id: $attachment.data('id'),
-            embedded_in_model: $attachmentUploader.data('embedded-in-model'),
-            embedded_in_id: $attachmentUploader.data('embedded-in-id')
-          }, function(data) {
-            $attachment.remove();
-          });
-        });
-
-        $("#attachmentVideoUploader" + modelAndRelation).live('click', function() {
-          var $attachment = $(this).parents('.attachment');
-          var $attachmentUploader = $(this).parents('.attachmentUploader');
-          var $videoField = $("#attachmentVideoUploaderField" + modelAndRelation);
-
-          $.get('/upload', {
-            model: $container.data('model'),
-            id: $container.data('id'),
-            relation: $container.data('relation'),
-            relation_id: $attachment.data('id'),
-            embedded_in_model: $attachmentUploader.data('embedded-in-model'),
-            embedded_in_id: $attachmentUploader.data('embedded-in-id'),
-            partial: $container.data('partial') === undefined ? '' : $container.data('partial'),
-            video: $videoField.val()
-          }, function(data) {
-            $("#" + $container.attr("id") + "-loadedAttachments").append(data);
-            $videoField.val("");
-          });
-        });
       });
 
       $('#' + settings.container + '-' + settings.upload_button).click(function(e) {
@@ -152,11 +115,57 @@
         uploader.bind('FileUploaded', function(up, file, response) {
           $('#' + file.id).addClass('completed');
           $('#' + file.id + " span.status").html("100%");
-          $("#" + container + '-' + target_list).append(response.response);
+          $("#" + modelAndRelation + '-' + target_list).append(response.response);
         });
       })(settings.container, settings.queue_element, settings.target_list);
 
     });
 
   };
-})(jQuery);
+})(jQuery);
+
+$(function() {
+  // video upload (youtube/vimeo)
+  $('.attachmentVideoUploader').on('click', 'a.attachmentVideoUploaderButton', function(){
+    var $container  = $(this).parent(".attachmentVideoUploader");
+    var $attachment = $(this).parents('.attachment');
+    var $videoField = $container.find(".attachmentVideoUploaderField");
+    var modelAndRelation = $container.data('model').replace('::','-') + "-" + $container.data('relation');
+
+    $.get('/upload', {
+        model: $container.data('model'),
+        id: $container.data('id'),
+        relation: $container.data('relation'),
+        relation_id: $attachment.data('id'),
+        embedded_in_model: $container.data('embedded-in-model'),
+        embedded_in_id: $container.data('embedded-in-id'),
+        partial: $container.data('partial') === undefined ? '' : $container.data('partial'),
+        video: $videoField.val()
+      }, function(data) {
+      $('#' + modelAndRelation + '-loadedAttachments').append(data);
+      $videoField.val("");
+    });
+  });
+
+  // attachment removal
+  $('.loadedAttachments').on('click', 'a.remove', function() {
+    var confirmation_message = $(this).data("confirmation");
+    var answer = confirm(confirmation_message);
+
+    if(answer) {
+      var $container  = $(this).parents('.loadedAttachments');
+      var $attachment = $(this).parents('.attachment');
+
+      $.get('/remove', {
+        model: $container.data('model'),
+        id: $container.data('id'),
+        relation: $container.data('relation'),
+        relation_id: $attachment.data('id'),
+        embedded_in_model: $container.data('embedded-in-model'),
+        embedded_in_id: $container.data('embedded-in-id')
+      }, function(data) {
+        $attachment.remove();
+      });
+    }
+  });
+});

data/app/controllers/media_magick/attach_controller.rb

@@ -8,20 +8,20 @@ module MediaMagick
     def create
       if !params[:embedded_in_model].blank?
         embedded_in = params[:embedded_in_model].constantize.find(params[:embedded_in_id])
-        klass = embedded_in.send(params[:model].pluralize.downcase).find(params[:id])
+        obj = embedded_in.send(params[:model].pluralize.downcase).find(params[:id])
       else
-        klass = params[:model].constantize.find(params[:id])
+        obj = params[:model].constantize.find(params[:id])
       end
 
       if params[:video]
-        attachment = klass.send(params[:relation].pluralize).create(video: params[:video])
+        attachment = create_video(obj, params)
       else
-        attachment = klass.send(params[:relation].pluralize).create(params[:relation].singularize => params[:file])
+        attachment = obj.send(params[:relation]).create(params[:relation].singularize => params[:file])
       end
 
-      klass.save
+      obj.save
 
-      partial = params[:partial].blank? ? "/#{attachment.class::TYPE}" : params[:partial]
+      partial = params[:loader_partial].blank? ? "/loader" : params[:loader_partial]
 
       render :partial => partial, :locals => {:model => params[:model], :relation => params[:relation], :attachment => attachment}
     end

data/app/helpers/media_magick/application_helper.rb

@@ -1,71 +1,81 @@
 module MediaMagick
   module ApplicationHelper
-    def attachment_container(model, relation, options = {})
-      data_attributes = {
-        model:    model.class.to_s,
-        id:       model.id.to_s,
-        relation: relation.to_s
-      }
+    def attachment_uploader(model, relation, type, options={})
+      id       = "#{model_name_for_id(model)}-#{relation.to_s}-#{type.to_s}"
+      classes  = "attachmentUploader"
+      partial  = get_partial("/uploader", options)
+      data     = data_attributes(model, relation, partial, options)
 
-      data_attributes.merge!(:partial => get_partial_name(options))
-      data_attributes.merge!(:embedded_in_id => options[:embedded_in].id.to_s, :embedded_in_model => options[:embedded_in].class.to_s) if options[:embedded_in]
+      if type == :video
+        partial = "/video_uploader"
+        classes = "attachmentVideoUploader"
+      end
 
-      content_tag :div, id: model.class.to_s.downcase << '-' << relation.to_s, class: 'attachmentUploader ' << relation.to_s, data: data_attributes do
+      content_tag :div, id: id, class: classes, data: data do
         if block_given?
           yield
         else
-          partial_attributes = {
-            model:             model,
-            relations:         relation,
-            newAttachments:    options[:newAttachments]    || {},
-            loadedAttachments: options[:loadedAttachments] || {},
-            partial:           get_partial_name(options)
-          }
-
-          render '/upload', partial_attributes
+          render partial
         end
       end
     end
 
-    def attachment_container_for_video(model, relation, options = {})
-      data_attributes = {
-        model:    model.class.to_s,
-        id:       model.id.to_s,
-        relation: relation.to_s
-      }
+    def attachment_loader(model, relation, options={})
+      id      = "#{model_name_for_id(model)}-#{relation.to_s}-loadedAttachments"
+      classes = "#{relation.to_s} loadedAttachments"
+      partial = get_partial("/loader", options)
+      data    = data_attributes(model, relation, partial, options)
 
-      data_attributes.merge!(:partial => get_partial_name(options))
-      data_attributes.merge!(:embedded_in_id => options[:embedded_in].id.to_s, :embedded_in_model => options[:embedded_in].class.to_s) if options[:embedded_in]
-
-      content_tag :div, id: model.class.to_s.downcase << '-' << relation.to_s, class: 'attachmentUploader ' << relation.to_s, data: data_attributes do
+      content_tag :div, id: id, class: classes, data: data do
         if block_given?
           yield
         else
-          partial_attributes = {
-            model:             model,
-            relations:         relation,
-            newAttachments:    options[:newAttachments]    || {},
-            loadedAttachments: options[:loadedAttachments] || {},
-            partial:           get_partial_name(options)
-          }
-
-          render '/video', partial_attributes
+          render partial:    partial,
+                 collection: model.send(relation),
+                 as:         :attachment,
+                 locals:     { model: nil, relation: nil }
         end
       end
     end
 
+    def attachment_container(model, relation, options = {})
+      warn "%" * 50
+      warn "[DEPRECATION] `attachment_container` is deprecated. please use `attachment_uploader`"
+      warn "%" * 50
+    end
+
+    def attachment_container_for_video
+      warn "%" * 50
+      warn "[DEPRECATION] `attachment_container_for_video` is deprecated. please use `attachment_uploader`"
+      warn "%" * 50
+    end
+
     private
+      def data_attributes(model, relation, partial, options)
+        data_attributes = {
+          model:    model_name(model),
+          id:       model.id.to_s,
+          relation: relation.to_s
+        }
 
-    def get_partial_name(options)
-      if options[:partial]
-        options[:partial]
-      else
-        if options[:as]
-          "/#{options[:as]}"
-        else
-          '/image'
-        end
+        data_attributes.merge!(partial: partial)
+        data_attributes.merge!(loader_partial: options[:loader_partial]) if options[:loader_partial]
+        data_attributes.merge!(embedded_in_id: options[:embedded_in].id.to_s, embedded_in_model: options[:embedded_in].class.to_s) if options[:embedded_in]
+
+        data_attributes
+      end
+
+      def get_partial(default, options)
+        return options[:partial] if options[:partial]
+        default
+      end
+
+      def model_name(model)
+        @model_name ||= model.class.to_s
+      end
+
+      def model_name_for_id(model)
+        model_name(model).gsub(/::/, '-')
       end
-    end
   end
-end
+end