comfortable_mexican_sofa 1.4.8 → 1.4.9

data/VERSION

@@ -1 +1 @@
-1.4.8
+1.4.9

data/app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js

@@ -337,4 +337,86 @@ WYMeditor.editor.prototype.xhtml = function() {
   var reg = /(>)(<)(\/*)/g;
   html = html.replace(reg, '$1\r\n$2$3');
   return html;
-};
+};
+
+/**
+ * WYMeditor : what you see is What You Mean web-based editor
+ * Copyright (c) 2005 - 2009 Jean-Francois Hovinne, http://www.wymeditor.org/
+ * Dual licensed under the MIT (MIT-license.txt)
+ * and GPL (GPL-license.txt) licenses.
+ *
+ * For further information visit:
+ *        http://www.wymeditor.org/
+ *
+ * File Name:
+ *        jquery.wymeditor.embed.js
+ *        Experimental embed plugin
+ *
+ * File Authors:
+ *        Jonatan Lundin (jonatan.lundin a-t gmail dotcom)
+ *        Roger Hu (roger.hu a-t gmail dotcom)
+ *        Scott Nixon (citadelgrad a-t gmail dotcom)
+ */
+
+(function () {
+  function removeItem(item, arr) {
+    for (var i = arr.length; i--;) {
+      if (arr[i] === item) {
+        arr.splice(i, 1);
+      }
+    }
+    return arr;
+  }
+  if (WYMeditor && WYMeditor.XhtmlValidator._tags.param.attributes) {
+    
+    WYMeditor.XhtmlValidator._tags.embed = {
+      "attributes":[
+        "allowscriptaccess",
+        "allowfullscreen",
+        "height",
+        "src",
+        "type",
+        "width"
+      ]
+    };
+
+    WYMeditor.XhtmlValidator._tags.param.attributes = {
+      '0':'name',
+      '1':'type',
+      'valuetype':/^(data|ref|object)$/,
+      '2':'valuetype',
+      '3':'value'
+    };
+
+    WYMeditor.XhtmlValidator._tags.iframe = {
+      "attributes":[
+        "allowfullscreen",
+        "width",
+        "height",
+        "src",
+        "title",
+        "frameborder"
+      ]
+    };
+
+    // Override the XhtmlSaxListener to allow param, embed and iframe.
+    //
+    // We have to do an explicit override
+    // of the function instead of just changing the startup parameters
+    // because those are only used on creation, and changing them after
+    // the fact won't affect the existing XhtmlSaxListener
+    var XhtmlSaxListener = WYMeditor.XhtmlSaxListener;
+    WYMeditor.XhtmlSaxListener = function () {
+      var listener = XhtmlSaxListener.call(this);
+      // param, embed and iframe should be inline tags so that they can
+      // be nested inside other elements
+      removeItem('param', listener.block_tags);
+      listener.inline_tags.push('param');
+      listener.inline_tags.push('embed');
+      listener.inline_tags.push('iframe');
+      return listener;
+    };
+
+    WYMeditor.XhtmlSaxListener.prototype = XhtmlSaxListener.prototype;
+  }
+})();

data/app/controllers/cms_content_controller.rb

@@ -42,7 +42,9 @@ protected
     end
     
     if @cms_site
-      params[:cms_path].to_s.gsub!(/^#{@cms_site.path}/, '').gsub!(/^\//, '')
+      if params[:cms_path].present?
+        params[:cms_path].gsub!(/^#{@cms_site.path}/, '').gsub!(/^\//, '')
+      end
       I18n.locale = @cms_site.locale
     else
       I18n.locale = I18n.default_locale

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.8"
+  s.version = "1.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2011-09-05}
+  s.date = %q{2011-09-06}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/db/migrate/01_create_cms.rb

@@ -108,7 +108,6 @@ class CreateCms < ActiveRecord::Migration
     add_index :cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
       :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
       
-    ActiveRecord::Base.establish_connection
   end
   
   def self.down
@@ -125,6 +124,5 @@ class CreateCms < ActiveRecord::Migration
     drop_table :cms_categories
     drop_table :cms_categorizations
     
-    ActiveRecord::Base.establish_connection
   end
 end

data/db/migrate/upgrades/02_upgrade_to_1_1_0.rb

@@ -7,7 +7,6 @@ class UpgradeTo110 < ActiveRecord::Migration
     rename_column :cms_blocks,    :cms_page_id,   :page_id
     rename_column :cms_snippets,  :cms_site_id,   :site_id
     rename_column :cms_uploads,   :cms_site_id,   :site_id
-    ActiveRecord::Base.establish_connection
   end
 
   def self.down
@@ -18,6 +17,5 @@ class UpgradeTo110 < ActiveRecord::Migration
     rename_column :cms_layouts,   :site_id,   :cms_site_id
     rename_column :cms_pages,     :layout_id, :cms_layout_id
     rename_column :cms_pages,     :site_id,   :cms_site_id
-    ActiveRecord::Base.establish_connection
   end
 end

data/db/migrate/upgrades/03_upgrade_to_1_2_0.rb

@@ -8,12 +8,10 @@ class UpgradeTo120 < ActiveRecord::Migration
       t.datetime  :created_at
     end
     add_index :cms_revisions, [:record_type, :record_id, :created_at]
-    ActiveRecord::Base.establish_connection
   end
 
   def self.down
     ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     drop_table :cms_revisions
-    ActiveRecord::Base.establish_connection
   end
 end

data/db/migrate/upgrades/04_upgrade_to_1_3_0.rb

@@ -9,7 +9,6 @@ class UpgradeTo130 < ActiveRecord::Migration
     add_column :cms_layouts,  :is_shared, :boolean, :null => false, :default => false
     add_column :cms_pages,    :is_shared, :boolean, :null => false, :default => false
     add_column :cms_snippets, :is_shared, :boolean, :null => false, :default => false
-    ActiveRecord::Base.establish_connection
   end
 
   def self.down
@@ -22,6 +21,5 @@ class UpgradeTo130 < ActiveRecord::Migration
     remove_column :cms_layouts,   :is_shared
     remove_column :cms_pages,     :is_shared
     remove_column :cms_snippets,  :is_shared
-    ActiveRecord::Base.establish_connection
   end
 end

data/db/migrate/upgrades/05_upgrade_to_1_4_0.rb

@@ -20,7 +20,6 @@ class UpgradeTo140 < ActiveRecord::Migration
     end
     add_index :cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
       :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
-    ActiveRecord::Base.establish_connection
   end
   
   def self.down
@@ -32,6 +31,5 @@ class UpgradeTo140 < ActiveRecord::Migration
     
     drop_table :cms_categories
     drop_table :cms_categorizations
-    ActiveRecord::Base.establish_connection
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000 -04:00
+date: 2011-09-06 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70169043481960 !ruby/object:Gem::Requirement
+  requirement: &70300779511500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70169043481960
+  version_requirements: *70300779511500
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70169043481480 !ruby/object:Gem::Requirement
+  requirement: &70300779510480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70169043481480
+  version_requirements: *70300779510480
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70169043481000 !ruby/object:Gem::Requirement
+  requirement: &70300779509540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70169043481000
+  version_requirements: *70300779509540
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -347,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3607967943366637378
+      hash: 99875934053295203
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: