paperclip-defaults 1.0.3 → 1.0.4

data/README.md

@@ -14,15 +14,6 @@ To use Paperclip::Defaults simply add it to your Gemfile and update config/appli
 config.paperclip_defaults = {default_url: "http://www.example.com/missing.png"}
 ```
 
-In addition to allowing you to set the defaults for Paperclip has_attached_file now accepts a new option: default_asset_url
-When default_asset_url is passed in has_attached_file will determine the URL of the image through the Rails asset pipeline (making use of an asset host if you have set one for your Rails application). You can also make use of a Proc or lambda like so:
-
-``` ruby
-class YourModel < ActiveRecord::Base
-  has_attached_file :logo, default_asset_url: ->(attachment) { "#{attachment.instance.your_special_field}.png" }
-end
-```
-
 Development
 -----------
 - Source hosted on [GitHub](https://github.com)

data/lib/paperclip-defaults/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Defaults
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/lib/paperclip-defaults.rb

@@ -13,16 +13,6 @@ module Paperclip
     alias_method :has_attached_file_without_defaults, :has_attached_file
     def has_attached_file_with_defaults(name, options = {})
       paperclip_options = ::Rails.application.config.paperclip_defaults.merge(options)
-      if paperclip_options[:default_asset_url]
-        begin
-          default_asset_url = paperclip_options[:default_asset_url]
-          paperclip_options[:default_url] = ->(attachment) {ActionController::Base.new.view_context.asset_path(default_asset_url.respond_to?(:call) ? default_asset_url.call(attachment) : default_asset_url)}
-        rescue StandardError => e
-          ::Rails.logger.warn("Could not set default asset url for '#{paperclip_options[:default_asset_url]}'")
-        end
-
-        paperclip_options.delete(:default_asset_url)
-      end
       has_attached_file_without_defaults(name, paperclip_options)
     end
     alias_method :has_attached_file, :has_attached_file_with_defaults

data/test/test_paperclip-defaults.rb

@@ -17,36 +17,6 @@ class TestPaperclipDefaults < MiniTest::Unit::TestCase
     assert_equal expect, model.attachment_definitions[:image1]
   end
 
-  def test_default_asset_url_will_use_action_controller_view_context_to_decide_default_url
-    ActionController::Base.stubs(:new).returns(mock('new_action_controller'))
-    ActionController::Base.new.stubs(:view_context).returns(mock('view_context'))
-    ActionController::Base.new.view_context.stubs(:asset_path).returns('http://www.example.com/unknown.png')
-
-    model = Class.new(ActiveRecord::Base) do
-      has_attached_file :image1, default_asset_url: "unknown.png"
-    end
-
-    expect = {validations: [], default_url: "http://www.example.com/unknown.png"}
-    assert_equal [], model.attachment_definitions[:image1][:validations]
-    assert_equal Proc, model.attachment_definitions[:image1][:default_url].class
-    assert_equal "http://www.example.com/unknown.png", model.attachment_definitions[:image1][:default_url].call(nil)
-  end
-
-  def test_default_asset_url_with_proc_will_make_use_of_it_each_time
-    ActionController::Base.stubs(:new).returns(mock('new_action_controller'))
-    ActionController::Base.new.stubs(:view_context).returns(mock('view_context'))
-    ActionController::Base.new.view_context.stubs(:asset_path).returns('http://www.example.com/unknown.png')
-
-    model = Class.new(ActiveRecord::Base) do
-      has_attached_file :image1, default_asset_url: ->(attachment){ "UNKNOWN.PNG".downcase }
-    end
-
-    expect = {validations: [], default_url: "http://www.example.com/unknown.png"}
-    assert_equal [], model.attachment_definitions[:image1][:validations]
-    assert_equal Proc, model.attachment_definitions[:image1][:default_url].class
-    assert_equal "http://www.example.com/unknown.png", model.attachment_definitions[:image1][:default_url].call(nil)
-  end
-
   def test_defaults_will_not_overwrite_explicit_options
     Rails.application.config.stubs(:paperclip_defaults).returns({storage: :fog})
     model = Class.new(ActiveRecord::Base) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-defaults
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &22097060 !ruby/object:Gem::Requirement
+  requirement: &16356180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22097060
+  version_requirements: *16356180
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &21809720 !ruby/object:Gem::Requirement
+  requirement: &16351440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21809720
+  version_requirements: *16351440
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &21531320 !ruby/object:Gem::Requirement
+  requirement: &16377320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21531320
+  version_requirements: *16377320
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &19200420 !ruby/object:Gem::Requirement
+  requirement: &16390060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19200420
+  version_requirements: *16390060
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &19069000 !ruby/object:Gem::Requirement
+  requirement: &16386140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19069000
+  version_requirements: *16386140
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &19078180 !ruby/object:Gem::Requirement
+  requirement: &16398480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19078180
+  version_requirements: *16398480
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &19074720 !ruby/object:Gem::Requirement
+  requirement: &16411920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19074720
+  version_requirements: *16411920
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &19072900 !ruby/object:Gem::Requirement
+  requirement: &16410500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19072900
+  version_requirements: *16410500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19071180 !ruby/object:Gem::Requirement
+  requirement: &16408780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19071180
+  version_requirements: *16408780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19084680 !ruby/object:Gem::Requirement
+  requirement: &16452340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19084680
+  version_requirements: *16452340
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &19081500 !ruby/object:Gem::Requirement
+  requirement: &16462400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19081500
+  version_requirements: *16462400
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &19094400 !ruby/object:Gem::Requirement
+  requirement: &16461160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19094400
+  version_requirements: *16461160
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19092260 !ruby/object:Gem::Requirement
+  requirement: &16460260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19092260
+  version_requirements: *16460260
 description: Configurable application wide defaults for Paperclip
 email:
 - mark@socialreferral.com
@@ -195,10 +195,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4279530141429349155
+      hash: -487911157935510595
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Configurable application wide defaults for Paperclip