file_column_with_s3 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0482bce566504b5f4172787d578a64cf71f37294
-  data.tar.gz: e77a7c13b7bb686225cd8a0786c62abd9ffdd07e
+SHA256:
+  metadata.gz: a873a910fc1cbaafc4f2e5756510c1a41f37e3393fd1c1b256b1368a3dcf1060
+  data.tar.gz: ea40ce044ddeb43e49bf96d6d755048ef53d588c909db0aec6bc7dbc63e71847
 SHA512:
-  metadata.gz: 853f2abd43b2a722fe7ea52423dbe68f234a849a12ea876c263a0bb1eb02dd5992ff64bb023e1d51683f8e115b07aa20360747591f6abed421b89878a101dc5a
-  data.tar.gz: 134232b045d69995b655e043156ca5c95c6ba2ca6ecb9ee14647c6a596d9fb33d046e9ea279d330126775a77fc0da155d7b4d20dba9a00896a9a287ac1516b44
+  metadata.gz: fe3e04f3b4a29cc641c966ab28f437b29ce57f64e95c32809f8edc205c4e1da42e899926afbed84c9a80eaa3de1d63fef5ac8439be2b10eee0cfab3bf3234b3f
+  data.tar.gz: 055f3b4a607e2bbf0f1ce25fb216d5b3037b575e0d6420de7c333c6b68963f2e88d70b6224fc883533e0efc6aa436f0a9fcc6f591c6a812abfadd3dafbcd01cc

data/README

@@ -1,3 +1,5 @@
+Master branch :image:https://app.snap-ci.com/ThoughtWorksStudios/file_column/branch/master/build_image["Build Status", link="https://app.snap-ci.com/ThoughtWorksStudios/file_column/branch/master"]
+
 FEATURES
 ========
 
@@ -22,8 +24,8 @@ end
   uploaded file. Note that you need an Entry object in the instance variable @entry for this
   to work.
 
-* easy integration with RMagick to resize images and/or create thumb-nails.
-
+* Does not support RMagick based features anymore. Look for version 0.2.0 and below for the same. Images cannot be resized or
+checked for resolution.
 USAGE
 =====
 

data/Rakefile

@@ -35,6 +35,4 @@ desc "Run all tests"
 task :test do
   sh "cd test; ruby file_column_test.rb"
   sh "cd test; ruby file_column_helper_test.rb"
-  sh "cd test; ruby magick_test.rb"
-  sh "cd test; ruby magick_view_only_test.rb"
 end

data/lib/file_column.rb

@@ -1,8 +1,7 @@
 require 'fileutils'
 require 'tempfile'
-require 'magick_file_column'
 require 'storage'
-require 'file_column/validations'
+require File.dirname(__FILE__) + '/file_column/validations'
 
 module FileColumn # :nodoc:
   def self.append_features(base)
@@ -337,7 +336,7 @@ module FileColumn # :nodoc:
     def get_content_type(fallback=nil)
       if options[:file_exec]
         begin
-          content_type = `#{options[:file_exec]} -bi "#{File.join(@dir,@filename)}"`.chomp
+          content_type = `#{options[:file_exec]} -b --mime "#{File.join(@dir,@filename)}"`.chomp
           content_type = fallback unless $?.success?
           content_type.gsub!(/;.+$/,"") if content_type
           content_type
@@ -499,12 +498,6 @@ module FileColumn # :nodoc:
   # As a convenience you can access files stored in sub-directories via the +subdir+
   # parameter if they have the same filename.
   #
-  # Suppose your uploaded file is named "vancouver.jpg" and you want to create a
-  # thumb-nail and store it in the "thumb" directory. If you call
-  # <tt>image("thumb")</tt>, you
-  # will receive an absolute path for the file "thumb/vancouver.jpg" in the same
-  # directory "vancouver.jpg" is stored. Look at the documentation of FileColumn::Magick
-  # for more examples and how to create these thumb-nails automatically.
   #
   # == File Extensions
   #
