refinerycms-resources 2.1.5 → 3.0.0

data/config/routes.rb

@@ -1,5 +1,5 @@
 Refinery::Core::Engine.routes.draw do
-  get '/system/resources/*dragonfly', :to => Dragonfly[:refinery_resources]
+  get '/system/resources/*dragonfly', :to => Dragonfly.app(:refinery_resources)
 
   namespace :admin, :path => Refinery::Core.backend_route do
     resources :resources, :except => :show do

data/db/migrate/20150430180959_add_translated_title_to_refinery_resources.rb

@@ -0,0 +1,11 @@
+class AddTranslatedTitleToRefineryResources < ActiveRecord::Migration
+  def self.up
+    Refinery::Resource.create_translation_table!({
+      resource_title: :string
+    })
+  end
+
+  def self.down
+    Refinery::Resource.drop_translation_table!
+  end
+end

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

@@ -18,8 +18,7 @@ Refinery::Resources.configure do |config|
   # config.s3_region = ENV['S3_REGION']
 
   # Configure Dragonfly
-  # This is where in the middleware stack to insert the Dragonfly middleware
-  # config.dragonfly_insert_before = <%= Refinery::Resources.dragonfly_insert_before.inspect %>
+  # 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 %>

data/lib/refinery/resources.rb

@@ -1,6 +1,5 @@
 require 'refinerycms-core'
 require 'dragonfly'
-require 'rack/cache'
 
 module Refinery
   autoload :ResourcesGenerator, 'generators/refinery/resources/resources_generator'
@@ -23,3 +22,7 @@ module Refinery
     end
   end
 end
+
+ActiveSupport.on_load(:active_record) do
+  require 'globalize'
+end

data/lib/refinery/resources/configuration.rb

@@ -2,26 +2,34 @@ module Refinery
   module Resources
     include ActiveSupport::Configurable
 
-    config_accessor :dragonfly_insert_before, :dragonfly_secret, :dragonfly_url_format, :dragonfly_url_host,
+    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
 
-    self.dragonfly_insert_before = 'ActionDispatch::Callbacks'
     self.dragonfly_secret = Core.dragonfly_secret
-    self.dragonfly_url_format = '/system/resources/:job/:basename.:format'
+    self.dragonfly_url_format = '/system/resources/:job/:basename.:ext'
     self.dragonfly_url_host = ''
+    self.dragonfly_verify_urls = true
 
     self.content_disposition = :attachment
-    self.max_file_size = 52428800
+    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 dragonfly_url_format
+        if config.dragonfly_url_format.include?(':format')
+          config.dragonfly_url_format.gsub!(':format', ':ext')
+          Refinery.deprecate(':format option in Refinery::Resources dragonfly_url_format config', when: '3.1', replacement: ':ext option')
+        end
+        config.dragonfly_url_format
+      end
+
       def datastore_root_path
         config.datastore_root_path || (Rails.root.join('public', 'system', 'refinery', 'resources').to_s if Rails.root)
       end

data/lib/refinery/resources/dragonfly.rb

@@ -5,34 +5,35 @@ module Refinery
     module Dragonfly
 
       class << self
-        def setup!
-          app_resources = ::Dragonfly[:refinery_resources]
-
-          app_resources.define_macro(::Refinery::Resource, :resource_accessor)
+        def configure!
+          ActiveRecord::Base.extend ::Dragonfly::Model
+          ActiveRecord::Base.extend ::Dragonfly::Model::Validations
 
-          app_resources.analyser.register(::Dragonfly::Analysis::FileCommandAnalyser)
-          app_resources.content_disposition = Refinery::Resources.content_disposition
-        end
+          app_resources = ::Dragonfly.app(:refinery_resources)
 
-        def configure!
-          app_resources = ::Dragonfly[:refinery_resources]
-          app_resources.configure_with(:rails)
           app_resources.configure do |c|
-            c.datastore.root_path = Refinery::Resources.datastore_root_path
-            c.url_format = Refinery::Resources.dragonfly_url_format
-            c.url_host = Refinery::Resources.dragonfly_url_host
-            c.secret = Refinery::Resources.dragonfly_secret
+            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
-            app_resources.datastore = ::Dragonfly::DataStorage::S3DataStore.new
-            app_resources.datastore.configure do |s3|
-              s3.bucket_name = Refinery::Resources.s3_bucket_name
-              s3.access_key_id = Refinery::Resources.s3_access_key_id
-              s3.secret_access_key = Refinery::Resources.s3_secret_access_key
-              # S3 Region otherwise defaults to 'us-east-1'
-              s3.region = Refinery::Resources.s3_region if Refinery::Resources.s3_region
-            end
+            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?
@@ -43,10 +44,17 @@ module Refinery
         ##
         # Injects Dragonfly::Middleware for Refinery::Images into the stack
         def attach!(app)
-          if ::Rails.application.config.action_controller.perform_caching
-            app.config.middleware.insert_after 'Rack::Cache', 'Dragonfly::Middleware', :refinery_resources
+          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
+            app.config.middleware.use ::Dragonfly::Middleware, :refinery_resources
           end
         end
       end

