progstr-filer 0.8.7 → 0.8.8

data/Gemfile

@@ -12,14 +12,14 @@ group :development do
   gem "libnotify"
   gem "shoulda", ">= 0"
   #gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
   gem "rdoc", ">= 0"
 end
 
 gem "activerecord", ">=3.0.0"
 gem "activemodel", ">=3.0.0"
+gem "actionpack", ">=3.0.0"
 gem "uuid"
 gem "rest-client"
 gem "multi_json"

data/Gemfile.lock

@@ -1,68 +1,94 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.1.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
+    arel (3.0.2)
     builder (3.0.0)
+    erubis (2.7.0)
     ffi (1.0.11)
     git (1.2.5)
-    guard (0.10.0)
+    guard (1.0.1)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
     guard-test (0.4.3)
       guard (>= 0.4)
       test-unit (~> 2.2)
+    hike (1.2.1)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.4)
-    libnotify (0.7.1)
+    journey (1.0.3)
+    json (1.6.6)
+    libnotify (0.7.2)
     macaddr (1.5.0)
       systemu (>= 2.4.0)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
+    mime-types (1.18)
+    multi_json (1.3.0)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.1)
+      rack (>= 1.0)
     rake (0.9.2.2)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
-    rcov (0.9.11)
     rdoc (3.12)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    shoulda (2.11.3)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    sprockets (2.1.2)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
-    systemu (2.4.2)
-    test-unit (2.4.4)
+    systemu (2.5.0)
+    test-unit (2.4.8)
     thor (0.14.6)