@@ -756,7 +749,6 @@ module FileColumn # :nodoc:
 
       private after_save_method, after_destroy_method
 
-      FileColumn::MagickExtension::file_column(self, attr, my_options) if options[:magick]
     end
 
   end

data/lib/file_column/validations.rb

@@ -1,6 +1,6 @@
 module FileColumn
   module Validations #:nodoc:
-    
+
     def self.append_features(base)
       super
       base.extend(ClassMethods)
@@ -16,7 +16,7 @@ module FileColumn
     #    end
     module ClassMethods
       EXT_REGEXP = /\.([A-z0-9]+)$/
-    
+
       # This validates the file type of one or more file_columns.  A list of file columns
       # should be given followed by an options hash.
       #
@@ -28,12 +28,12 @@ module FileColumn
       #     validates_file_format_of :field, :in => ["gif", "png", "jpg"]
       #     validates_file_format_of :field, :in => ["image/jpeg"]
       def validates_file_format_of(*attrs)
-      
+
         options = attrs.pop if attrs.last.is_a?Hash
         raise ArgumentError, "Please include the :in option." if !options || !options[:in]
         options[:in] = [options[:in]] if options[:in].is_a?String
         raise ArgumentError, "Invalid value for option :in" unless options[:in].is_a?Array
-      
+
         validates_each(attrs, options) do |record, attr, value|
           unless value.blank?
             mime_extensions = record.send("#{attr}_options")[:mime_extensions]
@@ -41,9 +41,9 @@ module FileColumn
             record.errors.add attr, "is not a valid format." unless extensions.include?(value.scan(EXT_REGEXP).flatten.first)
           end
         end
-      
+
       end
-    
+
       # This validates the file size of one or more file_columns.  A list of file columns
       # should be given followed by an options hash.
       #
@@ -54,12 +54,12 @@ module FileColumn
       # Examples:
       #    validates_filesize_of :field, :in => 0..100.megabytes
       #    validates_filesize_of :field, :in => 15.kilobytes..1.megabyte
-      def validates_filesize_of(*attrs)  
-      
+      def validates_filesize_of(*attrs)
+
         options = attrs.pop if attrs.last.is_a?Hash
         raise ArgumentError, "Please include the :in option." if !options || !options[:in]
         raise ArgumentError, "Invalid value for option :in" unless options[:in].is_a?Range
-      
+
         validates_each(attrs, options) do |record, attr, value|
           unless value.blank?
             size = File.size(value)
@@ -67,45 +67,7 @@ module FileColumn
             record.errors.add attr, "is larger than the allowed size range." if size > options[:in].last
           end
         end
-      
-      end 
-
-      IMAGE_SIZE_REGEXP = /^(\d+)x(\d+)$/
-
-      # Validates the image size of one or more file_columns.  A list of file columns
-      # should be given followed by an options hash. The validation will pass
-      # if both image dimensions (rows and columns) are at least as big as
-      # given in the <tt>:min</tt> option.
-      #
-      # Required options:
-      # * <tt>:min</tt> => minimum image dimension string, in the format NNxNN
-      #   (columns x rows).
-      #
-      # Example:
-      #    validates_image_size :field, :min => "1200x1800"
-      #
-      # This validation requires RMagick to be installed on your system
-      # to check the image's size.
-      def validates_image_size(*attrs)      
-        options = attrs.pop if attrs.last.is_a?Hash
-        raise ArgumentError, "Please include a :min option." if !options || !options[:min]
-        minimums = options[:min].scan(IMAGE_SIZE_REGEXP).first.collect{|n| n.to_i} rescue []
-        raise ArgumentError, "Invalid value for option :min (should be 'XXxYY')" unless minimums.size == 2
 
-        require 'RMagick'
-
-        validates_each(attrs, options) do |record, attr, value|
-          unless value.blank?
-            begin
-              img = ::Magick::Image::read(value).first
-              record.errors.add('image', "is too small, must be at least #{minimums[0]}x#{minimums[1]}") if ( img.rows < minimums[1] || img.columns < minimums[0] )
-            rescue ::Magick::ImageMagickError
-              record.errors.add('image', "invalid image")
-            end
-            img = nil
-            GC.start
-          end
-        end
       end
     end
   end

data/lib/file_column_helper.rb

@@ -77,72 +77,6 @@ module FileColumnHelper
 
   end
 
-  # Same as +url_for_file_colum+ but allows you to access different versions
-  # of the image that have been processed by RMagick.
-  #
-  # If your +options+ parameter is non-nil this will
-  # access a different version of an image that will be produced by
-  # RMagick. You can use the following types for +options+:
-  #
-  # * a <tt>:symbol</tt> will select a version defined in the model
-  #   via FileColumn::Magick's <tt>:versions</tt> feature.
-  # * a <tt>geometry_string</tt> will dynamically create an
-  #   image resized as specified by <tt>geometry_string</tt>. The image will
-  #   be stored so that it does not have to be recomputed the next time the
-  #   same version string is used.
-  # * <tt>some_hash</tt> will dynamically create an image
-  #   that is created according to the options in <tt>some_hash</tt>. This
-  #   accepts exactly the same options as Magick's version feature.
-  #
-  # The version produced by RMagick will be stored in a special sub-directory.
-  # The directory's name will be derived from the options you specified
-  # (via a hash function) but if you want
-  # to set it yourself, you can use the <tt>:name => name</tt> option.
-  #
-  # Examples:
-  #
-  #    <%= url_for_image_column @entry, "image", "640x480" %>
-  #
-  # will produce an URL like this
-  #
-  #    /entry/image/42/bdn19n/filename.jpg
-  #    # "640x480".hash.abs.to_s(36) == "bdn19n"
-  #
-  # and
-  #
-  #    <%= url_for_image_column @entry, "image",
-  #       :size => "50x50", :crop => "1:1", :name => "thumb" %>
-  #
-  # will produce something like this:
-  #
-  #    /entry/image/42/thumb/filename.jpg
-  #
-  # Hint: If you are using the same geometry string / options hash multiple times, you should
-  # define it in a helper to stay with DRY. Another option is to define it in the model via
-  # FileColumn::Magick's <tt>:versions</tt> feature and then refer to it via a symbol.
-  #
-  # The URL produced by this method is relative to your application's root URL,
-  # although it will start with a slash.
-  # If you pass this URL to rails' +image_tag+ helper, it will be converted to an
-  # absolute URL automatically.
-  # If there is currently no image uploaded, or there is a problem while loading
-  # the image this method will return +nil+.
-  def url_for_image_column(object, method, options=nil, store_url_for_options={})
-    case object
-    when String, Symbol
-      object = instance_variable_get("@#{object.to_s}")
-    end
-    subdir = nil
-    if options
-      subdir = object.send("#{method}_state").create_magick_version_if_needed(options)
-    end
-    if subdir.nil?
-      nil
-    else
-      url_for_file_column(object, method, subdir, store_url_for_options)
-    end
-  end
-
   private
   def get_relative_url_for_rails(rails_version)
     (rails_version == 2 ? ActionController::Base.relative_url_root : Rails.application.config.action_controller.relative_url_root).to_s

data/lib/rails_file_column.rb

@@ -14,7 +14,7 @@ module ActiveRecord # :nodoc:
 end
 
 module ActionView # :nodoc:
-  class Base # :nodoc:
+  module Helpers # :nodoc:
     include FileColumnHelper
   end
 end

data/test/abstract_unit.rb

@@ -2,6 +2,7 @@ require 'thread'
 require 'test/unit'
 require 'rubygems'
 require 'active_support'
