media_magick 0.2.0 → 0.3.0

data/app/views/_loader.html.erb

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

data/app/views/_uploader.html.erb

@@ -0,0 +1,13 @@
+<div class="newAttachments ">
+  <ul class="attachmentQueue">
+  </ul>
+
+  <div class="dropAttachments">
+  </div>
+  <%= link_to "javascript://", class: "pickAttachments btn" do %>
+    <%= t('media_magick.select') %>
+  <% end %>
+  <%= link_to "javascript://", class: "uploadAttachments btn" do %>
+    <%= t('media_magick.upload') %>
+  <% end %>
+</div>

data/app/views/_video_uploader.html.erb

@@ -0,0 +1,2 @@
+<%= text_field_tag "video", "", id: "", class: "attachmentVideoUploaderField" %>
+<%= link_to "upload", "javascript://", class: "attachmentVideoUploaderButton" %>

data/config/locales/en.yml

@@ -3,3 +3,4 @@ en:
     confirm_removal: "are you sure you want to delete this file?"
     select: "select files"
     upload: "upload files"
+    remove: "remove"

data/gemfiles/mongoid-3.0.gemfile

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

data/lib/media_magick.rb

@@ -3,4 +3,4 @@ require 'plupload/rails'
 
 require 'media_magick/model'
 require 'media_magick/engine'
-require 'media_magick/version'
+require 'media_magick/version'

data/lib/media_magick/controller/helpers.rb

@@ -3,18 +3,38 @@ module MediaMagick
     module Helpers
       extend ActiveSupport::Concern
 
-      # {"embedded_in_model"=>"embedded_model", 
-      #   "embedded_in_id"=>"embedded_id", "model"=>"model", 
+      # {"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?                  
+        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])          
+          doc = params[:embedded_in_model].classify.constantize.find(params[:embedded_in_id]).send(params[:model].pluralize.downcase).find(params[:model_id])
         end
         doc
       end
+
+      # Creates a video based on a url
+      #
+      # @example Creates a video for an user
+      #   user   = User.create
+      #   params = {relation: "photo", video: "youtube.com/watch?v=FfUHkPf9D9k"}
+      #   create_video(user, params)
+      #
+      # @param [ Mongoid::Document ] Mongoid document object
+      # @param [ Hash ] Hash with relation name and video url
+      #
+      # @return [ Mongoid::Document ] The mongoid document object
+      def create_video(obj, params)
+        relation_metadata = obj.class.relations[params[:relation]]
+
+        unless relation_metadata.many? # one
+          return obj.send("create_#{params[:relation]}", {video: params[:video]})
+        end
+        obj.send(params[:relation]).create(video: params[:video])
+      end
     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

data/lib/media_magick/image/dimensions.rb

@@ -0,0 +1,23 @@
+module MediaMagick
+  module Image
+    module Dimensions
+      extend ActiveSupport::Concern
+
+      def size
+        version_key = version_name.present? ? version_name : "_original"
+
+        begin
+          if model.dimensions[version_key.to_s].nil?
+            image = MiniMagick::Image.open(file.path)
+            model.dimensions[version_key.to_s] = {"width" => image[:width], "height" => image[:height]}
+            model.save
+          end
+
+          return model.dimensions[version_key.to_s]
+        rescue
+          return {"width" => 0, "height" => 0}
+        end
+      end
+    end
+  end
+end

data/lib/media_magick/model.rb

@@ -8,11 +8,15 @@ module MediaMagick
     extend ActiveSupport::Concern
 
     module ClassMethods
+      # smell
       def attaches_many(name, options = {})
         attaches_block = block_given? ? Proc.new : nil
 
         name_camelcase = create_attaches_class(name, options, attaches_block) do
-          create_video_methods(name) if options[:allow_videos]
+          if options[:allow_videos]
+            raise "name 'videos' not allowed" if name.to_s == "videos"
+            create_video_methods(name)
+          end
 
           field :priority, type: Integer, default: 0
 
@@ -24,11 +28,15 @@ module MediaMagick
         embeds_many(name, :as => :attachmentable, class_name: "#{self}#{name_camelcase}")
       end
 
+      # smell
       def attaches_one(name, options = {})
         attaches_block = block_given? ? Proc.new : nil
 
         name_camelcase = create_attaches_class(name, options, attaches_block) do
-          create_video_methods(name) if options[:allow_videos]
+          if options[:allow_videos]
+            raise "name 'video' not allowed" if name.to_s == "video"
+            create_video_methods(name)
+          end
 
           embedded_in(name)
         end
@@ -44,6 +52,7 @@ module MediaMagick
           extend CarrierWave::Mount
 
           field :type, type: String, default: options[:as] || 'image'
+          field :dimensions, type: Hash, default: {}
 
           def self.create_video_methods(name)
             field :video, type: String
@@ -53,13 +62,11 @@ module MediaMagick
               super
 
               video = MediaMagick::Video::Parser.new(url)
-
               send(self.class::ATTACHMENT).store!(video.to_image) if video.valid?
             end
 
             def source(options = {})
               video = MediaMagick::Video::Parser.new(self.video)
-
               video.to_html(options) if video.valid?
             end
           end
@@ -80,10 +87,20 @@ module MediaMagick
         end
 
         name_camelcase = name.to_s.camelcase
-        Object.const_set "#{self}#{name_camelcase}", klass
+
+        # sets klass to a constant
+        # ProductImages = klass
+        constantize_embedded_klass(self, name_camelcase, klass)
 
         return name_camelcase
       end
+
+      def constantize_embedded_klass(klass_self, relation_name, embedded_klass)
+        parent = klass_self.parents.first # module or Object
+        embedded_klass_name = "#{klass_self.to_s.demodulize}#{relation_name}"
+        parent.const_set embedded_klass_name, embedded_klass
+      end
+
     end
   end
 end

data/lib/media_magick/version.rb

@@ -1,3 +1,3 @@
 module MediaMagick
-  VERSION = '0.2.0'
-end
+  VERSION = '0.3.0'
+end

data/media_magick.gemspec

@@ -14,19 +14,16 @@ Gem::Specification.new do |gem|
   gem.name          = 'media_magick'
   gem.require_paths = ['lib']
   gem.version       = MediaMagick::VERSION
-  
-  gem.add_dependency 'carrierwave',    '~> 0.7.0'
-  gem.add_dependency 'mongoid',        '>= 2.4'
+
+  gem.add_dependency 'carrierwave',    '~> 0.8.0'
+  gem.add_dependency 'mongoid',        '>= 2.7.0'
   gem.add_dependency 'plupload-rails', '~> 1.0.6'
   gem.add_dependency 'rails',          '~> 3.2.0'
-  
-  gem.add_development_dependency 'bson_ext',    '~> 1.7.0'
-  gem.add_development_dependency 'mini_magick', '~> 3.4'
-  gem.add_development_dependency 'rake',        '~> 0.9'
-  gem.add_development_dependency 'rspec-rails', '~> 2.11.0'
-  gem.add_development_dependency 'simplecov',   '~> 0.7.0'
+  gem.add_dependency 'mini_magick',    '~> 3.6.0'
 
-  #gems for code analyses
-  gem.add_development_dependency 'flog', '~> 3.0.0.b2'
-  gem.add_development_dependency 'flay', '~> 2.0.0.b1'
-end
+  gem.add_development_dependency 'rake',         '~> 10.1.0'
+  gem.add_development_dependency 'rspec-rails',  '~> 2.13.2'
+  gem.add_development_dependency 'simplecov',    '~> 0.7.1'
+  gem.add_development_dependency 'guard-rspec',  '~> 3.0.2'
+  gem.add_development_dependency 'rb-fsevent',   '~> 0.9.3'
+end

data/spec/controllers/media_magick/attach_controller_spec.rb

@@ -12,23 +12,10 @@ describe MediaMagick::AttachController do
           post :create, { model: 'Album', id: album.id, relation: 'photos', file: fixture_file_upload("#{File.expand_path('../../..',  __FILE__)}/support/fixtures/nu.jpg") }
         }.to change { album.reload.photos.count }.by(1)
 
-        response.should render_template('_image')
-
+        response.should render_template('_loader')
         response.body.should =~ /nu.jpg/m
       end
 
-      it "creates a new video" do
-        album = Album.create
-
-        expect {
-          post :create, { model: 'Album', id: album.id, relation: 'photos_and_videos', video: 'youtube.com/watch?v=FfUHkPf9D9k' }
-        }.to change { album.reload.photos_and_videos.count }.by(1)
-
-        response.should render_template('_image')
-
-        response.body.should =~ /FfUHkPf9D9k/m
-      end
-
       it "creates a new photo for embedded models" do
         album = Album.create
         track = album.tracks.create
@@ -37,16 +24,43 @@ describe MediaMagick::AttachController do
           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.should render_template('_loader')
         response.body.should =~ /nu.jpg/m
       end
 
-      it "render a personalized partial" do
+      it "renders a custom 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") }
+        post :create, { model: 'Album', id: album.id, relation: 'photos', loader_partial: 'albums/photo', file: fixture_file_upload("#{File.expand_path('../../..',  __FILE__)}/support/fixtures/nu.jpg") }
         response.should render_template('albums/_photo')
       end
+
+      describe "creating videos" do
+        context "relation is attaches many" do
+          it "creates a new video" do
+            album = Album.create
+
+            expect {
+              post :create, { model: 'Album', id: album.id, relation: 'photos_and_videos', video: 'youtube.com/watch?v=FfUHkPf9D9k' }
+            }.to change { album.reload.photos_and_videos.count }.by(1)
+
+            response.should render_template('_loader')
+            response.body.should =~ /FfUHkPf9D9k/m
+          end
+        end
+
+        context "relation is attaches one" do
+          it "creates a new video" do
+            user      = User.create
+            video_url = 'youtube.com/watch?v=FfUHkPf9D9k'
+
+            post :create, { model: 'User', id: user.id, relation: 'photo_and_video', video: video_url }
+
+            user.reload.photo_and_video.video.should eq(video_url)
+            response.should render_template('_loader')
+            response.body.should =~ /FfUHkPf9D9k/m
+          end
+        end
+      end
     end
   end
 
@@ -102,8 +116,8 @@ describe MediaMagick::AttachController do
     end
   end
 
-  describe "recriate versions" do
-    it "recriate images versions" do
+  describe "recreate versions" do
+    it "recreate images versions" do
       album = Album.create
 
       request.env["HTTP_REFERER"] = "/"
@@ -112,7 +126,7 @@ describe MediaMagick::AttachController do
       response.status.should be(302)
     end
 
-    it "recriate images versions for embedded models" do
+    it "recreate images versions for embedded models" do
       album = Album.create
       track = album.tracks.create
 

data/spec/dummy/app/assets/javascripts/store/products.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/store/products.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/store/products_controller.rb

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

data/spec/dummy/app/helpers/store/products_helper.rb

@@ -0,0 +1,2 @@
+module Store::ProductsHelper
+end

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

@@ -7,4 +7,5 @@ class Post
 
   attaches_many :files,  :type => 'file'
   attaches_many :images, :type => 'image', :uploader => PostUploader, :allow_videos => true
+  attaches_many :just_videos, :type => 'image', :uploader => PostUploader, :allow_videos => true
 end