-    tzinfo (0.3.31)
-    uuid (2.3.4)
+    tilt (1.3.3)
+    tzinfo (0.3.33)
+    uuid (2.3.5)
       macaddr (~> 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionpack (>= 3.0.0)
   activemodel (>= 3.0.0)
   activerecord (>= 3.0.0)
-  bundler (~> 1.0.0)
+  bundler (>= 1.0.0)
   guard-test
   jeweler (~> 1.6.4)
   libnotify
   multi_json
   rb-inotify
-  rcov
   rdoc
   rest-client
   shoulda

data/Rakefile

@@ -38,18 +38,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-#RSpec::Core::RakeTask.new(:rcov) do |spec|
-  #spec.pattern = 'spec/**/*_spec.rb'
-  #spec.rcov = true
-#end
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
 task :default => :spec
 
 require 'rdoc/task'

data/VERSION

@@ -1 +1 @@
-0.8.7
+0.8.8

data/lib/filer/activerecord.rb

@@ -46,24 +46,35 @@ module Progstr
       def _get_attachment(attribute)
         if _attachments[attribute].nil?
           id = read_attribute(attribute)
+          uploader_class = self.class._uploaders[attribute].class
           if id.nil?
-            _attachments[attribute] = Attachment.empty
+            _attachments[attribute] = Attachment.empty(uploader_class)
           else
-            _attachments[attribute] = Attachment.from_id(attribute, id)
+            _attachments[attribute] = Attachment.from_id(uploader_class, attribute, id)
           end
         else
           _attachments[attribute]
         end
       end
 
-      def _set_attachment(attribute, file)
+      def _set_attachment(attribute, value)
         old_attachment = _get_attachment(attribute)
         unless old_attachment.blank?
           _attachments_to_delete << old_attachment
         end
 
-        unless file.nil?
-          attachment = Attachment.from_file(attribute, file)
+        uploader_class = self.class._uploaders[attribute].class
+        if value.kind_of?(String)
+          attachment = nil
+          if value.include?("{")
+            attachment = Attachment.from_json(uploader_class, attribute, value)
+          else
+            attachment = Attachment.from_id(uploader_class, attribute, value)
+          end
+          _attachments[attribute] = attachment
+          write_attribute(attribute, attachment.id)
+        elsif !value.nil? #file-like
+          attachment = Attachment.from_file(uploader_class, attribute, value)
           _attachments[attribute] = attachment
           write_attribute(attribute, attachment.id)
         else
@@ -81,7 +92,7 @@ module Progstr
 
       def _upload_attachment(attribute)
         attachment = _get_attachment(attribute)
-        if (!attachment.blank?) && (!attachment.file.nil?)
+        if attachment.need_upload?
           uploader = self.class._uploaders[attribute]
           uploader.upload_attachment(attachment) unless uploader.nil?
         end

data/lib/filer/attachment.rb

@@ -1,7 +1,25 @@
 module Progstr
   module Filer
+    class FileLike
+      def initialize(json)
+        @values = MultiJson.decode(json)
+      end
+
+      def id
+        @values["id"]
+      end
+
+      def path
+        @values["name"]
+      end
+
+      def size
+        @values["size"]
+      end
+    end
+
     class Attachment
-      attr_accessor :id, :attribute, :file, :pre_validated
+      attr_accessor :id, :uploader_class, :attribute, :file, :pre_validated
 
       @@id_generator = ::UUID.new
 
@@ -9,34 +27,58 @@ module Progstr
         def blank?
           true
         end
-
         def size
           0
         end
-
         def path
           ""
         end
-
         def extension
           ""
         end
+        def display_hash
+          nil
+        end
+        def display_json
+          nil
+        end
+        def need_upload?
+          false
+        end
       end
 
-      def self.empty
-        EmptyAttachment.new
+      def self.empty(uploader_class)
+        result = EmptyAttachment.new
+        result.uploader_class = uploader_class
+        result
       end
 
-      def self.from_file(attribute, file)
+      def self.from_json(uploader_class, attribute, json)
+        file = FileLike.new(json)
+        result = from_file(uploader_class, attribute, file)
+        result.pre_validated = true
+        return result
+      end
+
+      def self.from_file(uploader_class, attribute, file)
         result = Attachment.new
-        result.id = generate_id
+        result.id = file_id(file)
         result.attribute = attribute
+        result.uploader_class = uploader_class
 
         result.file = file
         result.pre_validated = false
         result
       end
 
+      def self.file_id(file)
+        if file.respond_to?(:id)
+          file.id
+        else
+          generate_id
+        end
+      end
+
       def self.generate_id
         uuid = @@id_generator.generate
         uuid.gsub("-", "")
@@ -56,10 +98,11 @@ module Progstr
         from_file.sub(".", "")
       end
 
-      def self.from_id(attribute, id)
+      def self.from_id(uploader_class, attribute, id)
         result = Attachment.new
         result.id = id
         result.attribute = attribute
+        result.uploader_class = uploader_class
 
         result.pre_validated = true
         result
@@ -71,7 +114,7 @@ module Progstr
 
       def url
         if !blank?
-          token = Progstr::Filer.generate_file_auth_token(id)
+          token = Progstr::Filer.generate_download_auth_token(id)
           "#{Progstr::Filer.url_prefix}files/data/#{Progstr::Filer.access_key}/#{id}?auth=#{token}"
         else
           ""
@@ -85,6 +128,28 @@ module Progstr
           ""
         end
       end
+
+      def display_json
+        MultiJson.encode(display_hash)
+      end
+
+      def display_hash
+        {
+          "name" => path,
+          "size" => size,
+          "id" => id
+        }
+      end
+
+      def need_upload?
+        if file.nil?
+          false
+        elsif file.kind_of?(FileLike)
+          false
+        else
+          true
+        end
+      end
     end
   end
 end

data/lib/filer/config.rb

@@ -2,7 +2,7 @@
 module Progstr
   module Filer
     class << self
-      attr_accessor :host, :port, :path_prefix, :session_timeout
+      attr_accessor :host, :port, :path_prefix, :session_timeout, :asset_url_prefix, :upload_url, :use_ssl
       attr_writer :access_key, :secret_key
 
       def access_key
@@ -16,6 +16,21 @@ module Progstr
       def host
         @host ||= "filer-api.progstr.com"
       end
+
+      def default_asset_url_prefix
+        insecure_prefix = "http://cdn.progstr.com/upload/"
+        secure_prefix = "https://s3.amazonaws.com/cdn.progstr.com/upload/"
+        javascript_version = "1.0"
+
+        prefix = insecure_prefix
+        prefix = secure_prefix if use_ssl
+        prefix + javascript_version
+      end
+
+      def default_upload_url
+        "http://#{Progstr::Filer.host}/upload/new"
+      end
+
       def port
         @port || 80
       end
@@ -23,7 +38,7 @@ module Progstr
         @path_prefix ||= '/'
       end
       def session_timeout
-        @http_read_timeout ||= 30 * 60 # 30 minutes
+        @session_timeout ||= 30 * 60 # 30 minutes
       end
 
       def generate_auth_token
@@ -33,13 +48,20 @@ module Progstr
         "#{access_key}-#{expiration}-#{signature}"
       end
 
-      def generate_file_auth_token(file_id)
+      def generate_download_auth_token(file_id)
         expiration = expiration_time
         to_sign = "#{access_key}-#{file_id}-#{expiration}-#{secret_key}"
         signature = Digest::SHA1.hexdigest(to_sign)
         "#{access_key}-#{expiration}-#{signature}"
       end
 
+      def generate_upload_auth_token(uploader)
+        expiration = expiration_time
+        to_sign = "#{access_key}-#{uploader}-#{expiration}-#{secret_key}"
+        signature = Digest::SHA1.hexdigest(to_sign)
+        "#{access_key}-#{expiration}-#{signature}"
+      end
+
       def url_prefix
         prefix = "http://#{Progstr::Filer.host}:#{Progstr::Filer.port}#{Progstr::Filer.path_prefix}"
         if prefix.end_with? "/"

data/lib/filer/file_info.rb

@@ -12,9 +12,6 @@ class FileInfo
   def content_type
     @values["contentType"]
   end
-  def property
-    @values["property"]
-  end
   def uploader
     @values["uploader"]
   end

data/lib/filer/uploader.rb

@@ -30,7 +30,6 @@ module Progstr
           response = RestClient.post(url, {
                       :upload1 => attachment.file,
                       :authToken => Progstr::Filer.generate_auth_token,
-                      :property => attachment.attribute,
                       :uploader => self.class.name,
                       :id => attachment.id
                     }, json_headers)

data/lib/filer/views/form_html.rb

@@ -0,0 +1,23 @@
+module Progstr
+  module Filer
+    module FormHtml
+
+      def filer_upload_field(method, options = {})
+        unless options.key? :file_input_name
+          sanitized_method_name = method.to_s.sub(/\?$/,"")
+          input_name = "#{@object_name}[#{sanitized_method_name}]"
+          options[:file_input_name] = input_name
+        end
+        attachment = @object.send(method)
+
+        @template.filer_upload(attachment, options)
+      end
+    end
+  end
+end
+
+require "action_view"
+form_builder = ActionView::Base.default_form_builder
+form_builder.class_eval do 
+  include Progstr::Filer::FormHtml
+end

data/lib/filer/views/html.rb

@@ -0,0 +1,69 @@
+module Progstr
+  module Filer
+    module Html
+      def filer_upload(attachment, options = {})
+        client_id = generate_container_id
+        register_scripts
+
+        client_options = prepare_client_options(attachment, options)
+        client_options_json = MultiJson.encode(client_options)
+
+        init_script = <<EOJSON
+    $(function(){
+      $('\##{client_id}').filerUpload(#{client_options_json})
+    })
+EOJSON
+
+        tag("div", "id" => client_id) +
+          javascript_tag(init_script)
+      end
+
+
+      def filer_scripts
+        prefix = Progstr::Filer.asset_url_prefix || Progstr::Filer.default_asset_url_prefix
+
+        scripts = [
+          "/upload.js",
+          "/pl/flash.support.js",
+        ]
+        tags = scripts.map do |script|
+          javascript_include_tag (prefix + script)
+        end
+        tags.join("\r\n").html_safe
+      end
+
+      private
+      def generate_container_id
+        request.env["PROGSTR_FILER_UPLOAD_INSTANCES"] ||= 1
+        instances = request.env["PROGSTR_FILER_UPLOAD_INSTANCES"]
+        request.env["PROGSTR_FILER_UPLOAD_INSTANCES"] += 1
+        "filer_upload_container_#{instances}"
+      end
+
+      def prepare_client_options(attachment, options)
+        client_options = {}
+        options.each do |k, v|
+          client_options[k.to_s.camelize(:lower)] = v
+        end
+        uploader_name = attachment.uploader_class.name
+        client_options["uploader"] = uploader_name
+        client_options["initialFiles"] = [attachment.display_hash] unless attachment.blank?
+        client_options["authToken"] = Progstr::Filer.generate_upload_auth_token(uploader_name)
+        client_options["uploadUrl"] = Progstr::Filer.upload_url unless Progstr::Filer.upload_url.nil?
+
+        client_options
+      end
+
+      def register_scripts
+        unless request.env.key? "PROGSTR_FILER_SCRIPTS_INCLUDED"
+          request.env["PROGSTR_FILER_SCRIPTS_INCLUDED"] = true
+
+          content_for :filer_scripts, filer_scripts
+        end
+      end
+    end
+  end
+end
+
+require "action_controller"
+ActionController::Base.helper(Progstr::Filer::Html)

data/lib/progstr-filer.rb

@@ -10,6 +10,8 @@ require 'filer/attachment'
 require 'filer/file_info'
 require 'filer/validation'
 require 'filer/activerecord'
+require 'filer/views/html'
+require 'filer/views/form_html'
 
 class ApiError < StandardError
   attr_accessor :server_response

data/test/{file_like.rb → file_mock.rb}

@@ -1,4 +1,4 @@
-class FileLike
+class FileMock
   attr_accessor :size, :path
 
   def read
@@ -6,7 +6,7 @@ class FileLike
   end
 end
 
-class UploadedFileLike
+class UploadedFileMock
   attr_accessor :size, :original_filename
 
   def read

data/test/test_attachment_url.rb

@@ -2,10 +2,21 @@ require 'test_helper'
 
 class TestIdGeneration < Test::Unit::TestCase
   should "generate file URLs using accessKey and file ID" do
-    a = Progstr::Filer::Attachment.from_id(:avatar, "some-attachment-id")
+    a = Progstr::Filer::Attachment.from_id(MockUploader, :avatar, "some-attachment-id")
 
     assert_match "/files/data/DEMO/some-attachment-id", a.url
     assert_match Progstr::Filer.host, a.url
     assert_match Progstr::Filer.host, a.url
   end
+
+  should "roundtrip from and to JSON" do
+    json = '{"id":"7933ad9a0f93457ab625a070fec3544f","name":"test.png","size":100}'
+    a = Progstr::Filer::Attachment.from_json(MockUploader, :avatar, json)
+
+    new_json = a.display_json
+
+    assert_match "7933ad9a0f93457ab625a070fec3544f", new_json
+    assert_match "test.png", new_json
+    assert_match "100", new_json
+  end
 end

data/test/test_file_mount.rb

@@ -8,20 +8,38 @@ class TestFileMount < UserTest
 
   should "create an uploader when given a file" do
     non_empty = User.new
-    non_empty.avatar = FileLike.new
+    non_empty.avatar = FileMock.new
     assert_false non_empty.avatar.blank?
   end
 
-  should "save persist attachment id only" do
+  should "create an uploader when given an id string" do
+    non_empty = User.new
+    non_empty.avatar = "some-string-id"
+    assert_false non_empty.avatar.blank?
+    assert_equal "some-string-id", non_empty.avatar.id
+  end
+
+  should "create an uploader when given file info JSON string" do
+    json = '{"id":"7933ad9a0f93457ab625a070fec3544f","name":"test.png","size":100}'
+
+    non_empty = User.new
+    non_empty.avatar = json
+    assert_false non_empty.avatar.blank?
+    assert_equal "7933ad9a0f93457ab625a070fec3544f", non_empty.avatar.id
+    assert_equal "test.png", non_empty.avatar.path
+    assert_equal 100, non_empty.avatar.size
+  end
+
+  should "persist attachment id only" do
     u = User.new
-    u.avatar = FileLike.new
+    u.avatar = FileMock.new
     assert_not_nil u.avatar.id, "attachment id generated"
     assert_equal u.read_attribute(:avatar), u.avatar.id, "attachment id saved to db"
   end
 
   should "save and load attachment id to db" do
     u = User.new
-    u.avatar = FileLike.new
+    u.avatar = FileMock.new
     u.save!
 
     loaded = User.find(u.id)

data/test/test_helper.rb

@@ -5,7 +5,7 @@ require 'progstr-filer'
 
 require 'test/unit'
 require 'shoulda'
-require 'file_like'
+require 'file_mock'
 require 'user_data'
 require 'pp'
 

data/test/test_http_upload.rb

@@ -6,12 +6,11 @@ end
 class TestHttpUpload < Test::Unit::TestCase
   # The mother of all tests calling the real API
   test "upload attachment" do
-    attachment = Progstr::Filer::Attachment.from_file(:version, File.open("VERSION"))
+    attachment = Progstr::Filer::Attachment.from_file(MockUploader, :version, File.open("VERSION"))
     uploader = DemoUploader.new
     response = uploader.upload_attachment attachment
 
     assert_equal response.name, "VERSION"
-    assert_equal response.success, true
     assert_equal response.message, "OK"
 
     info = uploader.file_info attachment
@@ -19,7 +18,6 @@ class TestHttpUpload < Test::Unit::TestCase
     assert_equal info.name, "VERSION"
     assert_equal info.id, attachment.id
     assert_equal info.content_type, "text/plain"
-    assert_equal info.property, "version"
     assert_equal info.uploader, "DemoUploader"
     assert_true info.size > 0
 
@@ -31,7 +29,7 @@ class TestHttpUpload < Test::Unit::TestCase
     begin
       Progstr::Filer.secret_key = "BROKEN"
 
-      attachment = Progstr::Filer::Attachment.from_file(:version, File.open("VERSION"))
+      attachment = Progstr::Filer::Attachment.from_file(MockUploader, :version, File.open("VERSION"))
       uploader = DemoUploader.new
       begin
         response = uploader.upload_attachment attachment

data/test/test_id_generation.rb

@@ -2,8 +2,8 @@ require 'test_helper'
 
 class TestIdGeneration < Test::Unit::TestCase
   should "use UUIDs for attachment IDs" do
-    a = Progstr::Filer::Attachment.from_file(:avatar, FileLike.new)
-    b = Progstr::Filer::Attachment.from_file(:avatar, FileLike.new)
+    a = Progstr::Filer::Attachment.from_file(MockUploader, :avatar, FileMock.new)
+    b = Progstr::Filer::Attachment.from_file(MockUploader, :avatar, FileMock.new)
 
     assert_not_nil a.id
     assert_not_nil b.id
@@ -11,7 +11,7 @@ class TestIdGeneration < Test::Unit::TestCase
   end
 
   should "have attachment IDs with no hyphens" do
-    a = Progstr::Filer::Attachment.from_file(:avatar, FileLike.new)
+    a = Progstr::Filer::Attachment.from_file(MockUploader, :avatar, FileMock.new)
     assert_match /^[^-]+$/, a.id, "IDs should contain no hyphens"
   end
 end

data/test/test_upload_on_save.rb

@@ -3,20 +3,41 @@ require 'test_helper'
 class TestUploadOnSave < UserTest
   should "upload file on record save" do
     u = User.new
-    f = FileLike.new
+    f = FileMock.new
     u.avatar = f
 
     u.save!
     assert_same $lastUploadedAtachment.file, f, "avatar file sent to uploader"
   end
 
+  should "not upload JSON-created attachments" do
+    $lastUploadedAtachment = nil
+
+    u = User.new
+    json = '{"id":"7933ad9a0f93457ab625a070fec3544f","name":"test.png","size":100}'
+    u.avatar = json
+
+    u.save!
+    assert_nil $lastUploadedAtachment
+  end
+
+  should "save id only when JSON-created" do
+    $lastUploadedAtachment = nil
+
+    u = User.new
+    json = '{"id":"7933ad9a0f93457ab625a070fec3544f","name":"test.png","size":100}'
+    u.avatar = json
+    saved_id = u.read_attribute(:avatar)
+    assert_equal "7933ad9a0f93457ab625a070fec3544f", saved_id
+  end
+
   should "delete the previous attachment on save" do
     u = User.new
-    f1 = FileLike.new
+    f1 = FileMock.new
     u.avatar = f1
     u.save!
 
-    f2 = FileLike.new
+    f2 = FileMock.new
     u.avatar = f2
 
     u.save!
@@ -25,7 +46,7 @@ class TestUploadOnSave < UserTest
 
   should "delete previous attachment and null attribute if set to nil" do
     u = User.new
-    f1 = FileLike.new
+    f1 = FileMock.new
     u.avatar = f1
     u.save!
 
@@ -39,7 +60,7 @@ class TestUploadOnSave < UserTest
 
   should "delete attachments on record delete" do
     u = User.new
-    f1 = FileLike.new
+    f1 = FileMock.new
     u.avatar = f1
     u.save!
 

data/test/test_validation.rb

@@ -8,7 +8,7 @@ class TestValidation < UserTest
 
   test "don't store if size greater than 2MB" do
     u = ValidatedUser.new
-    too_big = FileLike.new
+    too_big = FileMock.new
     too_big.path = "too_big.png"
     too_big.size = 5 * 1024 * 1024
     u.avatar = too_big
@@ -18,7 +18,7 @@ class TestValidation < UserTest
 
   test "don't store if extension not allowed" do
     u = ValidatedUser.new
-    exe = FileLike.new
+    exe = FileMock.new
     exe.path = "virus_infected.exe"
     u.avatar = exe
 
@@ -28,7 +28,7 @@ class TestValidation < UserTest
 
   test "use original_filename on file objects if present" do
     u = ValidatedUser.new
-    exe = UploadedFileLike.new
+    exe = UploadedFileMock.new
     exe.original_filename = "virus_infected.exe"
     u.avatar = exe
 
@@ -38,7 +38,7 @@ class TestValidation < UserTest
 
   test "don't store files without an extension" do
     u = ValidatedUser.new
-    exe = FileLike.new
+    exe = FileMock.new
     exe.path = "noextension"
     u.avatar = exe
 
@@ -62,7 +62,7 @@ class TestValidation < UserTest
 
   test "validation passes" do
     u = ValidatedUser.new
-    jpg = FileLike.new
+    jpg = FileMock.new
     jpg.path = "avatar.jpg"
     u.avatar = jpg
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: progstr-filer
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000Z
+date: 2012-05-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &23855440 !ruby/object:Gem::Requirement
+  requirement: &24236220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *23855440
+  version_requirements: *24236220
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &23854620 !ruby/object:Gem::Requirement
+  requirement: &24235640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *23854620
+  version_requirements: *24235640
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: &24235040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *24235040
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &23853940 !ruby/object:Gem::Requirement
+  requirement: &24234320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23853940
+  version_requirements: *24234320
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &23853000 !ruby/object:Gem::Requirement
+  requirement: &24233600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23853000
+  version_requirements: *24233600
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &23852420 !ruby/object:Gem::Requirement
+  requirement: &24227220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23852420
+  version_requirements: *24227220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &23851860 !ruby/object:Gem::Requirement
+  requirement: &24226500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23851860
+  version_requirements: *24226500
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &23847260 !ruby/object:Gem::Requirement
+  requirement: &24225800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23847260
+  version_requirements: *24225800
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &23846440 !ruby/object:Gem::Requirement
+  requirement: &24224980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23846440
+  version_requirements: *24224980
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &23845420 !ruby/object:Gem::Requirement
+  requirement: &24224220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23845420
+  version_requirements: *24224220
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &23844760 !ruby/object:Gem::Requirement
+  requirement: &24223540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,21 +131,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23844760
+  version_requirements: *24223540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23844080 !ruby/object:Gem::Requirement
+  requirement: &24222840 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23844080
+  version_requirements: *24222840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23843180 !ruby/object:Gem::Requirement
+  requirement: &24222200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,21 +153,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *23843180
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &23842540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *23842540
+  version_requirements: *24222200
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &23841900 !ruby/object:Gem::Requirement
+  requirement: &24221480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23841900
+  version_requirements: *24221480
 description: Progstr Filer is a developer-friendly file and attachment hosting service
   that lets you easily build apps that store and share files.
 email: hristo@deshev.com
@@ -189,9 +189,11 @@ files:
 - lib/filer/file_info.rb
 - lib/filer/uploader.rb
 - lib/filer/validation.rb
+- lib/filer/views/form_html.rb
+- lib/filer/views/html.rb
 - lib/progstr-filer.rb
 - test/adium-green-duckling.png
-- test/file_like.rb
+- test/file_mock.rb
 - test/test_attachment_url.rb
 - test/test_file_mount.rb
 - test/test_helper.rb
@@ -215,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 651641532922132160
+      hash: -4458103190430304874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: