media_magick 0.0.1 → 0.1.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm use 1.9.3@media_magick --create

data/CHANGELOG.md

@@ -0,0 +1,49 @@
+## 0.1.0 - June 11, 2012
+
+### Improvements
+
+* Implementation of `attaches_one`
+
+``` ruby
+class Album
+  include Mongoid::Document
+  include MediaMagick::Model
+
+  attaches_one :photo
+end
+
+album = Album.create
+album.photo.create(photo: params[:file])
+album.reload.photo.url
+album.reload.photo.filename
+```
+
+* `attachment_container` can personalize the partial
+
+``` erb
+<%= attachment_container @album, :photos, {}, {}, partial: 'albums/photo' %>
+```
+
+* Allows to create an image without a father in related relations
+
+``` ruby
+class Album
+  include Mongoid::Document
+  include MediaMagick::Model
+
+  attaches_many :photos, :relation => :referenced
+end
+
+album = Album.new
+photo = album.photos.create(photo: params[:file])
+```
+
+* Allow the `attachs_many` to be used in embedded documents
+
+### Deprecations
+
+* `MediaMagick::Model#attachs_many` is deprecated in favor of `attaches_many`.
+
+## 0.0.1 - April 11, 2012
+
+Initial release.

data/README.md

@@ -12,11 +12,42 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+## Getting Started
 
-    $ gem install media_magick
+### Model
 
-## Usage
+``` ruby
+class Album
+  include Mongoid::Document
+  include MediaMagick::Model
+
+  attachs_many :photos
+end
+```
+
+### Controller
+
+``` ruby
+def new
+  @album = Album.new
+end
+```
+
+### View
+
+``` erb
+<%= attachment_container @album, :files %>
+```
+
+### Javascript
+
+``` javascript
+$(document).ready(function () {
+  $(".attachmentUploader").pluploadIt();
+});
+```
+
+## Configuring
 
 ### Model
 
@@ -25,7 +56,7 @@ class Album
   include Mongoid::Document
   include MediaMagick::Model
 
-  attachs_many :photos, type: 'image'
+  attaches_many :photos, type: 'image'
 end
 
 album = Album.create
@@ -34,6 +65,22 @@ album.reload.photos.first.url
 album.reload.photos.first.filename
 ```
 
+#### attaches One
+
+``` ruby
+class Album
+  include Mongoid::Document
+  include MediaMagick::Model
+
+  attaches_one :photo, type: 'image'
+end
+
+album = Album.create
+album.photo.create(photo: params[:file])
+album.reload.photo.url
+album.reload.photo.filename
+```
+
 #### Custom classes
 
 ``` ruby
@@ -41,7 +88,7 @@ class Album
   include Mongoid::Document
   include MediaMagick::Model
 
-  attachs_many :photos, type: 'image' do
+  attaches_many :photos, type: 'image' do
     field :tags, type: Array
   end
 end
@@ -53,6 +100,8 @@ album.reload.photos.first.tags #=> ['ruby', 'guru']
 
 #### Custom uploader
 
+You also need to add `mini_magick` to your **Gemfile** in order to use it for thumbnail generation.
+
 ``` ruby
 class PhotoUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
@@ -74,7 +123,7 @@ class Album
   include Mongoid::Document
   include MediaMagick::Model
 
-  attachs_many :photos, type: 'image', uploader: PhotoUploader
+  attaches_many :photos, type: 'image', uploader: PhotoUploader
 end
 
 album = Album.create
@@ -82,6 +131,28 @@ album.photos.create(photo: params[:file])
 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:
+
+``` 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
 
 1. Fork it

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

@@ -56,7 +56,10 @@
         multipart_params: {
           id:       $container.data('id'),
           relation: $container.data('relation'),
-          model:    $container.data('model')
+          model:    $container.data('model'),
+          partial:  $container.data('partial'),
+          embedded_in_model: $container.data('embedded-in-model'),
+          embedded_in_id: $container.data('embedded-in-id')
         },
         resize:               settings.resize,
         runtimes:             settings.runtimes,
@@ -72,12 +75,15 @@
         $("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')
+            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();
           });

