tenon 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3848f32e34e0f1e0460ade450a9efd9aa35d13a
-  data.tar.gz: 2f2ee2e3c2d31c33116a4bde4cea1be713c708fd
+  metadata.gz: 6e5748fcf9b196fa90e2d8e40df6f4c95591ec12
+  data.tar.gz: 86540071e3cf945fc681c4fc1cb17358a4814a98
 SHA512:
-  metadata.gz: f33bc073e606b9e340bd17c756717690a45ab36fe9f71e0e3023a1f203108be2cceb2057cc39b9e30b3f7dfcaab906a6f5e31499ac080fc45905933f92c281cc
-  data.tar.gz: 44be645d288dc1d361b32017133844d056526f2f6670bb666b193196eff81e9db0d9e6f49fecac45c45a5c675552f7c48ea1bbbe2c1228a77c21972cbe45eeed
+  metadata.gz: 40d31fc0db7542758b6439eacdda83b322137d90870fe66fa53d437c0b708e0bd1621dd5c590575119e0baa0cfe2a12f7cd4ed71a4a568dfc9821f4b15925dcf
+  data.tar.gz: 6d0de504e06a23e40fc462b5cedf7f8d4be006b48ccc159bf02de51d44b5d6a6c75b35f97a5ad54cab5f1f63556a858c79e9efbfc1430090432a41467aae46c2

data/app/assets/javascripts/tenon/templates/redirects/redirect_row.jst.eco

@@ -0,0 +1,20 @@
+<li data-record-id="<%= @redirect.id %>">
+  <div class="record-details">
+    <div class="record-actions">
+      <%- @redirect.delete_link %>
+      <%- @redirect.edit_link %>
+      <% if @redirect.active == true: %>
+        <a data-tooltip="Active"><i class="fa fa-eye fa-fw"></i></span>
+      <% end %>
+    </div>
+
+    <div class="record-title">
+      <a href="<%= @redirect.edit_path %>">
+        /<%= @redirect.in %>/
+        <i class="fa fa-long-arrow-right" style="margin: 0 20px; opacity:0.3;" />
+        <%= @redirect.out %>
+      </a>
+    </div>
+
+  </div>
+</li>

data/app/controllers/tenon/redirects_controller.rb

@@ -0,0 +1,13 @@
+module Tenon
+  class RedirectsController < Tenon::ResourcesController
+    def resource_params
+      params.require(:redirect).permit!
+    end
+
+    private
+
+    def search_args
+      ["#{klass.table_name}.in ILIKE ? OR #{klass.table_name}.out ILIKE ?", "%#{params[:q]}%", "%#{params[:q]}%"]
+    end
+  end
+end

data/app/decorators/tenon/redirect_decorator.rb

@@ -0,0 +1,2 @@
+class Tenon::RedirectDecorator < Tenon::ApplicationDecorator
+end

data/app/models/tenon/redirect.rb

@@ -0,0 +1,13 @@
+class Tenon::Redirect < ActiveRecord::Base
+  # Scopes, attachments, etc.
+  has_history
+  include Tenon::Reorderable
+
+  default_scope { order('tenon_redirects.list_order') }
+  scope :active, -> { where(active: true) }
+
+  # Validations
+  validates_presence_of :in, :out
+  validates_uniqueness_of :in
+
+end

data/app/services/tenon/redirector.rb

