file_column_with_s3 0.1.5 → 0.1.6

data/lib/file_column.rb

@@ -718,6 +718,7 @@ module FileColumn # :nodoc:
       define_method "#{attr}_download_url" do |context_path, *args|
         subpath, store_url_for_option = args
         state = send(state_method)
+        store_url_for_option ||= {}
         relative_path = state.relative_path(subpath)
 
         return nil unless relative_path

data/test/abstract_unit.rb

@@ -86,7 +86,7 @@ class InMemoryWithUrlStorageStore
   end
 
   def url_for(path, options={})
-    "store generated url for #{path}"
+    "store generated url for #{path} with options #{options.inspect}"
   end
 
   def absolute_path(path)

data/test/file_column_helper_test.rb

@@ -14,11 +14,21 @@ class UrlForFileColumnTest < Test::Unit::TestCase
     FileColumn.config_store(:in_memory_with_url)
     @e = Entry.new(:image => upload(f("skanthak.png")))
     assert @e.save
-    assert_equal "store generated url for #{@e.image_relative_path}", url_for_file_column("e", "image")
+    assert_equal "store generated url for #{@e.image_relative_path} with options {}", url_for_file_column("e", "image")
   ensure
     FileColumn.config_store(:filesystem)
   end
 
+  def test_should_should_pass_through_store_url_for_options
+    FileColumn.config_store(:in_memory_with_url)
+    @e = Entry.new(:image => upload(f("skanthak.png")))
+    assert @e.save
+    assert_equal "store generated url for #{@e.image_relative_path} with options {:expires_in=>200}", url_for_file_column("e", "image", nil, {:expires_in => 200 })
+  ensure
+    FileColumn.config_store(:filesystem)
+  end
+
+
   def test_url_for_file_column_with_temp_entry
     @e = Entry.new(:image => upload(f("skanthak.png")))
     url = url_for_file_column("e", "image")

data/test/file_column_test.rb

@@ -695,7 +695,7 @@ class FileColumnDownloadUrlTest < Test::Unit::TestCase
     FileColumn.config_store(:in_memory_with_url)
     e = Entry.new(:image => upload(f("skanthak.png")))
     assert e.save
-    assert_equal "store generated url for #{e.image_relative_path}", e.image_download_url(nil)
+    assert_equal "store generated url for #{e.image_relative_path} with options {}", e.image_download_url(nil)
   ensure
     FileColumn.config_store(:filesystem)
   end

metadata

@@ -1,105 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: file_column_with_s3
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.1.6
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
 platform: ruby
-authors: 
+authors:
 - Mingle SaaS team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-03-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-03-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mingle-storage
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 0
-        - 8
+      - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.8
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
+      - !ruby/object:Gem::Version
         version: 2.3.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.8
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: aws-sdk
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: mingle.saas@thoughtworks.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - lib/file_column/validations.rb
 - lib/file_column.rb
@@ -125,36 +122,26 @@ files:
 - s3_env.example
 homepage: https://github.com/ThoughtWorksStudios/file_column
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: File attachment library for ruby
 test_files: []
-