data/app/controllers/media_magick/attach_controller.rb

@@ -3,15 +3,40 @@ require 'action_controller/railtie'
 module MediaMagick
   class AttachController < ActionController::Base
     def create
-      klass = params[:model].constantize.find(params[:id])
-      attachment = klass.send(params[:relation].pluralize).create(params[:relation].singularize => params[:file])
-      klass.save
+      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
+      end
 
-      render :partial => "/#{attachment.class::TYPE}", :locals => {:attachment => attachment}
+      partial = params[:partial].blank? ? "/#{attachment.class::TYPE}" : params[:partial]
+
+      render :partial => partial, :locals => {:model => params[:model], :relation => params[:relation], :attachment => attachment}
     end
 
     def destroy
-      attachment = params[:model].classify.constantize.find(params[:id]).send(params[:relation].pluralize).find(params[:relation_id])
+      if !params[:embedded_in_model].blank?
+        attachment = params[:embedded_in_model].classify.constantize.find(params[:embedded_in_id]).send(params[:model].pluralize.downcase).find(params[:id]).send(params[:relation].pluralize).find(params[:relation_id])
+      else
+        attachment = params[:model].classify.constantize.find(params[:id]).send(params[:relation].pluralize).find(params[:relation_id])
+      end
+
       attachment.destroy
       render nothing: true
     end
@@ -20,7 +45,11 @@ module MediaMagick
       attachments = params[:elements]
       attachments = attachments.split(',') unless attachments.kind_of?(Array)
 
-      parent = params[:model].constantize.find(params[:model_id])
+      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
 
       attachments.each_with_index do |id, i|
         attachment = parent.send(params[:relation]).find(id)
@@ -32,7 +61,11 @@ module MediaMagick
     end
 
     def recreate_versions
-      parent = params[:model].classify.constantize.find(params[:model_id])
+      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
 
       errors = []
       parent.send(params[:relation].pluralize).each do |attachment|

data/app/helpers/media_magick/application_helper.rb

@@ -1,11 +1,28 @@
 module MediaMagick
   module ApplicationHelper
