refinerycms-dragonfly 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d11bd9be648efd9d063d5a489296ad0568ef12303a859b149530777924ab637
-  data.tar.gz: 4040f71450f7c2df28c48e63c25002fcd24e854b4223ca0e3165d8fc9e5ef625
+  metadata.gz: 4bb7afb504be82500bb557ed39c1da5d9d4144bbdf2b91a8dceb7f2f3755c95e
+  data.tar.gz: 4849b2cbc8ad947f8efb8c8de3d4884a155d9e0654b745cebe27eca8e70cce97
 SHA512:
-  metadata.gz: 254b0753d946efe7acea73a163ec5fda529258c06bc84b4b32d6828ef0b38dc414dc400fdba2a28579b9793bb8c5dfe679bfcefaf097db484cb93ec477a65f9a
-  data.tar.gz: a2edb4ea5c3db95db85c706519671e8aa3e8cf58c5a15b26f73dca67c196b293849a3cd38d7789c19ab8832ac03b235eeed6f6a4e0e5e3696c9668e3a5bb956e
+  metadata.gz: 4856af1cbcab1a4ba40ae19fe3a8b2eb89f400f6678ae52ea942a096ddb89a0523e02b60667a66a36eb4a3a5645fd76f9690cc3bc591e9e8df81961dbfc6faee
+  data.tar.gz: e937e86abdda1ba4e64f5fd9c01e9103b9af06faff6b4f9a34b6d8c7ada19e52ac6535413ac549c04e6b633df390bdbcb5f99f2431d21737c2555097eef67c7f

data/Rakefile

@@ -1,7 +1,7 @@
 namespace :refinery do
   namespace :testing do
     task :setup_extension do
-      require 'refinerycms-dragonfly'
+      require 'refinery/dragonfly'
       Refinery::DragonflyGenerator.start %w[--quiet]
     end
   end

data/lib/generators/refinery/dragonfly/templates/config/initializers/refinery/dragonfly.rb.erb

@@ -31,12 +31,15 @@ Refinery::Dragonfly.configure do |config|
   # config.response_header      = <%= Refinery::Dragonfly.response_header.inspect %>
 
 
-  # Set the S3 options using means other than securely by environment variables.
-  # If you have to.
-  # config.s3_bucket_name = ENV['S3_BUCKET']
-  # config.s3_region = ENV['S3_REGION']
-  # config.s3_access_key_id = ENV['S3_KEY']
-  # config.s3_secret_access_key = ENV['S3_SECRET']
+  # Set the S3 access keys in the encrypted credentials file
+  # aws:
+  #   access_key_id: 123
+  #   secret_access_key: 345
+  #
+  # config.s3_bucket_name = Rails.application.credentials.aws[:bucket_name]
+  # config.s3_region = Rails.application.credentials.aws[:region]
+  # config.s3_access_key_id = Rails.application.credentials.aws[:access_key_id]
+  # config.s3_secret_access_key = Rails.application.credentials.aws[:secret_access_key]
 
   # When true will use Amazon's Simple Storage Service instead of the default file system for storing resources and images
   config.s3_datastore = config.s3_access_key_id.present? || config.s3_secret_access_key.present?

data/lib/refinery/dragonfly/configuration.rb

@@ -57,13 +57,14 @@ module Refinery
     self.verify_urls = true
 
     # s3 Data Store Config
-
+    # When using s3 as data store, make sure to add the dragonfly-s3_data_store gem to your project
     self.s3_datastore = false
-    self.s3_bucket_name = ENV['S3_BUCKET']
-    self.s3_access_key_id = ENV['S3_KEY']
-    self.s3_secret_access_key = ENV['S3_SECRET']
-    self.s3_region = ENV['S3_REGION']           # default 'us-east-1' see Dragonfly S3DataStore :s3_REGIONS for options
-    self.s3_url_scheme = nil                    # defaults to "http"
+    self.s3_bucket_name = Rails.application&.credentials&.fetch(:s3_bucket_name, nil)
+    self.s3_access_key_id = Rails.application&.credentials&.fetch(:s3_access_key_id, nil)
+    self.s3_secret_access_key = Rails.application&.credentials&.fetch(:s3_secret_access_key, nil)
+    # region defaults to 'us-east-1'; see Dragonfly S3DataStore :s3_REGIONS for options
+    self.s3_region = Rails.application&.credentials&.fetch(:s3_region, nil)
+    self.s3_url_scheme = 'https'                # defaults to "http"
     self.s3_url_host = nil                      # defaults to "<bucket-name>.s3.amazonaws.com" or "s3.amazonaws.com/<bucket-name>" if not a valid subdomain
     self.s3_use_iam_profile = nil               # boolean - if true no need for access_key_id or secret_access_key
     self.s3_root_path = nil                     # store all content under a subdirectory - uids will be relative to this - defaults to nil
