tenon 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a521546ef325229f9fa6c0240439add2bdbc5318
-  data.tar.gz: 463320ce76388a655be52ac58e06cce81c028fe3
+  metadata.gz: 43b616872ac8b90802cf3c43e82b32ee468acd61
+  data.tar.gz: 3e05204e249940d672054c186039586376373476
 SHA512:
-  metadata.gz: 71019ee2130b08af009131a20730a8ac29c7f1694162358c7a2fa85c7c355559c99a57d4347b7f99c5f077f0ba9a85da122ef6f02b551c66d3258e2d03cd3d54
-  data.tar.gz: 21ef6e710cf41346063b73628dabe1d576372bc5ac940016544cdd1db9561acdbac34ca0993c8cde6a5579bb7a3702a5b0deba620f7356217e4e86d86900cec4
+  metadata.gz: e3a2bc0e821162306fb2133c12579c3f75eab043c61891a30c1c25cfc5f92c016f52564aa94d5e7e36225979740e3ef077a80adae5aeee1fc04adbbcace2f885
+  data.tar.gz: 837a421d8809593ec427b09c5e556acc458420c410299fa1f813d06431e7a71e20b3e92f19983d90b1cf79886ce86baca48c1b79e272e8152a24eb8c035b4c50

data/README.rdoc

@@ -63,6 +63,9 @@ If you want to be able to use rspec, which would be good, you will also need to
 
     bundle exec rails generate rspec:install
 
+==== Note about CKEditor
+
+Currently options for serving CKEditor via the asset pipeline are limited.  For now, Tenon works around this by copying CKEditor's files into your app's public folder when you run the Tenon install task.  As such, you will need a web server that is capable of serving static files out of your public folder.  It is on the Tenon roadmap to find a better solution to this problem.
 
 == Scaffolding
 

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

@@ -8,7 +8,6 @@
 //= require bootstrap.modal
 //= require bootstrap.tabs
 //= require canvasjs.min
-//= require ckeditor/ckeditor
 //= require cocoon
 //= require imagesloaded
 //= require jquery-fileupload/basic

data/app/views/layouts/tenon/application.html.haml

@@ -10,6 +10,7 @@
       = Tenon::MySettings.site_title.present? ? Tenon::MySettings.site_title : 'Tenon'
 
     = stylesheet_link_tag 'tenon/tenon', '//fonts.googleapis.com/css?family=Open+Sans:400,700'
+    = javascript_include_tag '/ckeditor/ckeditor'
     = javascript_include_tag 'tenon/tenon_manifest'
 
   %body{data: { controller: params[:controller], action: params[:action] }, class: ('menu-open' if content_for?(:sidebar))}
@@ -24,4 +25,4 @@
       %i.fa-gear.fa.fa-4x.fa.fa-spin
 
     = flash_messages
-    = render 'tenon/shared/version_warning' if @item_version
+    = render 'tenon/shared/version_warning' if @item_version

data/lib/generators/tenon/install/install_generator.rb

@@ -6,9 +6,10 @@ module Tenon
       def copy_files
         copy_file('config/initializers/tenon.rb', File.join(Rails.root, 'config', 'initializers', 'tenon.rb'))
         copy_file('app/views/tenon/shared/_main_nav.html.haml', File.join(Rails.root, 'app', 'views', 'tenon', 'shared', '_main_nav.html.haml'))
-        copy_file('app/assets/stylesheets/tenon/colors-custom.css.scss', File.join(Rails.root, 'app', 'assets', 'stylesheets', 'tenon', 'colors-custom.css.scss'))
+        copy_file('app/assets/stylesheets/tenon/colors-custom.scss', File.join(Rails.root, 'app', 'assets', 'stylesheets', 'tenon', 'colors-custom.scss'))
         copy_file('lib/generators/tenon/install/tenon_addons.js', File.join(Rails.root, 'app', 'assets', 'javascripts', 'tenon_addons.js'))
         FileUtils.mkdir_p(File.join(Rails.root, 'app', 'assets', 'javascripts', 'tenon'))
+        directory('lib/ckeditor', Rails.root.join('public', 'ckeditor'))
 
         puts ''
         puts 'Make sure you add the following lines of code: '

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -914,51 +914,6 @@ files:
 - app/assets/images/tenon/tenon_icon.png
 - app/assets/images/tenon/thumb-doc.png
 - app/assets/images/tenon/thumb-video.png