-    def attachment_container(model, relation, newAttachments = {}, loadedAttachments= {})
-      content_tag :div, id: model.class.to_s.downcase << '-' << relation.to_s, class: 'attachmentUploader ' << relation.to_s, data: { model: model.class.to_s, id: model.id.to_s, relation: relation.to_s } do
+    def attachment_container(model, relation, newAttachments = {}, loadedAttachments = {}, 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!(: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
-          render :partial => "/upload", :locals => { model: model, relations: relation, newAttachments: newAttachments, loadedAttachments: loadedAttachments }
+          partial_attributes = {
+            model:             model,
+            relations:         relation,
+            newAttachments:    newAttachments,
+            loadedAttachments: loadedAttachments,
+            partial:           options[:partial]
+          }
+
+          render '/upload', partial_attributes
         end
       end
     end

data/app/views/_file.html.erb

@@ -1,4 +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" %>
+
+  <%= hidden_field_tag "#{model.parameterize}[#{relation.singularize}_ids][]", attachment.id if model && relation %>
 </li>

data/app/views/_image.html.erb

@@ -1,4 +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" %>
+
+  <%= hidden_field_tag "#{model.parameterize}[#{relation.singularize}_ids][]", attachment.id if model && relation %>
 </li>

data/app/views/_upload.html.erb

@@ -7,11 +7,13 @@
   <a class="uploadAttachments btn" href="javascript://"><%= t('media_magick.upload') %></a>
 </div>
 <ul class="loadedAttachments <%= loadedAttachments[:class] %>">
-  <% for attachment in model.send(relations).each do %>
-    <% if attachment.class::TYPE.to_s == 'file' %>
+  <% 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 } %>
+      <%= render :partial => "/image", :locals => { :attachment => attachment, :model => nil, :relation => nil } %>
     <% end %>
   <% end %>
 </ul>

data/lib/media_magick/model.rb

@@ -8,6 +8,15 @@ module MediaMagick
 
     module ClassMethods
       def attachs_many(name, options = {}, &block)
+        warn "[DEPRECATION] `attachs_many` is deprecated.  Please use `attaches_many` instead."
+        attaches_many(name, options, &block)
+      end
+
+      #
+      # TODO 
+      # * refactor these methods to remove duplication 
+      #
+      def attaches_many(name, options = {}, &block)
         klass = Class.new do
           include Mongoid::Document
           extend CarrierWave::Mount
@@ -15,9 +24,57 @@ module MediaMagick
           field :priority, type: Integer, default: 0
           default_scope asc(:priority)
 
-          embedded_in :attachmentable, polymorphic: true
+          if options[:relation] == :referenced
+            belongs_to :attachmentable, polymorphic: true
+          else
+            embedded_in :attachmentable, polymorphic: true
+          end
+
+          mount_uploader name.to_s.singularize, (options[:uploader] || AttachmentUploader)
+
+          self.const_set "TYPE", options[:type] || :image
+          self.const_set "ATTACHMENT", name.to_s.singularize
+
+          class_eval(&block) if block_given?
+
+          def method_missing(method, args = nil)
+            return self.send(self.class::ATTACHMENT).file.filename if method == :filename
+            self.send(self.class::ATTACHMENT).send(method)
+          end
+        end
+
+        name_camelcase = name.to_s.camelcase
+        Object.const_set "#{self}#{name_camelcase}", klass
+
+        if options[:relation] == :referenced
+          klass.collection_name = "#{self.name}_#{name.to_s.camelcase}".parameterize
+
+          has_many(name, :as => :attachmentable, class_name: "#{self}#{name_camelcase}")
+
+          field "#{name.to_s.singularize}_ids", type: Array
+
+          before_create do
+            ids = self.send("#{name.to_s.singularize}_ids") || []
+
+            ids.each do |id|
+              "#{self.class}#{name_camelcase}".constantize.find(id).update_attributes(attachmentable: self)
+            end
+          end
+        else
+          embeds_many(name, :as => :attachmentable, class_name: "#{self}#{name_camelcase}")
+        end
+      end
+
+      def attaches_one(name, options = {}, &block)
+        klass = Class.new do
+          include Mongoid::Document
+          extend CarrierWave::Mount
+
+          embedded_in name
           mount_uploader name.to_s.singularize, (options[:uploader] || AttachmentUploader)
 
+          accepts_nested_attributes_for name.to_s.singularize
+
           self.const_set "TYPE", options[:type] || :image
           self.const_set "ATTACHMENT", name.to_s.singularize
 
@@ -30,9 +87,9 @@ module MediaMagick
         end
 
         name_camelcase = name.to_s.camelcase
-        Object.const_set "#{self.name}#{name_camelcase}", klass
+        Object.const_set "#{self}#{name_camelcase}", klass
 
-        embeds_many(name, :as => :attachmentable, class_name: "#{self}#{name_camelcase}")
+        embeds_one name, class_name: "#{self}#{name_camelcase}", cascade_callbacks: true
       end
     end
   end

data/lib/media_magick/version.rb

@@ -1,3 +1,3 @@
 module MediaMagick
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/media_magick.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ['contato@lucasrenan.com', 'rbrancher@gmail.com', 'tiagogodinho3@gmail.com']
   gem.description   = %q{MediaMagick aims to make dealing with multimedia resources a very easy task – like magic.}
   gem.summary       = %q{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.}
-  gem.homepage      = ''
+  gem.homepage      = 'https://github.com/nudesign/media_magick'
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -23,6 +23,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'bson_ext',    '~> 1.6.0'
   gem.add_development_dependency 'mini_magick', '~> 3.4'
   gem.add_development_dependency 'rake',        '~> 0.9'
-  gem.add_development_dependency 'rspec-rails', '~> 2.9.0'
+  gem.add_development_dependency 'rspec-rails', '~> 2.10.1'
   gem.add_development_dependency 'simplecov',   '~> 0.6.1'
 end

data/spec/controllers/media_magick/attach_controller_spec.rb

@@ -16,6 +16,36 @@ describe MediaMagick::AttachController do
 
         response.body.should =~ /nu.jpg/m
       end
+
+      it "creates a new photo for embedded models" do
+        album = Album.create
+        track = album.tracks.create
+
+        expect {
+          post :create, { embedded_in_id: album.id, embedded_in_model: 'Album', model: 'Track', id: track.id, relation: 'files', file: fixture_file_upload("#{File.expand_path('../../..',  __FILE__)}/support/fixtures/nu.jpg") }
+        }.to change { track.reload.files.count }.by(1)
+
+        response.should render_template('_image')
+
+        response.body.should =~ /nu.jpg/m
+      end
+
+      it "render a personalized partial" do
+        album = Album.create
+        post :create, { model: 'Album', id: album.id, relation: 'photos', partial: 'albums/photo', file: fixture_file_upload("#{File.expand_path('../../..',  __FILE__)}/support/fixtures/nu.jpg") }
+        response.should render_template('albums/_photo')
+      end
+
+      it 'creates a new photo without parent' do
+        album = Album.new
+        album_files = AlbumFiles.create(file: File.new("#{File.expand_path('../../..',  __FILE__)}/support/fixtures/nu.jpg"))
+
+        AlbumFiles.should_receive(:create!).and_return(album_files)
+
+        post :create, { model: 'Album', id: album.id, relation: 'files', file: fixture_file_upload("#{File.expand_path('../../..',  __FILE__)}/support/fixtures/nu.jpg") }
+
+        response.body.should =~ /nu.jpg/m
+      end
     end
   end
 
@@ -28,6 +58,16 @@ describe MediaMagick::AttachController do
         delete :destroy, { model: 'Album', id: album.id, relation: 'photos', relation_id: photo.id }
       }.to change { album.reload.photos.count }.by(-1)
     end
+
+    it "destroys the requested photo for embedded models" do
+      album = Album.create
+      track = album.tracks.create
+      file = track.files.create(file: File.new(fixture_file_upload("#{File.expand_path('../../..',  __FILE__)}/support/fixtures/nu.jpg")))
+
+      expect {
+        delete :destroy, { embedded_in_model: 'Album', embedded_in_id: album.id, model: 'Track', id: track.id, relation: 'files', relation_id: file.id }
+      }.to change { track.reload.files.count }.by(-1)
+    end
   end
 
   describe "update priority" do
@@ -44,6 +84,21 @@ describe MediaMagick::AttachController do
       photo1.reload.priority.should eq(0)
       photo2.reload.priority.should eq(1)
     end
+
+    it "updates the attachments priority for embedded models" do
+      album = Album.create
+      track = album.tracks.create
+      file1 = track.files.create(file: File.new(fixture_file_upload("#{File.expand_path('../../..',  __FILE__)}/support/fixtures/nu.jpg")))
+      file2 = track.files.create(file: File.new(fixture_file_upload("#{File.expand_path('../../..',  __FILE__)}/support/fixtures/nu.jpg")))
+
+      id1 = file1.id.to_s
+      id2 = file2.id.to_s
+
+      put :update_priority, { elements: [id1, id2], embedded_in_model: 'Album', embedded_in_id: album.id, model: 'Track', model_id: track.id.to_s, relation: 'files' }
+
+      file1.reload.priority.should eq(0)
+      file2.reload.priority.should eq(1)
+    end
   end
 
   describe "recriate versions" do
@@ -55,5 +110,15 @@ describe MediaMagick::AttachController do
 
       response.status.should be(302)
     end
+
+    it "recriate images versions for embedded models" do
+      album = Album.create
+      track = album.tracks.create
+
+      request.env["HTTP_REFERER"] = "/"
+      put :recreate_versions, { embedded_in_model: 'album', embedded_in_id: album.id, model: 'track', model_id: track.id.to_s, relation: 'files' }
+
+      response.status.should be(302)
+    end
   end
 end

data/spec/dummy/app/assets/javascripts/users.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/spec/dummy/app/assets/stylesheets/scaffold.css

@@ -0,0 +1,56 @@
+body { background-color: #fff; color: #333; }
+
+body, p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size:   13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a { color: #000; }
+a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+div.field, div.actions {
+  margin-bottom: 10px;
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+}
+
+#error_explanation h2 {
+  text-align: left;
+  font-weight: bold;
+  padding: 5px 5px 5px 15px;
+  font-size: 12px;
+  margin: -7px;
+  margin-bottom: 0px;
+  background-color: #c00;
+  color: #fff;
+}
+
+#error_explanation ul li {
+  font-size: 12px;
+  list-style: square;
+}

data/spec/dummy/app/assets/stylesheets/users.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/spec/dummy/app/controllers/users_controller.rb

@@ -0,0 +1,84 @@
+class UsersController < ApplicationController
+  # GET /users
+  # GET /users.json
+  def index
+    @users = User.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @users }
+    end
+  end
+
+  # GET /users/1
+  # GET /users/1.json
+  def show
+    @user = User.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @user }
+    end
+  end
+
+  # GET /users/new
+  # GET /users/new.json
+  def new
+    @user = User.new
+    @user.build_photo
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @user }
+    end
+  end
+
+  # GET /users/1/edit
+  def edit
+    @user = User.find(params[:id])
+  end
+
+  # POST /users
+  # POST /users.json
+  def create
+    @user = User.new(params[:user])
+
+    respond_to do |format|
+      if @user.save
+        format.html { redirect_to @user, notice: 'User was successfully created.' }
+        format.json { render json: @user, status: :created, location: @user }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @user.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /users/1
+  # PUT /users/1.json
+  def update
+    @user = User.find(params[:id])
+
+    respond_to do |format|
+      if @user.update_attributes(params[:user])
+        format.html { redirect_to @user, notice: 'User was successfully updated.' }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @user.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /users/1
+  # DELETE /users/1.json
+  def destroy
+    @user = User.find(params[:id])
+    @user.destroy
+
+    respond_to do |format|
+      format.html { redirect_to users_url }
+      format.json { head :no_content }
+    end
+  end
+end

data/spec/dummy/app/helpers/users_helper.rb

@@ -0,0 +1,2 @@
+module UsersHelper
+end

data/spec/dummy/app/models/album.rb

@@ -2,13 +2,15 @@ class Album
   include Mongoid::Document
   include MediaMagick::Model
 
-  attachs_many :photos
-  attachs_many :files
-  attachs_many :compound_name_files
+  embeds_many :tracks
 
-  attachs_many :images do
+  attaches_many :photos
+  attaches_many :files, :relation => :referenced
+  attaches_many :compound_name_files
+
+  attaches_many :images do
     field :tags, type: Array
   end
 
-  attachs_many :pictures, uploader: PictureUploader
+  attaches_many :pictures, uploader: PictureUploader
 end

data/spec/dummy/app/models/product.rb

@@ -2,8 +2,8 @@ class Product
   include Mongoid::Document
   include MediaMagick::Model
 
-  attachs_many :files
-  attachs_many :images, uploader: PictureUploader do
+  attaches_many :files
+  attaches_many :images, uploader: PictureUploader do
     field :tags, type: Array
   end
 end

data/spec/dummy/app/models/track.rb

@@ -0,0 +1,8 @@
+class Track
+  include Mongoid::Document
+  include MediaMagick::Model
+
+  embedded_in :album
+
+  attaches_many :files
+end

data/spec/dummy/app/models/user.rb

@@ -0,0 +1,10 @@
+class User
+  include Mongoid::Document
+  include MediaMagick::Model
+
+  field :name, type: String
+
+  attaches_one :photo, uploader: PictureUploader
+  attaches_one :compound_name_file
+  attaches_one :file, type: :file
+end

data/spec/dummy/app/views/albums/_photo.html.erb

@@ -0,0 +1 @@
+albums/photo

data/spec/dummy/app/views/layouts/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Dummy</title>
+  <title>MediaMagick</title>
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>

data/spec/dummy/app/views/users/_form.html.erb

