imagine_cms 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56cac83570e5d82ba00864a4fb5c011224a2be35
-  data.tar.gz: bf841b79fe81a80b32aab3a47eeb68fbc083a6bc
+  metadata.gz: bbb42b1861f2db7db2704b150934135fa51145c4
+  data.tar.gz: 6ec23d6cbea4d1635c872100e0aeaaf0e1d48ae5
 SHA512:
-  metadata.gz: d508180c42dae4b31ae251f739f15d9348c2218dffd8163b35c83f6aa19e76a4a7a30ee5ebc524c495c8688847b89a7e0c94011ef02577f95e23a39445ce7a03
-  data.tar.gz: 803ef4f9137779889c391d403ca5d7b493c48aff6c4bce318c13f553c7cad4b48d80f26643d41e8ef9ebc50edbd26687a0829ba187ef1fd3bd25f4a127a5717a
+  metadata.gz: 2bea586993f3de37aa8f9a86661a6c0ffeace09e7377d81a8644e64c61f8f5de778af287b89e237791e12c04948db33b2b36ee78299cf0f0e17da2eb03b0779f
+  data.tar.gz: 7999134849b43caa223e14644b05afb4d9228ab1c12ecdc98f917f9d731f96305e7eee6dde46fc3af11c41067f0d599bf0823724bbeebc673ef3b4d71b99af38

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.3
+2.1.5

data/README.rdoc

@@ -14,9 +14,10 @@ All that is now firmly in the past. By extracting Imagine functionality into a g
 
 * Imagine 3.0 (Rails 3.2, Ruby 1.9): [DONE] 90% restored functionality, no database changes.
 * Imagine 3.1 (Rails 3.2, Ruby 1.9/2.0): [DONE, but released as 3.0.x] 100% restored functionality, plus a few extras and fixes.
-* Imagine 4.0 (Rails 4.x, Ruby 2.1): [IN PROGRESS] Compatibility with Rails 4.0, 4.1, 4.2
-* Imagine 4.1 (Rails 4.x, Ruby 2.1): [PLANNED, Late 2014] Switch to a cross-browser editor
-* Imagine 5.0 (Rails 5.0, Ruby 2.2): [PLANNED, Early 2015] Compatibility with Rails 5.0
+* Imagine 4.0 (Rails 4.0, Ruby 2.1): [DONE] Compatibility with Rails 4.0
+* Imagine 4.1 (Rails 4.1, Ruby 2.1): [DONE]
+* Imagine 4.2 (Rails 4.2, Ruby 2.1): [in progress on master]
+* Imagine 5.0 (Rails 5.0, Ruby 2.2): [PLANNED, Mid 2015] Compatibility with Rails 5.0, switch to a cross-browser editor
 
 In the future, there are plans to:
 * refactor & rewrite the worst parts (substitutions, galleries)
@@ -30,11 +31,11 @@ However, this will probably require forking off a separate project (imagine_cms_
 
 =Current Status
 
-Imagine 3.0 is ready for production use (v3.0-stable branch).
+Imagine 4.0 is ready for production use (v4.0-stable branch). Imagine 3 is also available for apps tied to Rails 3.2 (v3.0-stable branch).
 
-Imagine 4.0 is in progress on master.
+Imagine 4.1 is in progress on master.
 
-One major feature is still missing: browser-based editing of view layouts and stylesheets. While convenient, this was probably not ever a good idea, so I'm working on a better solution. We've also added a new feature, uploaded images and files can be stored on S3 (galleries still live on the local disk, so in a multiple app server setup, a shared filesystem is required).
+One major feature from the old days is still missing: browser-based editing of view layouts and stylesheets. While convenient, this was probably not ever a good idea, so we're working on a better solution. We've also added a new feature, uploaded images and files can be stored on S3 (galleries still live on the local disk, so in a multiple app server setup, a shared filesystem is required).
 
 Unless you are already familiar with Imagine and/or interested in contributing to development, this project is not suitable for wider use just yet. Why? Well, the purpose of the Imagine gem at this point is strictly to upgrade legacy sites to modern versions of Rails as simply as possible. Until imagine_cms_classic is forked, this project will be held back by its need to remain compatible with legacy installations dating back to 2006. The ERB templating language can be dangerous (it allows all Ruby, including shell escapes), and the editor (powered by an ancient version of Dojo) is still Firefox-only. It also uses Prototype, which has become a bit unfashionable these days.
 
@@ -42,7 +43,7 @@ If we can make a clean break from all of these "traditions," that will be a good
 
 =Hosting
 
-Imagine can run on most "standard" Rails hosting platforms, anything that uses Passenger, Unicorn, etc. On hosts that don't allow (or recommend) writing to the local filesystem (e.g. Heroku) you won't be able to use photo galleries or page caching, but other features should work (this has not been tested).
+Imagine can run on most "standard" Rails hosting platforms, anything that uses Passenger, Unicorn, etc. On hosts that don't allow (or recommend) writing to the local filesystem (e.g. Heroku) you won't be able to use photo galleries or page caching, but other features should work (note: this has not been tested).
 
 =Getting Help
 

data/app/assets/javascripts/imagine.js

@@ -826,9 +826,10 @@ function scanForPageObjects(page_id, parent_key, version) {
     found = [];
     
     var regex = /<%=\s*insert_object\(?\s*['"]([-\w\s\d]+)['"],\s*:(\w+)\s*(.*?)\)?\s*%>/gm;
-    var matches = $A($('page_objects_' + parent_key).value.match(regex));
+    if (!$('page_objects_' + parent_key).value) return;
     
-    matches.each(function (match) {
+    var matches = $('page_objects_' + parent_key).value.match(regex);
+    $A(matches).each(function (match) {
         // regex2 should be exactly the same as regex. Global regexes have a lastIndex which is not reset.
         var regex2 = /<%=\s*insert_object\(?\s*['"]([-\w\s\d]+)['"],\s*:(\w+)\s*(.*?)\)?\s*%>/gm;
         if (regex2.test(match)) {