forge-cli 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 93164ce3ded841c7e1386103fdafe25682b7a2e2
+  data.tar.gz: 9d915a573f35fec067b6ca3ebe472c2e22f776bf
+SHA512:
+  metadata.gz: 9fedc0a81b91b7332ef5c28a43bae50d195c4eba255e30d0f4c793d928120bc7933a856f8dd2002f1c5dabd857c2eb41ddf567d3be75d5337c0527cfa5f39653
+  data.tar.gz: ac85e5eeffc9069a8af2e23d055439d2bd42af70969df7b95d0ebe1f8e6dc46f81f503ab7d9a9a4402d296f438ef04453d64e23d29e20040afaaf14815998bc6

data/lib/forge-cli/modules/base/manifest.yml

@@ -117,11 +117,11 @@ files:
   # Assets
   - 'app/assets'
   - 'lib/assets'
-  - 'public/javascripts/ckeditor'
   - 'public/404.html'
   - 'public/500.html'
   - 'public/pixel.gif'
   - 'public/flash'
+  - 'public/images'
   - 'vendor/assets/images/fancybox'
   - 'vendor/assets/javascripts'
   - 'vendor/assets/stylesheets/fancybox.css.scss'

data/lib/forge-cli/modules/base/routes.rb

@@ -11,6 +11,6 @@ devise_scope :user do
 end
 
 match "/sitemap", :controller => 'index', :action => 'sitemap', :via => :get
-match '/pages/preview', :controller => 'pages', :action => 'preview', :via => :get
+match '/pages/preview', :controller => 'pages', :action => 'preview', :via => [:post, :patch]
 match '*slugs', :controller => 'pages', :action => 'show', :via => :get
 root :to => "index#index"

data/lib/forge-cli/modules/posts/routes.rb

@@ -3,7 +3,9 @@
 ##############
 resources :posts, :only => [:index, :show] do
   collection do
-    get :preview, :feed
+    get   :feed
+    patch :preview
+    post  :preview
   end
   member do
     get :category

data/lib/forge-cli/version.rb

@@ -1,3 +1,3 @@
 class ForgeCLI
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/forge/Gemfile

@@ -4,6 +4,7 @@ source "https://rubygems.org"
 gem 'forge-rad20', :require => 'forge-rad', :git => "git@github.com:factore/forge-rad20.git"
 
 # Extra Plugins
+gem 'ckeditor', :git => "git@github.com:adriand/ckeditor.git"
 gem 'exception_notification', :require => 'exception_notifier'
 gem 'launchy'
 gem 'nokogiri', '1.5.10'

data/lib/forge/app/assets/javascripts/ckeditor/config.js

@@ -0,0 +1,35 @@
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+CKEDITOR.editorConfig = function( config )
+{
+  config.PreserveSessionOnFileBrowser = true;
+  // Define changes to default configuration here. For example:
+  config.language = 'en';
+
+  config.height = '400px';
+
+  // remove collapsible toolbars so that it fits on one line
+  config.toolbarCanCollapse = false;
+
+  // allow all content
+  config.allowedContent = true;
+
+  // works only with en, ru, uk languages
+  config.extraPlugins = "mediaembed,forge_assets";
+  config.removePlugins = 'iframe'; // otherwise, instead of a youtube video (for example) in the content, you get an iframe block
+
+  config.toolbar = 'Basic';
+  config.toolbar_Basic =
+    [
+      ['Bold','Italic','Underline','Strike','TextColor'],
+      ['BulletedList', 'NumberedList', 'Blockquote'],
+      ['Format','RemoveFormat'],
+      ['Table','HorizontalRule'],
+      ['Maximize'],
+      ['PasteText', 'ForgeAssets','Link','Unlink','MediaEmbed'],
+      ['Source']
+    ];
+};

data/lib/forge/{public → app/assets}/javascripts/ckeditor/plugins/forge_assets/plugin.js

@@ -4,7 +4,7 @@ CKEDITOR.plugins.add('forge_assets', {
     editor.ui.addButton('ForgeAssets', {
       label: 'Add Images or Documents',
       click: function() { FORGE.assetDrawer.load(editor); },
-      icon: '/javascripts/ckeditor/images/image_new.gif'
+      icon: '/images/image_new.png'
     });
   }
-});
+});

data/lib/forge/app/assets/javascripts/ckeditor/plugins/mediaembed/plugin.js

@@ -0,0 +1,64 @@
+/*
+* Embed Media Dialog based on http://www.fluidbyte.net/embed-youtube-vimeo-etc-into-ckeditor
+*
+* Plugin name:      mediaembed
+* Menu button name: MediaEmbed
+*
+* Youtube Editor Icon
+* http://paulrobertlloyd.com/
+*
+* @author Fabian Vogelsteller [frozeman.de]
+* @version 0.5
+*/
+( function() {
+    CKEDITOR.plugins.add( 'mediaembed',
+    {
+        icons: 'mediaembed', // %REMOVE_LINE_CORE%
+        hidpi: true, // %REMOVE_LINE_CORE%
+        init: function( editor )
+        {
+           var me = this;
+           CKEDITOR.dialog.add( 'MediaEmbedDialog', function (instance)
+           {
+              return {
+                 title : 'Embed Media',
+                 minWidth : 550,
+                 minHeight : 200,
+                 contents :
+                       [
+                          {
+                             id : 'iframe',
+                             expand : true,
+                             elements :[{
+                                id : 'embedArea',
+                                type : 'textarea',
+                                label : 'Paste Embed Code Here',
+                                'autofocus':'autofocus',
+                                setup: function(element){
+                                },
+                                commit: function(element){
+                                }
+                              }]
+                          }
+                       ],
+                  onOk: function() {
+                        var div = instance.document.createElement('div');
+                        div.setHtml(this.getContentElement('iframe', 'embedArea').getValue());
+                        instance.insertElement(div);
+                  }
+              };
+           } );
+
+            editor.addCommand( 'MediaEmbed', new CKEDITOR.dialogCommand( 'MediaEmbedDialog',
+                { allowedContent: 'iframe[*]' }
+            ) );
+
+            editor.ui.addButton( 'MediaEmbed',
+            {
+                label: 'Embed Media',
+                command: 'MediaEmbed',
+                toolbar: 'mediaembed'
+            } );
+        }
+    } );
+} )();

data/lib/forge/app/models/asset.rb

@@ -25,7 +25,8 @@ class Asset < ActiveRecord::Base
   end
 
   def dimensions(style = :original)
-    Paperclip::Geometry.from_file(self.attachment.to_file(style)).to_s.split('x')
+    file = Paperclip.io_adapters.for(attachment.styles[style])
+    Paperclip::Geometry.from_file(file).to_s.split('x')
   end
 
   def self.for_drawer(params)