spud_media 0.9.0 → 0.9.1

data/app/models/spud_media.rb

@@ -1,101 +1,136 @@
 class SpudMedia < ActiveRecord::Base
 
 	has_attached_file :attachment,
-     :storage => Spud::Media.paperclip_storage,
-     :s3_credentials => Spud::Media.s3_credentials,
-     :s3_permissions => lambda { |attachment, style| 
-          attachment.instance.is_protected ? 'private' : 'public-read' 
-     },
-     :path => Spud::Media.paperclip_storage == :s3 ? Spud::Media.storage_path : lambda { |attachment| 
-          attachment.instance.is_protected ? Spud::Media.storage_path_protected : Spud::Media.storage_path
-     },
-     :url => Spud::Media.storage_url
+    :storage => Spud::Media.paperclip_storage,
+    :s3_credentials => Spud::Media.s3_credentials,
+    :s3_permissions => lambda { |attachment, style| 
+      attachment.instance.is_protected ? 'private' : 'public-read' 
+    },
+    :path => Spud::Media.paperclip_storage == :s3 ? Spud::Media.storage_path : lambda { |attachment| 
+      attachment.instance.is_protected ? Spud::Media.storage_path_protected : Spud::Media.storage_path
+    },
+    :url => Spud::Media.storage_url,
+    :styles => lambda { |attachment| attachment.instance.custom_style }
 
-     before_update :validate_permissions
+  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
-     def image_from_type
-     	if self.attachment_content_type.blank?
-     		return "spud/admin/files_thumbs/dat_thumb.png"
-     	end
+  validates_numericality_of :crop_x, :crop_y, :crop_w, :crop_h, :crop_s, :allow_nil => true
 
-     	if self.attachment_content_type.match(/jpeg|jpg/)
-     		return "spud/admin/files_thumbs/jpg_thumb.png"
-     	end
+  before_create :rename_file
+  before_update :validate_permissions
 
-     	if self.attachment_content_type.match(/png/)
-     		return "spud/admin/files_thumbs/png_thumb.png"
-     	end
+  def rename_file
+    # 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
+  end
 
-     	if self.attachment_content_type.match(/zip|tar|tar\.gz|gz/)
-     		return "spud/admin/files_thumbs/zip_thumb.png"
-     	end
+  def image_from_type
+    if self.attachment_content_type.blank?
+    	return "spud/admin/files_thumbs/dat_thumb.png"
+    
+    elsif self.attachment_content_type.match(/jpeg|jpg/)
+    	return "spud/admin/files_thumbs/jpg_thumb.png"
+    
+    elsif self.attachment_content_type.match(/png/)
+    	return "spud/admin/files_thumbs/png_thumb.png"
+    
+    elsif self.attachment_content_type.match(/zip|tar|tar\.gz|gz/)
+    	return "spud/admin/files_thumbs/zip_thumb.png"
+    
+    elsif self.attachment_content_type.match(/xls|xlsx/)
+    	return "spud/admin/files_thumbs/xls_thumb.png"
+    
+    elsif self.attachment_content_type.match(/doc|docx/)
+    	return "spud/admin/files_thumbs/doc_thumb.png"
+    
+    elsif self.attachment_content_type.match(/ppt|pptx/)
+    	return "spud/admin/files_thumbs/ppt_thumb.png"
+    
+    elsif self.attachment_content_type.match(/txt|text/)
+    	return "spud/admin/files_thumbs/txt_thumb.png"
+    
+    elsif self.attachment_content_type.match(/pdf|ps/)
+    	return "spud/admin/files_thumbs/pdf_thumb.png"
+    
+    elsif self.attachment_content_type.match(/mp3|wav|aac/)
+    	return "spud/admin/files_thumbs/mp3_thumb.png"
+    end
+    
+    return "spud/admin/files_thumbs/dat_thumb.png"
+  end
 
-     	if self.attachment_content_type.match(/xls|xlsx/)
-     		return "spud/admin/files_thumbs/xls_thumb.png"
-     	end
-     	if self.attachment_content_type.match(/doc|docx/)
-     		return "spud/admin/files_thumbs/doc_thumb.png"
-     	end
-     	if self.attachment_content_type.match(/ppt|pptx/)
-     		return "spud/admin/files_thumbs/ppt_thumb.png"
-     	end
-     	if self.attachment_content_type.match(/txt|text/)
-     		return "spud/admin/files_thumbs/txt_thumb.png"
-     	end
-     	if self.attachment_content_type.match(/pdf|ps/)
-     		return "spud/admin/files_thumbs/pdf_thumb.png"
-     	end
-     	if self.attachment_content_type.match(/mp3|wav|aac/)
-     		return "spud/admin/files_thumbs/mp3_thumb.png"
-     	end
+  def is_image?
+    if self.attachment_content_type.match(/jpeg|jpg|png/)
+      return true
+    else
+      return false
+    end
+  end
 
-     	return "spud/admin/files_thumbs/dat_thumb.png"
-     end
+  def has_custom_crop?
+    return (crop_x && crop_y && crop_w && crop_h && crop_s)
+  end
 
-    # if you are using S3, attachment.url will automatically point to the S3 url
-    # protected files need to hit the rails middle-man first
-    # this method will provide the correct url for either case
-    def attachment_url
-      if Spud::Media.paperclip_storage == :s3 && is_protected
-        return Paperclip::Interpolations.interpolate(Spud::Media.config.storage_url, attachment, 'original')
-      else
-        return attachment.url
-      end
+  def custom_style
+    if is_image? && has_custom_crop?
+      {:cropped => {:geometry => '', :convert_options => "-resize #{crop_s}% -crop #{crop_w}x#{crop_h}+#{crop_x}+#{crop_y}"}}
+    else
+      {}
     end
+  end
 
-     # If is_protected has changed, we need to make sure we are setting the appropriate permissions
-     # This means either moving the file in the filesystem or setting the appropriate ACL in S3
-    def validate_permissions
-      if Spud::Media.config.paperclip_storage == :filesystem
-        validate_permissions_filesystem
-      elsif Spud::Media.config.paperclip_storage == :s3
-        validate_permissions_s3
-      end
+  # if you are using S3, attachment.url will automatically point to the S3 url
+  # protected files need to hit the rails middle-man first
+  # this method will provide the correct url for either case
+  def attachment_url(style=nil)
+    # defaults to cropped style if that style exists, otherwise use original
+    if !style
+      style = (is_image? && has_custom_crop?) ? 'cropped' : 'original'
     end
+    if Spud::Media.paperclip_storage == :s3 && is_protected
+      return Paperclip::Interpolations.interpolate(Spud::Media.config.storage_url, attachment, style)
+    else
+      return attachment.url(style)
+    end
+  end
+
+   # If is_protected has changed, we need to make sure we are setting the appropriate permissions
+   # This means either moving the file in the filesystem or setting the appropriate ACL in S3
+  def validate_permissions
+    if Spud::Media.config.paperclip_storage == :filesystem
+      validate_permissions_filesystem
+    elsif Spud::Media.config.paperclip_storage == :s3
+      validate_permissions_s3
+    end
+  end
 
 private
 
-    def validate_permissions_filesystem
-      if is_protected
-        old_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path, attachment, 'original')
-        new_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path_protected, attachment, 'original')
-      else
-        old_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path_protected, attachment, 'original')
-        new_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path, attachment, 'original') 
-      end
-      new_base_dir = File.dirname(new_path)
-      old_base_dir= File.dirname(old_path)
-      if File.directory?(old_base_dir)
-        FileUtils.mv(old_base_dir, new_base_dir)
-      end
+  def validate_permissions_filesystem
+    if is_protected
+      old_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path, attachment, 'original')
+      new_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path_protected, attachment, 'original')
+    else
+      old_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path_protected, attachment, 'original')
+      new_path = Paperclip::Interpolations.interpolate(Spud::Media.config.storage_path, attachment, 'original') 
+    end
+    new_base_dir = File.dirname(File.dirname(new_path))
+    old_base_dir= File.dirname(File.dirname(old_path))
+    if File.directory?(old_base_dir)
+      FileUtils.mv(old_base_dir, new_base_dir)
     end
+  end
 
-    def validate_permissions_s3
-      if is_protected
-        attachment.s3_object.acl = :private
-      else
-        attachment.s3_object.acl = :public_read
-      end
+  def validate_permissions_s3
+    if is_protected
+      attachment.s3_object(:original).acl = :private
+      attachment.s3_object(:cropped).acl = :private unless !has_custom_crop?
+    else
+      attachment.s3_object(:original).acl = :public_read
+      attachment.s3_object(:cropped).acl = :public_read unless !has_custom_crop?
     end
