RubyGems - scrivito_sdk - Versions diffs - 0.40.0.rc1 → 0.40.0.rc2 - Mend

scrivito_sdk 0.40.0.rc1 → 0.40.0.rc2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

checksums.yaml +4 -4
data/README.md +14 -0
data/app/views/scrivito/objs/search.json.jbuilder +1 -1
data/app/views/scrivito/ui/index.html.erb +3 -2
data/config/ca-bundle.crt +1 -1
data/lib/assets/javascripts/scrivito_sdk.js +23 -7
data/lib/assets/javascripts/scrivito_ui.js +58 -16
data/lib/assets/stylesheets/scrivito_ui.css +2 -2
data/lib/generators/scrivito/install/install_generator.rb +6 -5
data/lib/generators/scrivito/install/templates/app/models/download.rb +5 -0
data/lib/generators/scrivito/install/templates/scrivito/migrate/install_scrivito_migration.rb +4 -0
data/lib/scrivito/content_conversion.rb +8 -3
data/lib/scrivito/type_computer.rb +4 -4
metadata +4 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8252a5e0d8e9065485321bf6b634ffd8b3cf7af5
-  data.tar.gz: c9dd3a959868293794361fbd0d03eac3fa7c5e2a
+  metadata.gz: 7498188dfcdfe0f66634fda2984b92bbf6385cfa
+  data.tar.gz: fe7358c377c964a4ca0e5f9240785ac2ab55b3c2
 SHA512:
-  metadata.gz: d22f78b19c0d6d92b6a7761dcd5915f2542e681ab155666d773a11edeadf264b8c690847d18f80f47141c91a211f68ee23908e6f3078f4b200531c038c145d99
-  data.tar.gz: f2d5bae0a15db0c9fa70ebc23cf0866b9c0b6156731312e3c97d440b7a85de0fdb93b81b6bc18a05ba75ed6d4c751e48cae4324b428bc8403e0995107822b7d2
+  metadata.gz: 691ab70b6dae7619714d36bbbfd82113b2f967f8bb5f410e685fff5d6d5de3cdeb9b1c35b9ef407c17a1a83ddb5de54a6e5fb46697307052b4cd3780f78304e4
+  data.tar.gz: adce3b4e426bd92db2057e60143a65b4b5953779d12f50a0cbcae67292bccde50f978771d42948df0581be1f77b9cd1b65e850d0c23aa738fe298f0f75c98dfc

data/README.md ADDED Viewed