@@ -73,7 +74,6 @@ module Refinery
     self.s3_storage_path = nil
     self.s3_storage_headers = nil
 
-
     def self.custom_datastore?
       config.custom_datastore_class.present? && config.custom_datastore_opts.present?
     end
@@ -84,4 +84,3 @@ module Refinery
   end
 
 end
-

data/lib/refinery/dragonfly/dragonfly.rb

@@ -32,7 +32,7 @@ module Refinery
 
           #  These options require a name and block
           define_url extension.dragonfly_define_url if extension.dragonfly_define_url.present?
-          before_serve extension.dragonfly_before_serve if extension.dragonfly_before_serve.present?
+          before_serve(&extension.dragonfly_before_serve) if extension.dragonfly_before_serve.present?
 
 
           # There can be more than one instance of each of these options.
@@ -52,21 +52,21 @@ module Refinery
             processor p[:name], p[:block]
           end unless extension.dragonfly_processors.blank?
 
-          if extension.s3_datastore
+          if extension.s3_datastore?
             require 'dragonfly/s3_data_store'
             datastore :s3,{
-              s3_access_key_id: extension.s3_access_key_id,
-              s3_datastore: extension.s3_datastore,
-              s3_bucket_name: extension.s3_bucket_name,
-              s3_fog_storage_options: extension.s3_fog_storage_options,
-              s3_region: extension.s3_region,
-              s3_root_path: extension.s3_root_path,
-              s3_secret_access_key: extension.s3_secret_access_key,
-              s3_storage_path: extension.s3_storage_path,
-              s3_storage_headers: extension.s3_storage_headers,
-              s3_url_host: extension.s3_url_host,
-              s3_url_scheme: extension.s3_url_scheme,
-              s3_use_iam_profile: extension.s3_use_iam_profile
+              access_key_id: extension.s3_access_key_id,
+              datastore: extension.s3_datastore,
+              bucket_name: extension.s3_bucket_name,
+              fog_storage_options: extension.s3_fog_storage_options,
+              region: extension.s3_region,
+              root_path: extension.s3_root_path,
+              secret_access_key: extension.s3_secret_access_key,
+              storage_path: extension.s3_storage_path,
+              storage_headers: extension.s3_storage_headers,
+              url_host: extension.s3_url_host,
+              url_scheme: extension.s3_url_scheme,
+              use_iam_profile: extension.s3_use_iam_profile
             }
           end
 
@@ -81,8 +81,8 @@ module Refinery
           unless app.config.action_controller.perform_caching && app.config.action_dispatch.rack_cache
             app.config.middleware.insert 0, ::Rack::Cache, {
               verbose: extension.dragonfly_cache_log_level =='verbose',
-              metastore: URI.encode("file:#{extension.dragonfly_cache_store_root}/meta"), # URI encoded in case of spaces
-              entitystore: URI.encode("file:#{extension.dragonfly_cache_store_root}/body")
+              metastore: "file:#{extension.dragonfly_cache_store_root}/meta",
+              entitystore: "file:#{extension.dragonfly_cache_store_root}/body"
             }
           end
           app.config.middleware.insert_after ::Rack::Cache, ::Dragonfly::Middleware, extension.dragonfly_name

data/lib/refinerycms/dragonfly.rb

@@ -0,0 +1 @@
+require_relative '../refinery/dragonfly'

data/refinerycms-dragonfly.gemspec

@@ -1,10 +1,9 @@
 # Encoding: UTF-8
 
