paperclip 2.4.5 → 2.5.0

data/lib/paperclip/options.rb

@@ -1,78 +0,0 @@
-module Paperclip
-  class Options
-
-    attr_accessor :url, :path, :only_process, :normalized_styles, :default_url, :default_style,
-     :storage, :use_timestamp, :whiny, :use_default_time_zone, :hash_digest, :hash_secret,
-     :convert_options, :source_file_options, :preserve_files, :http_proxy
-
-    attr_accessor :s3_credentials, :s3_host_name, :s3_options, :s3_permissions, :s3_protocol,
-      :s3_headers, :s3_host_alias, :bucket
-
-    attr_accessor :fog_directory, :fog_credentials, :fog_host, :fog_public, :fog_file
-
-    def initialize(attachment, hash)
-      @attachment            = attachment
-
-      @url                   = hash[:url]
-      @url                   = @url.call(@attachment) if @url.is_a?(Proc)
-      @path                  = hash[:path]
-      @path                  = @path.call(@attachment) if @path.is_a?(Proc)
-      @styles                = hash[:styles]
-      @only_process          = hash[:only_process]
-      @normalized_styles     = nil
-      @default_url           = hash[:default_url]
-      @default_style         = hash[:default_style]
-      @storage               = hash[:storage]
-      @use_timestamp         = hash[:use_timestamp]
-      @whiny                 = hash[:whiny_thumbnails] || hash[:whiny]
-      @use_default_time_zone = hash[:use_default_time_zone]
-      @hash_digest           = hash[:hash_digest]
-      @hash_data             = hash[:hash_data]
-      @hash_secret           = hash[:hash_secret]
-      @convert_options       = hash[:convert_options]
-      @source_file_options   = hash[:source_file_options]
-      @processors            = hash[:processors]
-      @preserve_files        = hash[:preserve_files]
-      @http_proxy            = hash[:http_proxy]
-
-      #s3 options
-      @s3_credentials        = hash[:s3_credentials]
-      @s3_host_name          = hash[:s3_host_name]
-      @bucket                = hash[:bucket]
-      @s3_options            = hash[:s3_options]
-      @s3_permissions        = hash[:s3_permissions]
-      @s3_protocol           = hash[:s3_protocol]
-      @s3_headers            = hash[:s3_headers]
-      @s3_host_alias         = hash[:s3_host_alias]
-
-      #fog options
-      @fog_directory         = hash[:fog_directory]
-      @fog_credentials       = hash[:fog_credentials]
-      @fog_host              = hash[:fog_host]
-      @fog_public            = hash[:fog_public]
-      @fog_file              = hash[:fog_file]
-    end
-
-    def method_missing(method, *args, &blk)
-      if method.to_s[-1,1] == "="
-        instance_variable_set("@#{method[0..-2]}", args[0])
-      else
-        instance_variable_get("@#{method}")
-      end
-    end
-
-    def processors
-      @processors.respond_to?(:call) ? @processors.call(@attachment.instance) : @processors
-    end
-
-    def styles
-      if @styles.respond_to?(:call) || !@normalized_styles
-        @normalized_styles = ActiveSupport::OrderedHash.new
-        (@styles.respond_to?(:call) ? @styles.call(@attachment) : @styles).each do |name, args|
-          normalized_styles[name] = Paperclip::Style.new(name, args.dup, @attachment)
-        end
-      end
-      @normalized_styles
-    end
-  end
-end

data/test/options_test.rb

@@ -1,75 +0,0 @@
-# encoding: utf-8
-require './test/helper'
-
-class MockAttachment < Struct.new(:one, :two)
-  def instance
-    self
-  end
-end
-
-class OptionsTest < Test::Unit::TestCase
-  should "be able to set a value" do
-    @options = Paperclip::Options.new(nil, {})
-    assert_nil @options.path
-    @options.path = "this/is/a/path"
-    assert_equal "this/is/a/path", @options.path
-  end
-
-  context "#styles with a plain hash" do
-    setup do
-      @attachment = MockAttachment.new(nil, nil)
-      @options = Paperclip::Options.new(@attachment,
-                                        :styles => {
-                                          :something => ["400x400", :png]
-                                        })
-    end
-
-    should "return the right data for the style's geometry" do
-      assert_equal "400x400", @options.styles[:something][:geometry]
-    end
-
-    should "return the right data for the style's format" do
-      assert_equal :png, @options.styles[:something][:format]
-    end
-  end
-
-  context "#styles is a proc" do
-    setup do
-      @attachment = MockAttachment.new("123x456", :doc)
-      @options = Paperclip::Options.new(@attachment,
-                                        :styles => lambda {|att|
-                                          {:something => {:geometry => att.one, :format => att.two}}
-                                        })
-    end
-
-    should "return the right data for the style's geometry" do
-      assert_equal "123x456", @options.styles[:something][:geometry]
-    end
-
-    should "return the right data for the style's format" do
-      assert_equal :doc, @options.styles[:something][:format]
-    end
-
-    should "run the proc each time, giving dynamic results" do
-      assert_equal :doc, @options.styles[:something][:format]
-      @attachment.two = :pdf
-      assert_equal :pdf, @options.styles[:something][:format]
-    end
-  end
-
-  context "#processors" do
-    setup do
-      @attachment = MockAttachment.new(nil, nil)
-    end
-    should "return processors if not a proc" do
-      @options = Paperclip::Options.new(@attachment, :processors => [:one])
-      assert_equal [:one], @options.processors
-    end
-    should "return processors if it is a proc" do
-      @options = Paperclip::Options.new(@attachment, :processors => lambda{|att| [att.one]})
-      assert_equal [nil], @options.processors
-      @attachment.one = :other
-      assert_equal [:other], @options.processors
-    end
-  end
-end