@@ -0,0 +1,29 @@
+<%= form_for(@user, html: {multipart: true}) do |f| %>
+  <% if @user.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
+
+      <ul>
+      <% @user.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :name %><br />
+    <%= f.text_field :name %>
+  </div>
+  <%= f.fields_for :photo do |p| %>
+  <div class="field">
+    <%= p.label :photo %><br />
+    <%= p.file_field :photo %>
+    <%= p.hidden_field :photo_cache %>
+  </div>
+  <% end %>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/spec/dummy/app/views/users/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing user</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @user %> |
+<%= link_to 'Back', users_path %>

data/spec/dummy/app/views/users/index.html.erb

@@ -0,0 +1,23 @@
+<h1>Listing users</h1>
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @users.each do |user| %>
+  <tr>
+    <td><%= user.name %></td>
+    <td><%= link_to 'Show', user %></td>
+    <td><%= link_to 'Edit', edit_user_path(user) %></td>
+    <td><%= link_to 'Destroy', user, confirm: 'Are you sure?', method: :delete %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New User', new_user_path %>

data/spec/dummy/app/views/users/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New user</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', users_path %>

data/spec/dummy/app/views/users/show.html.erb

@@ -0,0 +1,15 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <b>Name:</b>
+  <%= @user.name %>
+</p>
+
+<p>
+  <b>Photo:</b>
+  <%= image_tag @user.photo.url if @user.photo %>
+</p>
+
+
+<%= link_to 'Edit', edit_user_path(@user) %> |
+<%= link_to 'Back', users_path %>

data/spec/dummy/config/routes.rb

@@ -1,4 +1,6 @@
 Rails.application.routes.draw do
 
+  resources :users
+
   mount MediaMagick::Engine => "/media_magick"
 end

data/spec/helpers/media_magick/application_helper_spec.rb

@@ -11,6 +11,25 @@ describe MediaMagick do
         end.should eq('<div class="attachmentUploader photos" data-id="12345678" data-model="Album" data-relation="photos" id="album-photos"></div>')
       end
 
+      it 'should include partial option on data attributes' do
+        album = Album.new
+        album.stub(id: '12345678')
+
+        helper.attachment_container(album, :photos, {}, {}, partial: 'albums/photo') do
+        end.should eq('<div class="attachmentUploader photos" data-id="12345678" data-model="Album" data-partial="albums/photo" data-relation="photos" id="album-photos"></div>')
+      end
+
+      it 'should create a div.attachmentUploader.photos for embedded models' do
+        album = Album.new
+        album.stub(id: '12345678')
+
+        track = album.tracks.new
+        track.stub(id: '87654321')
+
+        helper.attachment_container(track, :files, {}, {}, embedded_in: album) do
+        end.should eq('<div class="attachmentUploader files" data-embedded-in-id="12345678" data-embedded-in-model="Album" data-id="87654321" data-model="Track" data-relation="files" id="track-files"></div>')
+      end
+
       it 'should renders default partial if block is not given' do
         photo = AlbumPhotos.new
         photo.stub(filename: 'photo.jpg', url: 'url/photo.jpg')

data/spec/integration/images_spec.rb

@@ -4,44 +4,80 @@ describe 'Images' do
   let(:image_file)     { File.new("#{File.expand_path('../..',  __FILE__)}/support/fixtures/nu.jpg") }
   let(:non_image_file) { File.new("#{File.expand_path('../..',  __FILE__)}/support/fixtures/nu.txt") }
 
-  it 'should save the image on mongoid document' do
-    product = Product.create
-    product.images.create(image: image_file)
+  context "when uploading many files" do
+    it 'should save the image on mongoid document' do
+      product = Product.create
+      product.images.create(image: image_file)
 
-    product.reload.images.first.filename.should eq('nu.jpg')
-  end
+      product.reload.images.first.filename.should eq('nu.jpg')
+    end
 
-  it 'should save the file on mongoid document' do
-    product = Product.create
-    file = product.files.create(file: non_image_file)
+    it 'should save the file on mongoid document' do
+      product = Product.create
+      file = product.files.create(file: non_image_file)
 