-
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = %q{refinerycms-dragonfly}
-  s.version           = '1.0.0'
+  s.version           = '1.1.0'
   s.summary           = %q{Dragonfly interface for Refinery CMS}
   s.description       = %q{Allows Refinery to use dragonfly for file storage and processing}
   s.email             = %q{anita@joli.com.au}
@@ -16,12 +15,7 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency 'dragonfly', '~> 1.1'
-  s.add_dependency 'dragonfly-s3_data_store'
+  s.add_dependency 'dragonfly', '~> 1.4'
+  s.add_development_dependency 'dragonfly-s3_data_store'
   s.add_dependency 'refinerycms-core', ['~> 4.0', '>= 4.0.2']
-
-  s.cert_chain  = [File.expand_path("../../certs/parndt.pem", __FILE__)]
-  if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)
-    s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
-  end
 end

metadata

@@ -1,37 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Anita Graham
 - Philip Arndt
-autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDhjCCAm6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQ0wCwYDVQQDDARnZW1z
-  MREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixkARkWBWFybmR0MRIwEAYK
-  CZImiZPyLGQBGRYCaW8wHhcNMTcwNzI1MTMxMjIwWhcNMTgwNzI1MTMxMjIwWjBN
-  MQ0wCwYDVQQDDARnZW1zMREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixk
-  ARkWBWFybmR0MRIwEAYKCZImiZPyLGQBGRYCaW8wggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQDrjwB8be48TFEvGweP7BwWFnmsL2IMU9Ts2UKKWK9GYr7Z
-  5uNZFmO1yVBCrmUQHHDlpku6SN6HDO8ChDL7LNugz/4eapRTifHZl8jhPRsOLBcF
-  1hANy/V2v5NNkL5Zvb+vsUa7lyjbIOoD5yYzSDl4/T0nOe6xYzxJgBuxZK/nWSOe
-  Db8Uffc7B4yhA2kuayUiQUXPYAoPdfUSxoTKDohw17Sm6LKTpg8GkT0ttof1a/xu
-  vdsTvZHIcTsYv16e+8SrwLRZ/iBVVsyZFkMYPMxemw7WHxmWElWIgW9S7pUK5Q7J
-  oMS5uJVbtV2EmV+cOnhOWDz1A16P7QRFmGje5L+vAgMBAAGjcTBvMAkGA1UdEwQC
-  MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ7G/yxuQIzgszkOkaZBgoKBJ1rozAa
-  BgNVHREEEzARgQ9nZW1zQHAuYXJuZHQuaW8wGgYDVR0SBBMwEYEPZ2Vtc0BwLmFy
-  bmR0LmlvMA0GCSqGSIb3DQEBBQUAA4IBAQB12WMsC+yuuIeM0Ib6HUYZ2IbhRnuW
-  4uydNRvKDPdwzjChnOI0POGpcL8O1s1gh+19o/ITq6zRfTLhkwR2ir7XfwHJNppJ
-  yg48wbdL5gpZwggKWggKX5G9pqv9LjRsSAew6r0WB+5KW+ArCl/iNo9+AdeR3nUx
-  I+L/QiUxYU6XAXSrczL/i7kF5Xc3ZXQYuFsyGW9plA3i9faWUMvGKQc6pvUHIUZC
-  jOQmH9VbgbfUrXYM1YOKdlwW5sPR1f4PKLDlvEE+bppIUgKOgLOIv3i7KwrGvFOq
-  5r7Wz/HY31SM47mkK21saPJG4NvUFEycf0wlpzP657Pl9aVo47aKKbxX
-  -----END CERTIFICATE-----
-date: 2018-05-23 00:00:00.000000000 Z
+cert_chain: []
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -39,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: dragonfly-s3_data_store
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +31,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -96,6 +73,7 @@ files:
 - lib/refinery/dragonfly/engine.rb
 - lib/refinery/dragonfly/extension_configuration.rb
 - lib/refinerycms-dragonfly.rb
+- lib/refinerycms/dragonfly.rb
 - refinerycms-dragonfly.gemspec
 - spec/lib/generators/refinery/dragonfly/dragonfly_generator_spec.rb
 - spec/lib/refinery/dragonfly/dragonfly_spec.rb
@@ -108,7 +86,6 @@ homepage: http://refinerycms.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -123,9 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Dragonfly interface for Refinery CMS
 test_files: