dragonfly-s3_data_store 1.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 768cec2575b167242c6c5bf6b02313d61add3dbe
-  data.tar.gz: dfa4bc29b433f342556df40ba346a4967b915265
+  metadata.gz: 044ae3caafc588b999b25a91cb115f2395736d43
+  data.tar.gz: 174b9b095ac2177938457642948d17b73b886f0d
 SHA512:
-  metadata.gz: 12c5156cd14a58c7feeeb580cd4d79125071a9bf543df232828c88a6c4e3c5351587aa8d0dfc1a386cbbedf77eadebef2df379820322ef3e9a5b570f322cbd1a
-  data.tar.gz: 3dd4be70964435582b15ff3bd2fe15f06e28383dd6e974b63cfb4002639bda5385b0d13ccf83a5e2320afda29fedf92faa958b6a3f2b5780f240ad6ad5f0a814
+  metadata.gz: 86ec01a50a2dd00af9c7dcc2db8da6db15f30e49c08e699011a3a4d299c96ffad2822cdf537b9a68e996892ad34b2805ee5654b5da331b5bf04795bc130d7c19
+  data.tar.gz: b6f05e5104cba3f9041ca3efef8e3998b188127c689fa7eb76a079b5fec2bffac724fe93337af8495118868b88c01a0cea0db3d82fa75cc2e30f4bd06b7031b2

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+1.3.0 (2017-05-06)
+==================
+Changes
+-------
+- No longer validate the region, so it's now up to the user to get it right (this way we don't have to keep in sync with Amazon every time they add regions)
+
+1.2 (2015-08-04)
+================
+Changes
+-------
+- Save files into a different directory structure, e.g. '2015/08/03/5bccfdd8-0de2-4efc-b3f3-f4e96bcc4afa/file.png' rather than '2015/08/03/12/03/24/492/file.png'. This does not affect any functionality and won't break any of your old content! It's just more robust. (df7453a0)

data/README.md

@@ -37,7 +37,7 @@ end
 :bucket_name
 :access_key_id
 :secret_access_key
-:region               # default 'us-east-1', see Dragonfly::S3DataStore::REGIONS for options
+:region               # default 'us-east-1', see http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region for options
 :storage_headers      # defaults to {'x-amz-acl' => 'public-read'}, can be overridden per-write - see below
 :url_scheme           # defaults to "http"
 :url_host             # defaults to "<bucket-name>.s3.amazonaws.com", or "s3.amazonaws.com/<bucket-name>" if not a valid subdomain

data/dragonfly-s3_data_store.gemspec

@@ -21,12 +21,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "dragonfly", "~> 1.0"
   spec.add_runtime_dependency "fog-aws"
   spec.add_development_dependency "rspec", "~> 2.0"
-
-  spec.post_install_message = <<-POST_INSTALL_MESSAGE
-=====================================================
-Thanks for installing dragonfly-s3_data_store!!
-If you have any fog compatibility problems, please be aware that
-it now depends on the 'fog-aws' gem rather than the 'fog' gem.
-=====================================================
-POST_INSTALL_MESSAGE
 end

data/lib/dragonfly/s3_data_store.rb

@@ -11,18 +11,6 @@ module Dragonfly
     # Exceptions
     class NotConfigured < RuntimeError; end
 
-    REGIONS = {
-      'us-east-1' => 's3.amazonaws.com',  #default
-      'us-west-1' => 's3-us-west-1.amazonaws.com',
-      'us-west-2' => 's3-us-west-2.amazonaws.com',
-      'ap-northeast-1' => 's3-ap-northeast-1.amazonaws.com',
-      'ap-southeast-1' => 's3-ap-southeast-1.amazonaws.com',
-      'ap-southeast-2' => 's3-ap-southeast-2.amazonaws.com',
-      'eu-west-1' => 's3-eu-west-1.amazonaws.com',
-      'eu-central-1' => 's3-eu-central-1.amazonaws.com',
-      'sa-east-1' => 's3-sa-east-1.amazonaws.com'
-    }
-
     SUBDOMAIN_PATTERN = /^[a-z0-9][a-z0-9.-]+[a-z0-9]$/
 
     def initialize(opts={})
@@ -84,7 +72,12 @@ module Dragonfly
     end
 
     def domain
-      REGIONS[get_region]
+      case region
+      when 'us-east-1', nil
+        's3.amazonaws.com'
+      else
+        "s3-#{region}.amazonaws.com"
+      end
     end
 
     def storage
@@ -130,12 +123,6 @@ module Dragonfly
       end
     end
 
-    def get_region
-      reg = region || 'us-east-1'
-      raise "Invalid region #{reg} - should be one of #{valid_regions.join(', ')}" unless valid_regions.include?(reg)
-      reg
-    end
-
     def generate_uid(name)
       "#{Time.now.strftime '%Y/%m/%d/%H/%M/%S'}/#{SecureRandom.uuid}/#{name}"
     end
@@ -162,10 +149,6 @@ module Dragonfly
       {'x-amz-meta-json' => Serializer.json_encode(meta)}
     end
 
-    def valid_regions
-      REGIONS.keys
-    end
-
     def rescuing_socket_errors(&block)
       yield
     rescue Excon::Errors::SocketError => e

data/lib/dragonfly/s3_data_store/version.rb

@@ -1,5 +1,5 @@
 module Dragonfly
   class S3DataStore
-    VERSION = "1.2"
+    VERSION = "1.3.0"
   end
 end

data/spec/s3_data_store_spec.rb

@@ -5,6 +5,11 @@ require 'dragonfly/s3_data_store'
 
 describe Dragonfly::S3DataStore do
 
+  # This used to exist in dragonfly as Dragonfly::Serializer.marshal_b64_encode
+  def deprecated_marshal_b64_encode(meta)
+    Base64.encode64(Marshal.dump(meta)).tr("\n=", '')
+  end
+
   # To run these tests, put a file ".s3_spec.yml" in the dragonfly root dir, like this:
   # key: XXXXXXXXXX
   # secret: XXXXXXXXXX
@@ -115,11 +120,9 @@ describe Dragonfly::S3DataStore do
       @data_store.domain.should == 's3-eu-west-1.amazonaws.com'
     end
 
-    it "does raise an error if an unknown region is given" do
-      @data_store.region = 'latvia-central'
-      lambda{
-        @data_store.domain
-      }.should raise_error
+    it "use the default one if us-east-1" do
+      @data_store.region = 'us-east-1'
+      @data_store.domain.should == 's3.amazonaws.com'
     end
   end
 
@@ -315,7 +318,7 @@ describe Dragonfly::S3DataStore do
 
     it "works with the deprecated x-amz-meta-extra header (but stringifies its keys)" do
       uid = @data_store.write(content, :headers => {
-        'x-amz-meta-extra' => Dragonfly::Serializer.marshal_b64_encode(:some => 'meta', :wo => 4),
+        'x-amz-meta-extra' => deprecated_marshal_b64_encode(:some => 'meta', :wo => 4),
         'x-amz-meta-json' => ""
       })
       c, meta = @data_store.read(uid)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly-s3_data_store
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.3.0
 platform: ruby
 authors:
 - Mark Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -73,12 +74,7 @@ homepage: https://github.com/markevans/dragonfly-s3_data_store
 licenses:
 - MIT
 metadata: {}
-post_install_message: |
-  =====================================================
-  Thanks for installing dragonfly-s3_data_store!!
-  If you have any fog compatibility problems, please be aware that
-  it now depends on the 'fog-aws' gem rather than the 'fog' gem.
-  =====================================================
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -94,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Data store for storing Dragonfly content (e.g. images) on S3