@@ -0,0 +1,14 @@
+# Scrivito SDK
+[![Gem Version](https://badge.fury.io/rb/scrivito_sdk.png)](http://badge.fury.io/rb/scrivito_sdk)
+The Scrivito SDK makes CMS objects maintained by means of the cloud-based Scrivito CMS available
+to your Rails application. It offers easy-to-use functionality for rendering CMS content, doing
+searches, etc. For more information about Scrivito, please visit https://scrivito.com/.
+## License
+Copyright (c) 2009 - 2014 Infopark AG (http://www.infopark.com)
+This software can be used and modified under the LGPL-3.0. Please refer to
+http://www.gnu.org/licenses/lgpl-3.0.html for the license text.

data/app/views/scrivito/objs/search.json.jbuilder CHANGED Viewed

@@ -1,6 +1,6 @@
 json.total @enumerator.size
 json.hits do
   json.merge!(@enumerator.load_batch.map { |obj|
-    @formatter.call(obj, scrivito_user)
+    @formatter.call(obj, scrivito_user, controller.view_context)
   })
 end

data/app/views/scrivito/ui/index.html.erb CHANGED Viewed

@@ -7,7 +7,8 @@
   <%= stylesheet_link_tag 'scrivito_ui_extensions' %>
   <%= javascript_include_tag 'scrivito_ui_extensions' %>
 </head>
-<body>
-  <iframe name="scrivito_application" src="<%= @application_src %>">
+<body id="scrivito_ui">
+  <iframe name="scrivito_application" src="<%= @application_src %>"></iframe>
+  <%= scrivito_body_tags %>
 </body>
 </html>

data/config/ca-bundle.crt CHANGED Viewed

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Wed Jan 14 13:59:44 2015
+## Certificate data from Mozilla as of: Fri Jan 23 00:31:10 2015
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/assets/javascripts/scrivito_sdk.js CHANGED Viewed

@@ -2,29 +2,45 @@
   if (window.parent !== window) {
     var scrivito_ui = window.parent.scrivito;
     if (scrivito_ui) {
+      // In an iframe and parent window contains the UI: in UI mode.
       var cms_document = scrivito_ui.cms_element.from_dom_element($(document));
       cms_document.install_public_api();
       $(function() {
-        if (!scrivito_ui.is_inited()) {
-          var config = scrivito_ui.dom_config.read($('body'));
-          if (!config) {
-            $.error('Scrivito config missing. Did you forget to include scrivito_body_tags in layout?');
+        var dom_config = scrivito_ui.dom_config.read($('body'));
+        if (scrivito_ui.is_inited()) {
+          if (!dom_config) {
+            // UI is already running, but editing is not allowed: reload UI to make it disappear.
+            window.parent.location.reload();
+          }
+        } else {
+          if (!dom_config) {
+            // UI is not yet running and config is missing.
+            $.error('Missing Scrivito config. Did you forget to include scrivito_body_tags in layout?');
           }
-          scrivito_ui.init(config);
+          scrivito_ui.init(dom_config);
           scrivito_ui.gui.start();
+          if (window.parent.location.hash.length) {
+            location.hash = window.parent.location.hash;
+          }
         }
         cms_document.connect();
       });
     }
   } else  {
     $(function() {
-      if ($('*[data-scrivito-private-config]').length) {
+      // Not in UI mode, but editing is allowed: redirect to the UI mode.
+      if ($('[data-scrivito-private-config]').length) {
         console.log('Scrivito config found: redirecting to the UI...');
-        window.location = '/scrivito'+window.location.pathname;
+        window.location = '/scrivito' +
+          window.location.pathname +
+          window.location.search +
+          window.location.hash;
       }
     });
   }
+  // If the SDK is completely missing, the custom callbacks should nevertheless run.
   if (!window.scrivito) {
     window.scrivito = {
       on: function(event_name, callback) {

data/lib/assets/javascripts/scrivito_ui.js CHANGED Viewed

@@ -24398,6 +24398,7 @@ $.i18n().load({
   'commands.revert_obj.dialog.confirm': 'Verwerfen',
   'commands.revert_widget.title': 'Änderungen am Widget verwerfen',
+  'commands.revert_widget.rtc_workspace': 'Dieses Widget ist Teil der "rtc"-Arbeitskopie, bei der Änderungen an Widgets nicht verworfen werden können.',
   'commands.revert_widget.is_new': 'Dies ist ein neues Widget. Um die Erstellung dieses Widgets rückgängig zu machen, löschen Sie es bitte.',
   'commands.revert_widget.is_not_modified': 'Dieses Widget wurde nicht geändert. Daher gibt es nichts zu verwerfen.',
   'commands.revert_widget.dialog.title': 'Wirklich Änderungen an diesem Widget verwerfen?',
@@ -24612,6 +24613,7 @@ $.i18n().load({
   'commands.revert_obj.dialog.confirm': 'Discard',
   'commands.revert_widget.title': 'Discard changes to widget',
+  'commands.revert_widget.rtc_workspace': 'This widget is part of the "rtc" working copy, for which discarding changes to a widgets is not supported.',
   'commands.revert_widget.is_new': 'This is a new widget. To discard the creation of this widget, please delete it.',
   'commands.revert_widget.is_not_modified': 'This widget has not been modified. Therefore, nothing can be discarded.',
   'commands.revert_widget.dialog.title': 'Really discard changes to this widget?',
@@ -25120,7 +25122,7 @@ var scrivito = {};
   var reload = function(dom_element) {
     assert_valid_dom_element(dom_element);
     build_cms_element(dom_element);
-    dom_element.trigger('reload.scrivito');
+    $(dom_element).trigger('reload.scrivito');
   };
   $.extend(scrivito, {
@@ -25166,13 +25168,18 @@ var scrivito = {};
 }());
 (function() {
   _.extend(scrivito, {
-    url_update: function(source_window, target_window) {
-      if (source_window === target_window) { return; }
-      source_window.on('document', function(cms_document) {
-        var target_path = location.origin + '/scrivito' +
-          cms_document.browser_window().location.pathname +
-          cms_document.browser_window().location.search;
-        target_window.browser_window().history.replaceState({}, '', target_path);
+    url_update: function(application_cms_window, ui_cms_window) {
+      if (application_cms_window === ui_cms_window) { return; }
+      application_cms_window.on('document', function(application_document) {
+        var ui_window = ui_cms_window.browser_window();
+        var application_window = application_document.browser_window();
+        var ui_url = ui_window.location.origin + '/scrivito' +
+          application_window.location.pathname +
+          application_window.location.search +
+          application_window.location.hash;
+        ui_window.history.replaceState({}, '', ui_url);
       });
     }
   });
@@ -26435,7 +26442,7 @@ var scrivito = {};
     // PUBLIC
     _.extend(that, {
       install_public_api: function() {
-        local_$.fn.scrivito = scrivito.jquery_plugin;
+        local_$().fn.scrivito = scrivito.jquery_plugin;
         browser_window.scrivito = _.extend({}, additional_public_api, {
           on: local_on_function,
@@ -26486,7 +26493,7 @@ var scrivito = {};
       // return the given dom element using the local jQuery lib or the lib itself.
       local_jquery: function(element) {
-        return element ? local_$(element) : local_$;
+        return element ? local_$()(element) : local_$();
       },
       browser_window: function() {
@@ -26523,7 +26530,9 @@ var scrivito = {};
     var browser_window = browser_document.defaultView;
-    var local_$ = browser_window.jQuery;
+    var local_$ = function() {
+      return browser_window.jQuery;
+    };
     var connected = false;
     var load_callbacks = [];
@@ -28398,9 +28407,7 @@ var scrivito = {};
         scrivito.gui.on('document', function(cms_document) {
           var body = cms_document.dom_element().find('body');
-          body.on('reload.scrivito', function() {
-            cms_document.window().reload();
-          });
+          $(body).on('reload.scrivito', function() { cms_document.window().reload(); });
           // TODO: remove this in 1.0.0.
           cms_document.local_jquery(body).on('scrivito_reload', function() {
@@ -29373,6 +29380,9 @@ var scrivito = {};
         },
         disabled: function() {
+          if (scrivito.editing_context.selected_workspace.is_rtc()) {
+            return scrivito.t('commands.revert_widget.rtc_workspace');
+          }
           if (widget.is_new()) {
             return scrivito.i18n.translate('commands.revert_widget.is_new');
           }
@@ -29828,12 +29838,16 @@ var scrivito = {};
       return false;
     };
-    jquery_object.on('reload.scrivito', function() { activate(); });
+    $(jquery_object).on('reload.scrivito', function() {
+      activate();
+      return false;
+    });
     // TODO: remove this in 1.0.0.
     scrivito.cms_document.local_jquery(jquery_object).on('scrivito_reload', function() {
       scrivito.deprecation_warning('$.trigger("scrivito_reload")', '$.scrivito("reload")');
       activate();
+      return false;
     });
   };
 }());
@@ -30393,6 +30407,34 @@ var scrivito = {};
 (function() {
   $(function() {
-    scrivito.application_window = scrivito.cms_window.from($('iframe[name=scrivito_application]'));
+    var iframe = $('iframe[name=scrivito_application]');
+    scrivito.application_window = scrivito.cms_window.from(iframe);
+    // Fallback behavior in case that application window renders a page with no SDK, e.g. an error
+    // or a static page.
+    iframe.on('load', function() {
+      var has_config = !!scrivito.application_document().dom_element()
+        .find('[data-scrivito-private-config]').length;
+      var has_sdk = !!scrivito.application_window.browser_window().scrivito;
+      // The application window is completely missing the SDK and the config.
+      if (!has_config && !has_sdk) {
+        // Install jQuery in order to allow correct application document bootstrapping.
+        var browser_window = scrivito.application_window.browser_window();
+        if (!browser_window.jQuery) { browser_window.jQuery = jQuery; }
+        if (!browser_window.$) { browser_window.$ = $; }
+        // Bootstrap the application document.
+        var application_document = scrivito.application_document();
+        application_document.install_public_api();
+        if (!scrivito.is_inited()) {
+          // Start the UI if it is the first open, which responds with an error.
+          // Use the fallback config with no page context.
+          scrivito.init(scrivito.dom_config.read($('body')));
+          scrivito.gui.start();
+        }
+        application_document.connect();
+      }
+    });
   });
 }());

data/lib/assets/stylesheets/scrivito_ui.css CHANGED Viewed

@@ -3144,5 +3144,5 @@ html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
  */
-body { overflow: hidden }
-iframe[name=scrivito_application] { border: 0px; width: 100%; height: 100%; position: absolute; top: 45px; left: 0px; }
+body { overflow: hidden; position: fixed; margin: 0px; top: 45px; left: 0px; right: 0px; bottom: 0px; }
+iframe[name=scrivito_application] { border: 0px; width: 100%; height: 100%; position: absolute; top: 0px; left: 0px; }

data/lib/generators/scrivito/install/install_generator.rb CHANGED Viewed

@@ -31,7 +31,7 @@ module Scrivito
           File.join(Scrivito::Configuration.migration_path, 'install_scrivito_migration.rb')
       end
-      def copy_page_resources
+      def copy_page_files
         copy_file 'app/models/page.rb'
         copy_file 'app/controllers/page_controller.rb'
         copy_file 'app/views/page/details.html.erb'
@@ -39,23 +39,24 @@ module Scrivito
         copy_file 'app/views/page/thumbnail.html.erb'
       end
-      def copy_image_resources
+      def copy_resource_files
         copy_file 'app/models/image.rb'
+        copy_file 'app/models/download.rb'
       end
-      def copy_headline_widget_resources
+      def copy_headline_widget_files
         copy_file 'app/models/headline_widget.rb'
         copy_file 'app/views/headline_widget/show.html.erb'
         copy_file 'app/views/headline_widget/thumbnail.html.erb'
       end
-      def copy_text_widget_resources
+      def copy_text_widget_files
         copy_file 'app/models/text_widget.rb'
         copy_file 'app/views/text_widget/show.html.erb'
         copy_file 'app/views/text_widget/thumbnail.html.erb'
       end
-      def copy_image_widget_resources
+      def copy_image_widget_files
         copy_file 'app/models/image_widget.rb'
         copy_file 'app/views/image_widget/show.html.erb'
         copy_file 'app/views/image_widget/thumbnail.html.erb'

data/lib/generators/scrivito/install/templates/app/models/download.rb ADDED Viewed

@@ -0,0 +1,5 @@
+class Download < Obj
+  #
+  # Download (binary)
+  #
+end

data/lib/generators/scrivito/install/templates/scrivito/migrate/install_scrivito_migration.rb CHANGED Viewed

@@ -22,6 +22,10 @@ class InstallScrivitoMigration < Scrivito::Migration
       {name: 'image',  type: 'reference'}
     ])
+    Scrivito::ObjClass.create(name: 'Download', attributes:[
+      {name: 'blob', type: 'binary'},
+    ])
     Page.create(_path: '/', title: 'Welcome to Scrivito!', body: [
       HeadlineWidget.new(headline: 'A professional Cloud CMS built for Ruby on Rails.'),
       TextWidget.new(text: %{

data/lib/scrivito/content_conversion.rb CHANGED Viewed

@@ -33,14 +33,19 @@ module Scrivito
     end
     def self.convert_link(link_data, request_host, request_port)
-      if link_data && link_data.has_key?(:url)
+      return unless link_data
+      if url = link_data.delete(:url)
         link_data.delete(:obj_id)
-        url = link_data.delete(:url)
         link = Link.parse(url, request_host, request_port)
         link_data.merge!(link.to_cms_api_linklist_params)
       end
-      link_data
+      if obj_id = link_data.delete(:obj_id)
+        link_data.merge!(obj: Obj.find(obj_id))
+      end
+      Link.new(link_data)
     end
   end

data/lib/scrivito/type_computer.rb CHANGED Viewed

@@ -5,8 +5,8 @@ class TypeComputer
     @base_class, @fallback_class = base_class, fallback_class
   end
-  def compute_type(obj_class)
-    load_class(obj_class) || @fallback_class
+  def compute_type(obj_class_name)
+    load_class(obj_class_name) || @fallback_class
   end
   def special_class?(klass)
@@ -15,8 +15,8 @@ class TypeComputer
   private
-  def load_class(obj_class)
-    klass = obj_class.constantize
+  def load_class(obj_class_name)
+    klass = obj_class_name.constantize
     klass if inherits_from_base?(klass)
   rescue NameError
   end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 0.40.0.rc1
+  version: 0.40.0.rc2
 platform: ruby
 authors:
 - Infopark AG
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -157,6 +157,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .yardopts
+- README.md
 - app/controllers/scrivito/blobs_controller.rb
 - app/controllers/scrivito/default_cms_controller.rb
 - app/controllers/scrivito/objs_controller.rb
@@ -210,6 +211,7 @@ files:
 - lib/generators/scrivito/install/install_generator.rb
 - lib/generators/scrivito/install/templates/app/controllers/cms_controller.rb
 - lib/generators/scrivito/install/templates/app/controllers/page_controller.rb
+- lib/generators/scrivito/install/templates/app/models/download.rb
 - lib/generators/scrivito/install/templates/app/models/headline_widget.rb
 - lib/generators/scrivito/install/templates/app/models/image.rb
 - lib/generators/scrivito/install/templates/app/models/image_widget.rb