media_magick 0.1.0 → 0.1.1

data/.gitignore

@@ -6,4 +6,5 @@ spec/dummy/tmp/
 spec/dummy/public/uploads
 spec/dummy/.sass-cache
 uploads
-.DS_Store
+.DS_Store
+.rvmrc

data/.travis.yml

@@ -1,11 +1,15 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
-  - ruby-head
+
+services: mongodb
+
 notifications:
   email:
     - contato@lucasrenan.com
     - rbrancher@gmail.com
     - tiagogodinho3@gmail.com
-    - stefano@heavenstudio.com.br
+
+gemfile:
+  - Gemfile
+  - gemfiles/mongoid-3.0.gemfile

data/CHANGELOG.md

@@ -1,3 +1,90 @@
+## Next Release (branch: master)
+
+### Improvements
+
+* Adding support to videos.
+
+Model:
+
+``` rb
+class Album
+  include Mongoid::Document
+  include MediaMagick::Model
+
+  attaches_many :medias, allow_videos: true
+end
+
+album = Album.create
+album.medias.create(video: 'youtube.com/watch?v=FfUHkPf9D9k')
+album.reload.photos.first.url
+album.reload.photos.first.filename
+
+# Specific methods
+
+album.reload.medias.first.type   #=> 'video'
+album.reload.medias.first.video  #=> 'youtube.com/watch?v=FfUHkPf9D9k'
+album.reload.medias.first.source #=> <iframe>youtube video</iframe>
+```
+
+View:
+
+``` ruby
+attachment_container_for_video @album, :files
+```
+
+* Adding support to Mongoid 3.
+
+### Major Changes (Backwards Incompatible)
+
+* Media Magick no longer supports Ruby 1.8.7.
+
+* Adding the `as` option in `attachment_container` to define the partial to be rendered
+
+After:
+
+``` rb
+class Album
+  include Mongoid::Document
+  include MediaMagick::Model
+
+  attaches_many :files, type: 'file'
+end
+```
+
+Now:
+
+``` rb
+attachment_container @album, :files, as: 'file'
+```
+
+* Now **newAttachments** and **loadedAttachments** are options for `attachment_container`
+
+After:
+
+``` rb
+attachment_container @album, :photos, { class: 'thumbnails' }, { class: 'span3' }, partial: 'albums/photo'
+
+# without newAttachments and loadedAttachments
+attachment_container @album, :photos, {}, {}, partial: 'albums/photo'
+```
+
+Now:
+
+``` rb
+attachment_container @album, :photos, newAttachments: { class: 'thumbnails' }, loadedAttachments: { class: 'span3' }, partial: 'albums/photo'
+
+# without newAttachments and loadedAttachments
+attachment_container @album, :photos, partial: 'albums/photo'
+```
+
+* `MediaMagick::Model#attachs_many` has been removed in favor of `attaches_many`.
+
+* Removing related relations and the ability to create an image without a father.
+
+### Resolved Issues
+
+* Javascript returning undefined instead of "" prevents attachments from working at embedded documents
+
 ## 0.1.0 - June 11, 2012
 
 ### Improvements
