landable 1.11.1 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7eeff5bea21d975e1a609fae486601fd56f01d14
-  data.tar.gz: 5166ca9ae9d0ce55bc358e277f9ecffea37fbd7e
+  metadata.gz: 5e388115c83b9777fbb1f77c0e3d0cc81b25449f
+  data.tar.gz: d0afa913ce591d46f56b782d73e55e422051a1cc
 SHA512:
-  metadata.gz: 7c1cf3cead1831d185ad8054651c6f6caf69e933aa1662a775011857a66e89ec4f337a408ebbe597cbcab12b1ab7fec6df48e457303ad6e337ac5c2990122b90
-  data.tar.gz: fad90831911bae1b77ed361ee0ad66bc1e643316798c92fa9fab99764cce0bb5975b0814933dd62283ed643d6732b7390874221ef5daf3252368f4e50d713d3c
+  metadata.gz: 5e861cf8d4c43e405298c592ec75b147c7b7075b92863e74b63d24d1889079df741cd1c0a43628135d1c151771b70996da323f053b54fe83fed2de089980c6c6
+  data.tar.gz: ed5f727a8d7b71ac73d15b1d39ba24ea0896d65b268a7d32ee33c66e8247084c31f3dd82c7ada7645e5b0c5fe4cb5a594e0bd94e2fc9f952ebb5e98ccdddecf0

data/CHANGELOG.md

@@ -2,7 +2,13 @@
 
 See README.md before updating this file.
 
