media_magick 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 081002405f7060e217d727e95cec9d1188f0095c
-  data.tar.gz: 32ca60cc3d1d2923f7268db21f85bb1c810863f4
+  metadata.gz: 1962fba734c6fbafcae0bc35b6264134e386dafd
+  data.tar.gz: c97e7014de863bdb54726111ad67fd9adf8eadcc
 SHA512:
-  metadata.gz: 1e92428be8b5cd8087e8694c5bfa300086b63fddb09421dd714cf7d4ca22d7022d58ce2d36012165f4d389f437d137b4cf306b932c5624240702e89caf1a49c1
-  data.tar.gz: 40456cf3fde97e9ab74721be80b40b08cff966892df4b6565c4584985cab0a450b41746a4512575566831aea6f4bcfb43323ca321c8e6c59d48046ee20b8c6d6
+  metadata.gz: 09340ffcda973cc403a34ac87a9e78e7a75fabb63e67c7fe669d8d743e17ebb1a3482394eed3deeb1c5ae2ff721763a3ca96ea8f4ef3fc70ba17ed510b61439f
+  data.tar.gz: bfd22e4e1c753d99224258246ed1281d453833593721048314f08565f17c89a44c6df0be90d871a8d3b6949183b090ff750d77b448bb78e9b7e877a4547a95ed

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
 
 services: mongodb
 
@@ -11,4 +12,4 @@ notifications:
 
 gemfile:
   - Gemfile
-  - gemfiles/mongoid-3.0.gemfile
+  - gemfiles/mongoid-master.gemfile

data/CHANGELOG.md

@@ -1,6 +1,11 @@
-## Next Release (branch: v0.4)
+## Next Release
 
-* support rails 4
+  * see issues - https://github.com/nudesign/media_magick/issues
+
+## 0.4.0 - October 29, 2013
+
+  * now supports just rails 4
+  * bug fix - http verbs for attachment upload
 
 ## 0.3.3 - October 7, 2013
 

data/Gemfile

@@ -2,4 +2,5 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'jquery-rails'
+gem 'mongoid', github: 'mongoid/mongoid'
+gem 'jquery-rails'

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

@@ -1,7 +1,5 @@
-//= require plupload
-
-// optional, only needed if you'd like to use plupload localized
-//= require plupload/i18n/pt-br
+//= require moxie
+//= require plupload.dev
 
 // optional, but recommended. it sets generic settings like flash url, etc.
 //= require plupload.settings
@@ -9,12 +7,6 @@
 // optional, only if you want to use the jquery integration
 //= require jquery.plupload.queue
 
-// optional, choose the ones you'd like to use
-//= require plupload.flash
-//= require plupload.html4
-//= require plupload.html5
-//= require plupload.gears
-
 (function($) {
 
   $.fn.pluploadIt = function (options) {
@@ -132,7 +124,10 @@ $(function() {
     var $videoField = $container.find(".attachmentVideoUploaderField");
     var modelAndRelation = $container.data('model').replace(/::/g,'-') + "-" + $container.data('relation');
 
-    $.get('/upload', {
+    $.ajax({
+      type: 'POST',
+      url: '/upload',
+      data: {
         model: $container.data('model'),
         id: $container.data('id'),
         relation: $container.data('relation'),
@@ -141,9 +136,11 @@ $(function() {
         embedded_in_id: $container.data('embedded-in-id'),
         partial: $container.data('partial') === undefined ? '' : $container.data('partial'),
         video: $videoField.val()
-      }, function(data) {
-      $('#' + modelAndRelation + '-loadedAttachments').append(data);
-      $videoField.val("");
+      },
+      success: function(data) {
+        $('#' + modelAndRelation + '-loadedAttachments').append(data);
+        $videoField.val("");
+      }
     });
   });
 
@@ -156,15 +153,20 @@ $(function() {
       var $container  = $(this).parents('.loadedAttachments');
       var $attachment = $(this).parents('.attachment');
 
-      $.get('/remove', {
-        model: $container.data('model'),
-        id: $container.data('id'),
-        relation: $container.data('relation'),
-        relation_id: $attachment.data('id'),
-        embedded_in_model: $container.data('embedded-in-model'),
-        embedded_in_id: $container.data('embedded-in-id')
-      }, function(data) {
-        $attachment.remove();
+      $.ajax({
+        type: 'DELETE',
+        url: '/remove',
+        data: {
+          model: $container.data('model'),
+          id: $container.data('id'),
+          relation: $container.data('relation'),
+          relation_id: $attachment.data('id'),
+          embedded_in_model: $container.data('embedded-in-model'),
+          embedded_in_id: $container.data('embedded-in-id')
+        },
+        success: function(data) {
+          $attachment.remove();
+        }
       });
     }
   });

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
-  match 'upload' => 'media_magick/attach#create'
-  match 'remove' => 'media_magick/attach#destroy'
-  match 'update_priority' => 'media_magick/attach#update_priority'
-  match 'recreate_versions' => 'media_magick/attach#recreate_versions', as: 'recreate_versions'
+  post   'upload' => 'media_magick/attach#create'
+  delete 'remove' => 'media_magick/attach#destroy'
+  put    'update_priority' => 'media_magick/attach#update_priority'
+  put    'recreate_versions' => 'media_magick/attach#recreate_versions', as: 'recreate_versions'
 end

data/gemfiles/mongoid-master.gemfile

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

data/lib/media_magick/version.rb

@@ -1,3 +1,3 @@
 module MediaMagick
-  VERSION = '0.3.3'
+  VERSION = '0.4.0'
 end

data/media_magick.gemspec

@@ -16,14 +16,14 @@ Gem::Specification.new do |gem|
   gem.version       = MediaMagick::VERSION
 
   gem.add_dependency 'carrierwave',    '~> 0.9.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_dependency 'mongoid',        '>= 2.7.0'
+  gem.add_dependency 'plupload-rails', '~> 1.1.0'
+  gem.add_dependency 'rails',          '~> 4.0.0'
   gem.add_dependency 'mini_magick',    '~> 3.6.0'
 
   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'
+  gem.add_development_dependency 'rspec-rails',  '~> 2.14.0'
+  gem.add_development_dependency 'simplecov',    '~> 0.7.0'
+  gem.add_development_dependency 'guard-rspec',  '~> 4.0.0'
+  gem.add_development_dependency 'rb-fsevent',   '~> 0.9.0'
 end

data/spec/dummy/Rakefile

@@ -1,4 +1,3 @@
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

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

@@ -40,7 +40,7 @@ class PostsController < ApplicationController
   # POST /posts
   # POST /posts.json
   def create
-    @post = Post.new(params[:post])
+    @post = Post.new(post_params)
 
     respond_to do |format|
       if @post.save
@@ -59,7 +59,7 @@ class PostsController < ApplicationController
     @post = Post.find(params[:id])
 
     respond_to do |format|
-      if @post.update_attributes(params[:post])
+      if @post.update_attributes(post_params)
         format.html { redirect_to @post, notice: 'Post was successfully updated.' }
         format.json { head :no_content }
       else
@@ -80,4 +80,10 @@ class PostsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def post_params
+      params.require(:post).permit(:title, :text)
+    end
 end

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

@@ -41,7 +41,7 @@ class UsersController < ApplicationController
   # POST /users
   # POST /users.json
   def create
-    @user = User.new(params[:user])
+    @user = User.new(user_params)
 
     respond_to do |format|
       if @user.save
@@ -60,7 +60,7 @@ class UsersController < ApplicationController
     @user = User.find(params[:id])
 
     respond_to do |format|
-      if @user.update_attributes(params[:user])
+      if @user.update_attributes(user_params)
         format.html { redirect_to @user, notice: 'User was successfully updated.' }
         format.json { head :no_content }
       else
@@ -81,4 +81,10 @@ class UsersController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+    private
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def user_params
+      params.require(:user).permit(:name)
+    end
 end

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
-run Dummy::Application
+run Rails.application

data/spec/dummy/config/application.rb

@@ -1,15 +1,14 @@
 require File.expand_path('../boot', __FILE__)
 
 # Pick the frameworks you want:
-# require 'active_record/railtie'
-require 'action_controller/railtie'
-require 'action_mailer/railtie'
-require 'active_resource/railtie'
-require 'sprockets/railtie'
-# require 'rails/test_unit/railtie'
+# require "active_record/railtie"
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "sprockets/railtie"
+# require "rails/test_unit/railtie"
 
-Bundler.require
-require 'media_magick'
+Bundler.require(*Rails.groups)
+require "media_magick"
 
 module Dummy
   class Application < Rails::Application
@@ -17,16 +16,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -34,29 +23,5 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    # config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
   end
 end
-

data/spec/dummy/config/boot.rb

@@ -1,10 +1,5 @@
-require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-if File.exist?(gemfile)
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-end
-
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
+# Initialize the Rails application.
 Dummy::Application.initialize!

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

@@ -1,31 +1,27 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
-  config.assets.debug = false #true
 
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 end

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

@@ -1,67 +1,80 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this).
   config.serve_static_assets = false
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs
+  # Generate digests for assets URLs.
   config.assets.digest = true
 
-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
+  # Version of your assets, change this if you want to expire all your assets.
+  config.assets.version = '1.0'
 
-  # Specifies the header that your server uses for sending files
+  # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Set to :debug to see everything in the log.
+  config.log_level = :info
 
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # Precompile additional assets.
+  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
   # config.assets.precompile += %w( search.js )
 
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation can not be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Disable automatic flushing of the log to improve performance.
+  # config.autoflush_log = false
+
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
 end

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

@@ -1,5 +1,5 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,28 +7,30 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static asset server for tests with Cache-Control for performance.
+  config.serve_static_assets  = true
+  config.static_cache_control = "public, max-age=3600"
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 end

data/spec/dummy/config/initializers/filter_parameter_logging.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Configure sensitive parameters which will be filtered from the log file.
+Rails.application.config.filter_parameters += [:password]

data/spec/dummy/config/initializers/inflections.rb

@@ -1,15 +1,16 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
+# Add new inflection rules using the following format. Inflections
+# are locale specific, and you may define rules for as many different
+# locales as you wish. All of these examples are active by default:
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
-#
+
 # These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections do |inflect|
+# ActiveSupport::Inflector.inflections(:en) do |inflect|
 #   inflect.acronym 'RESTful'
 # end

data/spec/dummy/config/initializers/secret_token.rb

@@ -1,7 +1,12 @@
 # Be sure to restart your server when you modify this file.
 
-# Your secret key for verifying the integrity of signed cookies.
+# Your secret key is used for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
+
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '0a97a9eaaf07443725e400689e33d3a675a4a4163a52a224376a983d0aa524e22c5b69600ec465b0bebb588bddb40534170068d87af2934730ad9b47320cb52f'
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure your secret_key_base is kept private
+# if you're sharing your code publicly.
+Dummy::Application.config.secret_key_base = '86950f41ac18916d081e5ce66f46d4ac7e1a449f8d06afbf8fa8fb0810984bdaaae156bda397ce903d3894a935c219ffbf907f6feb82404d769fceedd60ae004'

data/spec/dummy/config/initializers/session_store.rb

@@ -1,8 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
 Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration")
-# Dummy::Application.config.session_store :active_record_store

data/spec/dummy/config/initializers/wrap_parameters.rb

@@ -1,14 +1,9 @@
 # Be sure to restart your server when you modify this file.
-#
+
 # This file contains settings for ActionController::ParamsWrapper which
 # is enabled by default.
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
-end
-
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
-  self.include_root_in_json = false
+  wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end

data/spec/dummy/config/routes.rb

@@ -1,4 +1,4 @@
-Rails.application.routes.draw do
+Dummy::Application.routes.draw do
 
   namespace :store do
     resources :products

data/spec/dummy/public/404.html

@@ -2,17 +2,48 @@
 <html>
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 
@@ -22,5 +53,6 @@
     <h1>The page you were looking for doesn't exist.</h1>
     <p>You may have mistyped the address or the page may have moved.</p>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/spec/dummy/public/422.html

@@ -2,17 +2,48 @@
 <html>
 <head>
   <title>The change you wanted was rejected (422)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 
@@ -22,5 +53,6 @@
     <h1>The change you wanted was rejected.</h1>
     <p>Maybe you tried to change something you didn't have access to.</p>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/spec/dummy/public/500.html

@@ -2,17 +2,48 @@
 <html>
 <head>
   <title>We're sorry, but something went wrong (500)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 
@@ -21,5 +52,6 @@
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/spec/lib/media_magick/image/dimensions_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MediaMagick::Image::Dimensions do
+describe "MediaMagick::Image::Dimensions" do
   let!(:post) { Post.create }
 
   context "without image file" do

data/spec/routing/attach_spec.rb

@@ -2,23 +2,23 @@ require 'spec_helper'
 
 describe 'routes for Attach' do
   it 'routes /upload to create action' do
-    get('/upload').should route_to('media_magick/attach#create')
+    post('/upload').should route_to('media_magick/attach#create')
   end
 
   it 'routes /remove to destroy action' do
-    get('/remove').should route_to('media_magick/attach#destroy')
+    delete('/remove').should route_to('media_magick/attach#destroy')
   end
 
   it 'routes /update_priority to update_priority action' do
-    get('/update_priority').should route_to('media_magick/attach#update_priority')
+    put('/update_priority').should route_to('media_magick/attach#update_priority')
   end
 
   it 'routes /recreate_versions to recreate_versions action' do
-    get('/recreate_versions').should route_to('media_magick/attach#recreate_versions')
+    put('/recreate_versions').should route_to('media_magick/attach#recreate_versions')
   end
 
   it 'routes recreate_versions_path to recreate_versions action' do
-    get(recreate_versions_path).should route_to('media_magick/attach#recreate_versions')
+    put(recreate_versions_path).should route_to('media_magick/attach#recreate_versions')
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: media_magick
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Lucas Renan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -25,48 +25,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: plupload-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -101,56 +87,56 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.0
 description: MediaMagick aims to make dealing with multimedia resources a very easy
   task – like magic.
 email:
@@ -184,7 +170,7 @@ files:
 - config/locales/en.yml
 - config/locales/pt-BR.yml
 - config/routes.rb
-- gemfiles/mongoid-3.0.gemfile
+- gemfiles/mongoid-master.gemfile
 - lib/carrierwave/mongoid.rb
 - lib/media_magick.rb
 - lib/media_magick/attachment_uploader.rb
@@ -242,6 +228,9 @@ files:
 - 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/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -250,6 +239,7 @@ files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -259,7 +249,6 @@ files:
 - spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/lib/assets/.gitkeep
-- spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -297,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: MediaMagick aims to make dealing with multimedia resources a very easy task
@@ -349,6 +338,9 @@ test_files:
 - 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/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -357,6 +349,7 @@ test_files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -366,7 +359,6 @@ test_files:
 - spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/lib/assets/.gitkeep
-- spec/dummy/log/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html

data/gemfiles/mongoid-3.0.gemfile

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