tenon 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59380735084a650c2c794fb1a0a72c1d1d0bc73a
-  data.tar.gz: 54eab279b37418af5e3a3bc384eb2249b71b6cce
+  metadata.gz: 34e1b1b1ecbd92e365d323988b5e9bafb32e19c1
+  data.tar.gz: e068e258a9520d70e0c9acf36afb870a4cbb13cf
 SHA512:
-  metadata.gz: a7878190e20b7aeb1b95da78e296978e9ce41277ca62a93462c645aec61f407e4660a2c76f947236194e6c7010764bcb052d874e840c6360e0c74679af37ebc5
-  data.tar.gz: fdef04a1371acec78eec16f3c8577382db7af86642f318f195a08aac72473d52630ea87d3482c0ca8692dbb0d9e60091c7f4fc17895622b74fdbbf109ae538c1
+  metadata.gz: ea19fd36996e7c42de91645ec5e67cc5b38c5865d2970772d4f7a84d2fd0cc6c469d10113809f59fe2d0c0be73cf7fe4f19ed16908f345a5b5c1599db31a42f3
+  data.tar.gz: a6fb89c25554d018a19ad6b2b9941c6a2c979daf1e2bb6b2ef3fa3410c6bfbdeba6af8ad934dfb1346c6d2e6d008a9ed8462f02a3dbdda7b9c02a5a016d7327d

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

@@ -3,14 +3,12 @@
     <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 %>
+      <%- @redirect.active_link %>
     </div>
 
     <div class="record-title">
       <a href="<%= @redirect.edit_path %>">
-        /<%= @redirect.in %>/
+        <%= @redirect.in %>
         <i class="fa fa-long-arrow-right" style="margin: 0 20px; opacity:0.3;" />
         <%= @redirect.out %>
       </a>

data/app/controllers/tenon/redirects_controller.rb

@@ -4,6 +4,18 @@ module Tenon
       params.require(:redirect).permit!
     end
 
+    def toggle_active
+      respond_to do |format|
+        if @redirect.toggle_active!
+          format.json { render json: @redirect.to_json }
+          format.html { flash[:notice] = 'redirect approved.' and redirect_to redirects_path }
+        else
+          format.json { render status: 500, nothing: true }
+          format.html { flash[:warning] = 'Error approving redirect.' and redirect_to redirects_path }
+        end
+      end
+    end
+
     private
 
     def search_args

data/app/models/tenon/redirect.rb

@@ -10,4 +10,8 @@ class Tenon::Redirect < ActiveRecord::Base
   validates_presence_of :in, :out
   validates_uniqueness_of :in
 
+  def toggle_active!
+    self.active = self.active? ? false : true
+    save
+  end
 end

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

@@ -7,8 +7,8 @@ json.records do
     json.updater page.updater.present? ? page.updater.email : 'Unknown User'
     json.edit_path edit_page_path(page)
 
-    if page.published? && route_exist?(page)
-      json.view_link action_link("View on Site", main_app.polymorphic_path(page), "laptop")
+    if page.published?
+      json.view_link action_link("View on Site", page.path, "laptop")
     end
 
     json.subpage_link action_link("Create a Sub-Page", new_page_path(:parent_id => page.id), "plus")

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

@@ -1 +1,3 @@
 json.extract!(redirect, :id, :in, :out, :active, :edit_path, :edit_link, :delete_link)
+
+json.active_link toggle_link(redirect, 'active', toggle_active_redirect_path(redirect), ['eye', 'Active'], ['eye-slash', 'Not Aactive'])

data/config/routes.rb

@@ -43,6 +43,7 @@ Tenon::Engine.routes.draw do
 
   resources :redirects do
     post    'reorder', :on => :collection
+    get 'toggle_active', :on => :member
   end
 
   resources :users, :except => [:show] do

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.26'
+  VERSION = '1.0.27'
 end

data/spec/models/tenon/redirect_spec.rb

@@ -7,4 +7,25 @@ describe Tenon::Redirect do
       Tenon::Redirect.active
     end
   end
+
+  describe '#toggle_active!' do
+    let(:redirect) { Tenon::Redirect.new(active: active) }
+    context 'when active is true' do
+      let(:active) { true }
+      it 'should set active to false and save the redirect' do
+        expect(redirect).to receive(:active=).with(false)
+        expect(redirect).to receive(:save)
+        redirect.toggle_active!
+      end
+    end
+
+    context 'when active is false' do
+      let(:active) { false }
+      it 'should set active to true and save the redirect' do
+        expect(redirect).to receive(:active=).with(true)
+        expect(redirect).to receive(:save)
+        redirect.toggle_active!
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.27
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -1470,7 +1470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.