@@ -38,7 +125,11 @@ album = Album.new
 photo = album.photos.create(photo: params[:file])
 ```
 
-* Allow the `attachs_many` to be used in embedded documents
+* Allow the `attaches_many` to be used in embedded documents
+
+``` erb
+<%= attachment_container @album, :photos, {}, {}, embedded_in: @album.artist %>
+```
 
 ### Deprecations
 

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?travis)](http://gemnasium.com/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/badge.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.
 

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

@@ -54,12 +54,12 @@
         flash_swf_url:        settings.flash_swf_url,
         max_file_size:        settings.max_file_size,
         multipart_params: {
-          id:       $container.data('id'),
-          relation: $container.data('relation'),
-          model:    $container.data('model'),
-          partial:  $container.data('partial'),
-          embedded_in_model: $container.data('embedded-in-model'),
-          embedded_in_id: $container.data('embedded-in-id')
+          id:                 $container.data('id'),
+          relation:           $container.data('relation'),
+          model:              $container.data('model'),
+          partial:            $container.data('partial') === undefined ? '' : $container.data('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')
         },
         resize:               settings.resize,
         runtimes:             settings.runtimes,
@@ -71,9 +71,10 @@
       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'));
-        
-        $("a.remove").live('click', function() {
-        
+
+        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');
           
@@ -88,6 +89,26 @@
             $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) {

data/app/controllers/media_magick/attach_controller.rb

@@ -1,30 +1,26 @@
 require 'action_controller/railtie'
+require 'media_magick/controller/helpers'
 
 module MediaMagick
   class AttachController < ActionController::Base
+    include MediaMagick::Controller::Helpers
+
     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])
-        attachment = klass.send(params[:relation].pluralize).create(params[:relation].singularize => params[:file])
-        klass.save
       else
-        if params[:model].constantize.relations[params[:relation]][:relation] == Mongoid::Relations::Referenced::Many
-          klass = params[:model].constantize.where(id: params[:id])
-          klass = klass.empty? ? nil : klass.first
-
-          if klass
-            attachment = klass.send(params[:relation].pluralize).create(params[:relation].singularize => params[:file])
-          else
-            attachment = params[:model].constantize.relations[params[:relation]][:class_name].constantize.create!(params[:relation].singularize => params[:file])
-          end
-        else
-          klass = params[:model].constantize.find(params[:id])
-          attachment = klass.send(params[:relation].pluralize).create(params[:relation].singularize => params[:file])
-          klass.save
-        end
+        klass = params[:model].constantize.find(params[:id])
       end
 
+      if params[:video]
+        attachment = klass.send(params[:relation].pluralize).create(video: params[:video])
+      else
+        attachment = klass.send(params[:relation].pluralize).create(params[:relation].singularize => params[:file])
+      end
+
+      klass.save
+
       partial = params[:partial].blank? ? "/#{attachment.class::TYPE}" : params[:partial]
 
       render :partial => partial, :locals => {:model => params[:model], :relation => params[:relation], :attachment => attachment}
@@ -45,14 +41,10 @@ module MediaMagick
       attachments = params[:elements]
       attachments = attachments.split(',') unless attachments.kind_of?(Array)
 
-      if !params[:embedded_in_model].blank?
-        parent = params[:embedded_in_model].classify.constantize.find(params[:embedded_in_id]).send(params[:model].pluralize.downcase).find(params[:model_id])
-      else
-        parent = params[:model].constantize.find(params[:model_id])
-      end
+      doc = find_doc_by_params(params)
 
       attachments.each_with_index do |id, i|
-        attachment = parent.send(params[:relation]).find(id)
+        attachment = doc.send(params[:relation]).find(id)
         attachment.priority = i
         attachment.save
       end
@@ -61,14 +53,10 @@ module MediaMagick
     end
 
     def recreate_versions
-      if !params[:embedded_in_model].blank?
-        parent = params[:embedded_in_model].classify.constantize.find(params[:embedded_in_id]).send(params[:model].pluralize.downcase).find(params[:model_id])
-      else
-        parent = params[:model].classify.constantize.find(params[:model_id])
-      end
+      doc = find_doc_by_params(params)
 
       errors = []
-      parent.send(params[:relation].pluralize).each do |attachment|
+      doc.send(params[:relation].pluralize).each do |attachment|
         errors << attachment unless attachment.recreate_versions!
       end
 

data/app/helpers/media_magick/application_helper.rb

@@ -1,13 +1,13 @@
 module MediaMagick
   module ApplicationHelper
-    def attachment_container(model, relation, newAttachments = {}, loadedAttachments = {}, options = {})
+    def attachment_container(model, relation, options = {})
       data_attributes = {
         model:    model.class.to_s,
         id:       model.id.to_s,
         relation: relation.to_s
       }
 
-      data_attributes.merge!(:partial => options[:partial]) if options[:partial]
+      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
@@ -17,14 +17,55 @@ module MediaMagick
           partial_attributes = {
             model:             model,
             relations:         relation,
-            newAttachments:    newAttachments,
-            loadedAttachments: loadedAttachments,
-            partial:           options[:partial]
+            newAttachments:    options[:newAttachments]    || {},
+            loadedAttachments: options[:loadedAttachments] || {},
+            partial:           get_partial_name(options)
           }
 
           render '/upload', partial_attributes
         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
+      }
+
+      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
+        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
+        end
+      end
+    end
+
+    private
+
+    def get_partial_name(options)
+      if options[:partial]
+        options[:partial]
+      else
+        if options[:as]
+          "/#{options[:as]}"
+        else
+          '/image'
+        end
+      end
+    end
   end
 end

data/app/views/_file.html.erb

@@ -1,6 +1,6 @@
 <li class="attachment" data-id="<%= attachment.to_param %>">
-  <%= link_to attachment.filename, attachment.url unless attachment.file.nil? %>
-  <%= link_to t('media_magick.remove'), "javascript://", method: "delete", confirm: t('media_magick.confirm_removal'), class: "remove btn btn-mini btn-danger" %>
+  <%= link_to attachment.filename, attachment.url, download: attachment.filename  unless attachment.file.nil? %>
+  <%= link_to t('media_magick.remove'), "javascript://", method: "delete", class: "remove btn btn-mini btn-danger", data: { confirm: t('media_magick.confirm_removal') } %>
 
   <%= hidden_field_tag "#{model.parameterize}[#{relation.singularize}_ids][]", attachment.id if model && relation %>
 </li>

data/app/views/_image.html.erb

@@ -1,6 +1,6 @@
-<li class="attachment" id="<%= attachment.to_param %>" data-id="<%= attachment.to_param %>">
-  <%= image_tag attachment.url, alt: attachment.filename %>
-  <%= link_to t('media_magick.remove'), "javascript://", method: "delete", confirm: t('media_magick.confirm_removal'), class: "remove btn btn-mini btn-danger" %>
+<li class="attachment" id="<%= attachment.to_param %>" data-id="<%= attachment.to_param %>"> 
+  <%= image_tag attachment.url, alt: attachment.filename if attachment.file %>
+  <%= link_to t('media_magick.remove'), "javascript://", method: "delete", class: "remove btn btn-mini btn-danger", data: { confirm: t('media_magick.confirm_removal') } %>
 
   <%= hidden_field_tag "#{model.parameterize}[#{relation.singularize}_ids][]", attachment.id if model && relation %>
 </li>

data/app/views/_upload.html.erb

@@ -6,14 +6,7 @@
   <a class="pickAttachments btn" href="javascript://"><%= t('media_magick.select') %></a>
   <a class="uploadAttachments btn" href="javascript://"><%= t('media_magick.upload') %></a>
 </div>
+
 <ul class="loadedAttachments <%= loadedAttachments[:class] %>">
-  <% model.send(relations).each do |attachment| %>
-    <% if partial %>
-      <%= render partial, attachment: attachment %>
-    <% elsif attachment.class::TYPE.to_s == 'file' %>
-      <%= render :partial => "/file", :locals => { :attachment => attachment } %>
-    <% elsif attachment.class::TYPE.to_s == 'image' %>
-      <%= render :partial => "/image", :locals => { :attachment => attachment, :model => nil, :relation => nil } %>
-    <% end %>
-  <% end %>
-</ul>
+  <%= render partial: partial, collection: model.send(relations), :as => :attachment, :locals => { model: nil, relation: nil } %>
+</ul>

data/app/views/_video.html.erb

@@ -0,0 +1,8 @@
+<% id = "#{model.class.name}-#{relations}" %>
+
+<input type="text" id="attachmentVideoUploaderField<%= id %>">
+<a id="attachmentVideoUploader<%= id %>" href="javascript://">upload</a>
+
+<ul class="loadedAttachments <%= loadedAttachments[:class] %>">
+  <%= render partial: partial, collection: model.send(relations), :as => :attachment, :locals => { model: nil, relation: nil } %>
+</ul>

data/gemfiles/mongoid-3.0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'mongoid', '~> 3.0.0'
+
+gem 'jquery-rails'
+
+gemspec :path => '../'

data/lib/media_magick.rb

@@ -3,8 +3,4 @@ require 'plupload/rails'
 
 require 'media_magick/model'
 require 'media_magick/engine'
-require 'media_magick/version'
-
-module MediaMagick
-  # Your code goes here...
-end
+require 'media_magick/version'

data/lib/media_magick/controller/helpers.rb

@@ -0,0 +1,20 @@
+module MediaMagick
+  module Controller
+    module Helpers
+      extend ActiveSupport::Concern
+
+      # {"embedded_in_model"=>"embedded_model", 
+      #   "embedded_in_id"=>"embedded_id", "model"=>"model", 
+      #   "model_id"=>"id"
+      # }
+      def find_doc_by_params(params)
+        if params[:embedded_in_model].blank?                  
+          doc = params[:model].classify.constantize.find(params[:model_id])
+        else
+          doc = params[:embedded_in_model].classify.constantize.find(params[:embedded_in_id]).send(params[:model].pluralize.downcase).find(params[:model_id])          
+        end
+        doc
+      end
+    end
+  end
+end

data/lib/media_magick/engine.rb

@@ -6,4 +6,4 @@ module MediaMagick
       ActionView::Base.send :include, MediaMagick::ApplicationHelper
     end
   end
-end
+end