+  end
+
 end

data/app/views/layouts/spud/admin/media/detail.html.erb

@@ -1,4 +1,5 @@
 <%=content_for :head do%>
-  <%= stylesheet_link_tag "spud/admin/media/application" %>
-<%end%>
+  <%= javascript_include_tag 'spud/admin/media' %>
+  <%= stylesheet_link_tag "spud/admin/media" %>
+<% end %>
 <%= render :template => 'layouts/spud/admin/detail' %>

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

@@ -0,0 +1,50 @@
+<%= error_messages_for(@media) %>
+
+<div id="spud_media_cropper_toolbar">
+  <%= form_for @media, :url => spud_admin_medium_path(@media) do |f| %>
+
+    <div class="spud_media_cropper_toolbar_item">
+      <%= label_tag :x %>
+      <%= f.text_field :crop_x %>
+    </div>
+
+    <div class="spud_media_cropper_toolbar_item">
+      <%= label_tag :y %>
+      <%= f.text_field :crop_y %>
+    </div>
+
+    <div class="spud_media_cropper_toolbar_item">
+      <%= label_tag :width %>
+      <%= f.text_field :crop_w %>
+    </div>
+
+    <div class="spud_media_cropper_toolbar_item">
+      <%= label_tag :height %>
+      <%= f.text_field :crop_h %>
+    </div>
+
+    <div class="spud_media_cropper_toolbar_item">
+      <%= label_tag :scale, 'Size' %>
+      <%= f.hidden_field :crop_s %>
+      <a href="#" id="spud_media_cropper_resize_up"><i class="icon-plus"></i></a>
+      <a href="#" id="spud_media_cropper_resize_down"><i class="icon-minus"></i></a>
+    </div>
+
+    <div id="spud_media_cropper_toolbar_actions">
+      <%= f.submit 'Crop', :id => 'spud_media_cropper_submit', :class => 'btn btn-mini btn-primary' %>
+      <%= link_to "Don't Crop", spud_admin_media_path, :class => 'btn btn-mini' %>
+    </div>
+  <% end %>
+</div>
+
+<div id="spud_media_cropper_outer">
+  <div id="spud_media_cropper">
+    <div id="spud_media_cropper_jcrop_container">
+      <%= image_tag @media.attachment_url(:original), :id => 'spud_media_cropper_image' %>
+    </div>
+  </div>
+</div>
+
+<script type="text/javascript">
+  $(window).load(Spud.Admin.Media.edit);
+</script>

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

@@ -12,12 +12,15 @@
 				</span>
 
 				<span class="edit_controls">
+					<% if media.is_image? %>
+						<%= link_to 'Crop', edit_spud_admin_medium_path(media.id), :class => 'btn' %>
+					<% end %>
 					<% if media.is_protected %>
 						<%= link_to raw('<i class="icon-lock"></i> Protected'), set_access_spud_admin_medium_path(media.id, :protected => false), :method => :put, :class => 'btn' %>
 					<% else %>
 						<%= link_to 'Public', set_access_spud_admin_medium_path(media.id, :protected => true), :method => :put, :class => 'btn' %>
 					<% end %>