-    product.reload.files.first.url.should eq("/uploads/product_files/file/#{file.id}/nu.txt")
-  end
+      product.reload.files.first.url.should eq("/uploads/product_files/file/#{file.id}/nu.txt")
+    end
 
-  it 'should access Uploader methods from relation class' do
-    product = Product.create
-    image = product.images.create(image: image_file)
+    it 'should access Uploader methods from relation class' do
+      product = Product.create
+      image = product.images.create(image: image_file)
 
-    image.url.should eq("/uploads/product_images/image/#{image.id}/nu.jpg")
-  end
+      image.url.should eq("/uploads/product_images/image/#{image.id}/nu.jpg")
+    end
 
-  it 'should access filename from relation class' do
-    product = Product.create
-    product.images.create(image: image_file)
+    it 'should access filename from relation class' do
+      product = Product.create
+      product.images.create(image: image_file)
 
-    product.reload.images.first.filename.should eq('nu.jpg')
-  end
+      product.reload.images.first.filename.should eq('nu.jpg')
+    end
 
-  it 'should add fields on relation class' do
-    product = Product.create
-    product.images.create(image: image_file, tags: ['ruby', 'guru'])
+    it 'should add fields on relation class' do
+      product = Product.create
+      product.images.create(image: image_file, tags: ['ruby', 'guru'])
 
-    product.reload.images.first.tags.should eq(['ruby', 'guru'])
+      product.reload.images.first.tags.should eq(['ruby', 'guru'])
+    end
+
+    it 'should create version of images' do
+      product = Product.create
+      image = product.images.create(image: image_file)
+      product.reload.images.first.thumb.url.should eq("/uploads/product_images/image/#{image.id}/thumb_nu.jpg")
+    end
   end
 
-  it 'should create version of images' do
-    product = Product.create
-    image = product.images.create(image: image_file)
-    product.reload.images.first.thumb.url.should eq("/uploads/product_images/image/#{image.id}/thumb_nu.jpg")
+  context "when uploading one file" do
+    let(:user) { User.create }    
+
+    it 'should save the image on mongoid document' do
+      user.create_photo(photo: image_file)
+
+      user.photo.filename.should eq('nu.jpg')
+    end
+
+    it 'should save the file on mongoid document' do
+      file = user.create_file(file: non_image_file)
+
+      user.file.url.should eq("/uploads/user_file/file/#{file.id}/nu.txt")
+    end
+
+    it 'should access Uploader methods from relation class' do
+      photo = user.create_photo(photo: image_file)
+
+      photo.url.should eq("/uploads/user_photo/photo/#{photo.id}/nu.jpg")
+    end
+
+    it 'should access filename from relation class' do
+      user.create_photo(photo: image_file)
+
+      user.photo.filename.should eq('nu.jpg')
+    end
+
+    it 'should create version of images' do
+      photo = user.create_photo(photo: image_file)
+
+      user.photo.thumb.url.should eq("/uploads/user_photo/photo/#{photo.id}/thumb_nu.jpg")
+    end
   end
 end

data/spec/lib/media_magick/model_spec.rb

@@ -3,18 +3,36 @@
 require 'spec_helper'
 
 describe MediaMagick::Model do
-  describe '.attachs_many' do
+  describe 'including class methods' do
     before(:all) do
-      @class = Album
-      @instance = @class.new
+      @klass = User
+    end
+
+    it "should includes .attaches_many" do      
+      @klass.should respond_to(:attaches_many)
+    end
+
+    it "should includes .attaches_one" do      
+      @klass.should respond_to(:attaches_one)
+    end
+  end
+
+  describe '.attaches_many' do
+    before(:all) do
+      @klass = Album
+      @instance = @klass.new
+    end
+
+    it 'should create a "has_many" relationship with photos' do
+      @klass.relations['files'].relation.should eq(Mongoid::Relations::Referenced::Many)
     end
 
     it 'should create a "embeds_many" relationship with photos' do
-      @class.relations['photos'].relation.should eq(Mongoid::Relations::Embedded::Many)
+      @klass.relations['photos'].relation.should eq(Mongoid::Relations::Embedded::Many)
     end
 
     it 'should create a relationship with photos through AlbumPhotos model' do