data/lib/refinery/resources/engine.rb

@@ -8,17 +8,16 @@ module Refinery
 
       config.autoload_paths += %W( #{config.root}/lib )
 
-      initializer 'attach-refinery-resources-with-dragonfly', :before => :build_middleware_stack do |app|
+      initializer 'attach-refinery-resources-with-dragonfly', :before => :finisher_hook do |app|
         ::Refinery::Resources::Dragonfly.configure!
         ::Refinery::Resources::Dragonfly.attach!(app)
       end
 
-      initializer "register refinery_files plugin" do
+      before_inclusion do
         Refinery::Plugin.register do |plugin|
           plugin.pathname = root
           plugin.name = 'refinery_files'
           plugin.menu_match = /refinery\/(refinery_)?(files|resources)$/
-          plugin.activity = { :class_name => :'refinery/resource' }
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.admin_resources_path }
         end
       end

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
  
-Copyright (c) 2005-2013 [Resolve Digital](http://www.resolvedigital.com)
+Copyright (c) 2005-2015 [Resolve Digital](http://resolve.digital)
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/refinerycms-resources.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.version           = version
   s.summary           = %q{Resources extension for Refinery CMS}
   s.description       = %q{Handles all file upload and processing functionality in Refinery CMS.}
-  s.email             = %q{info@refinerycms.com}
+  s.email             = %q{refinerycms@p.arndt.io}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
   s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
@@ -19,7 +19,10 @@ 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',        '~> 0.9.12'
-  s.add_dependency 'acts_as_indexed',  '~> 0.8.0'
-  s.add_dependency 'refinerycms-core', version
+  s.add_dependency 'acts_as_indexed',         '~> 0.8.0'
+  s.add_dependency 'dragonfly',               '~> 1.0.0'
+  s.add_dependency 'globalize',               ['>= 4.0.0', '< 5.2']
+  s.add_dependency 'refinerycms-core',        version
+
+  s.required_ruby_version = Refinery::Version.required_ruby_version
 end

data/spec/factories/resource.rb

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

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

@@ -3,71 +3,70 @@ require "spec_helper"
 
 module Refinery
   module Admin
-    describe "Resources" do
-      refinery_login_with :refinery_user
+    describe "Resources", :type => :feature do
+      refinery_login
 
       context "when no files" do
         it "invites to upload file" do
           visit refinery.admin_resources_path
-          page.should have_content(%q{There are no files yet. Click "Upload new file" to add your first file.})
+          expect(page).to have_content(%q{There are no files yet. Click "Upload new file" to add your first file.})
         end
       end
 
       it "shows upload file link" do
         visit refinery.admin_resources_path
-        page.should have_content("Upload new file")
-        page.should have_selector("a[href*='/refinery/resources/new']")
+        expect(page).to have_content("Upload new file")
+        expect(page).to have_selector("a[href*='/refinery/resources/new']")
       end
 
-
       context "new/create" do
         it "uploads file", :js => true do
           visit refinery.admin_resources_path
-          click_link "Upload new file"
+          find('a', text: 'Upload new file').trigger(:click)
 
-          page.should have_selector 'iframe#dialog_iframe'
+          expect(page).to have_selector 'iframe#dialog_iframe'
 
           page.within_frame('dialog_iframe') do
-            attach_file "resource_file", Refinery.roots(:'refinery/resources').
+            attach_file "resource_file", Refinery.roots('refinery/resources').
                                                   join("spec/fixtures/refinery_is_awesome.txt")
             click_button ::I18n.t('save', :scope => 'refinery.admin.form_actions')
           end
 
-          page.should have_content("Refinery Is Awesome.txt")
-          Refinery::Resource.count.should == 1
+          expect(page).to have_content("Refinery Is Awesome")
+          expect(Refinery::Resource.count).to eq(1)
         end
 
         describe "max file size" do
           before do
-            Refinery::Resources.stub(:max_file_size).and_return('1224')
+            allow(Refinery::Resources).to receive(:max_file_size).and_return('1224')
           end
 
           context "in english" do
             before do
-              Refinery::I18n.stub(:current_locale).and_return(:en)
+              allow(Refinery::I18n).to receive(:current_locale).and_return(:en)
             end
 
             it "is shown" do
               visit refinery.admin_resources_path
               click_link "Upload new file"
 
-              within('#maximum_file_size') do
-                page.should have_content "1.2 KB"
+              within('#file') do
+                expect(page).to have_selector("a[tooltip='The maximum file size is 1.2 KB.']")
               end
             end
           end
 
           context "in danish" do
             before do
-              Refinery::I18n.stub(:current_locale).and_return(:da)
+              allow(Refinery::I18n).to receive(:current_locale).and_return(:da)
             end
 
             it "is shown" do
               visit refinery.admin_resources_path
 
               click_link "Tilføj en ny fil"
-              within "#maximum_file_size" do
-                page.should have_content "1,2 KB"
+              within "#file" do
+                expect(page).to have_selector("a[tooltip='Filen må maksimalt fylde 1,2 KB.']")
               end
             end
           end
@@ -79,19 +78,43 @@ module Refinery
 
         it "updates file" do
           visit refinery.admin_resources_path
-          page.should have_content("Refinery Is Awesome.txt")
-          page.should have_selector("a[href='/refinery/resources/#{resource.id}/edit']")
+          expect(page).to have_content("Refinery Is Awesome")
+          expect(page).to have_selector("a[href='/refinery/resources/#{resource.id}/edit']")
 
           click_link "Edit this file"
 
-          page.should have_content("Download current file or replace it with this one...")
-          page.should have_selector("a[href*='/refinery/resources']")
+          expect(page).to have_content("Refinery Is Awesome or replace it with this one...")
+          expect(page).to have_selector("a[href*='/refinery/resources']")
 
-          attach_file "resource_file", Refinery.roots(:'refinery/resources').join("spec/fixtures/refinery_is_awesome2.txt")
+          attach_file "resource_file", Refinery.roots('refinery/resources').join("spec/fixtures/refinery_is_awesome2.txt")
           click_button "Save"
 
-          page.should have_content("Refinery Is Awesome2")
-          Refinery::Resource.count.should == 1
+          expect(page).to have_content("Refinery Is Awesome2")
+          expect(Refinery::Resource.count).to eq(1)
+        end
+
+        describe "translate" do
+          before do
+            allow(Refinery::I18n).to receive(:frontend_locales).and_return([:en, :fr])
+          end
+
+          it "can have a second locale added to it" do
+            visit refinery.admin_resources_path
+            expect(page).to have_content("Refinery Is Awesome")
+            expect(page).to have_selector("a[href='/refinery/resources/#{resource.id}/edit']")
+
+            click_link "Edit this file"
+
+            within "#switch_locale_picker" do
+              click_link "FR"
+            end
+
+            fill_in "Title", :with => "Premier fichier"
+            click_button "Save"
+
+            expect(page).to have_content("'Premier fichier' was successfully updated.")
+            expect(Resource.translation_class.count).to eq(1)
+          end
         end
       end
 
@@ -100,12 +123,12 @@ module Refinery
 
         it "removes file" do
           visit refinery.admin_resources_path
-          page.should have_selector("a[href='/refinery/resources/#{resource.id}']")
+          expect(page).to have_selector("a[href='/refinery/resources/#{resource.id}']")
 
           click_link "Remove this file forever"
 
-          page.should have_content("'Refinery Is Awesome' was successfully removed.")
-          Refinery::Resource.count.should == 0
+          expect(page).to have_content("'Refinery Is Awesome' was successfully removed.")
+          expect(Refinery::Resource.count).to eq(0)
         end
       end
 
@@ -117,7 +140,7 @@ module Refinery
 
           click_link "Download this file"
 
-          page.should have_content("http://www.refineryhq.com/")
+          expect(page).to have_content("http://www.refineryhq.com/")
         end
 
         context 'when the extension is mounted with a named space' do
@@ -139,7 +162,7 @@ module Refinery
 
             click_link "Download this file"
 
-            page.should have_content("http://www.refineryhq.com/")
+            expect(page).to have_content("http://www.refineryhq.com/")
           end
 
         end

data/spec/lib/generators/refinery/resources/resources_generator_spec.rb

@@ -13,7 +13,7 @@ module Refinery
     end
 
     specify do
-      destination_root.should have_structure {
+      expect(destination_root).to have_structure {
         directory "config" do
           directory "initializers" do
             directory "refinery" do

data/spec/lib/resources_spec.rb

@@ -6,7 +6,7 @@ describe Refinery::Resources do
       Refinery::Core.s3_bucket_name = "kfc"
       described_class.s3_bucket_name = "buckethead"
 
-      described_class.s3_bucket_name.should == "buckethead"
+      expect(described_class.s3_bucket_name).to eq("buckethead")
     end
   end
 
@@ -15,27 +15,31 @@ describe Refinery::Resources do
       described_class.s3_bucket_name = nil
       Refinery::Core.s3_bucket_name = "kfc"
 
-      described_class.s3_bucket_name.should == "kfc"
+      expect(described_class.s3_bucket_name).to eq("kfc")
     end
   end
 
   describe "with a custom storage backend" do
-    before do
-      Refinery::Core.dragonfly_custom_backend_class = 'DummyBackend1'
-      class DummyBackend1; end
-      class DummyBackend2; end
+    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
-    after { Refinery::Core.dragonfly_custom_backend_class = nil }
-    let(:backend1) { DummyBackend1.new }
-    let(:backend2) { DummyBackend2.new }
 
     it "uses the default configuration if present" do
-      described_class.custom_backend_class.should == backend1.class
+      expect(described_class.custom_backend_class).to eq(DummyBackend1)
     end
 
     it "prefers custom values over the defaults" do
       described_class.custom_backend_class = 'DummyBackend2'
-      described_class.custom_backend_class.should == backend2.class
+      expect(described_class.custom_backend_class).to eq(DummyBackend2)
     end
   end
 end