wheels 0.0.29 → 0.0.30

data/VERSION

@@ -1 +1 @@
-0.0.29
+0.0.30

data/app/controllers/attachments_controller.rb

@@ -12,5 +12,6 @@ class AttachmentsController < InheritedResources::Base
   def create
     create! {collection_url}
   end
+
 end
 

data/app/controllers/pages_controller.rb

@@ -48,6 +48,7 @@ class PagesController < InheritedResources::Base
     edit! do |format|
       set_children
       @attachment = Attachment.new(:page=>@page)
+      @s3provider = S3Provider.new(:key=>"attachments/#{current_user.id}")
     end
   end
 

data/app/helpers/pages_helper.rb

@@ -9,5 +9,186 @@ module PagesHelper
   def to_html_options(pages)
     pages.map{|p| [p.title, p.id]}
   end
+
+
+
+  ######################################################
+  ##
+  ##
+  ##   Begin of uploadify_s3
+  ##
+  ##
+  ######################################################
+
+  def uploadify_s3(options = {})
+#    stylesheet_link_tag('uploadify/uploadify') <<
+#    javascript_include_tag('uploadify/jquery.uploadify.v2.1.0.min') <<
+#    javascript_include_tag('uploadify/swfobject') <<
+    javascript_uploadify_s3_tag(options)
+  end
+
+  protected
+
+  def javascript_uploadify_s3_tag(options = {})
+    options = default_options.merge(options)
+    javascript_tag( %(
+  		$(document).ready(function() {
+  			$("#{options[:file_input_selector]}").uploadify({
+  				'fileDataName' : 'file',
+  				'uploader'       : '/uploadify.swf',
+  				'script'         : '#{bucket_url}',
+  				'cancelImg'      : '/images/uploadify/cancel.png',
+  				'folder'         : 'attachments',
+  				'auto'           : true,
+  				'multi'          : true,
+  				'buttonText'		 : 'Add File',
+  				'sizeLimit'			 : '#{max_filesize}',
+  				'fileDesc'		   : '#{options[:file_desc]}',
+  				'fileExt'				 : '#{options[:file_ext]}',
+  				'onSelect'       : function(event, queueID, fileObj) {
+  				    if (fileObj.size >= "#{max_filesize}") {
+      					$("#{options[:file_input_selector]}").uploadifyCancel(queueID);
+      					alert('Sorry the max file size is #{((max_filesize/1024)/1024)} MB');
+      					return false;
+      				}
+
+              $('div.button_group').hide();
+              return true;
+  				},
+  				'onComplete'     : function(event, queueID, fileObj, response) {
+            $('div.button_group').show();
+            fileInfo = {
+					    'name' : fileObj.name,
+					    'size' : fileObj.size,
+					    'type' : fileObj.type,
+					    'url'  : '#{bucket_url}#{upload_path}/' + fileObj.name + '#{rangen}'
+					  };
+					  var onsucc = (#{options[:on_success]});
+					  onsucc(fileInfo);
+						$('#{options[:file_input_selector]}').hide();
+						return true;
+  				},
+  				'onError' 			 : function (a, b, c, d) {
+  					if (d.info == 201) {
+  					  fileInfo = {
+  					    'name' : c.name,
+  					    'size' : c.size,
+  					    'type' : c.type,
+  					    'url'  : '#{bucket_url}#{upload_path}/' + c.name + '#{rangen}'
+  					  };
+  					  var onsucc = (#{options[:on_success]});
+  					  onsucc(fileInfo);
+  						$('#{options[:file_input_selector]}').hide();
+  					} else {
+              var onerror = (#{options[:on_error]});
+              if (onerror) {
+                onerror(d.type, d.text);
+                $('#file_uploaderQueue').hide();
+                return false;
+              }
+  					}
+
+  				  return true;
+  				},
+          'scriptData' 		 : {
+             'AWSAccessKeyId': '#{aws_access_key}',
+             'key': '#{key}',
+             'acl': '#{acl}',
+             'policy': '#{s3_policy}',
+  					 'success_action_status': '201',
+             'signature': encodeURIComponent(encodeURIComponent('#{s3_signature}')),
+        		 'Content-Type': ''
+            }
+  			});
+  		});
+    ))
+  end
+
+  def bucket_url
+    "http://#{bucket}.s3.amazonaws.com/"
+  end
+
+  def key
+    "#{upload_path}/${filename}#{rangen}"
+  end
+
+  def rangen
+    @rangen ||= '' # rand(36 ** 8).to_s(36)
+  end
+
+  def policy_doc
+    @policy ||= "{'expiration': '#{expiration_date}',
+        'conditions': [{'bucket': '#{bucket}'},
+          ['starts-with', '$key', '#{upload_path}'],
+          {'acl': '#{acl.to_s}'},
+          ['content-length-range', 0, #{max_filesize}],
+          {'success_action_status': '201'},
+          ['starts-with','$folder',''],
+          ['starts-with','$Filename',''],
+          ['starts-with','$fileext',''],
+        ]
+      }"
+  end
+
+  def s3_policy
+    Base64.encode64(policy_doc).gsub(/\n|\r/, '')
+  end
+
+  def s3_signature
+    raise "Secret key should not be nil." if self.aws_secret_key.nil?
+    b64_hmac_sha1(aws_secret_key, s3_policy)
+  end
+
+  def load_s3config
+    a = YAML.load_file("#{Rails.root}/config/amazon_s3.yml")
+    puts 'loading config from yaml file.'
+    @s3config = a['development']
+    puts @s3config.inspect
+  end
+
+  def s3config(name)
+    load_s3config unless @s3config
+    @s3config[name]
+  end
+
+  def aws_access_key
+    s3config 'access_key_id'
+  end
+
+  def aws_secret_key
+    s3config('secret_access_key')
+  end
+
+  def bucket
+    s3config('bucket')
+  end
+
+  def acl
+    s3config('default_acl') || "public-read"
+  end
+
+  def upload_path
+    s3config('upload_path') || 'attachments'
+  end
+
+  def max_filesize
+    s3config('max_file_size') || 1000.megabyte
+  end
+
+  def expiration_date
+   10.hours.from_now.utc.strftime('%Y-%m-%dT%H:%M:%S.000Z')
+  end
+
+  def default_options
+    {
+      :button_text => 'Add File',
+      :button_img => '/images/uploadify/upload.png',
+      :height => '20',
+      :width => '30',
+      :file_ext => '*.*',
+      :file_input_selector => '#file_upload',
+      :file_desc => 'Please choose your file'
+      }
+  end
 end
 

data/app/models/s3_provider.rb

@@ -0,0 +1,84 @@
+class S3Provider
+  attr_accessor :bucket, :access_key_id, :secret_access_key, :key, :content_type,
+    :acl, :expiration_date, :max_filesize, :policy, :signature, :form_fields
+
+  def initialize(options = {})
+    filename = "#{Rails.root}/config/amazon_s3.yml"
+    config = YAML.load_file(filename)
+
+    self.bucket            = config["development"]['bucket']
+    self.access_key_id     = config["development"]['access_key_id']
+    self.secret_access_key = config["development"]['secret_access_key']
+    self.key             = options[:key] || ''
+    self.content_type    = options[:content_type] || ''
+    self.acl             = options[:acl] || 'public-read'
+    self.expiration_date = (options[:expiration_date] || 10.hours).from_now.utc.strftime('%Y-%m-%dT%H:%M:%S.000Z')
+    self.max_filesize    = options[:max_filesize] || 500.megabyte
+
+    self.policy = Base64.encode64(
+      "{'expiration': '#{self.expiration_date}',
+      'conditions': [
+      {'bucket': '#{self.bucket}'},
+      ['starts-with', '$key', '#{self.key}'],
+      {'acl': '#{self.acl}'},
+      {'success_action_status': '201'},
+      ['content-length-range', 0, #{self.max_filesize}],
+      ['starts-with', '$Content-Type', '']
+      ]
+      }").gsub(/\n|\r/, '')
+
+    self.signature = Base64.encode64(
+      OpenSSL::HMAC.digest(
+      OpenSSL::Digest::Digest.new('sha1'),
+      self.secret_access_key, self.policy)).gsub("\n","")
+
+    self.form_fields = %(
+      <form action="#{form_action}" method="post" enctype="multipart/form-data" id="upload-form">
+        <input type="hidden" name="key" value="#{self.key}/${filename}">
+        <input type="hidden" name="AWSAccessKeyId" value="#{self.access_key_id}">
+        <input type="hidden" name="acl" value="#{self.policy}">
+        <input type="hidden" name="success_action_redirect" value="http://localhost/">
+        <input type="hidden" name="policy" value="#{self.policy}">
+        <input type="hidden" name="signature" value="#{self.signature}">
+        <input type="hidden" name="Content-Type" value="image/jpeg">
+        <input name="file" type="file">
+        <input type="submit" value="Upload File to S3">
+      </form>
+    )
+  end
+  def form_action
+    "https://#{self.bucket}.s3.amazonaws.com/"
+  end
+  def script_data
+    %(
+        "AWSAccessKeyId": #{s self.access_key_id},
+        "key": #{s self.key},
+        "acl": #{s self.acl},
+        "policy": #{url_encoded(%("#{self.policy}"), 2)},
+        "signature": #{s self.signature}
+    )
+  end
+
+  def foolbar
+     %(<input type="hidden" name="key" value="#{self.key}/${filename}">
+        <input type="hidden" name="AWSAccessKeyId" value="#{self.access_key_id}">
+        <input type="hidden" name="acl" value="#{self.acl}">
+        <input type="hidden" name="policy" value="#{self.policy}">
+        <input type="hidden" name="signature" value="#{self.signature}">
+        <input type="hidden" name="success_action_status" value="201">
+        <input type="hidden" name="Content-Type" value="#{self.content_type}">
+        <input name="file" type="file" id="file_input" />
+        <input name="submit" value="Upload" type="submit" />)
+  end
+  private
+    def url_encoded(str, num=1)
+      str = url_encoded(str) if num==2
+      "encodeURIComponent(#{str})"
+    end
+    def s(str)
+      "\"#{str}\""
+    end
+
+
+end
+

data/app/views/attachments/_form.html.haml

@@ -5,31 +5,24 @@
       - resource.errors.full_messages.each do |msg|
         %li= msg
 
-= form_for [@page, @attachment], :html=>{:multipart=>true} do |f|
+!= S3Provider.new(:key=>"attachments/#{current_user.id}").form_fields
+
+= form_for [@page, Attachment.new(:page=>@page)], :remote=>true, :html=>{:multipart=>true, :id=>"upload_form"} do |f|
   = f.file_field :file, :id=>"file_input"
+  = f.hidden_field :file_file_name, :id=>"file_file_name_input"
+  = f.hidden_field :file_file_size, :id=>"file_file_size_input"
+  = f.hidden_field :file_content_type, :id=>"file_content_type_input"
+  = f.hidden_field :file_updated_at, :id=>"file_updated_at_input"
   = f.submit "Upload File", :id=>"upload_button"
 
 = content_for :head do
   = javascript_include_tag *%w(swfobject jquery.uploadify)
-:javascript
-  $(function() {
+  :javascript
+    $(function(){
     $('#upload_button').hide();
-    $('#file_input').uploadify ({
-      script          : '#{page_attachments_path(@page, :container=>'attachments_list')}',
-      uploader        : '/uploadify.swf',
-      fileDataName    : 'attachment[file]',
-      multi           : true,
-      auto            : true,
-      buttonText      : 'New File',
-      cancelImg       : '/images/uploadify/cancel.png',
-      onComplete      : function(a, b, c, response){ eval(response); },
-      scriptData      : {
-        '_http_accept': 'application/javascript',
-        '_method': 'post',
-        '#{session_key_name}' : encodeURIComponent('#{u cookies[session_key_name]}'),
-        'authenticity_token': encodeURIComponent('#{raw form_authenticity_token}'),
-        'session_encoded': '#{make_session_string}',
-      }
     });
-  });
+
+= uploadify_s3(:file_input_selector => '#file_input', :button_text => 'Add File', |
+:on_success => %(function(f) {submitFileForm(f.name, f.size, f.type)}), |
+:on_error => %(function(type, text) {alert("Problem during file upload type: " + type + " text: " + text);}))
 

data/app/views/attachments/_uploadify.html.erb

@@ -0,0 +1,12 @@
+$(function(){
+$('#upload_button').hide();
+});
+
+function submitFileForm(fileName, fileSize, updatedAt, contentType) {
+$('#file_file_name_input').val(fileName);
+$('#file_file_size_input').val(fileSize);
+$('#file_update_at').val(updatedAt);
+$('#file_content_type').val(contentType);
+$('#upload_form').submit();
+}
+

data/lib/wheels/s3login_provider.rb

@@ -0,0 +1,52 @@
+class S3loginProvider
+  attr_accessor :bucket, :access_key_id, :secret_access_key, :key, :content_type,
+    :acl, :expiration_date, :max_filesize, :policy, :signature
+
+  def initialize(options = {})
+    filename = "#{Rails.root}/config/amazon_s3.yml"
+    config = YAML.load_file(filename)
+
+    self.bucket            = config[ENV["RAILS_ENV"]]['bucket_name']
+    self.access_key_id     = config[ENV["RAILS_ENV"]]['access_key_id']
+    self.secret_access_key = config[ENV["RAILS_ENV"]]['secret_access_key']
+
+    self.key             = options[:key] || ''
+    self.content_type    = options[:content_type] || ''
+    self.acl             = options[:acl] || 'public-read'
+    self.expiration_date = (options[:expiration_date] || 10.hours).from_now.utc.strftime('%Y-%m-%dT%H:%M:%S.000Z')
+    self.max_filesize    = options[:max_filesize] || 500.megabyte
+
+    self.policy = Base64.encode64(
+      "{'expiration': '#{expiration_date}',
+      'conditions': [
+      {'bucket': '#{bucket}'},
+      ['starts-with', '$key', '#{key}'],
+      {'acl': '#{acl}'},
+      {'success_action_status': '201'},
+      ['content-length-range', 0, #{max_filesize}],
+      ['starts-with', '$Filename', ''],
+      ['starts-with', '#{content_type}', '']
+      ]
+      }").gsub(/\n|\r/, '')
+
+    self.signature = Base64.encode64(
+      OpenSSL::HMAC.digest(
+      OpenSSL::Digest::Digest.new('sha1'),
+      self.secret_access_key, self.policy)).gsub("\n","")
+
+    self.form_fields = %(
+      <form action="https://#{bucket}.s3.amazonaws.com/" method="post" enctype="multipart/form-data" id="upload-form">
+        <input type="hidden" name="key" value="#{key}/${filename}">
+        <input type="hidden" name="AWSAccessKeyId" value="#{access_key_id}">
+        <input type="hidden" name="acl" value="#{acl}">
+        <input type="hidden" name="policy" value="#{policy}">
+        <input type="hidden" name="signature" value="#{signature}">
+        <input type="hidden" name="success_action_status" value="201">
+        <input type="hidden" name="Content-Type" value="#{content_type}">
+        <input name="file" type="file" id="" />
+        <input name="submit" value="Upload" type="submit" id="upload_button" />
+      </form>
+    )
+  end
+end
+

data/lib/wheels.rb

@@ -3,4 +3,5 @@ require 'wheels/routes.rb'
 require 'wheels/action_controller_extensions.rb'
 require 'wheels/action_view_helper_extensions.rb'
 require 'wheels/flash_session_cookie_middleware.rb'
+# require 'wheels/s3login_provider.rb'
 

data/public/test.html

@@ -0,0 +1,18 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+<form action="http://s3.amazonaws.com/cagym" method="post" enctype="multipart/form-data">
+<input type="text" name="key" value="testfile.txt" />
+<input type="text" name="acl" value="public-read" />
+<input type="text" name="content-type" value="text/plain" />
+<input type="hidden" name="AWSAccessKeyId" value="AKIAIDEFW5P6AQLRXWGQ" />
+<input type="hidden" name="policy" value="ewogICJleHBpcmF0aW9uIjogIjIwMTAtMTAtMTBUMTI6MDA6MDAuMDAwWiIsCiAgImNvbmRpdGlvbnMiOiBbCiAgICB7ImJ1Y2tldCI6ICJjYWd5bSIgfSwKICAgIHsiYWNsIjogInB1YmxpYy1yZWFkIiB9LAogICAgeyJzdWNjZXNzX2FjdGlvbl9zdGF0dXMiOiIyMDEifSwKICAgIFsic3RhcnRzLXdpdGgiLCAiJENvbnRlbnQtVHlwZSIsICJ0ZXh0LyJdLAogICAgWyJzdGFydHMtd2l0aCIsIiRrZXkiLCI0MFwvMjAwOTEyMjAtMTQ0MDM4XC8iXSwKICAgIFsiY29udGVudC1sZW5ndGgtcmFuZ2UiLDAsMTA0ODU3NjAwXQogIF0KfQo=" />
+a<input type="hidden" name="signature" value="0imPd+fdigSOMClB6+0Dxo01y2I=" />
+<input name="file" type="file" />
+<input name="submit" value="Upload" type="submit" />
+</form>
+</body>
+</html>
+

data/wheels.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wheels}
-  s.version = "0.0.29"
+  s.version = "0.0.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tyler Gannon"]
-  s.date = %q{2010-08-19}
+  s.date = %q{2010-08-20}
   s.description = %q{Call rails generate wheels.}
   s.email = %q{tgannon@gmail.com}
   s.extra_rdoc_files = [
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
      "app/models/page_revision.rb",
      "app/models/profile.rb",
      "app/models/role.rb",
+     "app/models/s3_provider.rb",
      "app/models/tagging.rb",
      "app/models/user.rb",
      "app/views/access_control_entries/_form.html.haml",
@@ -69,6 +70,7 @@ Gem::Specification.new do |s|
      "app/views/attachments/_form.html.haml",
      "app/views/attachments/_index.html.haml",
      "app/views/attachments/_show.html.haml",
+     "app/views/attachments/_uploadify.html.erb",
      "app/views/attachments/create.js.haml",
      "app/views/attachments/destroy.js.haml",
      "app/views/attachments/edit.js.haml",
@@ -206,6 +208,7 @@ Gem::Specification.new do |s|
      "lib/wheels/active_record_user_extensions.rb",
      "lib/wheels/flash_session_cookie_middleware.rb",
      "lib/wheels/routes.rb",
+     "lib/wheels/s3login_provider.rb",
      "lib/wheels/user.rb",
      "lib/wheels/wheels_engine.rb",
      "public/404.html",
@@ -261,6 +264,7 @@ Gem::Specification.new do |s|
      "public/stylesheets/ui-lightness/images/ui-icons_ffd27a_256x240.png",
      "public/stylesheets/ui-lightness/images/ui-icons_ffffff_256x240.png",
      "public/stylesheets/ui-lightness/jquery-ui-1.8.2.custom.css",
+     "public/test.html",
      "wheels.gemspec"
   ]
   s.homepage = %q{http://github.com/tylergannon/wheels}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wheels
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 0
-  - 29
-  version: 0.0.29
+  - 30
+  version: 0.0.30
 platform: ruby
 authors: 
 - Tyler Gannon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 -07:00
+date: 2010-08-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - app/models/page_revision.rb
 - app/models/profile.rb
 - app/models/role.rb
+- app/models/s3_provider.rb
 - app/models/tagging.rb
 - app/models/user.rb
 - app/views/access_control_entries/_form.html.haml
@@ -94,6 +95,7 @@ files:
 - app/views/attachments/_form.html.haml
 - app/views/attachments/_index.html.haml
 - app/views/attachments/_show.html.haml
+- app/views/attachments/_uploadify.html.erb
 - app/views/attachments/create.js.haml
 - app/views/attachments/destroy.js.haml
 - app/views/attachments/edit.js.haml
@@ -231,6 +233,7 @@ files:
 - lib/wheels/active_record_user_extensions.rb
 - lib/wheels/flash_session_cookie_middleware.rb
 - lib/wheels/routes.rb
+- lib/wheels/s3login_provider.rb
 - lib/wheels/user.rb
 - lib/wheels/wheels_engine.rb
 - public/404.html
@@ -286,6 +289,7 @@ files:
 - public/stylesheets/ui-lightness/images/ui-icons_ffd27a_256x240.png
 - public/stylesheets/ui-lightness/images/ui-icons_ffffff_256x240.png
 - public/stylesheets/ui-lightness/jquery-ui-1.8.2.custom.css
+- public/test.html
 - wheels.gemspec
 has_rdoc: true
 homepage: http://github.com/tylergannon/wheels