landable 1.9.0.rc1 → 1.9.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa1b60f79220988343e9f1438585cecb2dbc9098
-  data.tar.gz: 16442db46400bebecdd4fe19f914c64e65335d01
+  metadata.gz: 1ae45a1d06e787c18d34b13ac783b226052dcf27
+  data.tar.gz: 549abf6b33387d0e86eb3ec840608dbcd9b40eb0
 SHA512:
-  metadata.gz: eacec5ab37461a178bc801e0d44cc2ec6d401a1e5bd12d421c32ba864b6440ffee03d5d85575d29e4e7b7815547ec8b9214591e4a9e661301b0dccbfa8e5d4ca
-  data.tar.gz: 81e6d79b97f684452ae2e17368c60cd1a439f7bcb3b0120c1ad91f04a017a0a6eb24da5fa9f7a058c0b1fd31c88a5dde4141a139e9b557612877aafd9c5511df
+  metadata.gz: bfea9429af570577f8da59c425f73c13688422891dac7dca7530a41841bfda38bb98f50a82a23d39f023cb6e3de2071e1f77ca82cea2013f70333854d318e2e6
+  data.tar.gz: a4ecfb3df6a1d97a38d1ff8769f6a574f7f738f51cb0c11f2ea341887c38fd4c66b49c9d33fcb13c2c623451cec81dbf3a2ad27491436a628b231be94d47ab86

data/CHANGELOG.md

@@ -2,7 +2,10 @@
 
 See README.md before updating this file.
 
-## Unreleased [#](https://github.com/enova/landable/compare/v1.9.0.rc1...master)
+## Unreleased [#](https://github.com/enova/landable/compare/v1.9.0.rc2...master)
+
+## 1.9.0.rc1 [#](https://github.com/enova/landable/compare/v1.9.0.rc1...v1.9.0.rc2)
+* Audits [*10]
 
 ## 1.9.0.rc1 [#](https://github.com/enova/landable/compare/v1.8.0...v1.9.0.rc1)
 * Expose the tracker's referer domain & path [#14]

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

@@ -36,13 +36,13 @@ module Landable
 
       private
 
-      def find_own_access_token(id = params[:id])
-        current_author.access_tokens.fresh.find(id)
-      end
+        def find_own_access_token(id = params[:id])
+          current_author.access_tokens.fresh.find(id)
+        end
 
-      def asset_token_params
-        params.require(:access_token).permit(:username, :password)
-      end
+        def asset_token_params
+          params.require(:access_token).permit(:username, :password)
+        end
     end
   end
 end

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

@@ -0,0 +1,42 @@
+require_dependency "landable/api_controller"
+
+module Landable
+  module Api
+    class AuditsController < ApiController
+      def index
+        if params[:auditable_id].present?
+          audits = Audit.where(auditable_id: params[:auditable_id])
+        else
+          audits = Audit.order('created_at DESC')
+        end
+        respond_with audits
+      end
+
+      def show
+        respond_with Audit.find(params[:id])
+      end
+
+      def create
+        if params[:page_id].present?
+          type_id = params[:page_id]
+          type    = 'Landable::Page'
+        else
+          type_id = params[:template_id]
+          type    = 'Landable::Template'
+        end
+
+        audit = Audit.new audit_params.merge(auditable_id: type_id,
+                                             auditable_type: type)
+        audit.save!
+
+        respond_with audit, status: :created, location: audit_url(audit)
+      end
+
+      private
+        def audit_params
+          params[:audit][:flags] ||= []
+          params.require(:audit).permit(:id, :approver, :notes, :created_at, flags: [])
+        end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+require_dependency "landable/api_controller"
+
+module Landable
+  module Api
+    class ConfigurationsController < ApiController
+      skip_before_filter :require_author!
+
+      def show
+        respond_with configurations: [Landable.configuration.as_json]
+      end
+    end
+  end
+end

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

@@ -99,10 +99,6 @@ module Landable
             end
         end
       
-        def page_params
-          params.require(:page).permit(:id, :path, :theme_id, :category_id, :title, :head_content, :body, :status_code, :redirect_url, :lock_version, :abstract, :hero_asset_name, meta_tags: [:description, :keywords, :robots])
-        end
-      
         def with_format(format, &block)
           old_formats = formats
 
@@ -113,6 +109,13 @@ module Landable
             self.formats = old_formats
           end
         end
+
+        def page_params
+          params[:page][:audit_flags] ||= []
+          params.require(:page).permit(:id, :path, :theme_id, :category_id, :title, :head_content, :body, :status_code, :redirect_url, :lock_version, :abstract, :hero_asset_name, 
+                                       audit_flags: [],
+                                       meta_tags: [:description, :keywords, :robots])
+        end
     end
   end
 end

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

@@ -49,15 +49,15 @@ module Landable
       end
 
       private
-        def load_template
-          @template = Template.find(params[:id])
-        end
-
         def template_params
-          params.require(:template).permit(:id, :name, :body, :description, :thumbnail_url, :slug, :is_layout, :is_publishable)
+          params.require(:template).permit(:id, :name, :body, :description, :thumbnail_url, 
+                                           :slug, :is_layout, :is_publishable,
+                                           audit_flags: [])
         end
 
-      # end
+        def load_template
+          @template = Template.find(params[:id])
+        end
     end
   end
 end

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

@@ -0,0 +1,60 @@
+require_dependency 'landable/liquid'
+
+module Landable
+  module HasTemplates
+    extend ActiveSupport::Concern
+
+    included do
+      has_and_belongs_to_many :templates, class_name: 'Landable::Template', join_table: templates_join_table_name
+
+      before_save :save_templates!
+
+      def template_names
+        # sticking with what we know about liquid, rather than doing regex.
+        # (though regex may be faster, should we need that optimization later.)
+        @template_names ||= begin
+          template = ::Liquid::Template.parse(body)
+          template_names_for_node template.root
+        end
+      end
+
+      def templates
+        Landable::Template.where(slug: template_names)
+      end
+
+      # passthrough for body=; clears the template_names cache in the process
+      def body= body_val
+        @template_slug = nil
+        @asset_names = nil
+        self[:body] = body_val
+      end
+
+      # this looks weird; I swear it works
+      def save_templates!
+        self.templates = self.templates
+      end
+
+      private
+
+      def template_names_for_node node, names = []
+        # set up a recursing function to search for template tags
+        if node.is_a? Landable::Liquid::TemplateTag
+          names << node.template_slug unless names.include? node.template_slug
+        end
+
+        if node.respond_to? :nodelist and node.nodelist
+          node.nodelist.each { |node| template_names_for_node node, names }
+        end
+
+        names
+      end
+
+    end
+
+    module ClassMethods
+      def templates_join_table_name
+        "#{Landable.configuration.database_schema_prefix}landable.#{self.name.underscore.split('/').last}_templates"
+      end
+    end
+  end
+end

data/app/models/landable/audit.rb

@@ -0,0 +1,9 @@
+module Landable
+  class Audit < ActiveRecord::Base
+    include Landable::TableName
+
+    validates :approver, presence: true
+
+    belongs_to :auditable, polymorphic: true
+  end
+end

data/app/models/landable/page.rb

@@ -8,6 +8,7 @@ module Landable
   class Page < ActiveRecord::Base
     include ActionView::Helpers::TagHelper
     include Landable::HasAssets
+    include Landable::HasTemplates
     include Landable::Engine.routes.url_helpers
     include Landable::TableName
     include Landable::Librarian
@@ -34,6 +35,9 @@ module Landable
     belongs_to :hero_asset,           class_name: 'Landable::Asset'
     has_many   :revisions,            class_name: 'Landable::PageRevision'
     has_many   :screenshots,          class_name: 'Landable::Screenshot',   as: :screenshotable
