refinerycms-dragonfly 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92de0732fad2d8a81a95112985e2b20fcbe3443861f50818701ce553243bd504
-  data.tar.gz: 39cecbbb7994f1a98eeec6265c8a9d7e6fa7f3310452582ce67608ecc30c6a16
+  metadata.gz: 4bb7afb504be82500bb557ed39c1da5d9d4144bbdf2b91a8dceb7f2f3755c95e
+  data.tar.gz: 4849b2cbc8ad947f8efb8c8de3d4884a155d9e0654b745cebe27eca8e70cce97
 SHA512:
-  metadata.gz: 2f6bb64f6efbecce6a008c82ccd5156c1480f1a2f2ab5dd86f64352cb3b3a1feb877769deb5e6017a81d8fba77e5a2ef6817352ecc9886bd685232c8148b95ac
-  data.tar.gz: 67891fe6046960dcd069cee7c77176f6e222c0367dbebe18d6649749a8ed01a33ae95dc0c6cc8cca5544cb9d35cbe7e18d5428c25a848355564f241e78ee58ad
+  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,7 +52,7 @@ 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,{
               access_key_id: extension.s3_access_key_id,
@@ -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,26 +1,21 @@
 # Encoding: UTF-8
 
-
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = %q{refinerycms-dragonfly}
-  s.version           = '1.0.1'
+  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}
   s.homepage          = %q{http://refinerycms.com}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski', 'Anita Graham']
+  s.authors           = ['Anita Graham', 'Philip Arndt']
   s.license           = %q{MIT}
   s.require_paths     = %w(lib)
 
   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.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
+  s.add_dependency 'dragonfly', '~> 1.4'
+  s.add_development_dependency 'dragonfly-s3_data_store'
+  s.add_dependency 'refinerycms-core', ['~> 4.0', '>= 4.0.2']
 end

metadata

@@ -1,43 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-dragonfly
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
-- Philip Arndt
-- Uģis Ozols
-- Rob Yurkowski
 - Anita Graham
-autorequire: 
+- Philip Arndt
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEMjCCApqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhnZW1z
-  L0RDPXAvREM9YXJuZHQvREM9aW8wHhcNMTgxMDI5MDk0MjQ5WhcNMTkxMDI5MDk0
-  MjQ5WjAjMSEwHwYDVQQDDBhnZW1zL0RDPXAvREM9YXJuZHQvREM9aW8wggGiMA0G
-  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQClF0/voptshDoTILFgUjvkViCOPe3W
-  uuDwfSep+gc5AI83MmrmonN3L/dwm60D3HhZOtVt9el1n5E5b5aPzJngjdF9sFPX
-  OIx3UlYde+WkzbG4iR2U0/8dMZ6DYuz6ijgPEpU1UKodUJVqEmt3Vc+rzDET9zoK
-  TkIALNbSaV2G32ZDhoabeQJoJ0ce/2vjDqhM7awG7CYGRqRq4c0NOKKm0bGh+LOo
-  vQNDvRjXPs0yp5i3keCgf6IcQ26nluqILYGPjuTExJj+k6AKfq6SPWDVtzSqdfiH
-  STs/W85rwrKdLfEzfXxNsHvJ6Ryx+0A0hsNbfTTOhp4dkYm/6fyOejp7Of7qWRw/
-  kJhI/PTq1gqh+Irpr+wUz04xItGE8WglKv1ydTUqBlCz2l9NfVTChtUpYlrk4FvN
-  r7s6fcXH5cNX1ll2D1X2XLxmYEUgbAv5xApspvmpdRY5zlmSXZapi2KbW5iqpOV2
-  luxRjhjfcOKfMugvGrMUFiqDaDi5IXS25KECAwEAAaNxMG8wCQYDVR0TBAIwADAL
-  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFLzeU7GH0rvnvDchSWtJhceiUDDTMBoGA1Ud
-  EQQTMBGBD2dlbXNAcC5hcm5kdC5pbzAaBgNVHRIEEzARgQ9nZW1zQHAuYXJuZHQu
-  aW8wDQYJKoZIhvcNAQELBQADggGBABMRA737G23Oiy1xBgVJsDW5LgGbeK9JQCC9
-  eRdx22TDyrJ5vviqB22k13+zp/tq5fgeCsrk5iLAt5F/GgcP82p7pPm3qKi1QWip
-  cnQvy5fLKcl+PaIX/+PYGVKUfV/wA+NuP06RSnzvNPepcUvbTJdAr6nQVdIh/ftB
-  64QhOWuk2CuGlt+tLMGbjR65W3SppBkvVd4yYHArbl4Z0qPG+TVrVrj2JEjo82rT
-  jIUDLkdUlQ/FmH5fHhbrtn5PMCXjto414YBC7aQUxQsiNCN2qhsjwiyzVBbBTjnA
-  1sA043YnGOd1XylVtnrARK5eT7DhFGrMGMp/KvOg+T7q19+65jaopvHH4zFXzBcY
-  MxlH/7tMQ5+DdHcqbu3SOAe1/VaaRk28J0CdPZS6Y60YuRqL17Zg2WOODiBkA9WE
-  JjcyzdERZXsSPh+DT5PrllEbTNTZPbBcnAWjqdEWLtBIxD3JpgZHTmYP4I2ExAeu
-  2Oqsxsw30MIZnh2Cw/xLRkc1I50luA==
-  -----END CERTIFICATE-----
-date: 2018-11-30 00:00:00.000000000 Z
+cert_chain: []
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -45,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
@@ -60,13 +31,33 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: refinerycms-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.2
 description: Allows Refinery to use dragonfly for file storage and processing
 email: anita@joli.com.au
 executables: []
@@ -82,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
@@ -94,7 +86,6 @@ homepage: http://refinerycms.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -109,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: