Attach images to topics

Author: Chris Parsons

Diff for: bin/fog

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'fog' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('fog', 'fog')

Diff for: features/administrator-manual/maintaining-topics.feature

@@ -51,7 +51,7 @@ Feature: Maintaining Topics
   Scenario: Adding an image to a topic
     Given I have uploaded an image called 'job-centres.png'
     When I create a topic "Job Centres" referencing the 'job-centres.png' background image
-    Then the topic page should show the 'job-centres.png' image as its background
+    Then an audience page for that topic should show the 'job-centres.png' image as the topic's background
 
   Scenario: Removing a topic
     When I create a topic "Youth"

Diff for: features/step_definitions/image_steps.rb

@@ -0,0 +1,4 @@
+Given(/^I have uploaded an image called 'job\-centres\.png'$/) do
+  basic_auth('discover', '')
+  visit '/admin/images/uploaded?bucket=discover-thamesmead-website-images&key=uploads%2Ffoo%2Fjob-centres.png'
+end

Diff for: features/step_definitions/topic_steps.rb

@@ -42,6 +42,18 @@
   create_topic(topic_name)
 end
 
+When(/^I create a topic "(.*?)" referencing the 'job\-centres\.png' background image$/) do |topic_name|
+  create_topic(topic_name) do
+    select 'job-centres.png'
+  end
+end
+
+Then(/^an audience page for that topic should show the 'job\-centres\.png' image as the topic's background$/) do
+  Discover::AudienceRepository.new.apply([Discover::Changes::AudienceCreated.new(Discover::Audience.new("foo", nil, ["job-centres"]))])
+  visit "/foo"
+  page.should have_css(".dt-topic-bg[style*='job-centres.png']")
+end
+
 When(/^I associate it with the "(.*?)" audience$/) do |audience_name|
   @audience_name = audience_name
   visit '/admin'

Diff for: features/support/env.rb

@@ -47,6 +47,7 @@ def create_topic(name, description = "")
   click_link 'Create topic'
   fill_in 'Topic name', :with => name
   fill_in 'Description', :with => description
+  yield if block_given?
   click_button 'Create topic'
   should_be_success
 end

Diff for: lib/discover.rb

@@ -4,6 +4,7 @@
 require 'discover/topic_validator'
 require 'discover/place'
 require 'discover/place_validator'
+require 'discover/image'
 require 'discover/changes'
 require 'discover/reactor'
 

Diff for: lib/discover/app/admin/topics.rb

@@ -73,14 +73,16 @@ def create_from_params(params)
           Topic.new(params[:object][:name],
                     params[:object][:description],
                     nil,
-                   [params[:object][:places]].flatten.compact)
+                   [params[:object][:places]].flatten.compact).
+                   with_image(params[:object][:image])
         end
 
         def update_from_params(object, params)
           object.
             with_name(params[:object][:name]).
             with_description(params[:object][:description]).
-            with_places([params[:object][:places]].flatten.compact)
+            with_places([params[:object][:places]].flatten.compact).
+            with_image(params[:object][:image])
         end
 
         def delete_change(slug)

Diff for: lib/discover/image.rb

@@ -0,0 +1,20 @@
+module Discover
+  class Image < Struct.new(:path, :bucket)
+    DEFAULT_BUCKET = 'discover-thamesmead-website-images'
+    DEFAULT_PATH = 'placeholder.jpg'
+
+    def initialize(*)
+      super
+      self.path = DEFAULT_PATH if self.path.nil? || self.path == ''
+      self.bucket ||= DEFAULT_BUCKET
+    end
+
+    def filename
+      File.basename(path)
+    end
+
+    def url
+      "https://s3.amazonaws.com/#{bucket}/#{path}"
+    end
+  end
+end

Diff for: lib/discover/persisted/audience.rb

@@ -32,11 +32,12 @@ class Topic
       field :name
       field :description
       field :slug
+      field :image
       has_and_belongs_to_many :audiences
       has_and_belongs_to_many :places
 
       def domain_object
-        Discover::Topic.new(name, description, slug, places.map(&:slug)).freeze
+        Discover::Topic.new(name, description, slug, places.map(&:slug), image).freeze
       end
 
       def sync_places!(places)
@@ -59,6 +60,18 @@ def domain_object
         YAML.load(yaml).freeze
       end
     end
+
+    class Image
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      field :path
+      field :bucket
+
+      def domain_object
+        Discover::Image.new(path, bucket).freeze
+      end
+    end
   end
 
   class AudienceRepository
@@ -86,7 +99,8 @@ def topic_created(change)
       topic = Persisted::Topic.create!(
         name: change.topic.name,
         description: change.topic.description,
-        slug: change.topic.slug
+        slug: change.topic.slug,
+        image: change.topic.image
       )
       topic.sync_places!(change.topic.places)
     end
