progstr-filer 0.8.0 → 0.8.1

data/Gemfile

@@ -19,6 +19,7 @@ group :development do
 end
 
 gem "activerecord", ">=3.0.0"
+gem "activemodel", ">=3.0.0"
 gem "uuid"
 gem "rest-client"
 gem "multi_json"

data/Gemfile.lock

@@ -16,10 +16,10 @@ GEM
     builder (3.0.0)
     ffi (1.0.11)
     git (1.2.5)
-    guard (0.9.1)
+    guard (0.10.0)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
-    guard-test (0.4.2)
+    guard-test (0.4.3)
       guard (>= 0.4)
       test-unit (~> 2.2)
     i18n (0.6.0)
@@ -27,8 +27,8 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.3)
-    libnotify (0.6.0)
+    json (1.6.4)
+    libnotify (0.7.1)
     macaddr (1.5.0)
       systemu (>= 2.4.0)
     mime-types (1.17.2)
@@ -44,7 +44,7 @@ GEM
     shoulda (2.11.3)
     sqlite3 (1.3.5)
     systemu (2.4.2)
-    test-unit (2.4.3)
+    test-unit (2.4.4)
     thor (0.14.6)
     tzinfo (0.3.31)
     uuid (2.3.4)
@@ -54,6 +54,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activemodel (>= 3.0.0)
   activerecord (>= 3.0.0)
   bundler (~> 1.0.0)
   guard-test

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/filer/activerecord.rb

@@ -3,6 +3,8 @@ require 'active_record'
 module Progstr
   module Filer
     module ActiveRecordClassMethods
+      include Validation
+
       def _uploaders
         if @uploaders.nil?
           @uploaders = {}
@@ -21,6 +23,12 @@ module Progstr
           def #{attribute}=(new_file)
             _set_attachment(:#{attribute}, new_file)
           end
+          def #{attribute}_file_size
+            _get_attachment(:#{attribute}).size
+          end
+          def #{attribute}_file_extension
+            _get_attachment(:#{attribute}).extension
+          end
           def upload_#{attribute}!
             _upload_attachment(:#{attribute})
           end
@@ -56,7 +64,7 @@ module Progstr
 
       def _set_attachment(attribute, file)
         old_attachment = _get_attachment(attribute)
-        unless old_attachment.empty?
+        unless old_attachment.blank?
           _attachments_to_delete << old_attachment
         end
 
@@ -74,7 +82,7 @@ module Progstr
 
       def _upload_attachment(attribute)
         attachment = _get_attachment(attribute)
-        if (!attachment.empty?) && (!attachment.file.nil?)
+        if (!attachment.blank?) && (!attachment.file.nil?)
           uploader = self.class._uploaders[attribute]
           uploader.upload_attachment(attachment) unless uploader.nil?
         end

data/lib/filer/attachment.rb

@@ -5,10 +5,22 @@ module Progstr
 
       @@id_generator = ::UUID.new
 
-      class EmptyAttachment
-        def empty?
+      class EmptyAttachment < Attachment
+        def blank?
           true
         end
+
+        def size
+          0
+        end
+
+        def path
+          ""
+        end
+
+        def extension
+          ""
+        end
       end
 
       def self.empty
@@ -28,6 +40,20 @@ module Progstr
         uuid.gsub("-", "")
       end
 
+      def size
+        file.size
+      end
+
+      def path
+        (file.original_filename if file.respond_to?(:original_filename)) ||
+          (file_path = file.path if file.respond_to?(:path))
+      end
+
+      def extension
+        from_file = File.extname(path) || ""
+        from_file.sub(".", "")
+      end
+
       def self.from_id(attribute, id)
         result = Attachment.new
         result.id = id
@@ -35,12 +61,12 @@ module Progstr
         result
       end
 
-      def empty?
+      def blank?
         false
       end
 
       def url
-        if !empty?
+        if !blank?
           "#{Progstr::Filer.url_prefix}files/data/#{Progstr::Filer.access_key}/#{id}"
         else
           ""

data/lib/filer/validation.rb

@@ -0,0 +1,51 @@
+require 'active_model'
+
+module Progstr
+  module Filer
+    module Validation
+      def validates_file_size_of(attribute, options)
+        range = options[:in] || (0..1.0/0)
+        min = options[:greater_than] || range.first
+        max = options[:less_than]    || range.last
+        allowed_range = (min..max)
+
+        message = options[:message] || "File size not between #{min} and #{max} bytes."
+
+        validates_with PropertyValidator, :attributes => [attribute],
+          :property => :size,
+          :in        => allowed_range,
+          :message   => message,
+          :allow_blank => true,
+          :allow_nil => true
+      end
+
+      def validates_file_extension_of(attribute, options)
+        allowed = options[:allowed] || EverythingIncluded.new
+        message = options[:message] || "File extension not allowed."
+
+        validates_with PropertyValidator, :attributes => [attribute],
+          :property => :extension,
+          :in        => allowed,
+          :message   => message
+      end
+
+      class EverythingIncluded
+        def include?
+          true
+        end
+      end
+
+      class PropertyValidator < ActiveModel::Validations::InclusionValidator
+        def initialize(options)
+          @property = options[:property]
+          super(options)
+        end
+
+        def validate_each(record, attribute, value)
+          property_value = value.send(@property)
+          super(record, attribute, property_value) unless value.nil? || value.blank? || property_value.nil?
+        end
+      end
+    end
+  end
+end

data/lib/progstr-filer.rb

@@ -8,6 +8,7 @@ require 'filer/config'
 require 'filer/uploader'
 require 'filer/attachment'
 require 'filer/file_info'
+require 'filer/validation'
 require 'filer/activerecord'
 
 class ApiError < StandardError

data/test/file_like.rb

@@ -1,6 +1,15 @@
 class FileLike
+  attr_accessor :size, :path
+
   def read
     "contents"
   end
 end
 
+class UploadedFileLike
+  attr_accessor :size, :original_filename
+
+  def read
+    "contents"
+  end
+end

data/test/test_file_mount.rb

@@ -3,13 +3,13 @@ require 'test_helper'
 class TestFileMount < UserTest
   should "start with an empty uploader field" do
     empty = User.new
-    assert_true empty.avatar.empty?
+    assert_true empty.avatar.blank?
   end
 
   should "create an uploader when given a file" do
     non_empty = User.new
     non_empty.avatar = FileLike.new
-    assert_false non_empty.avatar.empty?
+    assert_false non_empty.avatar.blank?
   end
 
   should "save persist attachment id only" do

data/test/test_validation.rb

@@ -0,0 +1,57 @@
+require 'test_helper'
+
+class TestValidation < UserTest
+  test "don't store without attachment" do
+    u = ValidatedUser.new
+    assert_false u.valid?, "User not valid without an avatar"
+  end
+
+  test "don't store if size greater than 2MB" do
+    u = ValidatedUser.new
+    too_big = FileLike.new
+    too_big.path = "too_big.png"
+    too_big.size = 5 * 1024 * 1024
+    u.avatar = too_big
+    assert_false u.valid?, "User not valid with huge avatar"
+    assert_equal u.errors[:avatar], ["Not uploading more than 2 MB."]
+  end
+
+  test "don't store if extension not allowed" do
+    u = ValidatedUser.new
+    exe = FileLike.new
+    exe.path = "virus_infected.exe"
+    u.avatar = exe
+
+    assert_false u.valid?, "User not valid with 'exe' avatar extension."
+    assert_equal u.errors[:avatar], ["Avatar image extension not allowed."]
+  end
+
+  test "use original_filename on file objects if present" do
+    u = ValidatedUser.new
+    exe = UploadedFileLike.new
+    exe.original_filename = "virus_infected.exe"
+    u.avatar = exe
+
+    assert_false u.valid?, "User not valid with 'exe' avatar extension."
+    assert_equal u.errors[:avatar], ["Avatar image extension not allowed."]
+  end
+
+  test "don't store files without an extension" do
+    u = ValidatedUser.new
+    exe = FileLike.new
+    exe.path = "noextension"
+    u.avatar = exe
+
+    assert_false u.valid?, "User not valid with an avatar without a file extension."
+    assert_equal u.errors[:avatar], ["Avatar image extension not allowed."]
+  end
+
+  test "validation passes" do
+    u = ValidatedUser.new
+    jpg = FileLike.new
+    jpg.path = "avatar.jpg"
+    u.avatar = jpg
+
+    assert_true u.valid?, "Validation passed."
+  end
+end

data/test/user_data.rb

@@ -6,7 +6,7 @@ dbconfig = {
 ActiveRecord::Base.establish_connection(dbconfig)
 ActiveRecord::Migration.verbose = false
 
-class TestUserMigration < ActiveRecord::Migration
+class UserMigration < ActiveRecord::Migration
   def self.up
     create_table :users, :force => true do |t|
       t.column :name, :string
@@ -36,13 +36,21 @@ class User < ActiveRecord::Base
   has_file :avatar, MockUploader
 end
 
+class ValidatedUser < User
+  validates_presence_of :avatar
+  validates_file_size_of :avatar,
+    :less_than => 2 * 1024 * 1024,
+    :message => "Not uploading more than 2 MB."
+  validates_file_extension_of :avatar, :allowed => ["png", "jpg"],
+    :message => "Avatar image extension not allowed."
+end
 
 class UserTest < Test::Unit::TestCase
   def setup
-    TestUserMigration.up
+    UserMigration.up
   end
 
   def teardown
-    TestUserMigration.down
+    UserMigration.down
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: progstr-filer
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-22 00:00:00.000000000Z
+date: 2012-01-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &15593540 !ruby/object:Gem::Requirement
+  requirement: &24667240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *15593540
+  version_requirements: *24667240
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &24665880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *24665880
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &15592400 !ruby/object:Gem::Requirement
+  requirement: &24663920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15592400
+  version_requirements: *24663920
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &15591680 !ruby/object:Gem::Requirement
+  requirement: &24663080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15591680
+  version_requirements: *24663080
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &15590700 !ruby/object:Gem::Requirement
+  requirement: &24659740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15590700
+  version_requirements: *24659740
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &15590140 !ruby/object:Gem::Requirement
+  requirement: &24659000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15590140
+  version_requirements: *24659000
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &15556920 !ruby/object:Gem::Requirement
+  requirement: &24658260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15556920
+  version_requirements: *24658260
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &15555680 !ruby/object:Gem::Requirement
+  requirement: &24657380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15555680
+  version_requirements: *24657380
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &15554380 !ruby/object:Gem::Requirement
+  requirement: &24656540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15554380
+  version_requirements: *24656540
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &15553320 !ruby/object:Gem::Requirement
+  requirement: &24652860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15553320
+  version_requirements: *24652860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15552060 !ruby/object:Gem::Requirement
+  requirement: &24651640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15552060
+  version_requirements: *24651640
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15550400 !ruby/object:Gem::Requirement
+  requirement: &24648740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +142,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *15550400
+  version_requirements: *24648740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &15549600 !ruby/object:Gem::Requirement
+  requirement: &24647720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15549600
+  version_requirements: *24647720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15543260 !ruby/object:Gem::Requirement
+  requirement: &24646940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15543260
+  version_requirements: *24646940
 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
@@ -177,6 +188,7 @@ files:
 - lib/filer/config.rb
 - lib/filer/file_info.rb
 - lib/filer/uploader.rb
+- lib/filer/validation.rb
 - lib/progstr-filer.rb
 - test/file_like.rb
 - test/test_attachment_url.rb
@@ -185,6 +197,7 @@ files:
 - test/test_http_upload.rb
 - test/test_id_generation.rb
 - test/test_upload_on_save.rb
+- test/test_validation.rb
 - test/user_data.rb
 homepage: http://github.com/progstr/progstr-filer-gem
 licenses:
@@ -201,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2703032228924922704
+      hash: 1683985428954431553
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: