spud_media 0.9.4 → 0.9.5

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

@@ -1,5 +1,5 @@
 class Spud::Admin::MediaController < Spud::Admin::ApplicationController
-	layout 'spud/admin/media/detail'
+	layout 'layouts/spud/admin/detail'
 	add_breadcrumb "Media", :spud_admin_media_path
 	belongs_to_spud_app :media
 	before_filter :load_media,:only => [:edit,:update,:show,:destroy,:set_private,:set_access]

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

@@ -0,0 +1,28 @@
+class Spud::Admin::MediaPickerController < Spud::Admin::ApplicationController
+
+  include RespondsToParent
+
+  layout false
+  respond_to :html
+
+  def index
+    @media = SpudMedia.all
+    respond_with @media
+  end
+
+  def create
+    @media = SpudMedia.new(params[:spud_media])
+    if @media.save
+      if request.xhr?
+        render 'create', :status => 200
+      else
+        respond_to_parent do
+          render 'create.js', :status => 200
+        end
+      end
+    else
+      render nil, :status => 422
+    end
+  end
+
+end

data/app/models/spud_media.rb

@@ -17,6 +17,7 @@ class SpudMedia < ActiveRecord::Base
   validates_numericality_of :crop_x, :crop_y, :crop_w, :crop_h, :crop_s, :allow_nil => true
 
   before_create :rename_file
+  #after_create :validate_permissions
   before_update :validate_permissions
 
   def rename_file
@@ -29,7 +30,7 @@ class SpudMedia < ActiveRecord::Base
   def image_from_type
 
     if self.is_image? || self.is_pdf?
-      return self.attachment.url(:small)
+      return self.attachment_url(:small)
 
     elsif self.attachment_content_type.blank?
     	return "spud/admin/files_thumbs/dat_thumb.png"
@@ -141,14 +142,12 @@ private
   def validate_permissions_s3
     if is_protected
       attachment.s3_object(:original).acl = :private
-      if attachment.s3_object(:cropped).exists?
-        attachment.s3_object(:cropped).acl = :private
-      end
+      attachment.s3_object(:cropped).acl = :private if attachment.s3_object(:cropped).exists?
+      attachment.s3_object(:small).acl = :private if attachment.s3_object(:small).exists?
     else
       attachment.s3_object(:original).acl = :public_read
-      if attachment.s3_object(:cropped).exists?
-        attachment.s3_object(:cropped).acl = :public_read
-      end
+      attachment.s3_object(:cropped).acl = :public_read if attachment.s3_object(:cropped).exists?
+      attachment.s3_object(:small).acl = :public_read if attachment.s3_object(:small).exists?
     end
   end
 

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

@@ -46,5 +46,5 @@
 </div>
 
 <script type="text/javascript">
-  $(window).load(Spud.Admin.Media.edit);
+  $(window).load(spud.admin.media.edit);
 </script>

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

@@ -7,8 +7,12 @@
 				<div class="page_row">
 					
 				<span class="row_meta">
-					<%=image_tag(media.image_from_type,:class => "size-50-thumb")%>
-					<%=link_to media.attachment.url.split("/").last, media.attachment_url %>					
+					<% if media.is_protected && (media.is_image? || media.is_pdf?) %>
+						<img src="<%= media.image_from_type %>" class="size-50-thumb" />
+					<% else %>
+						<%= image_tag(media.image_from_type, :class => "size-50-thumb") %>
+					<% end %>
+					<%= link_to media.attachment.url.split("/").last, media.attachment_url %>					
 				</span>
 
 				<span class="edit_controls">

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

@@ -0,0 +1,19 @@
+<%= content_tag :div, :class => 'spud_media_picker_item',
+  'data-id' => media.id,
+  'data-type' => (media.is_image? ? 'img' : 'file'),
+  'data-url' => media.attachment.url,
+  'data-name' => media.attachment_file_name,
+  'data-size' => media.attachment_file_size,
+  'data-lastmod' => media.attachment_updated_at.blank? == false ? media.attachment_updated_at.strftime("%l:%M %p, %D") : '',
+  'data-protected' => (media.is_protected ? 'Yes' : 'No') do %>
+  <span class="spud_media_picker_item_thumb">
+    <% if media.is_protected && (media.is_image? || media.is_pdf?) %>
+      <img src="<%= media.image_from_type %>"/>
+    <% else %>
+      <%= image_tag(media.image_from_type) %>
+    <% end %>
+  </span>
+  <span class="spud_media_picker_item_filename">
+    <%= media.attachment_file_name %>
+  </span>
+<% end %>

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

@@ -0,0 +1 @@
+<%= render :partial => 'media', :locals => {:media => @media} %>

data/app/views/spud/admin/media_picker/create.js.erb

@@ -0,0 +1 @@
+spud.admin.mediapicker.onLegacyUploadComplete("<%= escape_javascript(render :partial => 'media', :locals => {:media => @media}) %>");

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

@@ -0,0 +1,103 @@
+<html>
+<head>
+  <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' %>
+  <%= csrf_meta_tags %>
+</head>
+<body class="spud_media_picker">
+
+  <div class="spud_media_picker_container">
+
+    <div class="spud_media_picker_tabs">
+      <a class="spud_media_picker_tab" href="#spud_media_picker_tab_upload">Upload</a>
+      <a class="spud_media_picker_tab" href="#spud_media_picker_tab_choose">Choose</a>
+      <a class="spud_media_picker_tab" href="#spud_media_picker_tab_advanced">Advanced</a>
+    </div>
+
+    <div class="spud_media_picker_tab_body spud_media_picker_tab_upload">
+      <%= form_for :spud_media, :html => {:class => 'spud_media_picker_upload_form', :target => 'spud_media_picker_upload_target'} do |f| %>
+        <%= f.label :attachment, 'Upload New File' %>
+        <%= f.file_field :attachment%>
+        <div class="progress progress-striped active spud_media_picker_upload_progress">
+          <div class="bar"></div>
+        </div>
+        <div class="spud_media_picker_buttons">
+          <%= f.submit 'Upload', :class => 'btn btn-mini btn-primary spud_media_picker_tab_upload_submit' %>
+          <%= link_to 'Cancel', '#', :class => 'btn btn-mini spud_media_picker_button_cancel' %>
+        </div>
+      <% end %>
+    </div>
+
+    <div class="spud_media_picker_tab_body spud_media_picker_tab_choose">
+      <div class="spud_media_picker_list">
+        <%= render :partial => 'media', :collection => @media %>
+      </div>
+      <div class="spud_media_picker_details">
+        <img src="" class="spud_media_picker_details_thumb" />
+        <ul class="spud_media_picker_details_meta">
+          <li>File Name: <span class="spud_media_picker_details_name"></span></li>
+          <li>File Size: <span class="spud_media_picker_details_size"></span></li>
+          <li>Last Modified: <span class="spud_media_picker_details_lastmod"></span></li>
+          <li>Protected: <span class="spud_media_picker_details_protected"></span></li>
+        </ul>
+      </div>
+      <div class="spud_media_picker_buttons">
+        <%= link_to 'Use Selected', '#', :class => 'btn btn-mini btn-primary spud_media_picker_button_use_selected' %>
+        <%= link_to 'Cancel', '#', :class => 'btn btn-mini spud_media_picker_button_cancel' %>
+      </div>
+    </div>
+
+    <div class="spud_media_picker_tab_body spud_media_picker_tab_advanced">
+      <div class="spud_media_picker_option spud_media_picker_option_selected_file">
+        <label>Selected File:</label>
+        <input name="spud_media_picker_option_selected_file" type="text" disabled="disabled" />
+      </div>
+      <div class="spud_media_picker_option spud_media_picker_option_type">
+        <label>Media Type:</label>
+        <input name="spud_media_picker_option_type" type="text" disabled="disabled" />
+      </div>
+      <div class="spud_media_picker_option spud_media_picker_option_target">
+        <label>Open Link In:</label>
+        <select name="spud_media_picker_option_target">
+          <option value="">Same Window</option>
+          <option value="_blank">New Window</option>
+        </select>
+      </div>
+      <div class="spud_media_picker_option spud_media_picker_option_text">
+        <label>Link Text:</label>
+        <input name="spud_media_picker_option_text" type="text" />
+      </div>
+      <div class="spud_media_picker_option spud_media_picker_option_float">
+        <label>Float Image:</label>
+        <select name="spud_media_picker_option_float">
+          <option value="none">Normal</option>
+          <option value="left">Left</option>
+          <option value="right">Right</option>
+        </select>
+      </div>
+      <div class="spud_media_picker_option spud_media_picker_option_title">
+        <label>Title:</label>
+        <input name="spud_media_picker_option_title" type="text" />
+      </div>
+      <div class="spud_media_picker_option spud_media_picker_option_dimensions">
+        <label>Dimensions:</label>
+        <input name="spud_media_picker_option_dimension_w" type="text" placeholder="auto" /> px by <input name="spud_media_picker_option_dimension_h" type="text" placeholder="auto" /> px
+      </div>
+      <div class="spud_media_picker_buttons">
+        <%= link_to 'Insert', '#', :class => 'btn btn-mini btn-primary spud_media_picker_button_insert' %>
+        <%= link_to 'Cancel', '#', :class => 'btn btn-mini spud_media_picker_button_cancel' %>
+      </div>
+    </div>
+
+  </div>
+
+  <iframe id="spud_media_picker_upload_target" name="spud_media_picker_upload_target" style="display:none;"></iframe>
+
+  <script>
+    $(document).ready(spud.admin.mediapicker.init);
+  </script>
+
+</body>
+</html>