-      @class.relations['photos'].class_name.should eq('AlbumPhotos')
+      @klass.relations['photos'].class_name.should eq('AlbumPhotos')
     end
 
     describe "naming relations" do
@@ -30,16 +48,15 @@ describe MediaMagick::Model do
       it { should be_an_instance_of(AlbumPhotos) }
 
       it 'should perform a block in the context of the class' do
-        @class.attachs_many(:documents) do
-          def test_method
-          end
+        @klass.attaches_many(:documents) do
+          def test_method; end
         end
 
         @instance.documents.new.should respond_to(:test_method)
       end
 
       it "should be ordered by ascending priority" do
-        @instance = @class.new
+        @instance = @klass.new
 
         photo2 = @instance.photos.create(priority: 1)
         photo1 = @instance.photos.create(priority: 0)
@@ -66,7 +83,7 @@ describe MediaMagick::Model do
               storage :file
             end
 
-            @class.attachs_many :musics, uploader: AmazonS3Uploader
+            @klass.attaches_many :musics, uploader: AmazonS3Uploader
           end
 
           subject { @instance.musics.new }
@@ -77,4 +94,42 @@ describe MediaMagick::Model do
       end
     end
   end
+
+  describe '.attaches_one' do
+    before(:all) do
+      @klass    = User
+      @instance = @klass.new
+    end
+
+    it 'should create an embedded model' do
+      @klass.relations['photo'].class_name.should eq('UserPhoto')
+    end
+
+    it 'should create a "embeds_one" relation' do
+      @klass.relations['photo'].relation.should eq(Mongoid::Relations::Embedded::One)
+    end
+
+    describe "naming relations" do
+      it "should transform related compound name classe to camel case" do
+        @instance.should respond_to(:compound_name_file)
+        @instance.build_compound_name_file.class.should eq(UserCompoundNameFile)
+      end
+    end
+
+    describe "related method" do
+      subject { @instance.build_photo }
+
+      it { should be_an_instance_of(UserPhoto) }
+
+      it 'should perform a block in the context of the class' do
+        @klass.attaches_one(:image) do
+          def test_method; end
+        end
+                
+        @instance.build_image.should respond_to(:test_method) 
+      end
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: media_magick
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.10.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .rvmrc
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -202,15 +204,27 @@ files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/users.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/stylesheets/scaffold.css
+- spec/dummy/app/assets/stylesheets/users.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/users_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/helpers/users_helper.rb
 - spec/dummy/app/mailers/.gitkeep
-- spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/album.rb
 - spec/dummy/app/models/product.rb
+- spec/dummy/app/models/track.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/uploaders/picture_uploader.rb
+- spec/dummy/app/views/albums/_photo.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/users/_form.html.erb
+- spec/dummy/app/views/users/edit.html.erb
+- spec/dummy/app/views/users/index.html.erb
+- spec/dummy/app/views/users/new.html.erb
+- spec/dummy/app/views/users/show.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -241,7 +255,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/fixtures/nu.jpg
 - spec/support/fixtures/nu.txt
-homepage: ''
+homepage: https://github.com/nudesign/media_magick
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -255,7 +269,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 29995181221307107
+      hash: -141377081064224492
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,10 +278,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 29995181221307107
+      hash: -141377081064224492
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: MediaMagick aims to make dealing with multimedia resources a very easy task
@@ -278,15 +292,27 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/users.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/stylesheets/scaffold.css
+- spec/dummy/app/assets/stylesheets/users.css
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/users_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/helpers/users_helper.rb
 - spec/dummy/app/mailers/.gitkeep
-- spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/album.rb
 - spec/dummy/app/models/product.rb
+- spec/dummy/app/models/track.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/uploaders/picture_uploader.rb
+- spec/dummy/app/views/albums/_photo.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/users/_form.html.erb
+- spec/dummy/app/views/users/edit.html.erb
+- spec/dummy/app/views/users/index.html.erb
+- spec/dummy/app/views/users/new.html.erb
+- spec/dummy/app/views/users/show.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb