landable 1.7.1.rc1 → 1.8.0

data/app/controllers/landable/api/themes_controller.rb

@@ -1,28 +1,46 @@
-require_dependency "landable/api_controller"
+require_dependency 'landable/api_controller'
 
 module Landable
   module Api
     class ThemesController < ApiController
-      def index
-        respond_with Theme.all
-      end
+      # filters
+      before_filter :load_theme, except: [:create, :index, :preview]
 
+      # RESTful methods
       def create
         theme = Theme.new(theme_params)
         theme.save!
+        
         respond_with theme, status: :created, location: theme_url(theme)
       end
 
+      def destroy
+        @theme.try(:deactivate)
+        
+        respond_with @theme
+      end
+
+      def index
+        respond_with Theme.all
+      end
+
+      def reactivate
+        @theme.try(:reactivate)
+        
+        respond_with @theme
+      end
+
       def show
-        respond_with Theme.find(params[:id])
+        respond_with @theme
       end
 
       def update
-        theme = Theme.find(params[:id])
-        theme.update_attributes! theme_params
-        respond_with theme
+        @theme.update_attributes!(theme_params)
+        
+        respond_with @theme
       end
 
+      # custom methods
       def preview
         theme = Theme.new(theme_params)
         page  = Page.example(theme: theme)
@@ -30,17 +48,17 @@ module Landable
         params[:theme][:asset_ids].try(:each) do |asset_id|
           theme.attachments.add Asset.find(asset_id)
         end
-
+        
         content = render_to_string(
           text: RenderService.call(page),
           layout: page.theme.file || false
         )
-
+        
         respond_to do |format|
           format.html do
             render text: content, layout: false, content_type: 'text/html'
           end
-
+          
           format.json do
             render json: {theme: {preview: content}}
           end
@@ -48,10 +66,13 @@ module Landable
       end
 
       private
+        def load_theme
+          @theme = Theme.find(params[:id])
+        end
 
-      def theme_params
-        params.require(:theme).permit(:id, :name, :body, :description, :thumbnail_url)
-      end
+        def theme_params
+          params.require(:theme).permit(:id, :name, :body, :description, :thumbnail_url)
+        end
     end
   end
 end

data/app/models/concerns/landable/librarian.rb

@@ -0,0 +1,36 @@
+module Landable
+  # modules
+  module Librarian
+    # The original name for this module was Landable::JamesCole, but Isaac said 'no.'
+    # if this name confuses you, go watch "12 Monkeys" you class-less savage.
+    # Wait, where were you in 95? Prison? The womb? Ohmygawd, that was a great film.
+
+    # extensions
+    extend ActiveSupport::Concern
+
+    # includes
+    included do
+    end
+
+    # validations
+    
+    # standard methods
+    def deactivate
+      self.update_attribute(:deleted_at, Time.now)
+    end
+
+    # custom methods
+    def nuke!
+      self.destroy
+    end
+
+    def reactivate
+      self.update_attribute(:deleted_at, nil)
+    end
+    
+    # end
+  end
+
+  # Live Long the Army of the 12 Monkeys!
+  # end
+end

data/app/models/landable/asset.rb

@@ -6,6 +6,7 @@ require 'digest/md5'
 module Landable
   class Asset < ActiveRecord::Base
     include Landable::TableName
+    include Landable::Librarian
     
     mount_uploader :data, Landable::AssetUploader
     alias :file :data

data/app/models/landable/page.rb

@@ -10,6 +10,7 @@ module Landable
     include Landable::HasAssets
     include Landable::Engine.routes.url_helpers
     include Landable::TableName
+    include Landable::Librarian
 
     validates_presence_of   :path, :status_code
     validates_presence_of   :redirect_url, if: -> page { page.redirect? }
@@ -124,6 +125,14 @@ module Landable
       end
     end
 
+    def deactivate
+      self.update_attribute(:status_code, 410)
+      
+      publish!(author_id: updated_by_author.id, notes: "This page has been trashed")
+
+      super
+    end
+
     def html?
       content_type == 'text/html'
     end

data/app/models/landable/page_revision.rb

@@ -10,6 +10,7 @@ module Landable
       'page_id',
       'imported_at',
       'created_at',
+      'deleted_at',
       'updated_at',
       'published_revision_id',
       'is_publishable',
@@ -21,7 +22,8 @@ module Landable
 
     belongs_to :author
     belongs_to :page, inverse_of: :revisions
-    has_many   :screenshots, class_name: 'Landable::Screenshot', as: :screenshotable
+
+    after_commit :add_screenshot!, on: :create
 
     def page_id=(id)
       # set the value
@@ -42,14 +44,14 @@ module Landable
     end
 
     def snapshot
-      Page.new(title: self.title, 
-               meta_tags: page.meta_tags, 
+      Page.new(title: self.title,
+               meta_tags: page.meta_tags,
                head_content: page.head_content,
-               body: self.body, 
-               path: self.path, 
-               redirect_url: self.redirect_url, 
-               status_code: self.status_code, 
-               theme_id: self.theme_id, 
+               body: self.body,
+               path: self.path,
+               redirect_url: self.redirect_url,
+               status_code: self.status_code,
+               theme_id: self.theme_id,
                category_id: self.category_id,
                abstract: self.abstract,
                hero_asset_id: self.hero_asset_id)
@@ -64,11 +66,52 @@ module Landable
     end
 
     def preview_url
-      public_preview_page_revision_url(self)
+      begin
+        public_preview_page_revision_url(self, host: Landable.configuration.public_host)
+      rescue ArgumentError
+        Rails.logger.warn "Failed to generate preview url for page revision #{id} - missing Landable.configuration.public_host"
+        nil
+      end
     end
 
     def preview_path
       public_preview_page_revision_path(self)
     end
+
+    mount_uploader :screenshot, Landable::AssetUploader
+
+    def screenshot_url
+      screenshot.try(:url)
+    end
+
+    def add_screenshot!
+      return nil if preview_url.blank?
+
+      unless Landable.configuration.screenshots_enabled
+        Rails.logger.info "Screenshots disabled; skipping for #{path}"
+        return
+      end
+
+      attempts_left = 3
+
+      begin
+        attempts_left -= 1
+
+        self.screenshot = ScreenshotService.capture(preview_url)
+
+        # we've got a trigger preventing updates to other columns, so! muck
+        # about under the hood to commit the asset, and explicitly only update
+        # this column.
+        store_screenshot!
+        write_screenshot_identifier
+        update_column :screenshot, self[:screenshot]
+
+      rescue ScreenshotService::Error => error
+        Rails.logger.warn "Failed to generate screenshot (#{attempts_left} attempt(s) left) for #{path}: #{error.inspect}"
+
+        retry if attempts_left > 0
+      end
+    end
   end
+
 end

data/app/models/landable/search_engine.rb

@@ -14,7 +14,7 @@ module Landable
     end
 
     def meta
-      { search: { total_results: @scope.count } }
+      { search: { total_results: @scope.count(:all) } }
     end
 
     def filter_by!(filters)

data/app/models/landable/template.rb

@@ -1,6 +1,10 @@
 module Landable
   class Template < ActiveRecord::Base
     include Landable::TableName
+    include Landable::Librarian
+
+    # attributes
+    attr_accessor :temp_author
 
     validates_presence_of   :name, :slug, :description
     validates_uniqueness_of :name, case_sensitive: false
@@ -14,6 +18,12 @@ module Landable
       template.is_publishable = true unless template.published_revision_id_changed?
     }
 
+    def deactivate
+      publish!(author_id: temp_author.id, notes: "This template has been trashed")
+
+      super
+    end
+
     def name= val
       self[:name] = val
       self[:slug] ||= (val && val.underscore.gsub(/[^\w_]/, '_').gsub(/_{2,}/, '_'))

data/app/models/landable/template_revision.rb

@@ -11,6 +11,7 @@ module Landable
       'thumbnail_url',
       'is_layout',
       'is_publishable',
+      'deleted_at'
     ]
 
     cattr_accessor :ignored_template_attributes

data/app/models/landable/theme.rb

@@ -4,6 +4,7 @@ module Landable
   class Theme < ActiveRecord::Base
     include Landable::TableName
     include Landable::HasAssets
+    include Landable::Librarian
 
     validates_presence_of   :name, :description
     validates_uniqueness_of :name, case_sensitive: false

data/app/responders/landable/api_responder.rb

@@ -18,7 +18,7 @@ module Landable
       # For updates, rails defaults to returning 204 No Content;
       # we would actually prefer that the updated record be returned,
       # in case an update to one key necessitates an automatic update to another.
-      if patch? || put?
+      if patch? || put? || delete?
         display resource
       else
         super

