media_magick 0.2.0 → 0.3.0

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

@@ -0,0 +1,10 @@
+module Store
+  class Product
+    include Mongoid::Document
+    include MediaMagick::Model
+
+    field :name, :type => String
+
+    attaches_many :images
+  end
+end

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

@@ -4,7 +4,8 @@ class User
 
   field :name, type: String
 
-  attaches_one :photo, uploader: PictureUploader
+  attaches_one :photo,           uploader: PictureUploader
+  attaches_one :photo_and_video, uploader: PictureUploader, allow_videos: true
   attaches_one :compound_name_file
   attaches_one :file, type: :file
-end
+end

data/spec/dummy/app/uploaders/post_uploader.rb

@@ -1,7 +1,10 @@
 # encoding: utf-8
 
+require "media_magick/image/dimensions"
+
 class PostUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
+  include MediaMagick::Image::Dimensions
 
   storage :file
 
@@ -9,9 +12,14 @@ class PostUploader < CarrierWave::Uploader::Base
     "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
   end
 
-  process :resize_to_fill => [50, 50]
+  # process :resize_to_fill => [960, 544]
+
   version :thumb do
-    process :resize_to_fit => [300, 300]
+    process :resize_to_fit => [250, 136]
+  end
+
+  version :big do
+    process :resize_to_limit => [864, 489]
   end
 
-end
+end

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

@@ -22,13 +22,13 @@
 
   <h3>uploads</h3>
   <div class="field" style="overflow: hidden;">
-    <label>imagens and videos</label>
+    <label>images and videos</label>
     <%- if @post.new_record? -%>
       create first
     <%- else -%>
-      <%= attachment_container_for_video(@post, :images) %>
-      <br /><br />
-      <%= attachment_container @post, :images %>
+      <%= attachment_uploader(@post, :images, :video) %>
+      <%= attachment_uploader(@post, :images, :image) %>
+      <%= attachment_loader(@post, :images) %>
     <%- end -%>
   </div>
 
@@ -37,7 +37,18 @@
     <%- if @post.new_record? -%>
       create first
     <%- else -%>
-      <%= attachment_container @post, :files, :as => "file" %>
+      <%= attachment_uploader(@post, :files, :file) %>
+      <%= attachment_loader(@post, :files) %>
+    <%- end -%>
+  </div>
+
+  <div class="field" style="overflow: hidden;">
+  <label>just videos</label>
+    <%- if @post.new_record? -%>
+      create first
+    <%- else -%>
+      <%= attachment_uploader(@post, :just_videos, :video) %>
+      <%= attachment_loader(@post, :just_videos) %>
     <%- end -%>
   </div>
 

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

@@ -15,7 +15,7 @@
     <td><%= post.text %></td>
     <td><%= link_to 'Show', post %></td>
     <td><%= link_to 'Edit', edit_post_path(post) %></td>
-    <td><%= link_to 'Destroy', post, confirm: 'Are you sure?', method: :delete %></td>
+    <td><%= link_to 'Destroy', post, method: :delete, data: { confirm: 'Are you sure?' } %></td>
   </tr>
 <% end %>
 </table>

data/spec/dummy/app/views/store/products/_form.html.erb

@@ -0,0 +1,34 @@
+<%= form_for(@store_product) do |f| %>
+  <% if @store_product.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@store_product.errors.count, "error") %> prohibited this store_product from being saved:</h2>
+
+      <ul>
+      <% @store_product.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>
+
+  <h3>uploads</h3>
+
+  <div class="field">
+    <label>files</label>
+    <%- if @store_product.new_record? -%>
+      create first
+    <%- else -%>
+      <%= attachment_uploader(@store_product, :images, :image) %>
+      <%= attachment_loader(@store_product, :images) %>
+    <%- end -%>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/spec/dummy/app/views/store/products/edit.html.erb

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

data/spec/dummy/app/views/store/products/index.html.erb

@@ -0,0 +1,21 @@
+<h1>Listing store_products</h1>
+
+<table>
+  <tr>
+    <th></th>
+    <th></th>
+    <th></th>
+  </tr>
+
+<% @store_products.each do |store_product| %>
+  <tr>
+    <td><%= link_to 'Show', store_product %></td>
+    <td><%= link_to 'Edit', edit_store_product_path(store_product) %></td>
+    <td><%= link_to 'Destroy', store_product, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+  </tr>
+<% end %>
+</table>
+
+<br />
+
+<%= link_to 'New Product', new_store_product_path %>

data/spec/dummy/app/views/store/products/new.html.erb

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

data/spec/dummy/app/views/store/products/show.html.erb

@@ -0,0 +1,5 @@
+<p id="notice"><%= notice %></p>
+
+
+<%= link_to 'Edit', edit_store_product_path(@store_product) %> |
+<%= link_to 'Back', store_products_path %>

data/spec/dummy/config/boot.rb

@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environments/development.rb

@@ -26,5 +26,6 @@ Dummy::Application.configure do
   config.assets.compress = false
 
   # Expands the lines which load the assets
-  config.assets.debug = true
+  config.assets.debug = false #true
+
 end

data/spec/dummy/config/routes.rb

@@ -1,5 +1,10 @@
 Rails.application.routes.draw do
 
+  namespace :store do
+    resources :products
+  end
+
+
   resources :posts
   resources :users
 

data/spec/helpers/media_magick/application_helper_spec.rb

@@ -9,53 +9,78 @@ describe MediaMagick do
         album.stub(id: '12345678')
       end
 
-      def conteiner_html(model, relation, data_attributes, &block)
-        content_tag(:div, nil, id: "#{model}-#{relation}", class: "attachmentUploader #{relation}", data: data_attributes) do
+      def uploader_container_html(model, relation, type, data_attributes, &block)
+        id      = "#{model}-#{relation.to_s}-#{type.to_s}"
+        classes = "attachmentUploader"
+
+        content_tag(:div, nil, id: id, class: classes, data: data_attributes) do
+          class_eval(&block) if block_given?
+        end
+      end
+
+      def loader_container_html(model, relation, data_attributes, &block)
+        id      = "#{model}-#{relation.to_s}-loadedAttachments"
+        classes = "#{relation.to_s} loadedAttachments"
+
+        content_tag(:div, nil, id: id, class: classes, data: data_attributes) do
           class_eval(&block) if block_given?
         end
       end
 
       context 'without block' do
         before do
-          album.stub(id: '12345678')
+          # album.stub(id: '12345678')
 
           helper.stub(:render)
         end
 
-        it 'should create a div with data attributes' do
-          helper.attachment_container(album, :photos).should eq(conteiner_html('album', 'photos', { id: 12345678, model: 'Album', relation: 'photos', partial: '/image' }))
+        it 'should render /uploader partial' do
+          helper.should_receive(:render).with('/uploader')
+
+          helper.attachment_uploader(album, :photos, :image)
         end
 
-        it 'should render /upload partial' do
-          helper.should_receive(:render).with('/upload', model: album, relations: :photos, newAttachments: {}, loadedAttachments: {}, partial: '/image')
+        it 'should create a div with data attributes' do
+          data_attributes = { id: 12345678, model: 'Album', relation: 'photos', partial: '/uploader' }
+          html = uploader_container_html('Album', 'photos', 'image', data_attributes)
 
-          helper.attachment_container(album, :photos)
+          helper.attachment_uploader(album, :photos, :image).should eq(html)
         end
 
         context 'using partials' do
-          it 'should create a div with data-partial attributes' do
-            helper.attachment_container(album, :photos, partial: 'albums/photo').should eq(conteiner_html('album', 'photos', { id: 12345678, model: 'Album', relation: 'photos', partial: 'albums/photo'}))
-          end
+          it 'creates a div with data-partial attribute' do
+            html = uploader_container_html('Album', 'photos', 'image', { id: 12345678, model: 'Album', relation: 'photos', partial: 'albums/photo'})
 
-          it 'should include partial option on data attributes' do
-            helper.should_receive(:render).with('/upload', model: album, relations: :photos, newAttachments: {}, loadedAttachments: {}, partial: 'albums/photo')
-
-            helper.attachment_container(album, :photos, partial: 'albums/photo')
+            helper.attachment_uploader(album, :photos, :image, partial: 'albums/photo').should eq(html)
           end
-        end
 
