Partners for <%= @actionPage.title %>
-Add partner logos and email signups to this action.
+Add partners email signups to this action.
<%= form_for([:admin, @actionPage]) do |f| %>
diff --git a/app/views/admin/partners/_form.html.erb b/app/views/admin/partners/_form.html.erb
index 52ffc2e9c..574e40796 100644
--- a/app/views/admin/partners/_form.html.erb
+++ b/app/views/admin/partners/_form.html.erb
@@ -26,11 +26,6 @@
<%= f.text_field :code -%>
-
- <%= f.label :logo, "Logo" -%>
- <%= f.file_field :logo -%>
-
-
<%= f.submit "Save", class: "btn btn-primary" %>
diff --git a/app/views/admin/partners/index.html.erb b/app/views/admin/partners/index.html.erb
index 953257e60..19e053612 100644
--- a/app/views/admin/partners/index.html.erb
+++ b/app/views/admin/partners/index.html.erb
@@ -2,7 +2,7 @@
Partners
-If we are running a joint campaign, we’ll want to include the partner organization’s name and logo on the action. Adding a partner here puts the name and logo into our database so that they can be added to an action from a list.
+If we are running a joint campaign, we’ll want to include the partner organization’s name on the action. Adding a partner here puts the name into our database so that they can be added to an action from a list.
Partner signups
diff --git a/app/views/tools/_tweet.html.erb b/app/views/tools/_tweet.html.erb index 00a498ac6..e02c28027 100644 --- a/app/views/tools/_tweet.html.erb +++ b/app/views/tools/_tweet.html.erb @@ -15,9 +15,6 @@ <% initial_targets = @tweet.targets.sample(3) %> <% @tweet.targets.each do |target| %>>
- <% if target.image_url.present? %>
- 
- <% end %>
<%= link_to "https://twitter.com/intent/tweet?" + {
text: ".@#{target.twitter_id} #{@tweet.message}",
diff --git a/config/application.rb b/config/application.rb
index a1be54f9a..b427923d1 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -52,9 +52,5 @@ class Application < Rails::Application
config.google_civic_api_url = Rails.application.secrets.google_civic_api_url
config.time_zone = Rails.application.secrets.time_zone || "Eastern Time (US & Canada)"
- # fix file attachment:
- # https://github.com/EFForg/action-center-platform/pull/408#issuecomment-381269915
- # https://stackoverflow.com/questions/49176124/error-no-handler-found-with-base64-for-paperclip-5-2
- Paperclip::HttpUrlProxyAdapter.register
end
end
diff --git a/config/initializers/carrier_wave.rb b/config/initializers/carrier_wave.rb
new file mode 100644
index 000000000..f080311cf
--- /dev/null
+++ b/config/initializers/carrier_wave.rb
@@ -0,0 +1,25 @@
+CarrierWave.configure do |config|
+ config.fog_credentials = {
+ provider: 'AWS', # required
+ aws_access_key_id: Rails.application.secrets.amazon_access_key_id, # required unless using use_iam_profile
+ aws_secret_access_key: Rails.application.secrets.amazon_secret_access_key, # required unless using use_iam_profile
+ # use_iam_profile: true, # optional, defaults to false
+ region: Rails.application.secrets.amazon_region, # optional, defaults to 'us-east-1'
+ # host: 's3.example.com', # optional, defaults to nil
+ # endpoint: 'https://s3.example.com', # optional, defaults to nil
+ }
+ config.fog_directory = Rails.application.secrets.amazon_bucket # required
+ # config.fog_public = false # optional, defaults to true
+ # config.fog_attributes = { cache_control: "public, max-age=#{365.days.to_i}" } # optional, defaults to {}
+ # Use this if you have AWS S3 ACLs disabled.
+ # config.fog_attributes = { 'x-amz-acl' => 'bucket-owner-full-control' }
+ # Use this if you have Google Cloud Storage uniform bucket-level access enabled.
+ # config.fog_attributes = { uniform: true }
+ # Use if you use a CDN
+ # config.asset_host = "http://mycdn.cdn.com"
+ # setting here allows you to setup a local dev env that points to production assets if `amazon_bucket_url` doesnt match the bucket other things will break
+ # config.asset_host = Rails.application.secrets.amazon_bucket_url.present? ? "https://#{Rails.application.secrets.amazon_bucket_url}" : nil
+ # For an application which utilizes multiple servers but does not need caches persisted across requests,
+ # uncomment the line :file instead of the default :storage. Otherwise, it will use AWS as the temp cache store.
+ config.cache_storage = :file
+end
diff --git a/config/initializers/paperclip_patch.rb b/config/initializers/paperclip_patch.rb
deleted file mode 100644
index c10d2162c..000000000
--- a/config/initializers/paperclip_patch.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Monkeypatch paperclip's media type detection
-Rails.application.reloader.to_prepare do
- Paperclip::MediaTypeSpoofDetector.prepend MonkeyPatches::OctetStreamOverride
-end
diff --git a/db/migrate/20140504080222_add_attachment_featured_image_to_action_pages.rb b/db/migrate/20140504080222_add_attachment_featured_image_to_action_pages.rb
index dc3dacef3..e0050ce68 100644
--- a/db/migrate/20140504080222_add_attachment_featured_image_to_action_pages.rb
+++ b/db/migrate/20140504080222_add_attachment_featured_image_to_action_pages.rb
@@ -1,11 +1,8 @@
class AddAttachmentFeaturedImageToActionPages < ActiveRecord::Migration[5.0]
- def self.up
- change_table :action_pages do |t|
- t.attachment :featured_image
- end
- end
-
- def self.down
- drop_attached_file :action_pages, :featured_image
+ def change
+ add_column :action_pages, :featured_image_file_name, :string
+ add_column :action_pages, :featured_image_content_type, :string
+ add_column :action_pages, :featured_image_file_size, :bigint
+ add_column :action_pages, :featured_image_updated_at, :datetime
end
end
diff --git a/db/migrate/20140515192334_add_attachment_background_image_to_action_pages.rb b/db/migrate/20140515192334_add_attachment_background_image_to_action_pages.rb
index 448c2453d..f101087c6 100644
--- a/db/migrate/20140515192334_add_attachment_background_image_to_action_pages.rb
+++ b/db/migrate/20140515192334_add_attachment_background_image_to_action_pages.rb
@@ -1,11 +1,9 @@
+# todo: ??
class AddAttachmentBackgroundImageToActionPages < ActiveRecord::Migration[5.0]
- def self.up
- change_table :action_pages do |t|
- t.attachment :background_image
- end
- end
-
- def self.down
- drop_attached_file :action_pages, :background_image
+ def change
+ add_column :action_pages, :background_image_file_name, :string
+ add_column :action_pages, :background_image_content_type, :string
+ add_column :action_pages, :background_image_file_size, :bigint
+ add_column :action_pages, :background_image_updated_at, :datetime
end
end
diff --git a/db/migrate/20140529220025_add_og_image_to_action_pages.rb b/db/migrate/20140529220025_add_og_image_to_action_pages.rb
index bef964ffc..9cf386113 100644
--- a/db/migrate/20140529220025_add_og_image_to_action_pages.rb
+++ b/db/migrate/20140529220025_add_og_image_to_action_pages.rb
@@ -1,11 +1,8 @@
class AddOgImageToActionPages < ActiveRecord::Migration[5.0]
- def self.up
- change_table :action_pages do |t|
- t.attachment :og_image
- end
- end
-
- def self.down
- drop_attached_file :action_pages, :og_image
+ def change
+ add_column :action_pages, :og_image_file_name, :string
+ add_column :action_pages, :og_image_content_type, :string
+ add_column :action_pages, :og_image_file_size, :bigint
+ add_column :action_pages, :og_image_updated_at, :datetime
end
end
diff --git a/db/migrate/20191031184958_add_logo_to_partners.rb b/db/migrate/20191031184958_add_logo_to_partners.rb
index 5665283de..cee82e686 100644
--- a/db/migrate/20191031184958_add_logo_to_partners.rb
+++ b/db/migrate/20191031184958_add_logo_to_partners.rb
@@ -1,11 +1,9 @@
class AddLogoToPartners < ActiveRecord::Migration[5.0]
- def up
- add_attachment :partners, :logo
+ def change
+ add_column :action_pages, :logo_file_name, :string
+ add_column :action_pages, :logo_content_type, :string
+ add_column :action_pages, :logo_file_size, :bigint
+ add_column :action_pages, :logo_updated_at, :datetime
add_column :partnerships, :enable_mailings, :boolean, default: false, null: false
end
-
- def down
- remove_attachment :partners, :logo
- remove_column :partnerships, :enable_mailings, :boolean, default: false, null: false
- end
end
diff --git a/lib/amazon_credentials.rb b/lib/amazon_credentials.rb
deleted file mode 100644
index bec9750f7..000000000
--- a/lib/amazon_credentials.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module AmazonCredentials
- # This module is primarily for paperclip config
- def amazon_credentials
- bucket_url_options = {}
- unless Rails.application.secrets.amazon_bucket_url.nil?
- bucket_url_options = {
- s3_host_alias: Rails.application.secrets.amazon_bucket_url,
- url: ":s3_alias_url",
- path: "/:class/:attachment/:id_partition/:style/:filename"
- }
- end
-
- {
- storage: Rails.application.secrets.storage.to_sym,
- s3_credentials: {
- bucket: Rails.application.secrets.amazon_bucket,
- access_key_id: Rails.application.secrets.amazon_access_key_id,
- secret_access_key: Rails.application.secrets.amazon_secret_access_key
- },
- s3_region: Rails.application.secrets.amazon_region,
- s3_host_name: build_s3_host_name,
- s3_protocol: "https",
- default_url: ""
- }.merge(bucket_url_options)
- end
-
- def build_s3_host_name
- AmazonCredentials.build_s3_host_name
- end
-
- def self.build_s3_host_name
- "s3-#{Rails.application.secrets.amazon_region}.amazonaws.com"
- end
-end
diff --git a/lib/monkey_patches/octet_stream_override.rb b/lib/monkey_patches/octet_stream_override.rb
deleted file mode 100644
index e2e5c9d24..000000000
--- a/lib/monkey_patches/octet_stream_override.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# Monkeypatch for paperclip to continue working post Rails 5 fileupload changes
-#
-# Without this, the following error occurs when trying to change the image
-# attached to a particular record:
-# Content Type Spoof: Filename img_file.png (binary/octet-stream from Headers,
-# ["image/png"] from Extension), content type discovered from file command: image/png.
-#
-# Additionally, this only allows paperclip to interact with image files
-#
-# The class we're patching is here: https://github.com/thoughtbot/paperclip/blob/fbdcbe8da30138dac5500e4291e7b279491d1316/lib/paperclip/media_type_spoof_detector.rb
-module MonkeyPatches
- module OctetStreamOverride
- def spoofed?
- return true unless image?
-
- override_header_type if supplied_content_type == "binary/octet-stream"
- if has_name? && has_extension? && media_type_mismatch? && mapping_override_mismatch?
- Paperclip.log("Content Type Spoof: Filename #{File.basename(@name)} (#{supplied_content_type} from Headers, #{content_types_from_name.map(&:to_s)} from Extension), content type discovered from file command: #{calculated_content_type}. See documentation to allow this combination.")
- true
- else
- false
- end
- end
-
- private
-
- def image?
- return true if %r{\Aimage/.*\Z}.match? calculated_content_type
-
- Paperclip.log("Attempted non-image upload: Filename #{File.basename(@name)} (#{supplied_content_type}")
- false
- end
-
- def override_header_type
- @content_type = calculated_content_type
- end
- end
-end
diff --git a/spec/features/admin/action_creation_spec.rb b/spec/features/admin/action_creation_spec.rb
index 0227cb1ca..748579655 100644
--- a/spec/features/admin/action_creation_spec.rb
+++ b/spec/features/admin/action_creation_spec.rb
@@ -134,6 +134,44 @@
end
end
+ it "can add images" do
+ stub_request(:get, %r{uploads/featured-image.png}).to_return(status: 200, body: fixture_file_upload("test-image.png", "image/png").tempfile.to_io, headers: {})
+ stub_request(:any, %r{/action_pages/featured_images/000/000/([0-9]+)/original/featured-image.png}).to_return(status: 200, body: "", headers: {})
+ stub_request(:get, %r{uploads/og-image.png}).to_return(status: 200, body: fixture_file_upload("test-image.png", "image/png").tempfile.to_io, headers: {})
+ stub_request(:any, %r{/action_pages/og_images/000/000/([0-9]+)/original/og-image.png}).to_return(status: 200, body: "", headers: {})
+ FactoryBot.create(:source_file, key: "uploads/featured-image.png", file_name: "featured-image.png")
+ FactoryBot.create(:source_file, key: "uploads/og-image.png", file_name: "og-image.png")
+ visit new_admin_action_page_path
+ fill_in_basic_info(title: "Very Important Action",
+ summary: "A summary",
+ description: "A description")
+ next_section
+
+ select_action_type("tweet")
+ fill_in "Message", with: "A message"
+ next_section
+
+ expect(page).to have_selector("#images", visible: true, wait: 5)
+ click_on "featured-image.png"
+ next_section
+
+ expect(page).to have_selector("#sharing", visible: true, wait: 5)
+ fill_in "Share Message", with: "Twitter message"
+ fill_in "Title", with: "A social media title"
+ click_on "og-image.png"
+ next_section
+
+ tempermental do
+ click_button "Save"
+ expect(page).to have_content("Very Important Action", wait: 10)
+ end
+
+ # save_and_open_page
+ # expect(page).to have_xpath("//img[contains(@src,'missing')]")
+ expect(page).to have_xpath("//img[contains(@src,'featured-image.png')]")
+ expect(page).to have_xpath("//meta[contains(@content,'og-image.png')]", visible: false)
+ end
+
def fill_in_basic_info(title:, summary:, description:)
fill_in "Title", with: title
fill_in_editor "#action_page_summary", with: summary
diff --git a/spec/lib/paperclip_spec.rb b/spec/lib/paperclip_spec.rb
deleted file mode 100644
index 9f6d38c80..000000000
--- a/spec/lib/paperclip_spec.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require "rails_helper"
-
-RSpec.describe Paperclip::MediaTypeSpoofDetector do
- let(:img_file) { "test-image.png" }
- let(:csv) { "schools.csv" }
- it "passes for good png files" do
- detector = described_class.new(File.open(file_fixture(img_file)), img_file,
- "image/png")
- expect(detector.spoofed?).to eq(false)
- end
-
- it "passes for png files when the header is 'binary/octet-stream'" do
- detector = described_class.new(File.open(file_fixture(img_file)), img_file,
- "binary/octet-stream")
- expect(detector.spoofed?).to eq(false)
- end
-
- it "fails when headers are 'binary/octet-stream' and not an image" do
- detector = described_class.new(File.open(file_fixture(csv)), csv,
- "binary/octet-stream")
- expect(detector.spoofed?).to eq(true)
- end
-
- it "fails for non-images" do
- detector = described_class.new(File.open(file_fixture(csv)), csv,
- "text/csv")
- expect(detector.spoofed?).to eq(true)
- end
-end
diff --git a/spec/models/action_page_spec.rb b/spec/models/action_page_spec.rb
index ec529d49c..606d51a20 100644
--- a/spec/models/action_page_spec.rb
+++ b/spec/models/action_page_spec.rb
@@ -167,4 +167,29 @@
expect { ActionPage.status("unknown") }.to raise_error(ArgumentError)
end
end
+
+ describe "image attachment" do
+ context "when there is no image" do
+ it "uses missing" do
+ page = ActionPage.create!(attr)
+ expect(page.featured_image.url).to match "missing.png"
+ end
+ end
+
+ context "when there is a featured image" do
+ let(:page_attr) { FactoryBot.attributes_for :action_page, remote_featured_image_url: "https://example.com/fakeimages/test.png" }
+ let(:test_image_file_upload) { fixture_file_upload("test-image.png", "image/png").tempfile.to_io }
+ it "creates a new record with image fields" do
+ stub_request(:get, %r{fakeimages/test.png}).to_return(status: 200, body: test_image_file_upload, headers: { content_type: "image/png" })
+ stub_request(:put, %r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}).to_return(status: 200, body: "", headers: {})
+
+ page = ActionPage.create!(page_attr)
+ expect(page.featured_image_file_name).to eq("test.png")
+ expect(page.featured_image.content_type).to eq("image/png")
+ expect(WebMock).to have_requested(:put, %r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png})
+ expect(page.featured_image.url).to match(%r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png})
+ expect(page.image.url).to match(%r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png})
+ end
+ end
+ end
end
diff --git a/spec/requests/action_pages_spec.rb b/spec/requests/action_pages_spec.rb
index 705523dc2..dbb2bf0f1 100644
--- a/spec/requests/action_pages_spec.rb
+++ b/spec/requests/action_pages_spec.rb
@@ -33,4 +33,50 @@
expect(response.body).to eq "1000"
end
end
+
+ describe "json" do
+ it "returns json" do
+ FactoryBot.create(:action_page)
+ get "/action.json"
+ expect(response.code).to eq "200"
+ expect(response.parsed_body).to include(a_hash_including({ "title" => "Sample Action Page" }))
+ end
+
+ it "returns image attributes in json" do
+ stub_request(:get, %r{fakeimages/test.png}).to_return(status: 200, body: fixture_file_upload("test-image.png", "image/png").tempfile.to_io, headers: { content_type: "image/png" })
+ stub_request(:any, %r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}).to_return(status: 200, body: "", headers: {})
+ FactoryBot.create(:action_page, remote_featured_image_url: "https://example.com/fakeimages/test.png")
+
+ get "/action.json"
+ expect(response.code).to eq "200"
+ expect(response.parsed_body).to include(a_hash_including({
+ "title" => "Sample Action Page",
+ "featured_image"=> a_hash_including({
+ "alt"=>"Test.Png",
+ "url"=> a_string_matching(%r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png})
+ })
+ }))
+ end
+ end
+
+ describe "atom" do
+ it "returns atom" do
+ FactoryBot.create(:action_page)
+ get "/action.atom"
+ expect(response.code).to eq "200"
+ expect(response.body).to match("Sample Action Page")
+ end
+
+ it "returns image attributes in atom" do
+ allow_any_instance_of(ActionPageImageUploader).to receive(:content_type).and_return("image/png")
+ stub_request(:get, %r{fakeimages/test.png}).to_return(status: 200, body: file_fixture("test-image.png").read, headers: {content_type: "image/png"})
+ stub_request(:any, %r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}).to_return(status: 200, body: file_fixture("test-image.png").read, headers: {content_type: "image/png"})
+ FactoryBot.create(:action_page, remote_featured_image_url: "https://example.com/fakeimages/test.png")
+
+ get "/action.atom"
+ expect(response.code).to eq "200"
+ expect(response.body).to match("Sample Action Page")
+ expect(response.body).to match(%r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png})
+ end
+ end
end
diff --git a/spec/requests/admin/action_pages_spec.rb b/spec/requests/admin/action_pages_spec.rb
index 5d1292bd3..66a4dab10 100644
--- a/spec/requests/admin/action_pages_spec.rb
+++ b/spec/requests/admin/action_pages_spec.rb
@@ -38,6 +38,26 @@
expect(ActionPage.count).to eq 1
end
+ it "should allow them to specify a featured image" do
+ valid_attributes[:action_page][:remote_featured_image_url] = "https://example.com/fakeimages/test-featured-image.png"
+ valid_attributes[:action_page][:remote_og_image_url] = "https://example.com/fakeimages/test-og-image.png"
+ test_image_file_upload = file_fixture("test-image.png").read
+ stub_request(:get, %r{fakeimages/test-featured-image.png}).to_return(status: 200, body: test_image_file_upload, headers: { content_type: "image/png" })
+ stub_request(:any, %r{/action_pages/featured_images/000/000/([0-9]+)/original/test-featured-image.png}).to_return(status: 200, body: "", headers: {})
+ stub_request(:get, %r{fakeimages/test-og-image.png}).to_return(status: 200, body: test_image_file_upload, headers: { content_type: "image/png" })
+ stub_request(:any, %r{/action_pages/og_images/000/000/([0-9]+)/original/test-og-image.png}).to_return(status: 200, body: "", headers: {})
+
+ post "/admin/action_pages", params: valid_attributes
+
+ expect(response).to redirect_to(assigns(:actionPage))
+ follow_redirect!
+
+ expect(response.code).to eq "200"
+ expect(ActionPage.count).to eq 1
+ expect(response.body).to match("test-featured-image")
+ expect(response.body).to match("test-og-image")
+ end
+
it "should allow them to search action pages" do
border = FactoryBot.create(
:action_page_with_petition,
diff --git a/spec/requests/admin/s3_uploads_spec.rb b/spec/requests/admin/s3_uploads_spec.rb
index 3e00c35be..85b103de3 100644
--- a/spec/requests/admin/s3_uploads_spec.rb
+++ b/spec/requests/admin/s3_uploads_spec.rb
@@ -35,4 +35,20 @@
post "/admin/source_files", params: valid_attributes
end.to change { SourceFile.count }.by(1)
end
+
+ it "should have valid response" do
+ @admin = FactoryBot.create(:admin_user)
+ login @admin
+
+ post "/admin/source_files", params: valid_attributes
+
+ expect(response.parsed_body).to include(
+ "id" => 1,
+ "delete_url" => "/admin/source_files/1.json",
+ "full_url" => a_string_matching(%r{/uploads/3be325f2b4e64d9d92a89405577280a4/img.png}),
+ "image" => true,
+ "name" => "img.png",
+ "size" => 10
+ )
+ end
end