-- app/assets/javascripts/ckeditor/CHANGES.md
-- app/assets/javascripts/ckeditor/LICENSE.md
-- app/assets/javascripts/ckeditor/README.md
-- app/assets/javascripts/ckeditor/adapters/jquery.js
-- app/assets/javascripts/ckeditor/build-config.js
-- app/assets/javascripts/ckeditor/ckeditor.js
-- app/assets/javascripts/ckeditor/config.js
-- app/assets/javascripts/ckeditor/contents.css
-- app/assets/javascripts/ckeditor/lang/en.js
-- app/assets/javascripts/ckeditor/lang/fr-ca.js
-- app/assets/javascripts/ckeditor/plugins/clipboard/dialogs/paste.js
-- app/assets/javascripts/ckeditor/plugins/dialog/dialogDefinition.js
-- app/assets/javascripts/ckeditor/plugins/icons.png
-- app/assets/javascripts/ckeditor/plugins/icons_hidpi.png
-- app/assets/javascripts/ckeditor/plugins/link/dialogs/anchor.js
-- app/assets/javascripts/ckeditor/plugins/link/dialogs/link.js
-- app/assets/javascripts/ckeditor/plugins/link/images/anchor.png
-- app/assets/javascripts/ckeditor/plugins/link/images/hidpi/anchor.png
-- app/assets/javascripts/ckeditor/plugins/linktoasset/plugin.js
-- app/assets/javascripts/ckeditor/plugins/pastefromword/filter/default.js
-- app/assets/javascripts/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
-- app/assets/javascripts/ckeditor/skins/moono-dark/dialog.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/dialog_ie.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/dialog_ie7.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/dialog_ie8.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/dialog_iequirks.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/editor.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/editor_gecko.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/editor_ie.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/editor_ie7.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/editor_ie8.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/editor_iequirks.css
-- app/assets/javascripts/ckeditor/skins/moono-dark/icons.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/icons_hidpi.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/images/arrow.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/images/close.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/images/hidpi/close.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/images/hidpi/lock-open.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/images/hidpi/lock.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/images/hidpi/refresh.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/images/lock-open.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/images/lock.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/images/refresh.png
-- app/assets/javascripts/ckeditor/skins/moono-dark/readme.md
-- app/assets/javascripts/ckeditor/styles.js
 - app/assets/javascripts/tenon/controllers/assets.js.coffee
 - app/assets/javascripts/tenon/controllers/index.js.coffee
 - app/assets/javascripts/tenon/controllers/tenon.js.coffee
@@ -1369,6 +1324,51 @@ files:
 - db/migrate/20150318162013_remove_taggings.rb
 - db/migrate/20150928230951_remove_unique_key_from_tenon_pages.rb
 - db/seeds.rb
+- lib/ckeditor/CHANGES.md
+- lib/ckeditor/LICENSE.md
+- lib/ckeditor/README.md
+- lib/ckeditor/adapters/jquery.js
+- lib/ckeditor/build-config.js
+- lib/ckeditor/ckeditor.js
+- lib/ckeditor/config.js
+- lib/ckeditor/contents.css
+- lib/ckeditor/lang/en.js
+- lib/ckeditor/lang/fr-ca.js
+- lib/ckeditor/plugins/clipboard/dialogs/paste.js
+- lib/ckeditor/plugins/dialog/dialogDefinition.js
+- lib/ckeditor/plugins/icons.png
+- lib/ckeditor/plugins/icons_hidpi.png
+- lib/ckeditor/plugins/link/dialogs/anchor.js
+- lib/ckeditor/plugins/link/dialogs/link.js
+- lib/ckeditor/plugins/link/images/anchor.png
+- lib/ckeditor/plugins/link/images/hidpi/anchor.png
+- lib/ckeditor/plugins/linktoasset/plugin.js
+- lib/ckeditor/plugins/pastefromword/filter/default.js
+- lib/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
+- lib/ckeditor/skins/moono-dark/dialog.css
+- lib/ckeditor/skins/moono-dark/dialog_ie.css
+- lib/ckeditor/skins/moono-dark/dialog_ie7.css
+- lib/ckeditor/skins/moono-dark/dialog_ie8.css
+- lib/ckeditor/skins/moono-dark/dialog_iequirks.css
+- lib/ckeditor/skins/moono-dark/editor.css
+- lib/ckeditor/skins/moono-dark/editor_gecko.css
+- lib/ckeditor/skins/moono-dark/editor_ie.css
+- lib/ckeditor/skins/moono-dark/editor_ie7.css
+- lib/ckeditor/skins/moono-dark/editor_ie8.css
+- lib/ckeditor/skins/moono-dark/editor_iequirks.css
+- lib/ckeditor/skins/moono-dark/icons.png
+- lib/ckeditor/skins/moono-dark/icons_hidpi.png
+- lib/ckeditor/skins/moono-dark/images/arrow.png
+- lib/ckeditor/skins/moono-dark/images/close.png
+- lib/ckeditor/skins/moono-dark/images/hidpi/close.png
+- lib/ckeditor/skins/moono-dark/images/hidpi/lock-open.png
+- lib/ckeditor/skins/moono-dark/images/hidpi/lock.png
+- lib/ckeditor/skins/moono-dark/images/hidpi/refresh.png
+- lib/ckeditor/skins/moono-dark/images/lock-open.png
+- lib/ckeditor/skins/moono-dark/images/lock.png
+- lib/ckeditor/skins/moono-dark/images/refresh.png
+- lib/ckeditor/skins/moono-dark/readme.md
+- lib/ckeditor/styles.js
 - lib/generators/tenon/i18n_migrations/i18n_migrations_generator.rb
 - lib/generators/tenon/i18n_migrations/templates/migration.rb
 - lib/generators/tenon/install/install_generator.rb