tenon 1.0.41 → 1.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 260131e99456e8dd06c3dcc18b48ae15b0f446b1
-  data.tar.gz: e00b4a63668923fda2663f6e69a65aeba3ce1912
+  metadata.gz: 5747889adb3a9b011fe501c2ef049ff321191e5b
+  data.tar.gz: c92f02e7db14a5bac99a2e6ad61c16936a470142
 SHA512:
-  metadata.gz: a2a1d0dce53d88d2ecbd9c1c1f8ae2b67a1f481162bddc32a3bab542ad569216dfeda72a02093fa43e6fd6132e9d7b74a83f9d30963c8153fb8989608b4f4bdb
-  data.tar.gz: 73502d848604767bf0af207eebeff2d184ec234eda1a21772d49ab3c586a2b901ce001de375a947adfba27e3e244666e3c860f539f67e95c4f26fe081c2ab45f
+  metadata.gz: da50312b33ddb8ee6ebd3c92f46dc7fb6383fa94f008beae1a91f09e0db44b504a9a110105515773c01b82de5206cab986ba3b8e83775647adca57b57787a646
+  data.tar.gz: c87d3304040a3d9ecab3c54619c967d80648d7ee383064a063fcf3ba21bc4d0fd37a17ee4a7ac49b1f67158052d6bfa46887baf8e92ac362e7f5c7efd201643a

data/app/assets/javascripts/tenon/features/asset_cropping.js.coffee

@@ -13,7 +13,7 @@ class Tenon.features.AssetCropping
   _loadCrop: (e) =>
     e.preventDefault()
     @$link = $(e.currentTarget)
-    url = "/tenon/assets/#{@$link.data('asset-id')}/crop"
+    url = Routes.tenon_crop_asset_path(@$link.data('asset-id'))
     $.get(url, {format: 'html'}, @_startCrop, 'html')
 
   _cancelCrop: (e) ->

data/app/assets/javascripts/tenon/templates/assets/asset_field.jst.eco

@@ -3,15 +3,15 @@
   <div class="record-details">
     <div class="record-title big">
       <strong>
-        <a href="/tenon/assets/<%= @asset.id %>/edit"><%= @asset.display_name %></a>
+        <a href="<%= Routes.tenon_edit_asset_path(@asset.id) %>"><%= @asset.display_name %></a>
       </strong>
       <div class="explanation">
         <%= @asset.human_size %>
       </div>
     </div>
     <div class="record-actions">
-      <a data-tooltip="Edit" href="/tenon/assets/<%= @asset.id %>/edit" title="Edit"><i class="fa fa-pencil"></i></a>
-      <a data-confirm="Are you sure? There is no undo for this!" data-method="delete" data-tooltip="Delete" href="/tenon/assets/<%= @asset.id %>" rel="nofollow" title="Delete"><i class="fa fa-trash-o"></i></a>
+      <a data-tooltip="Edit" href="<%= Routes.tenon_edit_asset_path(@asset.id) %>" title="Edit"><i class="fa fa-pencil"></i></a>
+      <a data-confirm="Are you sure? There is no undo for this!" data-method="delete" data-tooltip="Delete" href="<%= Routes.tenon_asset_path(@asset.id) %>" rel="nofollow" title="Delete"><i class="fa fa-trash-o"></i></a>
     </div>
   </div>
 </li>

data/app/assets/javascripts/tenon/templates/assets/asset_row.jst.eco

@@ -2,7 +2,7 @@
   <div class="thumbnail"><%- @asset.icon %></div>
   <div class="record-details">
     <div class="record-title">
-      <a href="/tenon/assets/<%= @asset.id %>/edit" data-modal-remote="true" data-modal-title="Edit Asset"><%= @asset.display_name %></a>
+      <a href="<%= Routes.tenon_edit_asset_path(@asset.id) %>" data-modal-remote="true" data-modal-title="Edit Asset"><%= @asset.display_name %></a>
     </div>
 
     <div class="record-fields">

data/app/assets/javascripts/tenon/tenon_manifest.js

@@ -20,6 +20,7 @@
 //= require jquery.radioSlider
 //= require jquery.twoLevelSort
 //= require jquery.ui.sortable
+//= require js-routes
 //= require medium-editor
 //= require ./medium_customizations
 //= require select2

data/app/models/ability.rb

@@ -18,7 +18,7 @@ class Ability
       end
       can :create, Tenon::User
     elsif u.is_contributor?
-      can([:update, :edit], Tenon::User) { |user| user == u }
+      can([:update, :edit, :publish], Tenon::User) { |user| user == u }
       can :read, :all
       can :create, Tenon::Page
       can([:update, :destroy, :edit], Tenon::Page) do |item|

data/config/routes.rb

@@ -3,7 +3,7 @@ Tenon::Engine.routes.draw do
 
   resources :item_versions, only: [:create, :show, :new, :index]
 
-  resources :assets, except: [:show] do
+  resources :assets, path: 'asset-library', except: [:show] do
     post 'encode_notify', :on => :collection
     get :crop, :on => :member
   end

data/lib/tenon/engine.rb

@@ -20,6 +20,7 @@ require 'jbuilder'
 require 'jquery-fileupload-rails'
 require 'jquery-rails'
 require 'jquery-ui-rails'
+require 'js-routes'
 require 'later_dude'
 require 'launchy'
 require 'lodash-rails'

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.41'
+  VERSION = '1.0.42'
 end

data/spec/controllers/tenon/assets_controller_spec.rb

@@ -15,7 +15,7 @@ describe Tenon::AssetsController do
 
   before do
     controller.stub(:current_user) { user }
-    controller.stub(:polymorphic_index_path) { '/tenon/assets' }
+    controller.stub(:polymorphic_index_path) { '/tenon/asset-library' }
   end
 
   describe 'GET index.html' do
@@ -134,9 +134,9 @@ describe Tenon::AssetsController do
         expect(controller.flash[:notice]).not_to be_nil
       end
 
-      it "should redirect to '/tenon/assets'" do
+      it "should redirect to '/tenon/asset-library'" do
         post :create, asset: params
-        expect(response).to redirect_to '/tenon/assets'
+        expect(response).to redirect_to '/tenon/asset-library'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.41
+  version: 1.0.42
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -528,6 +528,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 4.0.5
+- !ruby/object:Gem::Dependency
+  name: js-routes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: later_dude
   requirement: !ruby/object:Gem::Requirement
@@ -1475,7 +1489,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A highly flexible mountable Rails CMS built for rapid application development.