@@ -0,0 +1,52 @@
+# If the app catches a 404, check Redirect records for a match.
+
+# Use -> Add the following to application_controller.rb:
+# rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
+# private
+# def record_not_found
+#   redirect_to Tenon::Redirector.redirect(request)
+# end
+
+module Tenon
+  class Redirector
+    def initialize(path, redirects = Tenon::Redirect.active)
+      @path = path
+      @redirects = redirects
+    end
+
+    def redirect
+      # If 404 -> Compare the path to all Redirect records:
+      @destination = get_destination
+      # raise @destination.inspect
+      if @destination.present?
+        # If there is a match return destination:
+        return @destination
+      else
+        # Else -> trigger the 404 again:
+        raise ActiveRecord::RecordNotFound
+      end
+    end
+
+    private
+
+    def get_destination
+      @redirects.each do |redirect|
+        if @path.match(/#{redirect.in}/).present?
+          return redirect_match(redirect)
+        end
+      end
+      nil
+    end
+
+    def redirect_match(redirect)
+      @destination = redirect.out
+      captures = @path.match(/#{redirect.in}/).captures
+      if captures.present?
+        captures.each_with_index do |capture, i|
+          @destination = @destination.gsub(/\{#{i}\}/, capture)
+        end
+      end
+      @destination
+    end
+  end
+end

data/app/views/tenon/redirects/_form.html.haml

@@ -0,0 +1,42 @@
+- content_for :sidebar do
+  .sidebar
+    .content
+      %h2 Redirects
+      = link_to "New Redirect", new_redirect_path, class: 'btn btn-block btn-primary'
+
+= autosaving_form_for @redirect do |f|
+  .flash.flash-alert{style: 'padding-right: 40px;'}
+    %i.fa.fa-exclamation-triangle
+    Redirects will be run when a page cannot be found. It will not redirect an existing page.
+
+  = error_messages_for :redirect
+  .fields.large.tabs
+    .tab-pane.active#details
+      .form-group
+        = f.text_field :in, label: 'Route to match', explanation: 'String, can be written as a regular expression (without opening and closing /)', placeholder: '\/old-path\/(\d+)-(\.*)'
+      .form-group
+        = f.text_field :out, label: 'Destination', explanation: 'Zero-indexed captures can be returned in {x}', placeholder: '/new-path/{0}-{1}'
+
+  .fields.small
+    %h4.box-label Details
+    .box
+      .form-group.bordered.inline
+        = f.check_box :active, class: 'tn-checkbox-right'
+        = f.super_label :active
+
+    %h4.box-label Actions
+    .box
+      .content
+        - if can?(:publish, @redirect)
+          %button.btn.btn-block.btn-comp Save
+        - if can?(:create, Tenon::ItemVersion)
+          = save_draft_button(@redirect)
+          .last-autosave
+
+      %hr
+      .content
+        = clear_draft_link if params[:version]
+        = load_draft_link(@redirect)
+        - if @redirect.persisted?
+          = link_to "Delete", @redirect, data: {method: :delete, confirm: 'Are you sure you want to delete this?'}, :class => 'delete-link'
+    .spacer

data/app/views/tenon/redirects/_redirect.json.jbuilder

@@ -0,0 +1 @@
+json.extract!(redirect, :id, :in, :out, :active, :edit_path, :edit_link, :delete_link)

data/app/views/tenon/redirects/edit.html.haml

@@ -0,0 +1,8 @@
+%header
+  %h1 Edit Redirect
+
+  .tools
+    = render "tenon/shared/section_header/sidebar_toggle"
+
+.main-content
+  = render "form"

data/app/views/tenon/redirects/index.html.haml

@@ -0,0 +1,29 @@
+- content_for :sidebar do
+  .sidebar
+    .content
+      %h2 Redirects
+      = link_to "New Redirect", new_redirect_path, class: 'btn btn-block btn-primary'
+      %p Drag and drop to set priority.
+
+%header
+  %h1 Redirects
+
+  .tools
+    = render "tenon/shared/section_header/sidebar_toggle"
+
+    .header-button
+      = link_to '#', id: 'quick-search-toggle' do
+        .header-icon= fa_icon('fw search')
+
+.toolbox
+  = render "tenon/shared/section_header/quick_search", record_list: '#redirects'
+
+.main-content
+  .flash.flash-alert{style: 'padding-right: 40px;'}
+    %i.fa.fa-exclamation-triangle
+    Redirects will be run when a page cannot be found. It will not redirect an existing page.
+
+  = error_messages_for :redirect
+  %ul#redirects.record-list.sortable{data: {records: {url: redirects_path(format: 'json'), template: 'tenon/templates/redirects/redirect_row', name: 'redirect'}, :'reorder-path' => reorder_redirects_path}}
+
+  = link_to "Load More Redirects", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#redirects'

data/app/views/tenon/redirects/index.json.jbuilder

@@ -0,0 +1,5 @@
+json.records do
+  json.partial! 'redirect', collection: @redirects, as: :redirect
+end
+
+json.partial!('tenon/shared/pagination', collection: @redirects)

data/app/views/tenon/redirects/new.html.haml

@@ -0,0 +1,8 @@
+%header
+  %h1 New Redirect
+
+  .tools
+    = render "tenon/shared/section_header/sidebar_toggle"
+
+.main-content
+  = render "form"

data/app/views/tenon/shared/_main_nav.html.haml

@@ -10,4 +10,5 @@
       = nav_item 'Events', events_path, 'calendar'
       = nav_item 'Galleries', galleries_path, 'th'
       = nav_item 'Contacts', contacts_path, 'envelope'
+      = nav_item 'Redirects', redirects_path, 'exchange'
       = nav_item 'Settings', settings_path, 'gear'

data/config/routes.rb

@@ -41,9 +41,14 @@ Tenon::Engine.routes.draw do
     post    'reorder', :on => :collection
   end
 
+  resources :redirects do
+    post    'reorder', :on => :collection
+  end
+
   resources :users, :except => [:show] do
     get 'approve', :on => :member
   end
 
   root :to => 'index#index'
 end
+

data/db/migrate/20140623142634_create_tenon_redirects.rb

@@ -0,0 +1,12 @@
+class CreateTenonRedirects < ActiveRecord::Migration
+  def change
+    create_table :tenon_redirects do |t|
+      t.string :in
+      t.string :out
+      t.integer :list_order, default: 0
+      t.boolean :active, default: true
+
+      t.timestamps
+    end
+  end
+end

data/lib/tenon/factories/redirects.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :tenon_redirect, class: Tenon::Redirect do
+    sequence(:title) { |n| "Test Page - #{n}" }
+    'in' '\/on-the-floor\/(\d+-.*)'
+    'out' '/posts/{0}'
+  end
+end
+
+

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.20'
+  VERSION = '1.0.21'
 end

data/spec/models/tenon/redirect_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Tenon::Redirect do
+  describe '.active' do
+    it 'should find redirects that are active' do
+      expect(Tenon::Redirect).to receive(:where).with(active: true)
+      Tenon::Redirect.active
+    end
+  end
+end

data/spec/services/tenon/redirector_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Tenon::Redirector do
+  describe '.redirect' do
+    before do
+      Tenon::Redirect.create(in: '\/a-page', out: '/new-page', list_order: 0)
+      Tenon::Redirect.create(in: '\/on-the-floor\/(\d+-.*)', out: '/posts/{0}', list_order: 1)
+      Tenon::Redirect.create(in: '\/on-the-floor.*', out: '/posts', list_order: 2)
+    end
+
+    context 'finds a redirect match' do
+      it 'should return a destination path' do
+        redirector = Tenon::Redirector.new('/a-page')
+        expect(redirector.redirect).to eq('/new-page')
+      end
+
+      it 'should return the first match ordered by list_order' do
+        redirector = Tenon::Redirector.new('/on-the-floor/1-something')
+        expect(redirector.redirect).to eq('/posts/1-something')
+      end
+    end
+
+    context 'does not find a redirect match' do
+      it 'should raise 404' do
+        redirector = Tenon::Redirector.new('/not-on-the-floor/1-something')
+        expect{ redirector.redirect }.to raise_error{ ActiveRecord::RecordNotFound }
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -993,6 +993,7 @@ files:
 - app/assets/javascripts/tenon/templates/pages/page_row.jst.eco
 - app/assets/javascripts/tenon/templates/post_categories/post_category_row.jst.eco
 - app/assets/javascripts/tenon/templates/posts/post_row.jst.eco
+- app/assets/javascripts/tenon/templates/redirects/redirect_row.jst.eco
 - app/assets/javascripts/tenon/templates/tenon_callouts/tenon_callout_row.jst.eco
 - app/assets/javascripts/tenon/templates/tenon_content/popped_out.jst.eco
 - app/assets/javascripts/tenon/templates/users/user_row.jst.eco
@@ -1056,6 +1057,7 @@ files:
 - app/controllers/tenon/pages_controller.rb
 - app/controllers/tenon/post_categories_controller.rb
 - app/controllers/tenon/posts_controller.rb
+- app/controllers/tenon/redirects_controller.rb
 - app/controllers/tenon/resources_controller.rb
 - app/controllers/tenon/settings_controller.rb
 - app/controllers/tenon/simple_resources_controller.rb
@@ -1071,6 +1073,7 @@ files:
 - app/decorators/tenon/paginating_decorator.rb
 - app/decorators/tenon/post_category_decorator.rb
 - app/decorators/tenon/post_decorator.rb
+- app/decorators/tenon/redirect_decorator.rb
 - app/decorators/tenon/tenon_callout_decorator.rb
 - app/decorators/tenon/tenon_content/row_decorator.rb
 - app/decorators/tenon/user_decorator.rb
@@ -1099,6 +1102,7 @@ files:
 - app/models/tenon/photo.rb
 - app/models/tenon/post.rb
 - app/models/tenon/post_category.rb
+- app/models/tenon/redirect.rb
 - app/models/tenon/role.rb
 - app/models/tenon/role_assignment.rb
 - app/models/tenon/s3_direct_upload.rb
@@ -1125,6 +1129,7 @@ files:
 - app/models/tenon/tenon_content/row_types/two_column_text.rb
 - app/models/tenon/thinger.rb
 - app/models/tenon/user.rb
+- app/services/tenon/redirector.rb
 - app/views/devise/confirmations/new.html.erb
 - app/views/devise/confirmations/new.html.haml
 - app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1197,6 +1202,12 @@ files:
 - app/views/tenon/posts/index.html.haml
 - app/views/tenon/posts/index.json.jbuilder
 - app/views/tenon/posts/new.html.haml
+- app/views/tenon/redirects/_form.html.haml
+- app/views/tenon/redirects/_redirect.json.jbuilder
+- app/views/tenon/redirects/edit.html.haml
+- app/views/tenon/redirects/index.html.haml
+- app/views/tenon/redirects/index.json.jbuilder
+- app/views/tenon/redirects/new.html.haml
 - app/views/tenon/settings/_contact.html.haml
 - app/views/tenon/settings/_general.html.haml
 - app/views/tenon/settings/_seo.html.haml
@@ -1289,6 +1300,7 @@ files:
 - db/migrate/20140520150508_add_publish_at_and_remove_published_from_tenon_posts.rb
 - db/migrate/20140520161213_remove_published_feld_from_tenon_pages.rb
 - db/migrate/20140619135927_add_stretch_boolean_to_tenon_tenon_content_pieces.rb
+- db/migrate/20140623142634_create_tenon_redirects.rb
 - db/seeds.rb
 - lib/generators/tenon/i18n_migrations/i18n_migrations_generator.rb
 - lib/generators/tenon/i18n_migrations/templates/migration.rb
@@ -1332,6 +1344,7 @@ files:
 - lib/tenon/factories/galleries.rb
 - lib/tenon/factories/pages.rb
 - lib/tenon/factories/posts.rb
+- lib/tenon/factories/redirects.rb
 - lib/tenon/factories/tenon_callouts.rb
 - lib/tenon/factories/users.rb
 - lib/tenon/has_asset.rb
@@ -1395,9 +1408,11 @@ files:
 - spec/models/tenon/my_settings_spec.rb
 - spec/models/tenon/page_spec.rb
 - spec/models/tenon/post_spec.rb
+- spec/models/tenon/redirect_spec.rb
 - spec/models/tenon/tenon_callout_spec.rb
 - spec/models/tenon/tenon_content/row_spec.rb
 - spec/models/tenon/user_spec.rb
+- spec/services/tenon/redirector_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration_example_group.rb
 - spec/support/request_helpers.rb
@@ -1508,9 +1523,11 @@ test_files:
 - spec/models/tenon/my_settings_spec.rb
 - spec/models/tenon/page_spec.rb
 - spec/models/tenon/post_spec.rb
+- spec/models/tenon/redirect_spec.rb
 - spec/models/tenon/tenon_callout_spec.rb
 - spec/models/tenon/tenon_content/row_spec.rb
 - spec/models/tenon/user_spec.rb
+- spec/services/tenon/redirector_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration_example_group.rb
 - spec/support/request_helpers.rb