@@ -95,7 +109,8 @@ def topic_edited(change)
       topic = Persisted::Topic.find_by(slug: change.slug)
       topic.update_attributes(
         name: change.topic.name,
-        description: change.topic.description
+        description: change.topic.description,
+        image: change.topic.image
       )
       topic.sync_places!(change.topic.places)
     end
@@ -119,6 +134,13 @@ def place_deleted(change)
       Persisted::Place.find_by(slug: change.slug).destroy
     end
 
+    def image_uploaded(change)
+      Persisted::Image.create!(
+        path: change.path,
+        bucket: change.bucket
+      )
+    end
+
     def topics
       Persisted::Topic.all.map(&:domain_object)
     end
@@ -131,6 +153,10 @@ def active_audiences
       Persisted::Audience.all.map(&:domain_object)
     end
 
+    def available_images
+      Persisted::Image.all.map(&:domain_object)
+    end
+
     def audience_from_slug(slug)
       Persisted::Audience.find_by(slug: slug).domain_object
     rescue Mongoid::Errors::DocumentNotFound

Diff for: lib/discover/topic.rb

@@ -1,27 +1,32 @@
 module Discover
-  class Topic < Struct.new(:name, :description, :slug, :places)
+  class Topic < Struct.new(:name, :description, :slug, :places, :image)
     def initialize(*)
       super
       self.name ||= ''
       self.description ||= ''
       self.slug ||= sluggify(name)
       self.places ||= []
+      self.image ||= Image.new.url
     end
 
     def sluggify(string)
       string.downcase.gsub(/\W/,'-')
     end
 
     def with_name(new_name)
-      self.class.new(new_name, description, slug, places)
+      self.class.new(new_name, description, slug, places, image)
     end
 
     def with_description(new_description)
-      self.class.new(name, new_description, slug, places)
+      self.class.new(name, new_description, slug, places, image)
     end
 
     def with_places(new_places)
-      self.class.new(name, description, slug, new_places)
+      self.class.new(name, description, slug, new_places, image)
+    end
+
+    def with_image(new_image)
+      self.class.new(name, description, slug, places, Image.new(new_image, Image::DEFAULT_BUCKET).url)
     end
 
     def places_by_name(repository)

Diff for: spec/lib/discover/image_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+require 'discover/image'
+
+module Discover
+  describe Image do
+    subject { Image.new('path/to/image.png', 'bucket') }
+
+    it 'displays basic filename' do
+      expect(subject.filename).to eq('image.png')
+    end
+
+    it 'displays full url' do
+      expect(subject.url).to eq('https://s3.amazonaws.com/bucket/path/to/image.png')
+    end
+  end
+end

Diff for: spec/lib/discover/persisted/audience_spec.rb

@@ -4,6 +4,7 @@
 require 'discover/audience'
 require 'discover/topic'
 require 'discover/place'
+require 'discover/image'
 require 'discover/changes'
 require 'discover/reactor'
 
@@ -84,11 +85,12 @@ def create_place!
     it "edits topics" do
       create_place!
       create_topic!
-      new_topic = Topic.new("new_name", nil, nil, [place.slug])
+      new_topic = Topic.new("new_name", nil, nil, [place.slug], 'image-url')
       subject.apply([Changes::TopicEdited.new(topic.slug, new_topic)])
       saved_topic = subject.topic_from_slug(topic.slug)
       expect(saved_topic.name).to eq "new_name"
       expect(saved_topic.places).to eq [place.slug]
+      expect(saved_topic.image).to eq "image-url"
     end
 
     it 'deletes topics' do
@@ -97,5 +99,11 @@ def create_place!
       subject.apply([Changes::TopicDeleted.new(topic.slug)])
       expect { subject.topic_from_slug(topic.slug) }.to raise_error(NoTopicFoundError)
     end
+
+    it 'adds uploaded images' do
+      subject.apply([Changes::ImageUploaded.new("path", "bucket")])
+      subject.available_images.size.should == 1
+      subject.available_images.first.should == Image.new("path", "bucket")
+    end
   end
 end

Diff for: views/admin/topics/form.haml

@@ -8,5 +8,9 @@
     %select.chzn-select.span12#places{:multiple => 'multiple', :name => 'object[places][]'}
       - @places.each do |place|
         %option{:value => place.slug, :selected => @object.places.include?(place.slug)}= place.name
+    %label{:for => "image"} Background Image
+    %select.chzn-select.span12#image{:name => 'object[image]'}
+      - repository.available_images.each do |image|
+        %option{:value => image.path, :selected => @object.image == image}= image.filename
     %br
     %br

Diff for: views/audience.haml

@@ -3,7 +3,7 @@
 .dt-audience-bg.row-fluid
   - @audience.topics.each do |slug|
     - topic = repository.topic_from_slug(slug)
-    .dt-topic-bg{:style => 'background: url(/img/discover/index-bg.jpg)'}
+    .dt-topic-bg{:style => "background: url(#{topic.image})"}
       %a.dt-topic{:href => topic_path(@audience, topic)}
         .name
           = topic.name