dragonfly-s3_data_store 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7958747f8087147274b566b9a03b588016e1951c
-  data.tar.gz: baf40e36ace3f506553d1c227bfdae3e53a705ac
+  metadata.gz: 579ca4af3872e20c1c6f21531cedfee3f1bb56e9
+  data.tar.gz: fca80fb704e505bede803d25c1e8bdae5d0985e0
 SHA512:
-  metadata.gz: 3a5a60312800230e4dcacd84486003e61114fab36c7a2922f28097f260dee1917b5f5f37de8fe930e32e12dcd298b56ebc65a079d1dba7f5134b72f1100f8763
-  data.tar.gz: 6b8c30b5863c92c0485f91f4d4b492149e559525a990b9cd44473e610fe2bb63158022327e7d8c8df2e45ba87afd8371bd6c663a665b3822a6a91ad254d84336
+  metadata.gz: 95fe2ec3866d04d444821333e5acf1f9d84d6ad963ac119f4a2f4bfb61fc5be8367540312a5c53ec31377336cda1966043572cab2d5b4fcc963532ae4549a89b
+  data.tar.gz: 52ba953e4efcdfb49265b4f052cf51ce4bd58c50c3ffebb4cba7c4f1e051fa3a92811bfb0bd07de9fd91f9734d7229637240371f839d3370f346a8681bc41058

data/README.md

@@ -38,6 +38,7 @@ end
 :url_host             # defaults to "<bucket-name>.s3.amazonaws.com", or "s3.amazonaws.com/<bucket-name>" if not a valid subdomain
 :use_iam_profile      # boolean - if true, no need for access_key_id or secret_access_key
 :root_path            # store all content under a subdirectory - uids will be relative to this - defaults to nil
+:fog_storage_options  # hash for passing any extra options to Fog::Storage.new, e.g. {path_style: true}
 ```
 
 ### Per-storage options

data/lib/dragonfly/s3_data_store/version.rb

@@ -1,5 +1,5 @@
 module Dragonfly
   class S3DataStore
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/lib/dragonfly/s3_data_store.rb

@@ -23,18 +23,19 @@ module Dragonfly
     SUBDOMAIN_PATTERN = /^[a-z0-9][a-z0-9.-]+[a-z0-9]$/
 
     def initialize(opts={})
-      @bucket_name       = opts[:bucket_name]
-      @access_key_id     = opts[:access_key_id]
+      @bucket_name = opts[:bucket_name]
+      @access_key_id = opts[:access_key_id]
       @secret_access_key = opts[:secret_access_key]
-      @region            = opts[:region]
-      @storage_headers   = opts[:storage_headers] || {'x-amz-acl' => 'public-read'}
-      @url_scheme        = opts[:url_scheme] || 'http'
-      @url_host          = opts[:url_host]
-      @use_iam_profile   = opts[:use_iam_profile]
-      @root_path         = opts[:root_path]
+      @region = opts[:region]
+      @storage_headers = opts[:storage_headers] || {'x-amz-acl' => 'public-read'}
+      @url_scheme = opts[:url_scheme] || 'http'
+      @url_host = opts[:url_host]
+      @use_iam_profile = opts[:use_iam_profile]
+      @root_path = opts[:root_path]
+      @fog_storage_options = opts[:fog_storage_options] || {}
     end
 
-    attr_accessor :bucket_name, :access_key_id, :secret_access_key, :region, :storage_headers, :url_scheme, :url_host, :use_iam_profile, :root_path
+    attr_accessor :bucket_name, :access_key_id, :secret_access_key, :region, :storage_headers, :url_scheme, :url_host, :use_iam_profile, :root_path, :fog_storage_options
 
     def write(content, opts={})
       ensure_configured
@@ -85,13 +86,13 @@ module Dragonfly
 
     def storage
       @storage ||= begin
-        storage = Fog::Storage.new({
+        storage = Fog::Storage.new(fog_storage_options.merge({
           :provider => 'AWS',
           :aws_access_key_id => access_key_id,
           :aws_secret_access_key => secret_access_key,
           :region => region,
           :use_iam_profile => use_iam_profile
-        }.reject {|name, option| option.nil?})
+        }).reject {|name, option| option.nil?})
         storage.sync_clock
         storage
       end

data/spec/s3_data_store_spec.rb

@@ -333,4 +333,14 @@ describe Dragonfly::S3DataStore do
     end
   end
 
+  describe "fog_storage_options" do
+    it "adds options to Fog::Storage object" do
+      @data_store.fog_storage_options = {:random_option => 'look at me!'}
+      Fog::Storage.should_receive(:new).with do |hash|
+        hash[:random_option].should == 'look at me!'
+        hash[:aws_access_key_id].should match /\w+/
+      end.and_call_original
+      @data_store.storage
+    end
+  end
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-s3_data_store
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: S3 data store for Dragonfly
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -79,17 +79,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Data store for storing Dragonfly content (e.g. images) on S3