-        context 'partial for images' do
-          it 'should create a div with data-partial attributes' do
-            helper.attachment_container(album, :photos, as: 'file').should eq(conteiner_html('album', 'photos', { id: 12345678, model: 'Album', relation: 'photos', partial: '/file'}))
+          it 'creates a div with data-loader_partial attribute' do
+            attrs = { id: 12345678, model: 'Album', relation: 'photos', partial: '/uploader', loader_partial: 'custom_loader'}
+            html  = uploader_container_html('Album', 'photos', 'image', attrs)
+
+            helper.attachment_uploader(album, :photos, :image, loader_partial: 'custom_loader').should eq(html)
           end
 
-          it 'should include partial option on data attributes' do
-            helper.should_receive(:render).with('/upload', model: album, relations: :photos, newAttachments: {}, loadedAttachments: {}, partial: '/file')
+          it 'includes partial option on data attributes' do
+            helper.should_receive(:render).with('albums/photo')
 
-            helper.attachment_container(album, :photos, as: 'file')
+            helper.attachment_uploader(album, :photos, :image, partial: 'albums/photo')
           end
+
         end
 
+        # context 'partial for images' do
+        #   xit 'should create a div with data-partial attributes' do
+        #     helper.attachment_container(album, :photos, as: 'file').should eq(uploader_container_html('album', 'photos', { id: 12345678, model: 'Album', relation: 'photos', partial: '/file'}))
+        #   end
+
+        #   xit 'should include partial option on data attributes' do
+        #     helper.should_receive(:render).with('/upload', model: album, relations: :photos, newAttachments: {}, loadedAttachments: {}, partial: '/file')
+
+        #     helper.attachment_container(album, :photos, as: 'file')
+        #   end
+        # end
+
         context 'embbeded models' do
           let(:track) { album.tracks.new }
 
@@ -64,22 +89,24 @@ describe MediaMagick do
           end
 
           it 'should create a div with data-embedded-in-id and data-embedded-in-model attributes' do
-            helper.attachment_container(track, :files, embedded_in: album).should eq(conteiner_html('track', 'files', { id: 87654321, model: 'Track', embedded_in_id: 12345678, embedded_in_model: 'Album', relation: 'files', partial: '/image'}))
+            html = uploader_container_html('Track', 'files', 'file', { id: 87654321, model: 'Track', embedded_in_id: 12345678, embedded_in_model: 'Album', relation: 'files', partial: '/uploader'})
+
+            helper.attachment_uploader(track, :files, :file, embedded_in: album).should eq(html)
           end
 
-          it 'should render /upload partial' do
-            helper.should_receive(:render).with('/upload', model: track, relations: :files, newAttachments: {}, loadedAttachments: {}, partial: '/image')
+          xit 'should render /upload partial' do
+            helper.should_receive(:render).with('/upload', model: track, relations: :files, newAttachments: {}, loadedAttachments: {}, partial: '/uploader')
 
             helper.attachment_container(track, :files, embedded_in: album)
           end
         end
 
         context 'customizing newAttachments element' do
-          it 'should create a div with data attributes' do
-            helper.attachment_container(album, :photos, newAttachments: { class: 'thumbnails' }).should eq(conteiner_html('album', 'photos', { id: 12345678, model: 'Album', relation: 'photos', partial: '/image' }))
+          xit 'should create a div with data attributes' do
+            helper.attachment_container(album, :photos, newAttachments: { class: 'thumbnails' }).should eq(uploader_container_html('album', 'photos', { id: 12345678, model: 'Album', relation: 'photos', partial: '/image' }))
           end
 
-          it 'should render /upload partial with newAttachments attributes' do
+          xit 'should render /upload partial with newAttachments attributes' do
             helper.should_receive(:render).with('/upload', model: album, relations: :photos, newAttachments: { class: 'thumbnails' }, loadedAttachments: {}, partial: '/image')
 
             helper.attachment_container(album, :photos, newAttachments: { class: 'thumbnails' })
@@ -87,11 +114,11 @@ describe MediaMagick do
         end
 
         context 'customizing loadedAttachments element' do
-          it 'should create a div with data attributes' do
-            helper.attachment_container(album, :photos, loadedAttachments: { class: 'span3' }).should eq(conteiner_html('album', 'photos', { id: 12345678, model: 'Album', relation: 'photos', partial: '/image' }))
+          xit 'should create a div with data attributes' do
+            helper.attachment_container(album, :photos, loadedAttachments: { class: 'span3' }).should eq(uploader_container_html('album', 'photos', { id: 12345678, model: 'Album', relation: 'photos', partial: '/image' }))
           end
 
-          it 'should render /upload partial with loadedAttachments attributes' do
+          xit 'should render /upload partial with loadedAttachments attributes' do
             helper.should_receive(:render).with('/upload', model: album, relations: :photos, newAttachments: {}, loadedAttachments: { class: 'span3' }, partial: '/image')
 
             helper.attachment_container(album, :photos, loadedAttachments: { class: 'span3' })
@@ -100,12 +127,38 @@ describe MediaMagick do
       end
 
       context 'with block' do
-        it 'should create a div with data attributes and content inside' do
-          expected =  conteiner_html('album', 'photos', { id: 12345678, model: 'Album', relation: 'photos', partial: '/image' }) { 'template here' }
+        xit 'should create a div with data attributes and content inside' do
+          expected =  uploader_container_html('album', 'photos', { id: 12345678, model: 'Album', relation: 'photos', partial: '/image' }) { 'template here' }
 
           helper.attachment_container(album, :photos) { 'template here' }.should eq(expected)
         end
       end
+
+      context 'when model is inside a module' do
+        let(:model) { Store::Product.new }
+
+        before do
+          helper.stub(:render)
+        end
+
+        describe 'uploader' do
+          it 'converts string :: to - from model name to create id attribute' do
+            data_attributes = { id: model.id.to_s, model: 'Store::Product', relation: 'images', partial: '/uploader' }
+            html = uploader_container_html('Store-Product', 'images', 'image', data_attributes)
+
+            helper.attachment_uploader(model, :images, :image).should eq(html)
+          end
+        end
+
+        describe 'loader' do
+          it 'converts string :: to - from model name to create id attribute' do
+            data_attributes = { id: model.id.to_s, model: 'Store::Product', relation: 'images', partial: '/loader' }
+            html = loader_container_html('Store-Product', :images, data_attributes)
+
+            helper.attachment_loader(model, :images).should eq(html)
+          end
+        end
+      end
     end
   end
 end

data/spec/lib/media_magick/controller/helper_spec.rb

@@ -1,37 +1,62 @@
 require 'spec_helper'
 
 describe MediaMagick::Controller::Helpers do
+  let(:controller) { Class.new }
+
   before do
-    @controller = Class.new
-    @controller.extend MediaMagick::Controller::Helpers
+    controller.extend MediaMagick::Controller::Helpers
   end
 
   describe "getting doc by params" do
-    before do
-      @track = Track.new
-      @album = Album.create(tracks: [@track])
-    end
+    let(:track) { Track.new }
+    let!(:album) { Album.create(tracks: [track]) }
 
     context "document is embedded" do
       it "should get parent by params" do
         params = {
-          :embedded_in_model => "album", 
-          :embedded_in_id    => "#{@album.id.to_s}", 
-          :model             => "track", 
-          :model_id          => "#{@track.id.to_s}"
+          :embedded_in_model => "album",
+          :embedded_in_id    => "#{album.id.to_s}",
+          :model             => "track",
+          :model_id          => "#{track.id.to_s}"
         }
-        @controller.find_doc_by_params(params).should eq(@track)
+        controller.find_doc_by_params(params).should eq(track)
       end
     end
 
     context "document is root" do
       it "should get parent by params" do
         params = {
-          :model             => "album", 
-          :model_id          => "#{@album.id.to_s}"
+          :model             => "album",
+          :model_id          => "#{album.id.to_s}"
         }
-        @controller.find_doc_by_params(params).should eq(@album)
+        controller.find_doc_by_params(params).should eq(album)
+      end
+    end
+  end
+
+  describe "creating video" do
+    context "relation is attaches many" do
+      let(:video_url) { "youtube.com/watch?v=FfUHkPf9D9k" }
+      let!(:album) { Album.create }
+
+      it "should create video" do
+        params = {relation: "photos_and_videos", video: video_url}
+
+        controller.create_video(album, params).should be_true
+        album.reload.photos_and_videos.first.video.should eq(video_url)
+      end
+    end
+
+    context "relation is attaches one" do
+      let(:video_url) { "youtube.com/watch?v=FfUHkPf9D9k" }
+      let!(:user) { User.create }
+
+      it "should create video" do
+        params = {relation: "photo_and_video", video: video_url}
+
+        controller.create_video(user, params).should be_true
+        user.reload.photo_and_video.video.should eq(video_url)
       end
     end
   end
-end
+end