refinerycms-dragonfly 1.0.2 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7e627011d10036c5d6c3520d3a3e2c8a446c72a86134ef5f3b2b66b7ddc4db7c
4
- data.tar.gz: ada8291d87eaa63ef780f211d58482497e33100cde25bbd6b10b99c30f34844d
3
+ metadata.gz: ff882fa9b99060b46e7fdbc4ab65bb9240f076ee9874e955272da66b1512f8e8
4
+ data.tar.gz: 562c10b87784ed1178789de972b38130d2c24e582631e7b7e21bf1a59c46f2b8
5
5
  SHA512:
6
- metadata.gz: 2feccd669d92dd5e69918f52da35ffb9a064f200b650549d660d94f812d7a5d3fca98c61912facb77773023f366be3f1dc733026fb824fc60acb367562040ae0
7
- data.tar.gz: 58133f0d26dc9a1e3cdaff457f938d0a7cbdf356928d794f560b0358d73451db41413135601bee13ab1c0962386e536b167495ac7c57236b031bf41cd679c953
6
+ metadata.gz: 0e8a88ff7800b494db39d41f7094601b505a4dbd3d586057473ed416227f321c6478791ad3f47d5863ef84b556da3a31688de0071e5c7632893fabd5792d3431
7
+ data.tar.gz: c95c2fa7d66b6b9b1a0d91bccd13db614d6a02d547bb6f72450fb4508037fb426b38061546b589ba61b147abc6e2baca7dde77daae296ae83ae936cb998abb73
data/Rakefile CHANGED
@@ -1,7 +1,7 @@
1
1
  namespace :refinery do
2
2
  namespace :testing do
3
3
  task :setup_extension do
4
- require 'refinerycms-dragonfly'
4
+ require 'refinery/dragonfly'
5
5
  Refinery::DragonflyGenerator.start %w[--quiet]
6
6
  end
7
7
  end
@@ -31,12 +31,15 @@ Refinery::Dragonfly.configure do |config|
31
31
  # config.response_header = <%= Refinery::Dragonfly.response_header.inspect %>
32
32
 
33
33
 
34
- # Set the S3 options using means other than securely by environment variables.
35
- # If you have to.
36
- # config.s3_bucket_name = ENV['S3_BUCKET']
37
- # config.s3_region = ENV['S3_REGION']
38
- # config.s3_access_key_id = ENV['S3_KEY']
39
- # config.s3_secret_access_key = ENV['S3_SECRET']
34
+ # Set the S3 access keys in the encrypted credentials file
35
+ # aws:
36
+ # access_key_id: 123
37
+ # secret_access_key: 345
38
+ #
39
+ # config.s3_bucket_name = Rails.application.credentials.aws[:bucket_name]
40
+ # config.s3_region = Rails.application.credentials.aws[:region]
41
+ # config.s3_access_key_id = Rails.application.credentials.aws[:access_key_id]
42
+ # config.s3_secret_access_key = Rails.application.credentials.aws[:secret_access_key]
40
43
 
41
44
  # When true will use Amazon's Simple Storage Service instead of the default file system for storing resources and images
42
45
  config.s3_datastore = config.s3_access_key_id.present? || config.s3_secret_access_key.present?
@@ -57,13 +57,14 @@ module Refinery
57
57
  self.verify_urls = true
58
58
 
59
59
  # s3 Data Store Config
60
-
60
+ # When using s3 as data store, make sure to add the dragonfly-s3_data_store gem to your project
61
61
  self.s3_datastore = false
62
- self.s3_bucket_name = ENV['S3_BUCKET']
63
- self.s3_access_key_id = ENV['S3_KEY']
64
- self.s3_secret_access_key = ENV['S3_SECRET']
65
- self.s3_region = ENV['S3_REGION'] # default 'us-east-1' see Dragonfly S3DataStore :s3_REGIONS for options
66
- self.s3_url_scheme = nil # defaults to "http"
62
+ self.s3_bucket_name = Rails.application&.credentials&.fetch(:s3_bucket_name, nil)
63
+ self.s3_access_key_id = Rails.application&.credentials&.fetch(:s3_access_key_id, nil)
64
+ self.s3_secret_access_key = Rails.application&.credentials&.fetch(:s3_secret_access_key, nil)
65
+ # region defaults to 'us-east-1'; see Dragonfly S3DataStore :s3_REGIONS for options
66
+ self.s3_region = Rails.application&.credentials&.fetch(:s3_region, nil)
67
+ self.s3_url_scheme = 'https' # defaults to "http"
67
68
  self.s3_url_host = nil # defaults to "<bucket-name>.s3.amazonaws.com" or "s3.amazonaws.com/<bucket-name>" if not a valid subdomain
68
69
  self.s3_use_iam_profile = nil # boolean - if true no need for access_key_id or secret_access_key
69
70
  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
73
74
  self.s3_storage_path = nil
74
75
  self.s3_storage_headers = nil
75
76
 
76
-
77
77
  def self.custom_datastore?
78
78
  config.custom_datastore_class.present? && config.custom_datastore_opts.present?
79
79
  end
@@ -84,4 +84,3 @@ module Refinery
84
84
  end
85
85
 
86
86
  end
87
-
@@ -38,7 +38,7 @@ module Refinery
38
38
 
39
39
  # These options require a name and block
40
40
  define_url extension.dragonfly_define_url if extension.dragonfly_define_url.present?
41
- before_serve extension.dragonfly_before_serve if extension.dragonfly_before_serve.present?
41
+ before_serve(&extension.dragonfly_before_serve) if extension.dragonfly_before_serve.present?
42
42
 
43
43
 
44
44
  # There can be more than one instance of each of these options.
@@ -58,7 +58,7 @@ module Refinery
58
58
  processor p[:name], p[:block]
59
59
  end unless extension.dragonfly_processors.blank?
60
60
 
61
- if extension.s3_datastore
61
+ if extension.s3_datastore?
62
62
  require 'dragonfly/s3_data_store'
63
63
  datastore :s3,{
64
64
  access_key_id: extension.s3_access_key_id,
@@ -87,8 +87,8 @@ module Refinery
87
87
  unless app.config.action_controller.perform_caching && app.config.action_dispatch.rack_cache
88
88
  app.config.middleware.insert 0, ::Rack::Cache, {
89
89
  verbose: extension.dragonfly_cache_log_level =='verbose',
90
- metastore: URI.encode("file:#{extension.dragonfly_cache_store_root}/meta"), # URI encoded in case of spaces
91
- entitystore: URI.encode("file:#{extension.dragonfly_cache_store_root}/body")
90
+ metastore: "file:#{extension.dragonfly_cache_store_root}/meta",
91
+ entitystore: "file:#{extension.dragonfly_cache_store_root}/body"
92
92
  }
93
93
  end
94
94
  app.config.middleware.insert_after ::Rack::Cache, ::Dragonfly::Middleware, extension.dragonfly_name
@@ -0,0 +1 @@
1
+ require_relative '../refinery/dragonfly'
@@ -1,21 +1,21 @@
1
1
  # Encoding: UTF-8
2
2
 
3
-
4
3
  Gem::Specification.new do |s|
5
4
  s.platform = Gem::Platform::RUBY
6
5
  s.name = %q{refinerycms-dragonfly}
7
- s.version = '1.0.2'
6
+ s.version = '1.1.1'
8
7
  s.summary = %q{Dragonfly interface for Refinery CMS}
9
8
  s.description = %q{Allows Refinery to use dragonfly for file storage and processing}
10
9
  s.email = %q{anita@joli.com.au}
11
10
  s.homepage = %q{http://refinerycms.com}
12
- s.authors = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski', 'Anita Graham']
11
+ s.authors = ['Anita Graham', 'Philip Arndt']
13
12
  s.license = %q{MIT}
14
13
  s.require_paths = %w(lib)
15
14
 
16
15
  s.files = `git ls-files`.split("\n")
17
16
  s.test_files = `git ls-files -- spec/*`.split("\n")
18
17
 
19
- s.add_dependency 'dragonfly', '~> 1.1'
20
- s.add_dependency 'dragonfly-s3_data_store'
18
+ s.add_dependency 'dragonfly', '~> 1.4'
19
+ s.add_development_dependency 'dragonfly-s3_data_store'
20
+ s.add_dependency 'refinerycms-core', ['~> 4.0', '>= 4.0.2']
21
21
  end
metadata CHANGED
@@ -1,13 +1,11 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: refinerycms-dragonfly
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.2
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
- - Philip Arndt
8
- - Uģis Ozols
9
- - Rob Yurkowski
10
7
  - Anita Graham
8
+ - Philip Arndt
11
9
  bindir: bin
12
10
  cert_chain: []
13
11
  date: 1980-01-02 00:00:00.000000000 Z
@@ -18,14 +16,14 @@ dependencies:
18
16
  requirements:
19
17
  - - "~>"
20
18
  - !ruby/object:Gem::Version
21
- version: '1.1'
19
+ version: '1.4'
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
23
  requirements:
26
24
  - - "~>"
27
25
  - !ruby/object:Gem::Version
28
- version: '1.1'
26
+ version: '1.4'
29
27
  - !ruby/object:Gem::Dependency
30
28
  name: dragonfly-s3_data_store
31
29
  requirement: !ruby/object:Gem::Requirement
@@ -33,13 +31,33 @@ dependencies:
33
31
  - - ">="
34
32
  - !ruby/object:Gem::Version
35
33
  version: '0'
36
- type: :runtime
34
+ type: :development
37
35
  prerelease: false
38
36
  version_requirements: !ruby/object:Gem::Requirement
39
37
  requirements:
40
38
  - - ">="
41
39
  - !ruby/object:Gem::Version
42
40
  version: '0'
41
+ - !ruby/object:Gem::Dependency
42
+ name: refinerycms-core
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: '4.0'
48
+ - - ">="
49
+ - !ruby/object:Gem::Version
50
+ version: 4.0.2
51
+ type: :runtime
52
+ prerelease: false
53
+ version_requirements: !ruby/object:Gem::Requirement
54
+ requirements:
55
+ - - "~>"
56
+ - !ruby/object:Gem::Version
57
+ version: '4.0'
58
+ - - ">="
59
+ - !ruby/object:Gem::Version
60
+ version: 4.0.2
43
61
  description: Allows Refinery to use dragonfly for file storage and processing
44
62
  email: anita@joli.com.au
45
63
  executables: []
@@ -55,6 +73,7 @@ files:
55
73
  - lib/refinery/dragonfly/engine.rb
56
74
  - lib/refinery/dragonfly/extension_configuration.rb
57
75
  - lib/refinerycms-dragonfly.rb
76
+ - lib/refinerycms/dragonfly.rb
58
77
  - refinerycms-dragonfly.gemspec
59
78
  - spec/lib/generators/refinery/dragonfly/dragonfly_generator_spec.rb
60
79
  - spec/lib/refinery/dragonfly/dragonfly_spec.rb