file_column_with_s3 0.1.4 → 0.1.5

data/lib/file_column.rb

@@ -716,12 +716,14 @@ module FileColumn # :nodoc:
       end
 
       define_method "#{attr}_download_url" do |context_path, *args|
+        subpath, store_url_for_option = args
         state = send(state_method)
-        relative_path = state.relative_path(*args)
+        relative_path = state.relative_path(subpath)
+
         return nil unless relative_path
 
         store = state.store
-        return store.url_for(relative_path) if store && store.respond_to?(:url_for)
+        return store.url_for(relative_path, store_url_for_option) if store && store.respond_to?(:url_for)
 
         url = ""
         url << context_path if context_path

data/lib/file_column_helper.rb

@@ -53,7 +53,7 @@ module FileColumnHelper
   #
   # If there is currently no uploaded file stored in the object's column this method will
   # return +nil+.
-  def url_for_file_column(object, method, options=nil)
+  def url_for_file_column(object, method, options=nil, store_url_for_options={})
     case object
     when String, Symbol
       object = instance_variable_get("@#{object.to_s}")
@@ -73,7 +73,7 @@ module FileColumnHelper
     end
 
     context_path = absolute ? ActionController::Base.relative_url_root.to_s : nil
-    object.send("#{method}_download_url", context_path, subdir)
+    object.send("#{method}_download_url", context_path, subdir, store_url_for_options)
 
   end
 
@@ -127,7 +127,7 @@ module FileColumnHelper
   # 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)
+  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}")
@@ -139,7 +139,7 @@ module FileColumnHelper
     if subdir.nil?
       nil
     else
-      url_for_file_column(object, method, subdir)
+      url_for_file_column(object, method, subdir, store_url_for_options)
     end
   end
 end

data/test/abstract_unit.rb

@@ -85,7 +85,7 @@ class InMemoryWithUrlStorageStore
     File.key?(path)
   end
 
-  def url_for(path)
+  def url_for(path, options={})
     "store generated url for #{path}"
   end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: file_column_with_s3
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Mingle SaaS team
@@ -14,30 +15,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-04 00:00:00 -08:00
-default_executable: 
+date: 2014-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mingle-storage
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 8
+        version: 0.0.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
@@ -49,9 +53,11 @@ dependencies:
   name: sqlite3
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -61,9 +67,11 @@ dependencies:
   name: rmagick
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -73,9 +81,11 @@ dependencies:
   name: aws-sdk
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -113,7 +123,6 @@ files:
 - README
 - CHANGELOG
 - s3_env.example
-has_rdoc: true
 homepage: https://github.com/ThoughtWorksStudios/file_column
 licenses: []
 
@@ -123,23 +132,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: File attachment library for ruby