data/app/serializers/landable/asset_serializer.rb

@@ -4,6 +4,7 @@ module Landable
     attributes :file_size, :mime_type, :md5sum
     attributes :created_at, :updated_at
     attributes :public_url
+    attributes :deleted_at
 
     embed :ids
 

data/app/serializers/landable/page_revision_serializer.rb

@@ -6,6 +6,7 @@ module Landable
     attributes :id, :ordinal, :notes, :is_minor, :is_published
     attributes :created_at, :updated_at
     attributes :preview_path
+    attributes :screenshot_url
 
     embed :ids
     has_one :page

data/app/serializers/landable/page_serializer.rb

@@ -1,18 +1,9 @@
 module Landable
   class PageSerializer < ActiveModel::Serializer
-    attributes :id
-    attributes :path
-    attributes :title
-    attributes :body
-    attributes :head_content
-    attributes :redirect_url
-    attributes :meta_tags
-    attributes :is_publishable
-    attributes :preview_path
-    attributes :lock_version
-    attributes :status_code
-    attributes :abstract
-    attributes :hero_asset_name
+
+    attributes :abstract, :body, :deleted_at, :head_content, :hero_asset_name, 
+               :id, :is_publishable, :lock_version, :meta_tags, :path, 
+               :preview_path, :redirect_url, :status_code, :title
 
     embed    :ids
     has_one  :theme

data/app/serializers/landable/template_serializer.rb

@@ -1,8 +1,8 @@
 module Landable
   class TemplateSerializer < ActiveModel::Serializer
-    attributes :id, :name, :body, :description
-    attributes :thumbnail_url, :slug, :is_layout, :editable
-    attributes :file, :is_publishable
+
+    attributes :body, :deleted_at, :description, :editable, :file, :id, 
+               :is_layout, :is_publishable, :name, :slug, :thumbnail_url
 
     embed    :ids
     has_one  :published_revision

data/app/serializers/landable/theme_serializer.rb

@@ -1,6 +1,6 @@
 module Landable
   class ThemeSerializer < ActiveModel::Serializer
-    attributes :id, :name, :editable, :body, :description, :thumbnail_url
+    attributes :id, :name, :editable, :body, :description, :thumbnail_url, :deleted_at
 
     embed :ids
   end

data/app/services/landable/screenshot_service.rb

@@ -0,0 +1,32 @@
+require 'tempfile'
+
+module Landable
+  class ScreenshotService
+    class Error < StandardError; end
+
+    class << self
+      def capture url
+        if not Landable.configuration.publicist_url
+          Rails.logger.warn "Couldn't generate screenshot for #{url}; no Landable.configuration.publicist_url configured"
+        else
+          screenshots_uri = URI(Landable.configuration.publicist_url)
+          screenshots_uri.path = '/api/services/screenshots'
+
+          response = Net::HTTP.post_form screenshots_uri, 'screenshot[url]' => url
+
+          if response.code == '200'
+            file = Tempfile.new ['screenshot-', '.png']
+            file.binmode
+            file.write response.body
+            file.rewind
+
+            file
+          else
+            raise Error, "Received #{response.code} back from #{screenshots_uri.to_s}"
+          end
+        end
+      end
+    end
+
+  end
+end

data/app/views/templates/preview.liquid

@@ -85,25 +85,27 @@
   <!-- pretty invalid, this is -->
   <style type="text/css">
     body {
-      padding-top: 40px;
+      padding-top: 30px;
     }
 
     body:before {
-      text-align: center;
-      font-weight: bold;
-      background-color: #FFDA73;
-      font-family: Roboto;
       width: 100%;
       position: absolute;
       top: 0;
       left: 0;
-      font-size: 20px;
-      padding: 5px 0;
-      line-height: 30px;
-      border-bottom: 1px #e2bd56 solid;
-      content: "Preview Mode (Test your unpublished changes with this page. Share this URL!)";
       box-sizing: border-box;
-      height: 40px;
+      box-shadow: inset 0 -10px 5px -10px rgba(0, 0, 0, 0.5);
+      height: 30px;
+      padding: 5px 0;
+      background-color: #FFDA73;
+      line-height: 20px;
+      font-size: 14px;
+      font-family: sans-serif;
+      font-weight: normal;
+      text-align: center;
+      color: #7e592d;
+      content: "Preview Mode";
+      text-transform: uppercase;
     }
 
     body.publicist-preview {