media_magick 0.1.0 → 0.1.1

data/spec/spec_helper.rb

@@ -24,17 +24,20 @@ RSpec.configure do |config|
   config.infer_base_class_for_anonymous_controllers = false
 
   config.before :suite do
-    Mongoid.configure do |config|
-      config.master = Mongo::Connection.new.db('media_magick')
+    if Mongoid::VERSION < '3'
+      Mongoid.configure do |config|
+        config.master = Mongo::Connection.new.db('media_magick')
+      end
+    else
+      Mongoid.connect_to('media_magick')
     end
   end
 
   config.after :each do
-    Mongoid.master.collections.select { |c| c.name !~ /^system/ }.each(&:drop)
-  end
-
-  config.after :suite do
-    Mongoid.master.connection.drop_database('media_magick')
-    Mongoid.master.connection.close
+    if Mongoid::VERSION < '3'
+      Mongoid.master.collections.select { |c| c.name !~ /^system/ }.each(&:drop)
+    else
+      Mongoid::Config.purge!
+    end
   end
 end

data/spec/views/_upload.html.erb_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe '_upload' do
+  let(:album)             { stub_model(Album) }
+  let(:album_with_photos) { stub_model(Album, photos: [stub_model(AlbumPhotos)]) }
+
+  def default_attributes
+    { newAttachments: {}, loadedAttachments: {}, partial: '/image', model: album, relations: 'photos' }
+  end
+
+  it 'should personalize css classes attributes of newAttachments element' do
+    render 'upload', default_attributes.merge(newAttachments: { class: 'thumbnails' })
+    rendered.should =~ /<div class="newAttachments thumbnails">/
+  end
+
+  it 'should personalize css classes attributes of loadedAttachments element' do
+    render 'upload', default_attributes.merge(loadedAttachments: { class: 'span3' })
+    rendered.should =~ /<ul class="loadedAttachments span3">/
+  end
+
+  it 'should render the partial passed' do
+    stub_template 'albums/_photo' => 'my partial'
+    render 'upload', default_attributes.merge(model: album_with_photos, partial: 'albums/photo')
+    rendered.should =~ /my partial/
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: media_magick
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -34,17 +34,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: plupload-rails
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.1
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +148,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: flog
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0.b2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0.b2
+- !ruby/object:Gem::Dependency
+  name: flay
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.b1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -156,7 +188,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 2.0.0.b1
 description: MediaMagick aims to make dealing with multimedia resources a very easy
   task – like magic.
 email:
@@ -169,7 +201,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
@@ -187,16 +218,20 @@ files:
 - app/views/_file.html.erb
 - app/views/_image.html.erb
 - app/views/_upload.html.erb
+- app/views/_video.html.erb
 - app/views/layouts/media_magick/application.html.erb
 - config/locales/en.yml
 - config/locales/pt-BR.yml
 - config/routes.rb
+- gemfiles/mongoid-3.0.gemfile
 - lib/carrierwave/mongoid.rb
 - lib/media_magick.rb
 - lib/media_magick/attachment_uploader.rb
+- lib/media_magick/controller/helpers.rb
 - lib/media_magick/engine.rb
 - lib/media_magick/model.rb
 - lib/media_magick/version.rb
+- lib/media_magick/video/parser.rb
 - lib/tasks/media_magick_tasks.rake
 - media_magick.gemspec
 - script/rails
@@ -204,22 +239,32 @@ files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/posts.js
 - spec/dummy/app/assets/javascripts/users.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/stylesheets/posts.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/posts_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/helpers/posts_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/album.rb
+- spec/dummy/app/models/post.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/uploaders/post_uploader.rb
 - spec/dummy/app/views/albums/_photo.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/posts/_form.html.erb
+- spec/dummy/app/views/posts/edit.html.erb
+- spec/dummy/app/views/posts/index.html.erb
+- spec/dummy/app/views/posts/new.html.erb
+- spec/dummy/app/views/posts/show.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
@@ -250,11 +295,14 @@ files:
 - spec/dummy/script/rails
 - spec/helpers/media_magick/application_helper_spec.rb
 - spec/integration/images_spec.rb
+- spec/lib/media_magick/controller/helper_spec.rb
 - spec/lib/media_magick/model_spec.rb
+- spec/lib/media_magick/video/parser_spec.rb
 - spec/routing/attach_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/nu.jpg
 - spec/support/fixtures/nu.txt
+- spec/views/_upload.html.erb_spec.rb
 homepage: https://github.com/nudesign/media_magick
 licenses: []
 post_install_message: 
@@ -267,18 +315,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -141377081064224492
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -141377081064224492
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -292,22 +334,32 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/posts.js
 - spec/dummy/app/assets/javascripts/users.js
 - spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/assets/stylesheets/posts.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/posts_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/helpers/posts_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/album.rb
+- spec/dummy/app/models/post.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/uploaders/post_uploader.rb
 - spec/dummy/app/views/albums/_photo.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/posts/_form.html.erb
+- spec/dummy/app/views/posts/edit.html.erb
+- spec/dummy/app/views/posts/index.html.erb
+- spec/dummy/app/views/posts/new.html.erb
+- spec/dummy/app/views/posts/show.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
@@ -338,8 +390,11 @@ test_files:
 - spec/dummy/script/rails
 - spec/helpers/media_magick/application_helper_spec.rb
 - spec/integration/images_spec.rb
+- spec/lib/media_magick/controller/helper_spec.rb
 - spec/lib/media_magick/model_spec.rb
+- spec/lib/media_magick/video/parser_spec.rb
 - spec/routing/attach_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/nu.jpg
 - spec/support/fixtures/nu.txt
+- spec/views/_upload.html.erb_spec.rb

data/.rvmrc

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

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

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