+    has_many   :audits,               class_name: 'Landable::Audit',        as: :auditable
+
+    delegate :republish!, to: :published_revision
 
     scope :imported, -> { where("imported_at IS NOT NULL") }
     scope :sitemappable, -> { where("COALESCE(meta_tags -> 'robots' NOT LIKE '%noindex%', TRUE)") 

data/app/models/landable/page_revision.rb

@@ -15,7 +15,8 @@ module Landable
       'published_revision_id',
       'is_publishable',
       'updated_by_author_id',
-      'lock_version'
+      'lock_version',
+      'audit_flags'
     ]
 
     cattr_accessor :ignored_page_attributes
@@ -65,6 +66,26 @@ module Landable
       update_attribute :is_published, false
     end
 
+    def republish!(options)
+      unpublish!
+      PageRevision.create!(page_id: self.page_id,
+                           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,
+                           category_id: self.category_id,
+                           abstract: self.abstract,
+                           hero_asset_id: self.hero_asset_id,
+                           notes: "Publishing update for template #{options[:template]}: #{options[:notes]}",
+                           is_minor: options[:is_minor],
+                           author_id: options[:author_id],
+                           is_published: true)
+    end
+
     def preview_url
       begin
         public_preview_page_revision_url(self, host: Landable.configuration.public_host)

data/app/models/landable/template.rb

@@ -12,8 +12,11 @@ module Landable
 
 
     belongs_to :published_revision,   class_name: 'Landable::TemplateRevision'
+    has_many   :audits,               class_name: 'Landable::Audit', as: :auditable
     has_many   :revisions,            class_name: 'Landable::TemplateRevision'
 
+    has_and_belongs_to_many :pages,   join_table: Page.templates_join_table_name
+
     before_save -> template {
       template.is_publishable = true unless template.published_revision_id_changed?
     }
@@ -38,6 +41,16 @@ module Landable
         published_revision.unpublish! if published_revision
         revision = revisions.create! options
         update_attributes!(published_revision: revision, is_publishable: false)
+
+        # Republish Templates Pages Last Page Revision
+        republish_associated_pages(options)
+      end
+    end
+
+    def republish_associated_pages(options)
+      options[:template] = self.name
+      pages.each do |page|
+        page.republish!(options) if page.published?
       end
     end
 

data/app/models/landable/template_revision.rb

@@ -11,6 +11,7 @@ module Landable
       'thumbnail_url',
       'is_layout',
       'is_publishable',
+      'audit_flags',
       'deleted_at'
     ]
 

data/app/serializers/landable/audit_serializer.rb

