spud_media 0.9.7 → 1.0.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d7b6b5fa84c4a3a36db6186d469051782cba93fe
+  data.tar.gz: 68c0d642b5af1827165ea2984c1d094bfe69d36a
+SHA512:
+  metadata.gz: ec056de961a21b5d51c6086216e3090d15548333501147aa1d00ce854a682befe33b1edabae1a6aaa84a4a69df6ce06ca0f948eada73393086951ce04d192ab3
+  data.tar.gz: dae05ef3195f08dc484d617266702771d9d5fc9aef557ee91d51ad9d99b82250da33e047ad770f6149e69e5144cdb62dcf141de70e588e92cede2c53b295c768

data/app/assets/javascripts/spud/admin/media/application.js

@@ -19,15 +19,15 @@ spud.admin.media = new function(){
 
   this.edit = function(){
     cropimage = $('#spud_media_cropper_image');
-    // IE8 isn't handling the image load event properly, so...
-    setTimeout(function(){
+
       if(cropimage[0].complete){
-        self.initializeEditor();
+        self.initializeEditor.call(self);
       }
       else{
-        self.edit();
+        $(copimage[0]).load(function() {
+          self.initializeEditor.call(self);
+        })
       }
-    }, 50);
   };
 
   this.initializeEditor = function(){
@@ -42,7 +42,7 @@ spud.admin.media = new function(){
 
     // the max width is 900px (at least until the UI can handle more than that)
     if(originalWidth > 900){
-      maxcropscale = Math.floor(900 / originalWidth * 100);
+      maxcropscale = Math.floor((900 / originalWidth)* 100);
     }
     else{
       maxcropscale = 100;
@@ -65,8 +65,10 @@ spud.admin.media = new function(){
     // update height of artbox to match height of scaled image
     cropartbox.height(originalHeight * (maxcropscale / 100));
 
+
     self.resizeAndCenter(cropscale);
 
+
     $('body').on('change', '#spud_media_crop_s', self.changedMediaCropScale);
     $('body').on('click', '#spud_media_cropper_resize_up, #spud_media_cropper_resize_down', self.incrementMediaCropScale);
     $('body').on('change', '#spud_media_crop_x, #spud_media_crop_y, #spud_media_crop_w, #spud_media_crop_h', self.changedMediaCropDimensions);
@@ -81,8 +83,8 @@ spud.admin.media = new function(){
     }
 
     // initialize jcrop. snap to pre-existing selection if one exists.
-    var _width = Math.min(900, (originalWidth * (percent / 100)));
-    var _height = originalHeight * (_width / originalWidth);
+    var _width = Math.floor(Math.min(900, (originalWidth * (percent / 100))));
+    var _height = Math.floor(originalHeight * (_width / originalWidth));
     cropimage.Jcrop({
         boxWidth:_width,
         boxHeight:_height,
@@ -96,8 +98,8 @@ spud.admin.media = new function(){
     );
 
     // using the outer container, center the jcrop object in the artboard
-    var _left = (900 - _width) / 2;
-    var _top = (cropartbox.height() - _height) / 6;
+    var _left = Math.floor((900 - _width) / 2);
+    var _top = Math.floor((cropartbox.height() - _height) / 6);
     cropcontainer.css({
       left:_left,
       top:_top
@@ -172,4 +174,4 @@ spud.admin.media = new function(){
       return false;
     }
   };
-};
+};

data/app/controllers/spud/admin/media_controller.rb

@@ -19,7 +19,7 @@ class Spud::Admin::MediaController < Spud::Admin::ApplicationController
 	def create
 		@page_name = "New Media"
 		add_breadcrumb "New", :new_spud_admin_medium_path
-		@media = SpudMedia.new(params[:spud_media])
+		@media = SpudMedia.new(media_params)
 		location = spud_admin_media_path
 		if @media.save
 			flash[:notice] = "File uploaded successfully"
@@ -47,7 +47,7 @@ class Spud::Admin::MediaController < Spud::Admin::ApplicationController
 	end
 
 	def update
-		if @media.update_attributes(params[:spud_media])
+		if @media.update_attributes(media_params)
 			@media.attachment.reprocess!
 		end
 		respond_with @media, :location => spud_admin_media_url
@@ -73,4 +73,8 @@ private
 		end
 
 	end
+
+	def media_params
+		params.require(:spud_media).permit(:attachment_content_type,:attachment_file_name,:attachment_file_size,:attachment, :is_protected, :crop_x, :crop_y, :crop_w, :crop_h, :crop_s)
+	end
 end

data/app/controllers/spud/admin/media_picker_controller.rb

@@ -11,7 +11,7 @@ class Spud::Admin::MediaPickerController < Spud::Admin::ApplicationController
   end
 
   def create
-    @media = SpudMedia.new(params[:spud_media])
+    @media = SpudMedia.new(media_params)
     if @media.save
       if request.xhr?
         render 'create', :status => 200
@@ -25,4 +25,9 @@ class Spud::Admin::MediaPickerController < Spud::Admin::ApplicationController
     end
   end
 
-end
+private
+  def media_params
+    params.require(:spud_media).permit(:attachment_content_type,:attachment_file_name,:attachment_file_size,:attachment, :is_protected, :crop_x, :crop_y, :crop_w, :crop_h, :crop_s)
+  end
+
+end

data/app/models/spud_media.rb

@@ -14,10 +14,10 @@ class SpudMedia < ActiveRecord::Base
     :url => Spud::Media.storage_url,
     :styles => lambda { |attachment| attachment.instance.dynamic_styles }
 
-  attr_accessible :attachment_content_type,:attachment_file_name,:attachment_file_size,:attachment, :is_protected, :crop_x, :crop_y, :crop_w, :crop_h, :crop_s
+  # attr_accessible :attachment_content_type,:attachment_file_name,:attachment_file_size,:attachment, :is_protected, :crop_x, :crop_y, :crop_w, :crop_h, :crop_s
 
   validates_numericality_of :crop_x, :crop_y, :crop_w, :crop_h, :crop_s, :allow_nil => true
-
+  validates :attachment, :presence => true
   before_create :rename_file
   before_update :rename_file
   #after_create :validate_permissions
@@ -29,13 +29,17 @@ class SpudMedia < ActiveRecord::Base
       return
     end
     # remove periods and other unsafe characters from file name to make routing easier
-    extension = File.extname(attachment_file_name)
-    filename = attachment_file_name.chomp(extension).parameterize
-    attachment.instance_write :file_name, filename + extension
+    if self.attachment_file_name.blank? == false
+      extension = File.extname(attachment_file_name)
+      filename = attachment_file_name.chomp(extension).parameterize
+      attachment.instance_write :file_name, filename + extension
+    end
   end
 
   def image_from_type
-
+    if self.attachment_content_type.blank?
+      return "spud/admin/files_thumbs/dat_thumb.png"
+    end
     if self.is_image? || self.is_pdf?
       return self.attachment_url(:small)
 
@@ -74,7 +78,7 @@ class SpudMedia < ActiveRecord::Base
   end
 
   def is_image?
-    if self.attachment_content_type.match(/jpeg|jpg|png/)
+    if self.attachment_content_type.blank? == false && self.attachment_content_type.match(/jpeg|jpg|png/)
       return true
     else
       return false

data/app/views/spud/admin/media/edit.html.erb

@@ -47,4 +47,4 @@
 
 <script type="text/javascript">
   $(window).load(spud.admin.media.edit);
-</script>
+</script>

data/app/views/spud/admin/media_picker/index.html.erb

@@ -3,7 +3,7 @@
   <title>Spud Media Picker</title>
   <%= stylesheet_link_tag *Spud::Core.config.admin_stylesheets %>
   <%= javascript_include_tag *Spud::Core.config.admin_javascripts %>
-  <%= javascript_include_tag 'tiny_mce/tiny_mce_popup' %>
+  <%= javascript_include_tag 'tinymce/tiny_mce_popup' %>
   <%= csrf_meta_tags %>
 </head>
 <body class="spud_media_picker">
@@ -100,4 +100,4 @@
   </script>
 
 </body>
-</html>
+</html>

data/config/routes.rb

@@ -10,5 +10,5 @@ Rails.application.routes.draw do
 	end
 
   #get '/media/protected/:id/:style/:filename' => 'ProtectedMedia#show', :as => 'protected_media'
-  get Spud::Media.config.storage_url => 'ProtectedMedia#show', :as => 'protected_media'
+  get Spud::Media.config.storage_url => 'protected_media#show', :as => 'protected_media'
 end

data/lib/spud_media/engine.rb

@@ -1,5 +1,6 @@
 require 'spud_core'
 require 'paperclip'
+require 'tinymce-rails'
 module Spud
 	module Media
 		 class Engine < Rails::Engine

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Media
-		VERSION = "0.9.7"
+		VERSION = "1.0.0.rc1"
 	end
 end

metadata

@@ -1,116 +1,102 @@
 --- !ruby/object:Gem::Specification
 name: spud_media
 version: !ruby/object:Gem::Version
-  version: 0.9.7
-  prerelease: 
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - David Estes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: spud_core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,55 +111,48 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 1.0.0.RC1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 1.0.0.RC1
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -256,34 +233,27 @@ files:
 - MIT-LICENSE
 - Rakefile
 - Readme.markdown
-homepage: http://www.github.com/davydotcom/spud_media
+homepage: http://www.github.com/spud-rails/spud_media
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -416899076259161455
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -416899076259161455
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Spud File upload/management module
 test_files: []