refinerycms-resources 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88faa05ca6216ceb4a7d5cb83f1cb5dcb10cde5a
-  data.tar.gz: 2f769810e6a006f1bd0349760b86a9bc4d592b03
+  metadata.gz: '08cc58f2f832273fd4283a124243cc8482e55979'
+  data.tar.gz: f76b1752e7a670ae4b40fdf072fe585305435143
 SHA512:
-  metadata.gz: b5ef915f67a536caf8e29a303bad81bf1a4465370717796c80b22c3750a46ebf180f15910fc3de1550016c5423b559bb91a57d1a532b3a3ebb393294400910dd
-  data.tar.gz: b10b8295ffbdeaf490deadb508598014802ccd343887c1cfd30a6972070dc7d6ba9714e2fed239c1e177b29934d33b766e7ddd6a673a4da80a23befec7f375e7
+  metadata.gz: d18db2f4b34ce8c222e88fd42f388ffc225cee10a4fb9fe70f22f6af75e9b76fbabb809590fca2183017f395cc5c1a31d6ea9f7bb58773158a280722cb3d38e6
+  data.tar.gz: 1e167bd3f2ae804447b4f917d7889e9906d5ef4db09eddc8b95faf62632ebcae2aef49520366234962f3566d265e5a444424007023810f2346c623e8539f8ab8

data.tar.gz.sig