-					<%=link_to "Remove",spud_admin_medium_path(:id => media.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this file?"%>
+					<%=link_to "Remove", spud_admin_medium_path(:id => media.id),:method => :delete,:class => 'btn btn-danger',:confirm => "Are you sure you want to remove this file?"%>
 				</span>
 				
 				<br style="clear:both;"/>

data/config/routes.rb

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

data/db/migrate/20120508132153_add_cropping_to_spud_media.rb

@@ -0,0 +1,9 @@
+class AddCroppingToSpudMedia < ActiveRecord::Migration
+  def change
+    add_column :spud_media, :crop_x, :int, :default => 0
+    add_column :spud_media, :crop_y, :int, :default => 0
+    add_column :spud_media, :crop_w, :int
+    add_column :spud_media, :crop_h, :int
+    add_column :spud_media, :crop_s, :int, :default => 100
+  end
+end

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Media
-		VERSION = "0.9.0"
+		VERSION = "0.9.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_media
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70279704590120 !ruby/object:Gem::Requirement
+  requirement: &70312311481820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70279704590120
+  version_requirements: *70312311481820
 - !ruby/object:Gem::Dependency
   name: spud_core
-  requirement: &70279704589000 !ruby/object:Gem::Requirement
+  requirement: &70312311252840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70279704589000
+  version_requirements: *70312311252840
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70279704603420 !ruby/object:Gem::Requirement
+  requirement: &70312311252020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70279704603420
+  version_requirements: *70312311252020
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70279704602440 !ruby/object:Gem::Requirement
+  requirement: &70312311251640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70279704602440
+  version_requirements: *70312311251640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70279704601520 !ruby/object:Gem::Requirement
+  requirement: &70312311251180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70279704601520
+  version_requirements: *70312311251180
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70279704600080 !ruby/object:Gem::Requirement
+  requirement: &70312311250760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70279704600080
+  version_requirements: *70312311250760
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70279704597640 !ruby/object:Gem::Requirement
+  requirement: &70312311250160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -90,10 +90,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70279704597640
+  version_requirements: *70312311250160
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70279704611520 !ruby/object:Gem::Requirement
+  requirement: &70312311249660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -101,10 +101,10 @@ dependencies:
         version: 0.10.3
   type: :development
   prerelease: false
-  version_requirements: *70279704611520
+  version_requirements: *70312311249660
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70279704610980 !ruby/object:Gem::Requirement
+  requirement: &70312311249200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -112,7 +112,7 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70279704610980
+  version_requirements: *70312311249200
 description: Spud Media allows you to upload files to your site and manage them in
   the spud administrative panel. It also uses paperclip and supports s3 storage
 email:
@@ -131,9 +131,17 @@ files:
 - app/assets/images/spud/admin/files_thumbs/txt_thumb.png
 - app/assets/images/spud/admin/files_thumbs/xls_thumb.png
 - app/assets/images/spud/admin/files_thumbs/zip_thumb.png
+- app/assets/images/spud/admin/media/checkers.jpg
 - app/assets/images/spud/admin/media_thumb.png
 - app/assets/images/spud/admin/media_thumb@2x.png
-- app/assets/javascripts/spud/admin/media/application.js
+- app/assets/javascripts/spud/admin/media.js
+- app/assets/libs/jcrop/css/Jcrop.gif
+- app/assets/libs/jcrop/css/jquery.Jcrop.css
+- app/assets/libs/jcrop/css/jquery.Jcrop.min.css
+- app/assets/libs/jcrop/js/jquery.color.js
+- app/assets/libs/jcrop/js/jquery.Jcrop.js
+- app/assets/libs/jcrop/js/jquery.Jcrop.min.js
+- app/assets/libs/jcrop/js/jquery.min.js
 - app/assets/libs/tiny_mce/plugins/spud_media/blank.htm
 - app/assets/libs/tiny_mce/plugins/spud_media/css/template.css
 - app/assets/libs/tiny_mce/plugins/spud_media/editor_plugin.js
@@ -141,7 +149,7 @@ files:
 - app/assets/libs/tiny_mce/plugins/spud_media/js/template.js
 - app/assets/libs/tiny_mce/plugins/spud_media/langs/en_dlg.js
 - app/assets/libs/tiny_mce/plugins/spud_media/template.htm
-- app/assets/stylesheets/spud/admin/media/application.css
+- app/assets/stylesheets/spud/admin/media.css
 - app/controllers/protected_media_controller.rb
 - app/controllers/spud/admin/media_controller.rb
 - app/helpers/protected_media_helper.rb
@@ -149,11 +157,13 @@ files:
 - app/helpers/spud/user_sessions_helper.rb
 - app/models/spud_media.rb
 - app/views/layouts/spud/admin/media/detail.html.erb
+- app/views/spud/admin/media/edit.html.erb
 - app/views/spud/admin/media/index.html.erb
 - app/views/spud/admin/media/new.html.erb
 - config/routes.rb
 - db/migrate/20120101194256_create_spud_media.rb
 - db/migrate/20120501203325_add_protected_to_spud_media.rb
+- db/migrate/20120508132153_add_cropping_to_spud_media.rb
 - lib/spud_media/configuration.rb
 - lib/spud_media/engine.rb
 - lib/spud_media/version.rb
@@ -204,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3389397261865265902
+      hash: 1269224106861082199
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -213,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3389397261865265902
+      hash: 1269224106861082199
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/app/assets/stylesheets/spud/admin/media/application.css

@@ -1,3 +0,0 @@
-img.size-50-thumb {
-	height:50px !important;
-}