data/config/routes.rb

@@ -4,6 +4,7 @@ Rails.application.routes.draw do
 			resources :media do
         put 'set_access', :on => :member
       end
+      resources :media_picker, :only => [:index, :create]
 		end
 	end
 

data/lib/responds_to_parent.rb

@@ -0,0 +1,69 @@
+#  Copyright (c) 2006 Sean Treadway
+#
+#  Permission is hereby granted, free of charge, to any person obtaining
+#  a copy of this software and associated documentation files (the
+#  "Software"), to deal in the Software without restriction, including
+#  without limitation the rights to use, copy, modify, merge, publish,
+#  distribute, sublicense, and/or sell copies of the Software, and to
+#  permit persons to whom the Software is furnished to do so, subject to
+#  the following conditions:
+#
+#  The above copyright notice and this permission notice shall be
+#  included in all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+#  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+#  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+#  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+# Module containing the methods useful for child IFRAME to parent window communication
+module RespondsToParent
+
+  # Executes the response body as JavaScript in the context of the parent window.
+  # Use this method of you are posting a form to a hidden IFRAME or if you would like
+  # to use IFRAME base RPC.
+  def responds_to_parent(&block)
+    yield
+
+    if performed?
+      # We're returning HTML instead of JS or XML now
+      response.headers['Content-Type'] = 'text/html; charset=UTF-8'
+
+      # Either pull out a redirect or the request body
+      script =  if response.headers['Location']
+                  #TODO: erase_redirect_results is missing in rails 3.0 has to be implemented
+#                  erase redirect
+                  "document.location.href = #{location.to_s.inspect}"
+                else
+                  response.body
+                end
+
+      # Escape quotes, linebreaks and slashes, maintaining previously escaped slashes
+      # Suggestions for improvement?
+      script = (script || '').
+        gsub('\\', '\\\\\\').
+        gsub(/\r\n|\r|\n/, '\\n').
+        gsub(/['"]/, '\\\\\&').
+        gsub('</script>','</scr"+"ipt>')
+
+      # Clear out the previous render to prevent double render
+      response.request.env['action_controller.instance'].instance_variable_set(:@_response_body, nil)
+
+      # Eval in parent scope and replace document location of this frame
+      # so back button doesn't replay action on targeted forms
+      # loc = document.location to be set after parent is updated for IE
+      # with(window.parent) - pull in variables from parent window
+      # setTimeout - scope the execution in the windows parent for safari
+      # window.eval - legal eval for Opera
+      render :text => "<html><body><script type='text/javascript' charset='utf-8'>
+        var loc = document.location;
+        with(window.parent) { setTimeout(function() { window.eval('#{script}'); if (typeof(loc) !== 'undefined') loc.replace('about:blank'); }, 1) };
+        </script></body></html>".html_safe
+    end
+  end
+  alias respond_to_parent responds_to_parent
+end

data/lib/spud_media.rb

@@ -1,6 +1,7 @@
 module Spud
 	module Media
 		require 'spud_media/configuration'
+    require 'responds_to_parent.rb'
 		require 'spud_media/engine' if defined?(Rails)
 	end
 end

data/lib/spud_media/engine.rb

@@ -5,15 +5,12 @@ module Spud
 		 class Engine < Rails::Engine
 			engine_name :spud_media
 			initializer :admin do
+				Spud::Core.append_admin_javascripts('spud/admin/media/application')
+  			Spud::Core.append_admin_stylesheets('spud/admin/media/application')
 				Spud::Core.configure do |config|
 				  config.admin_applications += [{:name => "Media",:thumbnail => "spud/admin/media_thumb.png",:url => "/spud/admin/media",:order => 3,:retina => true}]
 				end
 			end
-			initializer :assets do |config| 
-				Rails.application.config.assets.precompile += [ 
-				     "spud/admin/media*"
-				]
-			 end
 		 end
 	end
 end

data/lib/spud_media/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Media
-		VERSION = "0.9.4"
+		VERSION = "0.9.5"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_media
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -33,9 +33,6 @@ dependencies:
     none: false
     requirements:
     - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - <
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
@@ -44,9 +41,6 @@ dependencies:
     none: false
     requirements:
     - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-    - - <
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
@@ -70,49 +64,65 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.11
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.1
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +171,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 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:
@@ -182,7 +208,10 @@ files:
 - 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.js
+- app/assets/images/spud/admin/media_tiny.png
+- app/assets/javascripts/spud/admin/media/application.js
+- app/assets/javascripts/spud/admin/media/picker.js
+- app/assets/javascripts/spud/admin/media/plugin.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
@@ -197,21 +226,27 @@ 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.css
+- app/assets/stylesheets/spud/admin/media/application.css
+- app/assets/stylesheets/spud/admin/media/plugin.css
 - app/controllers/protected_media_controller.rb
 - app/controllers/spud/admin/media_controller.rb
+- app/controllers/spud/admin/media_picker_controller.rb
 - app/helpers/protected_media_helper.rb
 - app/helpers/spud/admin/users_helper.rb
 - 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
+- app/views/spud/admin/media_picker/_media.html.erb
+- app/views/spud/admin/media_picker/create.html.erb
+- app/views/spud/admin/media_picker/create.js.erb
+- app/views/spud/admin/media_picker/index.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/responds_to_parent.rb
 - lib/spud_media/configuration.rb
 - lib/spud_media/engine.rb
 - lib/spud_media/version.rb
@@ -220,34 +255,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - Readme.markdown
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/script/rails
 homepage: http://www.github.com/davydotcom/spud_media
 licenses: []
 post_install_message: 
@@ -262,7 +269,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1980562551546653351
+      hash: 1098441516915304500
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,39 +278,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1980562551546653351
+      hash: 1098441516915304500
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Spud File upload/management module
-test_files:
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/script/rails
+test_files: []