@@ -1,2 +1 @@
-�F�
-�>�J�EY�6"Z�w�'��a꜕O�G7�<BYg爷ᕁ��M�k#��Ҕ�ro���"˳ ��>2��rF@(�r�	*��B�S�M�҅
+d�������������2#�ќ��UPjŊ
z�^!�Vf󕧣��+�%30Ag�TT���[r�!6'�=o�j�f#O��i�熘U{����B��l�h�X���s_\��z:8�j1�$���`a4�A[JO��.�i=���	Уh�Q���^���.g�/\ڳ�o����~��a��ߑ<F���������P���f�y@R�e/�h����x�<�C��9HhF����WX�{���$�o�Ò�

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

@@ -9,25 +9,35 @@ Refinery::Resources.configure do |config|
   # Configure how many resources per page should be displayed in the list of resources in the admin area
   # config.pages_per_admin_index = <%= Refinery::Resources.pages_per_admin_index.inspect %>
 
-  # Configure S3 (you can also use ENV for this)
-  # The s3_backend setting by default defers to the core setting for this but can be set just for resources.
-  # config.s3_backend = Refinery::Core.s3_backend
-  # config.s3_bucket_name = ENV['S3_BUCKET']
-  # config.s3_access_key_id = ENV['S3_KEY']
-  # config.s3_secret_access_key = ENV['S3_SECRET']
-  # config.s3_region = ENV['S3_REGION']
+  # Configure Dragonfly.
+  # Refer to config/initializers/refinery/dragonfly.rb for the full list of dragonfly configurations which can be used.
+  # This includes all dragonfly config for Dragonfly v 1.1.1
 
-  # Configure Dragonfly
-  # config.dragonfly_verify_urls = <%= Refinery::Resources.dragonfly_verify_urls %>
-  # config.dragonfly_secret = <%= Refinery::Resources.dragonfly_secret.inspect %>
-  # config.dragonfly_url_format = <%= Refinery::Resources.dragonfly_url_format.inspect %>
-  # config.dragonfly_url_host = <%= Refinery::Resources.dragonfly_url_host.inspect %>
-  # config.datastore_root_path = <%= Refinery::Resources.datastore_root_path.inspect %>
-  # config.content_disposition = <%= Refinery::Resources.content_disposition.inspect %>
+  # config.dragonfly_verify_urls     = <%= Refinery::Resources.dragonfly_verify_urls.inspect %>
+  # config.dragonfly_secret          = <%= Refinery::Resources.dragonfly_secret.inspect %>
+  # config.dragonfly_url_host        = <%= Refinery::Resources.dragonfly_url_host.inspect %>
+  # config.dragonfly_datastore_root_path = <%= Refinery::Resources.dragonfly_datastore_root_path.inspect %>
+  # config.dragonfly_url_format       = <%= Refinery::Resources.dragonfly_url_format.inspect %>
 
-  # Configure Dragonfly custom storage backend
-  # The custom_backend setting by default defers to the core setting for this but can be set just for resources.
-  # config.custom_backend_class = <%= Refinery::Resources.custom_backend_class.inspect %>
-  # config.custom_backend_opts = <%= Refinery::Resources.custom_backend_opts.inspect %>
+  # Configure S3 (you can also use ENV for this)
+  # The s3_datastore setting by default defers to the Refinery::Dragonfly setting for this but can be set just for images.
+  # config.s3_datastore         = Refinery::Dragonfly.s3_datastore
+  # config.s3_bucket_name       = ENV['S3_BUCKET']
+  # config.s3_access_key_id     = ENV['S3_KEY']
+  # config.s3_secret_access_key = ENV['S3_SECRET']
+  # config.s3_region            = ENV['S3_REGION']
+  #
+  #  further S3 configuration options
+  # config.s3_fog_storage_options      = <%= Refinery::Resources.s3_fog_storage_options.inspect %>
+  # config.s3_root_path                = <%= Refinery::Resources.s3_root_path.inspect %>
+  # config.s3_storage_path             = <%= Refinery::Resources.s3_storage_path.inspect %>
+  # config.s3_storage_headers          = <%= Refinery::Resources.s3_storage_headers.inspect %>
+  # config.s3_url_host                 = <%= Refinery::Resources.s3_url_host.inspect %>
+  # config.s3_url_scheme               = <%= Refinery::Resources.s3_url_scheme.inspect %>
+  # config.s3_use_iam_profile          = <%= Refinery::Resources.s3_use_iam_profile.inspect %>
 
+  # Configure Dragonfly custom datastore
+  # The custom_datastore setting by default defers to the Refinery::Resources setting for this but can be set just for images.
+  # config.custom_datastore_class     = <%= Refinery::Resources.dragonfly_custom_datastore_class.inspect %>
+  # config.custom_datastore_opts      = <%= Refinery::Resources.dragonfly_custom_datastore_opts.inspect %>
 end

data/lib/refinery/resources.rb

@@ -1,15 +1,15 @@
 require 'refinerycms-core'
-require 'dragonfly'
+require 'refinerycms-dragonfly'
 
 module Refinery
   autoload :ResourcesGenerator, 'generators/refinery/resources/resources_generator'
 
   module Resources
     require 'refinery/resources/engine'
+    require 'refinery/dragonfly/extension_configuration'
     require 'refinery/resources/configuration'
 
-    autoload :Dragonfly, 'refinery/resources/dragonfly'
-    autoload :Validators, 'refinery/resources/validators'
+   autoload :Validators, 'refinery/resources/validators'
 
     class << self
       def root
@@ -25,4 +25,4 @@ end
 
 ActiveSupport.on_load(:active_record) do
   require 'globalize'
-end
+end

data/lib/refinery/resources/configuration.rb

@@ -1,63 +1,18 @@
 module Refinery
   module Resources
-    include ActiveSupport::Configurable
 
-    config_accessor :dragonfly_secret, :dragonfly_url_format, :dragonfly_url_host, :dragonfly_verify_urls,
-                    :max_file_size, :pages_per_dialog, :pages_per_admin_index,
-                    :s3_backend, :s3_bucket_name, :s3_region,
-                    :s3_access_key_id, :s3_secret_access_key,
-                    :datastore_root_path, :content_disposition,
-                    :custom_backend_class, :custom_backend_opts
+    extend Refinery::Dragonfly::ExtensionConfiguration
+    include ActiveSupport::Configurable
 
-    self.dragonfly_secret = Core.dragonfly_secret
-    self.dragonfly_url_format = '/system/resources/:job/:basename.:ext'
-    self.dragonfly_url_host = ''
-    self.dragonfly_verify_urls = true
+    config_accessor :max_file_size, :pages_per_dialog, :pages_per_admin_index, :content_disposition
 
     self.content_disposition = :attachment
     self.max_file_size = 52_428_800
     self.pages_per_dialog = 12
     self.pages_per_admin_index = 20
 
-    # We have to configure these settings after Rails is available.
-    # But a non-nil custom option can still be provided
-    class << self
-      def datastore_root_path
-        config.datastore_root_path || (Rails.root.join('public', 'system', 'refinery', 'resources').to_s if Rails.root)
-      end
-
-      def s3_backend
-        config.s3_backend.nil? ? Core.s3_backend : config.s3_backend
-      end
-
-      def s3_bucket_name
-        config.s3_bucket_name.presence || Core.s3_bucket_name
-      end
-
-      def s3_access_key_id
-        config.s3_access_key_id.presence || Core.s3_access_key_id
-      end
-
-      def s3_secret_access_key
-        config.s3_secret_access_key.presence || Core.s3_secret_access_key
-      end
+    self.dragonfly_name = :refinery_resources
 
-      def s3_region
-        config.s3_region.presence || Core.s3_region
-      end
-
-      def custom_backend?
-        config.custom_backend_class.nil? ? Core.dragonfly_custom_backend? : config.custom_backend_class.present?
-      end
-
-      def custom_backend_class
-        config.custom_backend_class.nil? ? Core.dragonfly_custom_backend_class : config.custom_backend_class.constantize
-      end
-
-      def custom_backend_opts
-        config.custom_backend_opts.presence || Core.dragonfly_custom_backend_opts
-      end
-
-    end
   end
 end
+

data/lib/refinery/resources/engine.rb

@@ -9,8 +9,8 @@ module Refinery
       config.autoload_paths += %W( #{config.root}/lib )
 
       initializer 'attach-refinery-resources-with-dragonfly', :before => :finisher_hook do |app|
-        ::Refinery::Resources::Dragonfly.configure!
-        ::Refinery::Resources::Dragonfly.attach!(app)
+        ::Refinery::Dragonfly.configure!(Refinery::Resources)
+        ::Refinery::Dragonfly.attach!(app, Refinery::Resources)
       end
 
       before_inclusion do

data/refinerycms-resources.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.summary           = %q{Resources extension for Refinery CMS}
   s.description       = %q{Handles all file upload and processing functionality in Refinery CMS.}
   s.email             = %q{refinerycms@p.arndt.io}
-  s.homepage          = %q{http://refinerycms.com}
+  s.homepage          = %q{https://www.refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
   s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
   s.license           = %q{MIT}
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'globalize',               ['>= 5.1.0.beta1', '< 5.2']
   s.add_dependency 'activemodel-serializers-xml', '~> 1.0', '>= 1.0.1'
   s.add_dependency 'refinerycms-core',        version
+  s.add_dependency 'refinerycms-dragonfly',   '~> 1.0'
 
   s.required_ruby_version = Refinery::Version.required_ruby_version
 

data/spec/factories/resource.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :resource, :class => Refinery::Resource do
     file Refinery.roots('refinery/resources').join("spec/fixtures/refinery_is_awesome.txt")
   end

data/spec/features/refinery/admin/resources_spec.rb

@@ -74,7 +74,7 @@ module Refinery
       end
 
       context "edit/update" do
-        let!(:resource) { FactoryGirl.create(:resource) }
+        let!(:resource) { FactoryBot.create(:resource) }
 
         it "updates file" do
           visit refinery.admin_resources_path
@@ -119,7 +119,7 @@ module Refinery
       end
 
       context "destroy" do
-        let!(:resource) { FactoryGirl.create(:resource) }
+        let!(:resource) { FactoryBot.create(:resource) }
 
         it "removes file" do
           visit refinery.admin_resources_path
@@ -133,7 +133,7 @@ module Refinery
       end
 
       context "download" do
-        let!(:resource) { FactoryGirl.create(:resource) }
+        let!(:resource) { FactoryBot.create(:resource) }
 
         it "succeeds" do
           visit refinery.admin_resources_path

data/spec/lib/refinery/resources/engine_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+module Refinery
+  describe Resources do
+    it_has_behaviour 'Creates a dragonfly App:'
+    it_has_behaviour 'adds the dragonfly app to the middleware stack'
+  end
+end

data/spec/models/refinery/resource_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 module Refinery
   describe Resource, :type => :model do
-    let(:resource) { FactoryGirl.create(:resource) }
-    let(:titled_resource) { FactoryGirl.create(:resource, resource_title: 'Resource Title')}
+    let(:resource) { FactoryBot.create(:resource) }
+    let(:titled_resource) { FactoryBot.create(:resource, resource_title: 'Resource Title')}
 
     context "with valid attributes" do
       it "should create successfully" do
@@ -27,7 +27,7 @@ module Refinery
       context "when Dragonfly.verify_urls is true" do
         before do
           allow(Refinery::Resources).to receive(:dragonfly_verify_urls).and_return(true)
-          ::Refinery::Resources::Dragonfly.configure!
+          ::Refinery::Dragonfly.configure!(Refinery::Resources)
         end
 
         it "returns a url with an SHA parameter" do
@@ -38,7 +38,7 @@ module Refinery
       context "when Dragonfly.verify_urls is false" do
         before do
           allow(Refinery::Resources).to receive(:dragonfly_verify_urls).and_return(false)
-          ::Refinery::Resources::Dragonfly.configure!
+          ::Refinery::Dragonfly.configure!(Refinery::Resources)
         end
         it "returns a url without an SHA parameter" do
           expect(resource.url).not_to match(/\?sha=[\da-fA-F]{16}\z/)

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+module Capybara
+
+  add_selector(:linkhref) do
+    xpath {|href| ".//a[@href='#{href}']"}
+  end
+end
+
+def ensure_on(path)
+  visit(path) unless current_path == path
+end
+
+RSpec.configure do |c|
+  c.alias_it_should_behave_like_to :it_has_behaviour, 'has behaviour:'
+end
+
+def uri_filename(url)
+  File.basename(URI.parse(url).path)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-resources
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Philip Arndt
@@ -32,7 +32,7 @@ cert_chain:
   jOQmH9VbgbfUrXYM1YOKdlwW5sPR1f4PKLDlvEE+bppIUgKOgLOIv3i7KwrGvFOq
   5r7Wz/HY31SM47mkK21saPJG4NvUFEycf0wlpzP657Pl9aVo47aKKbxX
   -----END CERTIFICATE-----
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_indexed
@@ -114,14 +114,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: 4.0.2
+- !ruby/object:Gem::Dependency
+  name: refinerycms-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'
 description: Handles all file upload and processing functionality in Refinery CMS.
 email: refinerycms@p.arndt.io
 executables: []
@@ -180,7 +194,6 @@ files:
 - lib/generators/refinery/resources/templates/config/initializers/refinery/resources.rb.erb
 - lib/refinery/resources.rb
 - lib/refinery/resources/configuration.rb
-- lib/refinery/resources/dragonfly.rb
 - lib/refinery/resources/engine.rb
 - lib/refinery/resources/validators.rb
 - lib/refinery/resources/validators/file_size_validator.rb
@@ -192,9 +205,10 @@ files:
 - spec/fixtures/refinery_is_awesome.txt
 - spec/fixtures/refinery_is_awesome2.txt
 - spec/lib/generators/refinery/resources/resources_generator_spec.rb
-- spec/lib/resources_spec.rb
+- spec/lib/refinery/resources/engine_spec.rb
 - spec/models/refinery/resource_spec.rb
-homepage: http://refinerycms.com
+- spec/spec_helper.rb
+homepage: https://www.refinerycms.com
 licenses:
 - MIT
 metadata: {}
@@ -224,5 +238,6 @@ test_files:
 - spec/fixtures/refinery_is_awesome.txt
 - spec/fixtures/refinery_is_awesome2.txt
 - spec/lib/generators/refinery/resources/resources_generator_spec.rb
-- spec/lib/resources_spec.rb
+- spec/lib/refinery/resources/engine_spec.rb
 - spec/models/refinery/resource_spec.rb
+- spec/spec_helper.rb

data/lib/refinery/resources/dragonfly.rb

@@ -1,64 +0,0 @@
-require 'dragonfly'
-
-module Refinery
-  module Resources
-    module Dragonfly
-
-      class << self
-        def configure!
-          ActiveRecord::Base.extend ::Dragonfly::Model
-          ActiveRecord::Base.extend ::Dragonfly::Model::Validations
-
-          app_resources = ::Dragonfly.app(:refinery_resources)
-
-          app_resources.configure do |c|
-            datastore :file, {
-              :root_path => Refinery::Resources.datastore_root_path
-            }
-            url_format Refinery::Resources.dragonfly_url_format
-            url_host Refinery::Resources.dragonfly_url_host
-            verify_urls Refinery::Resources.dragonfly_verify_urls
-            secret Refinery::Resources.dragonfly_secret
-            response_header 'Content-Disposition' do |job, request, headers|
-              "attachment; #{headers['Content-Disposition']}"
-            end if Refinery::Resources.content_disposition == :attachment
-            dragonfly_url nil
-          end
-
-          if ::Refinery::Resources.s3_backend
-            require 'dragonfly/s3_data_store'
-            options = {
-              bucket_name: Refinery::Resources.s3_bucket_name,
-              access_key_id: Refinery::Resources.s3_access_key_id,
-              secret_access_key: Refinery::Resources.s3_secret_access_key
-            }
-            options.update(region: Refinery::Resources.s3_region) if Refinery::Resources.s3_region
-            app_resources.use_datastore :s3, options
-          end
-
-          if Resources.custom_backend?
-            app_resources.datastore = Resources.custom_backend_class.new(Resources.custom_backend_opts)
-          end
-        end
-
-        ##
-        # Injects Dragonfly::Middleware for Refinery::Images into the stack
-        def attach!(app)
-          if defined?(::Rack::Cache)
-            unless app.config.action_controller.perform_caching && app.config.action_dispatch.rack_cache
-              app.config.middleware.insert 0, ::Rack::Cache, {
-                verbose: true,
-                metastore: URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
-                entitystore: URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
-              }
-            end
-            app.config.middleware.insert_after ::Rack::Cache, ::Dragonfly::Middleware, :refinery_resources
-          else
-            app.config.middleware.use ::Dragonfly::Middleware, :refinery_resources
-          end
-        end
-      end
-
-    end
-  end
-end

data/spec/lib/resources_spec.rb

@@ -1,45 +0,0 @@
-require "spec_helper"
-
-describe Refinery::Resources do
-  describe "with custom s3 settings" do
-    it "prefers custom values over the default" do
-      Refinery::Core.s3_bucket_name = "kfc"
-      described_class.s3_bucket_name = "buckethead"
-
-      expect(described_class.s3_bucket_name).to eq("buckethead")
-    end
-  end
-
-  describe "without custom s3 settings" do
-    it "falls back on defaults" do
-      described_class.s3_bucket_name = nil
-      Refinery::Core.s3_bucket_name = "kfc"
-
-      expect(described_class.s3_bucket_name).to eq("kfc")
-    end
-  end
-
-  describe "with a custom storage backend" do
-    before(:all) do
-      DummyBackend1 = Class.new
-      DummyBackend2 = Class.new
-    end
-
-    before(:each) do
-      allow(Refinery::Core).to receive_messages(:dragonfly_custom_backend_class => DummyBackend1)
-    end
-
-    after(:each) do
-      described_class.custom_backend_class = nil
-    end
-
-    it "uses the default configuration if present" do
-      expect(described_class.custom_backend_class).to eq(DummyBackend1)
-    end
-
-    it "prefers custom values over the defaults" do
-      described_class.custom_backend_class = 'DummyBackend2'
-      expect(described_class.custom_backend_class).to eq(DummyBackend2)
-    end
-  end
-end