-## Unreleased [#](https://github.com/enova/landable/compare/v1.11.1...master)
+## Unreleased [#](https://github.com/enova/landable/compare/v1.12.1...master)
+
+## 1.12.1 [#](https://github.com/enova/landable/compare/v1.11.1...v1.12.1)
+* Feature: Preview For Templates [#44]
+* Refactor: Clean Up MetaTags Decorator [#41]
+* Feature: Show which Pages a Template Lives On [#43]
+* BugFix: Deleted templates not rendered in page [#42]
 
 ## 1.11.1 [#](https://github.com/enova/landable/compare/v1.11.0...v1.11.1)
 * Adding PageName [#39]

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

@@ -58,13 +58,7 @@ module Landable
 
         # run the validators and render
         if page.valid?
-          if layout = page.theme.try(:file) || false
-            content = with_format(:html) do
-              render_to_string text: RenderService.call(page), layout: layout
-            end
-          else
-            content = RenderService.call(page, preview: true)
-          end
+          content = generate_preview_for(page)
         end
         
         respond_to do |format|
@@ -98,17 +92,6 @@ module Landable
               hash[:search] || {}
             end
         end
-      
-        def with_format(format, &block)
-          old_formats = formats
-
-          begin
-            self.formats = [format]
-            return block.call
-          ensure
-            self.formats = old_formats
-          end
-        end
 
         def page_params
           params[:page][:audit_flags] ||= []

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

@@ -4,7 +4,7 @@ module Landable
   module Api
     class TemplatesController < ApiController
       # filters
-      before_filter :load_template, except: [:create, :index]
+      before_filter :load_template, except: [:create, :index, :preview]
 
       # RESTful methods
       def create
@@ -48,6 +48,26 @@ module Landable
         respond_with @template
       end
 
+      # custom methods
+      def preview
+        template = Template.new(template_params)
+        theme  = Theme.most_used_on_pages
+
+        page  = Page.example(theme: theme, body: template.body)
+
+        content = generate_preview_for(page)
+
+        respond_to do |format|
+          format.html do
+            render text: content, layout: false, content_type: 'text/html'
+          end
+
+          format.json do
+            render json: { template: { preview: content } }
+          end
+        end
+      end
+
       private
         def template_params
           params.require(:template).permit(:id, :name, :body, :description, :thumbnail_url, 

data/app/controllers/landable/api_controller.rb

@@ -64,6 +64,27 @@ module Landable
       head :unauthorized if current_author.nil?
     end
 
+    def with_format(format, &block)
+      old_formats = formats
+
+      begin
+        self.formats = [format]
+        return block.call
+      ensure
+        self.formats = old_formats
+      end
+    end
+
+    def generate_preview_for(page)
+      if layout = page.theme.try(:file) || false
+        with_format(:html) do
+          render_to_string text: RenderService.call(page), layout: layout
+        end
+      else
+        RenderService.call(page, preview: true)
+      end
+    end
+
     def current_author
       return @current_author if @current_author
       authenticate_with_http_basic do |username, token|

data/app/decorators/landable/page_decorator.rb

@@ -28,11 +28,9 @@ module Landable
     end
 
     def meta_tags
-      return unless tags = page.meta_tags
-      Rails.logger.info "Meta tags string: #{tags}" if tags.is_a? String
-      return if tags.empty? or !tags.is_a? Hash
+      return nil unless page.meta_tags?
 
-      tags.map { |name, value|
+      page.meta_tags.map { |name, value|
         tag('meta', name: name, content: value) if value.present?
       }.compact.join("\n").html_safe
     end

data/app/models/landable/page.rb

@@ -30,7 +30,7 @@ module Landable
     validates :redirect_url, url: true, allow_blank: true
     validate :hero_asset_existence
 
-    belongs_to :theme,                class_name: 'Landable::Theme',        inverse_of: :pages
+    belongs_to :theme,                class_name: 'Landable::Theme',        inverse_of: :pages, counter_cache: true
     belongs_to :published_revision,   class_name: 'Landable::PageRevision'
     belongs_to :category,             class_name: 'Landable::Category'
     belongs_to :updated_by_author,    class_name: 'Landable::Author'

data/app/models/landable/template.rb

@@ -19,6 +19,8 @@ module Landable
 
     has_and_belongs_to_many :pages,   join_table: Page.templates_join_table_name
 
+    delegate :count, to: :pages, prefix: true # Returns how many Pages a Template lives in!
+
     before_save -> template {
       template.is_publishable = true unless template.published_revision_id_changed?
     }

data/app/models/landable/theme.rb

@@ -16,6 +16,10 @@ module Landable
         return unless table_exists?
         Layout.all.map(&:to_theme)
       end
+
+      def most_used_on_pages
+        order('pages_count DESC').first
+      end
     end
   end
 end

data/app/serializers/landable/template_serializer.rb

@@ -10,5 +10,7 @@ module Landable
 
     embed    :ids
     has_one  :published_revision
+
+    has_many :pages
   end
 end

data/config/routes.rb

@@ -27,6 +27,7 @@ Landable::Engine.routes.draw do
     end
 
     resources :templates, only: [:index, :show, :create, :update, :destroy, :reactivate] do
+      post 'preview', on: :collection
       post 'publish', on: :member
       put 'reactivate', on: :member
       resources :audits, only: [:create]

data/db/migrate/20141217171816_add_counter_for_themes_pages.rb

@@ -0,0 +1,13 @@
+class AddCounterForThemesPages < ActiveRecord::Migration
+  def up
+    add_column "#{Landable.configuration.database_schema_prefix}landable.themes", :pages_count, :integer, default: 0, null: false
+
+    Landable::Theme.all.each do |t|
+      Landable::Theme.reset_counters(t.id, :pages)
+    end
+  end
+
+  def down
+    remove_column "#{Landable.configuration.database_schema_prefix}landable.themes", :pages_count
+  end
+end

data/doc/schema/template.json

@@ -42,6 +42,11 @@
       "type": "boolean"
     },
 
+    "page_ids": {
+      "type": "array",
+      "items": { "$ref": "uuid.json" }
+    },
+
     "thumbnail_url": {
       "type": ["string", "null"]
     },

data/lib/landable/liquid/tags.rb

@@ -73,6 +73,9 @@ module Landable
       def render(context)
         template = Landable::Template.find_by_slug @template_slug
 
+        # Handle Templates that are deleted (don't render anything)
+        return if template && template.deleted_at?
+
         # Handle Templates that are Partials
         if template && template.partial?
           responder = context.registers[:responder]

data/lib/landable/version.rb

@@ -1,7 +1,7 @@
 module Landable
   module VERSION
     MAJOR = 1
-    MINOR = 11
+    MINOR = 12
     PATCH = 1
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

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

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+module Landable::Api
+  describe TemplatesController, json: true do
+    routes { Landable::Engine.routes }
+
+    describe '#preview', json: false do
+      include_examples 'Authenticated API controller', :make_request
+      render_views
+
+      let(:theme) { create :theme, body: '<html><head>{% head_content %}</head><body>Theme content; page content: {{body}}</body></html>' }
+
+      before do
+        request.env['HTTP_ACCEPT'] = 'text/html'
+      end
+
+      def make_request(attributes = attributes_for(:template, theme_id: theme.id))
+        post :preview, template: attributes
+      end
+
+      it 'renders JSON' do
+        request.env['HTTP_ACCEPT'] = 'application/json'
+        make_request
+        response.status.should == 200
+        last_json['template']['preview'].should be_present
+      end
+
+      it 'renders the layout without content if the body is not present' do
+        request.env['HTTP_ACCEPT'] = 'application/json'
+        make_request attributes_for(:page, body: nil)
+        response.status.should == 200
+        last_json['template']['preview'].should include('body')
+      end
+
+      it 'renders without a layout if no theme is present' do
+        request.env['HTTP_ACCEPT'] = 'application/json'
+        make_request attributes_for(:page, body: 'raw content')
+        response.status.should == 200
+        last_json['template']['preview'].should include('raw content')
+      end
+    end
+  end
+end

data/spec/models/landable/theme_spec.rb

@@ -4,5 +4,24 @@ module Landable
   describe Theme do
     it { should have_valid(:thumbnail_url).when(nil) }
     it { should be_a HasAssets }
+
+    describe '#most_used_theme' do
+      it 'returns the most used theme' do
+        t = create :theme
+        t2 = create :theme
+        t3 = create :theme
+        create :page, theme: t
+        create :page, theme: t
+        create :page, theme: t2
+        create :page, theme: t
+
+        Theme.most_used_on_pages.should == t
+      end
+
+      it 'return nil when there are no themes' do
+        Theme.destroy_all # Remove all themes!
+        Theme.most_used_on_pages.should be_nil
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: landable
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.1
 platform: ruby
 authors:
 - Team Trogdor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -463,6 +463,7 @@ files:
 - db/migrate/20140522202332_join_table_templates_pages.rb
 - db/migrate/20140602213937_path_response_time_view.rb
 - db/migrate/20141211200012_add_page_name_to_page.rb
+- db/migrate/20141217171816_add_counter_for_themes_pages.rb
 - db/test/landable.access_tokens.sql
 - db/test/landable.assets.sql
 - db/test/landable.authors.sql
@@ -569,6 +570,7 @@ files:
 - spec/controllers/landable/api/page_revisions_controller_spec.rb
 - spec/controllers/landable/api/pages_controller_spec.rb
 - spec/controllers/landable/api/template_revisions_controller_spec.rb
+- spec/controllers/landable/api/templates_controller_spec.rb
 - spec/controllers/landable/api_controller_spec.rb
 - spec/controllers/public/preview/page_revisions_controller_spec.rb
 - spec/controllers/public/preview/pages_controller_spec.rb
@@ -727,6 +729,7 @@ test_files:
 - spec/controllers/landable/api/page_revisions_controller_spec.rb
 - spec/controllers/landable/api/pages_controller_spec.rb
 - spec/controllers/landable/api/template_revisions_controller_spec.rb
+- spec/controllers/landable/api/templates_controller_spec.rb
 - spec/controllers/landable/api_controller_spec.rb
 - spec/controllers/public/preview/page_revisions_controller_spec.rb
 - spec/controllers/public/preview/pages_controller_spec.rb