+require 'active_support/core_ext/numeric/bytes' # is not loaded when active_support loads.
 require 'active_record'
 require 'action_view'
 require 'action_controller'
@@ -44,10 +45,10 @@ module Rails
 end
 
 
-require 'file_column'
-require 'file_column_helper'
-require 'file_compat'
-require 'test_case'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/file_column')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/file_column_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/file_compat')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/test_case')
 
 # do not use the file executable normally in our tests as
 # it may not be present on the machine we are running on
@@ -74,6 +75,13 @@ class Test::Unit::TestCase
     assert_equal normalize_path(expected_path), normalize_path(path)
   end
 
+  def with_failing_validation(klass, column, &block)
+    klass.validates_each(column) do |record, attr, value|
+      record.errors.add(column, 'some stupid error')
+    end
+    yield
+    klass.clear_validators!
+  end
 
   private
 
@@ -82,10 +90,8 @@ class Test::Unit::TestCase
   end
 
   def clear_validations
-    [:validate, :validate_on_create, :validate_on_update].each do |attr|
-        Entry.write_inheritable_attribute attr, []
-        Movie.write_inheritable_attribute attr, []
-      end
+    Entry.clear_validators!
+    Movie.clear_validators!
   end
 
   def file_path(filename)

data/test/connection.rb

@@ -4,7 +4,7 @@ ActiveRecord::Base.logger = Logger.new("debug.log")
 
 db = 'file_column_test.sqlite'
 
-ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",
+ActiveRecord::Base.establish_connection(:adapter  => "jdbcsqlite3",
                                         :database => db)
 
 

data/test/file_column_helper_test.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/abstract_unit'
-require File.dirname(__FILE__) + '/fixtures/entry'
+require File.expand_path(File.dirname(__FILE__) + '/abstract_unit')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/entry')
 
 class UrlForFileColumnTest < Test::Unit::TestCase
   include FileColumnHelper
@@ -81,7 +81,6 @@ class UrlForFileColumnWithContextPathTest < Test::Unit::TestCase
 
     # mock up some request data structures for AssetTagHelper
     @request = RequestMock.new
-    ActionController::Base.relative_url_root = "/foo/bar"
     @controller = self
   end
 
@@ -89,11 +88,11 @@ class UrlForFileColumnWithContextPathTest < Test::Unit::TestCase
     @request
   end
 
-  IMAGE_URL = %r{^/foo/bar/entry/image/.+/skanthak.png$}
+  IMAGE_URL = %r{^/foo/bar/entry/image/.+/skanthak.png}
   def test_with_image_tag
     e = Entry.new(:image => upload(f("skanthak.png")))
-    html = image_tag url_for_file_column(e, "image")
 
+    html = image_tag url_for_file_column(e, "image")
     url = html.scan(/src=\"([^?]+)\?*.*\"/).first.first
 
     assert_match IMAGE_URL, url
@@ -113,4 +112,9 @@ class UrlForFileColumnWithContextPathTest < Test::Unit::TestCase
     url_for_file_column(e, "image", :absolute => true)
     assert_equal "/foo/bar", get_relative_url_for_rails(Rails::VERSION::MAJOR)
   end
+
+  private
+  def config
+    OpenStruct.new(relative_url_root: '/foo/bar')
+  end
 end

data/test/file_column_test.rb

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/abstract_unit'
-
-require File.dirname(__FILE__) + '/fixtures/entry'
+require File.expand_path(File.dirname(__FILE__) + '/abstract_unit')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/entry')
 
 class Movie < ActiveRecord::Base
 end
@@ -143,7 +142,7 @@ class FileColumnTest < Test::Unit::TestCase
 
     # run this test only if the machine we are running on
     # has the file utility installed
-    if File.executable?(FILE_UTILITY)  && !RUBY_PLATFORM.include?("darwin")
+    if File.executable?(FILE_UTILITY)
       e = Entry.new(:image => uploaded_file(file_path("skanthak.png"), "", "skanthak.jpg"))
 
       assert_equal "skanthak.png", File.basename(e.image)
@@ -256,11 +255,14 @@ class FileColumnTest < Test::Unit::TestCase
   end
 
   def test_keep_tmp_image
-    e = Entry.new("image" => uploaded_file(file_path("kerb.jpg"), "image/jpeg", "kerb.jpg"))
-    e.validation_should_fail = true
-    assert !e.save, "e should not save due to validation errors"
-    assert File.exists?(local_path = e.image)
-    image_temp = e.image_temp
+    image_temp = ''
+    local_path = ''
+    with_failing_validation(Entry, :image) do
+      e = Entry.new("image" => uploaded_file(file_path("kerb.jpg"), "image/jpeg", "kerb.jpg"))
+      assert !e.save, "e should not save due to validation errors"
+      assert File.exists?(local_path = e.image)
+      image_temp = e.image_temp
+    end
     e = Entry.new("image_temp" => image_temp)
     assert_equal local_path, e.image
     assert e.save
@@ -271,11 +273,13 @@ class FileColumnTest < Test::Unit::TestCase
     e = Entry.new("image" =>uploaded_file(file_path("kerb.jpg"), "image/jpeg", "kerb.jpg"))
     assert e.save
     assert File.exists?(local_path = e.image)
-    e = Entry.find(e.id)
-    e.image = uploaded_file(file_path("skanthak.png"), "image/png", "skanthak.png")
-    e.validation_should_fail = true
-    assert !e.save
-    temp_path = e.image_temp
+    temp_path = ''
+    with_failing_validation(Entry, :image) do
+      e = Entry.find(e.id)
+      e.image = uploaded_file(file_path("skanthak.png"), "image/png", "skanthak.png")
+      assert !e.save
+      temp_path = e.image_temp
+    end
     e = Entry.find(e.id)
     e.image_temp = temp_path
     assert e.save
@@ -293,11 +297,14 @@ class FileColumnTest < Test::Unit::TestCase
   end
 
   def do_test_replace_tmp_image(order)
-    e = Entry.new("image" => uploaded_file(file_path("kerb.jpg"), "image/jpeg", "kerb.jpg"))
-    e.validation_should_fail = true
-    assert !e.save
-    image_temp = e.image_temp
-    temp_path = e.image
+    image_temp = ''
+    temp_path = ''
+    with_failing_validation(Entry, :image) do
+      e = Entry.new("image" => uploaded_file(file_path("kerb.jpg"), "image/jpeg", "kerb.jpg"))
+      assert !e.save
+      image_temp = e.image_temp
+      temp_path = e.image
+    end
     new_img = uploaded_file(file_path("skanthak.png"), "image/png", "skanthak.png")
     e = Entry.new
     for method in order
@@ -515,7 +522,8 @@ class FileColumnTest < Test::Unit::TestCase
 
     e.image = upload(f("skanthak.png"))
     assert !e.save
-    assert e.errors.invalid?("image")
+    assert e.invalid? :image
+    assert_equal ['is smaller than the allowed size range.'], e.errors.messages[:image]
   end
 
   def test_validates_file_format_simple
@@ -529,19 +537,8 @@ class FileColumnTest < Test::Unit::TestCase
 
     e.image = upload(f("mysql.sql"))
     assert !e.save
-    assert e.errors.invalid?("image")
-
-  end
-
-  def test_validates_image_size
-    Entry.validates_image_size :image, :min => "640x480"
-
-    e = Entry.new(:image => upload(f("kerb.jpg")))
-    assert e.save
-
-    e = Entry.new(:image => upload(f("skanthak.png")))
-    assert !e.save
-    assert e.errors.invalid?("image")
+    assert  e.invalid? :image
+    assert_equal ['is not a valid format.'], e.errors.messages[:image]
   end
 
   def do_permission_test(uploaded_file, permissions=0641)