@@ -0,0 +1,12 @@
+module Landable
+  class AuditSerializer < ActiveModel::Serializer
+    attributes :id, :flags, :notes, :approver
+    attributes :auditable_type, :auditable_id, :created_at
+
+    def auditable_type
+      if object.auditable_type.present?
+        object.auditable_type.underscore.gsub(/^landable\//, '')
+      end
+    end
+  end
+end

data/app/serializers/landable/configuration_serializer.rb

@@ -0,0 +1,5 @@
+module Landable
+  class ConfigurationSerializer < ActiveModel::Serializer
+    attributes :audit_flags
+  end
+end

data/app/serializers/landable/page_serializer.rb

@@ -1,9 +1,14 @@
 module Landable
   class PageSerializer < ActiveModel::Serializer
-
-    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
+    attributes :id
+    attributes :path, :title, :body
+    attributes :head_content, :meta_tags
+    attributes :status_code, :redirect_url
+    attributes :is_publishable, :preview_path
+    attributes :audit_flags
+    attributes :hero_asset_name, :abstract
+    attributes :lock_version
+    attributes :deleted_at
 
     embed    :ids
     has_one  :theme

data/app/serializers/landable/template_serializer.rb

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

data/config/routes.rb

@@ -10,6 +10,10 @@ Landable::Engine.routes.draw do
 
     resources :assets, only: [:index, :show, :create, :update, :deactivate, :destroy]
 
+    resources :audits, only: [:index, :show]
+
+    get 'configuration', to: 'configurations#show'
+
     concern :has_assets do
       resources :assets, only: [:index, :update, :destroy]
     end
@@ -26,6 +30,7 @@ Landable::Engine.routes.draw do
     resources :templates, only: [:index, :show, :create, :update, :destroy, :reactivate] do
       post 'publish', on: :member
       put 'reactivate', on: :member
+      resources :audits, only: [:create]
     end
 
     resources :template_revisions, only: [:index, :show] do
@@ -36,6 +41,7 @@ Landable::Engine.routes.draw do
       post 'preview', on: :collection
       post 'publish', on: :member
       put 'reactivate', on: :member
+      resources :audits, only: [:create]
     end
 
     resources :page_revisions, only: [:index, :show], concerns: [:has_screenshots] do

data/db/migrate/20140509192856_create_audits.rb

@@ -0,0 +1,19 @@
+class CreateAudits < ActiveRecord::Migration
+  def change
+    # Audit Flags Field on Pages, Templates
+    add_column "#{Landable.configuration.database_schema_prefix}landable.pages",     :audit_flags, :string, array: true, default: []
+    add_column "#{Landable.configuration.database_schema_prefix}landable.templates", :audit_flags, :string, array: true, default: []
+
+    # Audit Model
+    create_table "#{Landable.configuration.database_schema_prefix}landable.audits" do |t|
+      t.uuid   :auditable_id
+      t.string :auditable_type
+
+      t.text   :notes
+      t.text   :approver
+      t.string :flags, array: true, default: []
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140522202332_join_table_templates_pages.rb

@@ -0,0 +1,8 @@
+class JoinTableTemplatesPages < ActiveRecord::Migration
+  def change
+    create_table "#{Landable.configuration.database_schema_prefix}landable.page_templates", id: :uuid, primary_key: :page_template_id do |t|
+      t.uuid :page_id,       null: false
+      t.uuid :template_id,   null: false
+    end
+  end
+end

data/doc/schema/audit.json

@@ -0,0 +1,30 @@
+{
+  "title": "PageAudits / TemplateAudits / Audits",
+  "description": "Audits SERVED(!) by landable",
+  "type": "object",
+  "additionalProperties": false,
+  "required": ["id"],
+
+  "properties": {
+    "id": {
+      "$ref": "uuid.json#"
+    },
+
+    "notes": {
+      "type": ["text", "null"]
+    },
+
+    "approver": {
+      "type": ["text", "null"]
+    },
+
+    "flags": {
+      "type": ["array", "null"]
+    },
+
+    "created_at": {
+      "type": "string",
+      "format": "date-time"
+    }
+  }
+}

data/doc/schema/page.json

@@ -95,6 +95,11 @@
 
     "hero_asset_name": {
       "type": ["string", "null"]
+    },
+
+    "audit_flags" : {
+      "type" : ["array", "null"],
+      "items" : { "type" : "string"}
     }
   }
 }

data/doc/schema/template.json

@@ -61,7 +61,11 @@
     "deleted_at": {
       "type": "date",
       "format": "date-time"
-    }
+    },
 
+    "audit_flags" : {
+      "type" : ["array", "null"],
+      "items" : { "type" : "string"}
+    }
   }
 }

data/lib/landable/configuration.rb

@@ -8,7 +8,7 @@ module Landable
     attr_writer :traffic_enabled
     attr_writer :sitemap_exclude_categories, :sitemap_protocol, :sitemap_host, :sitemap_additional_paths
     attr_writer :reserved_paths, :partials_to_templates, :database_schema_prefix
-    attr_writer :publicist_url
+    attr_writer :publicist_url, :audit_flags
 
     def authenticators
       @authenticators || raise("No Landable authenticator configured.")
@@ -48,6 +48,10 @@ module Landable
       @public_host ||= public_uri.try(:host)
     end
 
+    def audit_flags
+      @audit_flags ||= []
+    end
+
     def public_namespace
       @public_namespace ||= (public_uri.try(:path).presence || '')
     end

data/lib/landable/liquid/tags.rb

@@ -62,6 +62,8 @@ module Landable
     end
 
     class TemplateTag < Tag
+      attr_accessor :template_slug
+
       def initialize(tag, param, tokens)
         param_tokens = param.split(/\s+/)
         @template_slug = param_tokens.shift

data/lib/landable/version.rb

@@ -3,7 +3,7 @@ module Landable
     MAJOR = 1
     MINOR = 9
     PATCH = 0
-    PRE   = 'rc1'
+    PRE   = 'rc2'
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end

data/spec/concerns/landable/has_templates_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+module Landable
+  describe HasTemplates do
+
+    before(:each) { create_list :template, 3 }
+
+    let(:templates) { Landable::Template.last(3) }
+    let(:subject) {
+      build :page, {
+        body: "
+          <div>{% template #{templates[0].slug} %}</div>
+          <div>{% template #{templates[1].slug} %}</div>
+          <div>{% template #{templates[2].slug} %}</div>
+        "
+      }
+    }
+
+    describe '#templates' do
+      it 'should return templates' do
+        slugs = [templates[0].slug, templates[1].slug, templates[2].slug]
+        subject.templates.should == Landable::Template.where(slug: slugs)
+      end
+    end
+
+    describe '#template_names' do
+      it 'should pull template slugs out of the body' do
+        subject.template_names.sort.should == templates.map(&:slug).uniq.sort
+      end
+    end
+
+    describe '#save_templates!' do
+      it 'should save the templates' do
+        assets_double = double()
+        subject.should_receive(:templates) { assets_double }
+        subject.should_receive(:templates=).with(assets_double)
+        subject.save_templates!
+      end
+
+      it 'should be called during save' do
+        subject.should_receive :save_templates!
+        subject.save!
+      end
+    end
+
+    describe 'body=' do
+      it 'should reset the template_slug cache, then set the body' do
+        subject.instance_eval { @template_slug = 'foo' }
+        subject.body = 'bar'
+        subject.body.should == 'bar'
+        subject.instance_eval { @template_slug }.should be_nil
+        subject.templates.should == []
+      end
+    end
+
+    describe '#templates_join_table_name' do
+      it 'should generate the correct join_table, and then apologize for doing so' do
+        Page.send(:templates_join_table_name).should == "#{Landable.configuration.database_schema_prefix}landable.page_templates"
+      end
+    end
+  end
+end

data/spec/controllers/landable/api/audits_controller_spec.rb

@@ -0,0 +1,150 @@
+require 'spec_helper'
+
+module Landable::Api
+  describe AuditsController, json: true do
+    routes { Landable::Engine.routes }
+
+    let(:page)     { create :page }
+    let(:template) { create :template }
+
+    describe '#index' do
+      context 'all' do
+        include_examples 'Authenticated API controller', :make_request
+
+        let(:audits) { create_list :audit, 3 }
+
+        def make_request(params = {})
+          get :index
+        end
+
+        it 'renders audits as json' do
+          make_request
+          last_json['audits'].collect { |p| p['id'] }.sort.should == Landable::Audit.all.map(&:id).sort
+        end
+      end
+
+      context 'tempalte audits' do
+        include_examples 'Authenticated API controller', :make_request
+
+        let(:audits) { create_list :audit, 3, auditable_id: template.id, auditable_type: 'Landable::Template', approver: 'ME!!!' }
+
+        def make_request(params = {})
+          get :index, auditable_id: template.id
+        end
+
+        it 'renders audits as json' do
+          make_request
+          last_json['audits'].collect { |p| p['id'] }.sort.should == Landable::Audit.all.map(&:id).sort
+        end
+      end
+
+      context 'page audits' do
+        include_examples 'Authenticated API controller', :make_request
+
+        let(:audits) { create_list :audit, 3, auditable_id: page.id, auditable_type: 'Landable::Page', approver: 'ME!!!' }
+
+        def make_request(params = {})
+          get :index, auditable_id: page.id
+        end
+
+        it 'renders audits as json' do
+          make_request
+          last_json['audits'].collect { |p| p['id'] }.sort.should == Landable::Audit.all.map(&:id).sort
+        end
+      end
+    end
+
+    describe '#show' do
+      include_examples 'Authenticated API controller', :make_request
+      let(:audit) { create(:audit) }
+
+      def make_request(id = audit.id)
+        get :show, id: id
+      end
+
+      it 'renders the page as JSON' do
+        make_request
+        last_json['audit']['flags'].should == audit.flags
+      end
+
+      context 'no such page' do
+        it 'returns 404' do
+          make_request random_uuid
+          response.status.should == 404
+        end
+      end
+    end
+
+    describe '#create' do
+      context 'template audit' do
+        include_examples 'Authenticated API controller', :make_request
+
+        let(:default_params) do
+          { audit: attributes_for(:audit).merge(auditable_id: template.id,
+                                                auditable_type: 'Landable::Template',
+                                                approver: 'Marley') }
+        end
+
+        let(:audit) do
+          Landable::Audit.where(auditable_id: default_params[:audit][:auditable_id]).first
+        end
+
+        def make_request(params = {})
+          post :create, default_params.deep_merge(audit: params, template_id: template.id)
+        end
+
+        context 'success' do
+          it 'returns 201 Created' do
+            make_request
+            response.status.should == 201
+          end
+
+          it 'returns header Location with the audit URL' do
+            make_request
+            response.headers['Location'].should == audit_url(audit)
+          end
+
+          it 'renders the audit as JSON' do
+            make_request
+            last_json['audit']['flags'].should == audit.flags
+          end
+        end
+      end
+
+      context 'page audit' do
+        include_examples 'Authenticated API controller', :make_request
+
+        let(:default_params) do
+          { audit: attributes_for(:audit).merge(auditable_id: page.id,
+                                                auditable_type: 'Landable::Page',
+                                                approver: 'Marley') }
+        end
+
+        let(:audit) do
+          Landable::Audit.where(auditable_id: default_params[:audit][:auditable_id]).first
+        end
+
+        def make_request(params = {})
+          post :create, default_params.deep_merge(page_audit: params, page_id: page.id)
+        end
+
+        context 'success' do
+          it 'returns 201 Created' do
+            make_request
+            response.status.should == 201
+          end
+
+          it 'returns header Location with the audit URL' do
+            make_request
+            response.headers['Location'].should == audit_url(audit)
+          end
+
+          it 'renders the audit as JSON' do
+            make_request
+            last_json['audit']['flags'].should == audit.flags
+          end
+        end
+      end
+    end
+  end
+end

data/spec/controllers/landable/api/configuration_controller_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+module Landable::Api
+  describe ConfigurationsController, json: true do
+    routes { Landable::Engine.routes }
+
+    describe '#show' do
+
+      def make_request
+        get :show
+      end
+
+      it 'renders the page as JSON' do
+        make_request
+        # defined in Landable Dummy Initalizer
+        last_json['configurations'][0]['audit_flags'].should == %w(loans apr)
+      end
+    end
+  end
+end

data/spec/dummy/config/initializers/landable.rb

@@ -13,6 +13,8 @@ Landable.configure do |config|
   config.reserved_paths = %w(/reserved_path_set_in_initializer /reject/.* /admin.*)
 
   config.database_schema_prefix = 'dummy'
+
+  config.audit_flags = %w(loans apr)
 end
 
 # Configure asset uploads. Assets will be uploaded to public/uploads by default.

data/spec/factories/audit.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :audit, class: 'Landable::Audit' do
+    approver 'Marley Pants'
+    notes 'you got served!'
+    flags ['loans', 'apr']
+  end
+end

data/spec/models/landable/audit_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Landable::Audit do
+  it { should validate_presence_of(:approver) }
+end

data/spec/models/landable/page_revision_spec.rb

@@ -23,7 +23,7 @@ module Landable
 
     describe '#page_id=' do
       it 'should set page revision attributes matching the page' do
-        attrs = revision.attributes.except('page_revision_id','ordinal','notes','is_minor','is_published','author_id','created_at','updated_at', 'page_id')
+        attrs = revision.attributes.except('page_revision_id','ordinal','notes','is_minor','is_published','author_id','created_at','updated_at', 'page_id', 'audit_flags')
         attrs.should include(page.attributes.except(*PageRevision.ignored_page_attributes))
       end
     end
@@ -57,6 +57,21 @@ module Landable
       end
     end
 
+    describe '#republish!' do
+      it 'republishes a page revision with almost exact attrs' do
+        template = create :template, name: 'Basic'
+        old = PageRevision.create!(page_id: page.id, author_id: author.id, is_published: true)
+        new_author = create :author
+        old.republish!({author_id: new_author.id, notes: "Great Note", template: template.name })
+
+        new_record = PageRevision.order('created_at ASC').last
+        new_record.author_id.should == new_author.id
+        new_record.notes.should == "Publishing update for template #{template.name}: Great Note"
+        new_record.page_id.should == page.id
+        new_record.body.should == page.body
+      end
+    end
+
     describe '#preview_path' do
       it 'should return the preview path' do
         revision.should_receive(:public_preview_page_revision_path) { 'foo' }

data/spec/models/landable/template_revision_spec.rb

@@ -15,7 +15,7 @@ module Landable
 
     describe '#template_id=' do
       it 'should set template revision attributes matching the template' do
-        attrs = revision.attributes.except('editable', 'is_publishable', 'created_at', 'updated_at', 'published_revision_id', 'file', 'thumbnail_url', 'is_layout', 'is_minor', 'ordinal', 'notes', 'is_published')
+        attrs = revision.attributes.except('editable', 'is_publishable', 'created_at', 'updated_at', 'published_revision_id', 'file', 'thumbnail_url', 'is_layout', 'is_minor', 'ordinal', 'notes', 'is_published', 'audit_flags')
         attrs.should include(template.attributes.except(*TemplateRevision.ignored_template_attributes))
       end
     end

data/spec/models/landable/template_spec.rb

@@ -72,6 +72,15 @@ module Landable
         template.publish! author: author
         revision1.is_published.should be_false
       end
+
+      it 'should call republish_associated_pages' do
+        page = create :page
+        template.pages = [page]
+        template.save!
+
+        template.should_receive(:republish_associated_pages)
+        template.publish! author: author
+      end
     end
 
     describe '#revert_to' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landable
 version: !ruby/object:Gem::Version
-  version: 1.9.0.rc1
+  version: 1.9.0.rc2
 platform: ruby
 authors:
 - Team Trogdor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -309,7 +309,9 @@ files:
 - app/controllers/concerns/landable/variables_concern.rb
 - app/controllers/landable/api/access_tokens_controller.rb
 - app/controllers/landable/api/assets_controller.rb
+- app/controllers/landable/api/audits_controller.rb
 - app/controllers/landable/api/categories_controller.rb
+- app/controllers/landable/api/configurations_controller.rb
 - app/controllers/landable/api/directories_controller.rb
 - app/controllers/landable/api/page_revisions_controller.rb
 - app/controllers/landable/api/pages_controller.rb
@@ -327,12 +329,14 @@ files:
 - app/helpers/landable/application_helper.rb
 - app/helpers/landable/pages_helper.rb
 - app/models/concerns/landable/has_assets.rb
+- app/models/concerns/landable/has_templates.rb
 - app/models/concerns/landable/librarian.rb
 - app/models/concerns/landable/table_name.rb
 - app/models/concerns/landable/traffic/table_name.rb
 - app/models/landable/access_token.rb
 - app/models/landable/asset.rb
 - app/models/landable/asset_search_engine.rb
+- app/models/landable/audit.rb
 - app/models/landable/author.rb
 - app/models/landable/category.rb
 - app/models/landable/directory.rb
@@ -391,8 +395,10 @@ files:
 - app/responders/landable/page_render_responder.rb
 - app/serializers/landable/access_token_serializer.rb
 - app/serializers/landable/asset_serializer.rb
+- app/serializers/landable/audit_serializer.rb
 - app/serializers/landable/author_serializer.rb
 - app/serializers/landable/category_serializer.rb
+- app/serializers/landable/configuration_serializer.rb
 - app/serializers/landable/directory_serializer.rb
 - app/serializers/landable/page_revision_serializer.rb
 - app/serializers/landable/page_serializer.rb
@@ -437,7 +443,9 @@ files:
 - db/migrate/20140501171359_add_deleted_at_to_assets.rb
 - db/migrate/20140501171406_add_deleted_at_to_templates.rb
 - db/migrate/20140509190128_create_template_revisions.rb
+- db/migrate/20140509192856_create_audits.rb
 - db/migrate/20140515164543_add_screenshot_to_page_revisions.rb
+- db/migrate/20140522202332_join_table_templates_pages.rb
 - db/migrate/20140602213937_path_response_time_view.rb
 - db/test/landable.access_tokens.sql
 - db/test/landable.assets.sql
@@ -450,6 +458,7 @@ files:
 - db/test/landable.themes.sql
 - doc/schema/access_token.json
 - doc/schema/asset.json
+- doc/schema/audit.json
 - doc/schema/author.json
 - doc/schema/directory.json
 - doc/schema/page.json
@@ -530,12 +539,15 @@ files:
 - script/rails
 - script/redb
 - spec/concerns/landable/has_assets_spec.rb
+- spec/concerns/landable/has_templates_spec.rb
 - spec/concerns/landable/librarian.rb
 - spec/concerns/landable/table_name_spec.rb
 - spec/concerns/landable/traffic/table_name_spec.rb
 - spec/controllers/concerns/landable/variables_concern_spec.rb
 - spec/controllers/landable/api/assets_controller_spec.rb
+- spec/controllers/landable/api/audits_controller_spec.rb
 - spec/controllers/landable/api/categories_controller_spec.rb
+- spec/controllers/landable/api/configuration_controller_spec.rb
 - spec/controllers/landable/api/directories_controller_spec.rb
 - spec/controllers/landable/api/page_revisions_controller_spec.rb
 - spec/controllers/landable/api/pages_controller_spec.rb
@@ -583,6 +595,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/.keep
+- spec/dummy/db/structure.sql
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/404.html
@@ -590,6 +603,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/factories/asset.rb
+- spec/factories/audit.rb
 - spec/factories/authors.rb
 - spec/factories/category.rb
 - spec/factories/page_revision.rb
@@ -611,6 +625,7 @@ files:
 - spec/lib/landable/traffic_spec.rb
 - spec/models/landable/access_token_spec.rb
 - spec/models/landable/asset_spec.rb
+- spec/models/landable/audit_spec.rb
 - spec/models/landable/directory_spec.rb
 - spec/models/landable/page/errors_spec.rb
 - spec/models/landable/page_revision_spec.rb
@@ -650,7 +665,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Mountable CMS engine for Rails
@@ -680,12 +695,15 @@ test_files:
 - features/support/env.rb
 - features/support/usefulness.rb
 - spec/concerns/landable/has_assets_spec.rb
+- spec/concerns/landable/has_templates_spec.rb
 - spec/concerns/landable/librarian.rb
 - spec/concerns/landable/table_name_spec.rb
 - spec/concerns/landable/traffic/table_name_spec.rb
 - spec/controllers/concerns/landable/variables_concern_spec.rb
 - spec/controllers/landable/api/assets_controller_spec.rb
+- spec/controllers/landable/api/audits_controller_spec.rb
 - spec/controllers/landable/api/categories_controller_spec.rb
+- spec/controllers/landable/api/configuration_controller_spec.rb
 - spec/controllers/landable/api/directories_controller_spec.rb
 - spec/controllers/landable/api/page_revisions_controller_spec.rb
 - spec/controllers/landable/api/pages_controller_spec.rb
@@ -733,6 +751,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/.keep
+- spec/dummy/db/structure.sql
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/404.html
@@ -740,6 +759,7 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/factories/asset.rb
+- spec/factories/audit.rb
 - spec/factories/authors.rb
 - spec/factories/category.rb
 - spec/factories/page_revision.rb
@@ -761,6 +781,7 @@ test_files:
 - spec/lib/landable/traffic_spec.rb
 - spec/models/landable/access_token_spec.rb
 - spec/models/landable/asset_spec.rb
+- spec/models/landable/audit_spec.rb
 - spec/models/landable/directory_spec.rb
 - spec/models/landable/page/errors_spec.rb
 - spec/models/landable/page_revision_spec.rb