comfortable_mexican_sofa 1.2.5 → 1.2.6

data/app/assets/stylesheets/comfortable_mexican_sofa/widgets.css

@@ -0,0 +1,96 @@
+/* -- Dialog Box --------------------------------------------------------- */
+.ui-dialog {
+  border: 1px solid #252525;
+  border-radius: 5px;
+}
+#cms_dialog {
+  border: 5px solid #9f9f9f;
+  border-radius: 5px;
+  background-color: #d8d8d8;
+  padding: 15px;
+}
+.ui-widget-overlay {
+  position: absolute;
+  top: 0px;
+  background: rgba(0,0,0,0.4);
+}
+.ui-dialog-titlebar {
+  position: relative;
+  padding: 0px 5px;
+  margin-bottom: -5px;
+  background-color: #9F9F9F;
+  border-top-left-radius: 5px;
+  border-top-right-radius: 5px;
+}
+.ui-dialog-titlebar .ui-dialog-title {
+  font: 15px/25px Helvetica, Arial, sans-serif;
+  text-shadow: #252525 1px 1px;
+  color: #f1f1f1;
+}
+a.ui-dialog-titlebar-close {
+  position: absolute;
+  top: 4px;
+  right: 4px;
+}
+
+/* -- WYMeditor ---------------------------------------------------------- */
+.wym_box {
+  background: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px;
+}
+.wym_box .wym_toolbar {
+  overflow: hidden;
+  margin-bottom: 2px;
+}
+.wym_box .wym_toolbar .wym_toolbar_section li:last-child a {
+  margin-right: 10px;
+}
+.wym_box .wym_toolbar a {
+  display: block;
+  float: left;
+  margin-right: 2px;
+  height: 20px;
+  width: 20px;
+  background: #fff url(/assets/comfortable_mexican_sofa/wym_icons.png) no-repeat;
+  border: 1px solid #fff;
+  border-radius: 3px;
+  text-indent: -9999px;
+}
+.wym_box .wym_toolbar a:hover {
+  border: 1px solid #d8d8d8;
+}
+.wym_box .wym_toolbar li.wym_containers_h2 a  { background-position: -20px 0px }
+.wym_box .wym_toolbar li.wym_containers_h3 a  { background-position: -40px 0px }
+.wym_box .wym_toolbar li.wym_containers_p a   { background-position: -60px 0px }
+.wym_box .wym_toolbar li.wym_containers_pre a { background-position: -80px 0px }
+
+.wym_box .wym_toolbar li.wym_tools_strong a         { background-position: -100px 0px }
+.wym_box .wym_toolbar li.wym_tools_emphasis a       { background-position: -120px 0px }
+.wym_box .wym_toolbar li.wym_tools_ordered_list a   { background-position: -140px 0px }
+.wym_box .wym_toolbar li.wym_tools_unordered_list a { background-position: -160px 0px }
+.wym_box .wym_toolbar li.wym_tools_table a          { background-position: -180px 0px }
+.wym_box .wym_toolbar li.wym_tools_link a           { background-position: -200px 0px }
+.wym_box .wym_toolbar li.wym_tools_unlink a         { background-position: -220px 0px }
+.wym_box .wym_toolbar li.wym_tools_image a          { background-position: -240px 0px }
+.wym_box .wym_toolbar li.wym_tools_paste a          { background-position: -260px 0px }
+.wym_box .wym_toolbar li.wym_tools_html a           { background-position: -280px 0px }
+
+.wym_box .wym_toolbar li.wym_classes_align_left a    { background-position: -300px 0px }
+.wym_box .wym_toolbar li.wym_classes_align_center a  { background-position: -320px 0px }
+.wym_box .wym_toolbar li.wym_classes_align_right a   { background-position: -340px 0px }
+
+.wym_box .wym_html, 
+.wym_box .wym_iframe {
+  background: #fff;
+  border: 1px solid #d8d8d8;
+}
+.wym_box .wym_html {
+  margin-bottom: 5px;
+}
+.wym_box iframe {
+  display: block;
+  height: 350px;
+  width: 100%;
+  border: 0px;
+}

data/app/controllers/cms_admin/base_controller.rb

@@ -36,6 +36,8 @@ protected
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
     ComfortableMexicanSofa::Fixtures.import_all(@cms_site.hostname)
-    flash.now[:error] = 'CMS Fixtures are enabled. All changes done here will be discarded.'
+    if %w(cms_admin/layouts cms_admin/pages cms_admin/snippets).member?(params[:controller])
+      flash.now[:error] = 'CMS Fixtures are enabled. All changes done here will be discarded.'
+    end
   end
 end

data/app/views/cms_admin/layouts/_form.html.erb

@@ -12,8 +12,8 @@
 <% end %>
 
 <%= form.text_area :content, :class => 'code' %>
-<%= form.text_area :css, :class => 'code_css' %>
-<%= form.text_area :js, :class => 'code_js' %>
+<%= form.text_area :css, :class => 'code css' %>
+<%= form.text_area :js, :class => 'code js' %>
 
 <%= form.simple_field nil, nil, :class => 'submit_element' do %>
   <%= form.submit @cms_layout.new_record?? 'Create Layout' : 'Update Layout', :disable_builder => true %>

data/app/views/cms_admin/pages/_form.html.erb

@@ -33,5 +33,5 @@
   <%= form.check_box :is_published, :disable_builder => true %>
   <%= form.label_for :is_published, :label => 'Published' %>
   <%= form.submit 'Preview', :name => 'preview', :id => nil, :disable_builder => true %>
-  <%= form.submit @cms_page.new_record? ? 'Create Page' : 'Update Page', :disable_builder => true %>
+  <%= form.submit @cms_page.new_record? ? 'Create Page' : 'Update Page', :id => 'cms_page_submit', :disable_builder => true %>
 <% end %>

data/app/views/layouts/cms_admin/_head.html.erb

@@ -3,10 +3,37 @@
   <title><%= ComfortableMexicanSofa.config.cms_title %></title>
   <%= csrf_meta_tag %>
   <meta name="cms-admin-path" content="<%= ComfortableMexicanSofa.config.admin_route_prefix %>" />
-  <%= stylesheet_link_tag :cms, :cache => ('_cms' if ComfortableMexicanSofa.config.enable_caching) %>
-  <%= javascript_include_tag :cms, :cache => ('_cms' if ComfortableMexicanSofa.config.enable_caching) %>
-  <%= javascript_include_tag :tiny_mce %>
-
+  
+  <% if ComfortableMexicanSofa.asset_pipeline_enabled? %>
+    
+    <%= stylesheet_link_tag 'comfortable_mexican_sofa/application' %>
+    <%= javascript_include_tag 'comfortable_mexican_sofa/application' %>
+    <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack.js' %>
+    <%= javascript_include_tag 'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js' %>
+    <%= javascript_include_tag 'comfortable_mexican_sofa/plupload/plupload.js' %>
+    <%= javascript_include_tag 'comfortable_mexican_sofa/plupload/plupload.html5.js' %>
+    
+  <% else %>
+    
+    <%= stylesheet_link_tag 'comfortable_mexican_sofa/reset',
+                            'comfortable_mexican_sofa/structure',
+                            'comfortable_mexican_sofa/typography',
+                            'comfortable_mexican_sofa/form',
+                            'comfortable_mexican_sofa/content',
+                            'comfortable_mexican_sofa/widgets',
+                            'comfortable_mexican_sofa/codemirror' %>
+    <%= javascript_include_tag  'comfortable_mexican_sofa/jquery',
+                                'comfortable_mexican_sofa/jquery_ui',
+                                'comfortable_mexican_sofa/rails',
+                                'comfortable_mexican_sofa/codemirror/codemirror',
+                                'comfortable_mexican_sofa/plupload/plupload',
+                                'comfortable_mexican_sofa/plupload/plupload.html5',
+                                'comfortable_mexican_sofa/application' %>
+    <%= javascript_include_tag  'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack',
+                                'comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms' %>
+                                
+  <% end %>
+  
   <%= yield :head %>
   <%= cms_hook :html_head %>
-</head>
+</head>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.2.5"
+  s.version = "1.2.6"
 
   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-05-30}
+  s.date = %q{2011-06-03}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -23,6 +23,66 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "app/assets/images/comfortable_mexican_sofa/arrow_bottom.gif",
+    "app/assets/images/comfortable_mexican_sofa/arrow_right.gif",
+    "app/assets/images/comfortable_mexican_sofa/icon_layout.gif",
+    "app/assets/images/comfortable_mexican_sofa/icon_move.gif",
+    "app/assets/images/comfortable_mexican_sofa/icon_regular.gif",
+    "app/assets/images/comfortable_mexican_sofa/icon_snippet.gif",
+    "app/assets/images/comfortable_mexican_sofa/wym_icons.png",
+    "app/assets/javascripts/comfortable_mexican_sofa/application.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/jquery.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/jquery_ui.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/plupload/plupload.html5.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/plupload/plupload.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/rails.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-blockquote.png",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h1.png",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h2.png",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h3.png",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h4.png",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h5.png",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-h6.png",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-p.png",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/lbl-pre.png",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.css",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.html",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.pack.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/bg.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/ca.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/cs.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/cy.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/de.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/en.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/es.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/fa.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/fi.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/fr.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/gl.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/he.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/hr.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/hu.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/it.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/nb.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/nl.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/nn.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/pl.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/pt-br.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/pt.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/ru.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/sv.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/tr.js",
+    "app/assets/javascripts/comfortable_mexican_sofa/wymeditor/lang/zh_cn.js",
+    "app/assets/stylesheets/comfortable_mexican_sofa/application.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/codemirror.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/content.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/form.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/reset.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/structure.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/typography.css",
+    "app/assets/stylesheets/comfortable_mexican_sofa/widgets.css",
     "app/controllers/application_controller.rb",
     "app/controllers/cms_admin/base_controller.rb",
     "app/controllers/cms_admin/layouts_controller.rb",
@@ -110,6 +170,7 @@ Gem::Specification.new do |s|
     "lib/comfortable_mexican_sofa/configuration.rb",
     "lib/comfortable_mexican_sofa/controller_methods.rb",
     "lib/comfortable_mexican_sofa/engine.rb",
+    "lib/comfortable_mexican_sofa/error.rb",
     "lib/comfortable_mexican_sofa/fixtures.rb",
     "lib/comfortable_mexican_sofa/form_builder.rb",
     "lib/comfortable_mexican_sofa/has_revisions.rb",
@@ -135,82 +196,10 @@ Gem::Specification.new do |s|
     "lib/generators/README",
     "lib/generators/cms_generator.rb",
     "lib/tasks/comfortable_mexican_sofa.rake",
-    "public/404.html",
     "public/422.html",
     "public/500.html",
     "public/favicon.ico",
-    "public/images/comfortable_mexican_sofa/arrow_bottom.gif",
-    "public/images/comfortable_mexican_sofa/arrow_right.gif",
-    "public/images/comfortable_mexican_sofa/icon_layout.gif",
-    "public/images/comfortable_mexican_sofa/icon_move.gif",
-    "public/images/comfortable_mexican_sofa/icon_regular.gif",
-    "public/images/comfortable_mexican_sofa/icon_snippet.gif",
-    "public/javascripts/comfortable_mexican_sofa/cms.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/codemirror.css",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/codemirror.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/codemirror_base.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_css.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_html_mixed.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_js.js",
-    "public/javascripts/comfortable_mexican_sofa/codemirror/parse_xml.js",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-icons_222222_256x240.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-icons_2e83ff_256x240.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-icons_454545_256x240.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-icons_888888_256x240.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/images/ui-icons_cd0a0a_256x240.png",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui.css",
-    "public/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui.js",
-    "public/javascripts/comfortable_mexican_sofa/jquery.js",
-    "public/javascripts/comfortable_mexican_sofa/plupload/plupload.full.min.js",
-    "public/javascripts/comfortable_mexican_sofa/plupload/plupload.html5.min.js",
-    "public/javascripts/comfortable_mexican_sofa/plupload/plupload.min.js",
-    "public/javascripts/comfortable_mexican_sofa/rails.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/jquery.tinymce.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/langs/en.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/about.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/anchor.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/charmap.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/color_picker.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/editor_template.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/image.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/img/colorpicker.jpg",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/img/icons.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/about.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/anchor.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/charmap.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/color_picker.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/image.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/link.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/js/source_editor.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/langs/en.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/langs/en_dlg.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/link.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/content.css",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/dialog.css",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/buttons.png",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/items.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/menu_check.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/progress.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/img/tabs.gif",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/ui.css",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/source_editor.htm",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/tiny_mce.js",
-    "public/javascripts/comfortable_mexican_sofa/tiny_mce/tiny_mce_popup.js",
     "public/robots.txt",
-    "public/stylesheets/comfortable_mexican_sofa/content.css",
-    "public/stylesheets/comfortable_mexican_sofa/form.css",
-    "public/stylesheets/comfortable_mexican_sofa/reset.css",
-    "public/stylesheets/comfortable_mexican_sofa/structure.css",
-    "public/stylesheets/comfortable_mexican_sofa/typography.css",
     "script/rails",
     "test/fixtures/cms/blocks.yml",
     "test/fixtures/cms/layouts.yml",
@@ -274,18 +263,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<active_link_to>, [">= 0.0.7"])
-      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.8"])
+      s.add_runtime_dependency(%q<paperclip>, [">= 2.3.11"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<active_link_to>, [">= 0.0.7"])
-      s.add_dependency(%q<paperclip>, [">= 2.3.8"])
+      s.add_dependency(%q<paperclip>, [">= 2.3.11"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<active_link_to>, [">= 0.0.7"])
-    s.add_dependency(%q<paperclip>, [">= 2.3.8"])
+    s.add_dependency(%q<paperclip>, [">= 2.3.11"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end

data/config/application.rb

@@ -41,6 +41,11 @@ module ComfortableMexicanSofa
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
     
+    # Enable the asset pipeline
+    if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
+      config.assets.enabled = true
+    end
+    
     config.session_store :cookie_store, :key => '_comfortable_mexican_sofa_session'
     config.secret_token = 'e0fef4ab56c1cacd8845864fe2cb2a27f5caad72823419f87b2774785187090a654b83229bf9cef70ce475a83bfa561dbbaa2015788181ea837c456964c1e0f6'
     

data/config/environments/development.rb

@@ -1,9 +1,9 @@
 defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -19,4 +18,8 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
 end
+

data/config/environments/production.rb

@@ -1,7 +1,6 @@
 defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb
 
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -9,14 +8,19 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
 
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+  # Compress both stylesheets and JavaScripts
+  config.assets.js_compressor  = :uglifier
+  config.assets.css_compressor = :scss
+
+  # Specifies the header that your server uses for sending files
+  # (comment out if your front-end server doesn't support this)
+  config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
 
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
 
   # See everything in the log (default is :info)
   # config.log_level = :debug
@@ -27,13 +31,12 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 

data/config/environments/test.rb

@@ -1,5 +1,5 @@
 defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Application.configure do
-  # Settings specified here will take precedence over those in config/environment.rb
+  # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
   # test suite.  You never need to work with it otherwise.  Remember that
@@ -7,7 +7,11 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
 
   # Show full error reports and disable caching

data/lib/comfortable_mexican_sofa/controller_methods.rb

@@ -8,7 +8,7 @@ module ComfortableMexicanSofa::ControllerMethods
     base.rescue_from 'ActionView::MissingTemplate' do |e|
       begin
         render :cms_page => request.path
-      rescue ActionView::MissingTemplate
+      rescue ComfortableMexicanSofa::MissingPage
         raise e
       end
     end
@@ -29,7 +29,7 @@ module ComfortableMexicanSofa::ControllerMethods
           @cms_page = page
           super(options, locals, &block)
         else
-          raise ActionView::MissingTemplate.new([path], path, "CMS page not found", nil)
+          raise ComfortableMexicanSofa::MissingPage.new(path)
         end
       else
         super(options, locals, &block)

data/lib/comfortable_mexican_sofa/error.rb

@@ -0,0 +1,11 @@
+module ComfortableMexicanSofa
+  
+  class Error < StandardError
+  end
+  
+  class MissingPage < ComfortableMexicanSofa::Error
+    def initialize(path)
+      super "Cannot find CMS page at #{path}"
+    end
+  end
+end

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -16,7 +16,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   end
   
   def default_field(type, field, options = {}, &block)
-    errors = if object.errors[field].present?
+    errors = if object.respond_to?(:errors) && object.errors[field].present?
       "<div class='errors'>#{[object.errors[field]].flatten.first}</div>"
     end
     if desc = options.delete(:desc)

data/lib/comfortable_mexican_sofa/is_mirrored.rb

@@ -42,17 +42,17 @@ module ComfortableMexicanSofa::IsMirrored
         when Cms::Layout
           m = site.layouts.find_by_slug(self.slug_was || self.slug) || site.layouts.new
           m.attributes = {
-            :slug   => self.slug,
-            :parent => site.layouts.find_by_slug(self.parent.try(:slug))
+            :slug       => self.slug,
+            :parent_id  => site.layouts.find_by_slug(self.parent.try(:slug)).try(:id)
           }
           m
         when Cms::Page
           m = site.pages.find_by_full_path(self.full_path_was || self.full_path) || site.pages.new
           m.attributes = {
-            :slug   => self.slug,
-            :label  => self.slug.blank?? self.label : m.label,
-            :parent => site.pages.find_by_full_path(self.parent.try(:full_path)),
-            :layout => site.layouts.find_by_slug(self.layout.slug)
+            :slug       => self.slug,
+            :label      => self.slug.blank?? self.label : m.label,
+            :parent_id  => site.pages.find_by_full_path(self.parent.try(:full_path)).try(:id),
+            :layout     => site.layouts.find_by_slug(self.layout.slug)
           }
           m
         when Cms::Snippet

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -40,26 +40,3 @@ module ComfortableMexicanSofa::ViewMethods
 end
 
 ActionView::Base.send :include, ComfortableMexicanSofa::ViewMethods
-
-ActionView::Helpers::AssetTagHelper.register_javascript_expansion :cms => [
-  'comfortable_mexican_sofa/jquery',
-  'comfortable_mexican_sofa/jquery-ui/jquery-ui',
-  'comfortable_mexican_sofa/rails',
-  'comfortable_mexican_sofa/plupload/plupload.min',
-  'comfortable_mexican_sofa/plupload/plupload.html5.min',
-  'comfortable_mexican_sofa/codemirror/codemirror.js',
-  'comfortable_mexican_sofa/cms'
-]
-ActionView::Helpers::AssetTagHelper.register_javascript_expansion :tiny_mce => [
-  'comfortable_mexican_sofa/tiny_mce/tiny_mce',
-  'comfortable_mexican_sofa/tiny_mce/jquery.tinymce'
-]
-
-ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :cms => [
-  'comfortable_mexican_sofa/reset',
-  'comfortable_mexican_sofa/structure',
-  'comfortable_mexican_sofa/typography',
-  'comfortable_mexican_sofa/form',
-  'comfortable_mexican_sofa/content',
-  '/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui'
-]

data/lib/comfortable_mexican_sofa.rb

@@ -4,6 +4,7 @@ unless defined? ComfortableMexicanSofa::Application
 end
 
 [ 'comfortable_mexican_sofa/version',
+  'comfortable_mexican_sofa/error',
   'comfortable_mexican_sofa/configuration',
   'comfortable_mexican_sofa/http_auth',
   'comfortable_mexican_sofa/rails_extensions',
@@ -42,5 +43,10 @@ module ComfortableMexicanSofa
     end
     alias :config :configuration
     
+    # Checking if Rails3.1+ asset pipeline is enabled
+    def asset_pipeline_enabled?
+      Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1 && Rails.configuration.assets.enabled
+    end
+    
   end
 end

data/lib/generators/cms_generator.rb

@@ -23,14 +23,15 @@ class CmsGenerator < Rails::Generators::Base
   end
   
   def generate_public_assets
-    assets_dir = if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1 && Rails.configuration.assets.enabled
-      'app/assets'
-    else
-      'public'
-    end
-    directory 'public/stylesheets/comfortable_mexican_sofa', "#{assets_dir}/stylesheets/comfortable_mexican_sofa"
-    directory 'public/javascripts/comfortable_mexican_sofa', "#{assets_dir}/javascripts/comfortable_mexican_sofa"
-    directory 'public/images/comfortable_mexican_sofa', "#{assets_dir}/images/comfortable_mexican_sofa"
+    return if ComfortableMexicanSofa.asset_pipeline_enabled?
+    directory 'app/assets/stylesheets/comfortable_mexican_sofa',  'public/stylesheets/comfortable_mexican_sofa'
+    directory 'app/assets/javascripts/comfortable_mexican_sofa',  'public/javascripts/comfortable_mexican_sofa'
+    directory 'app/assets/images/comfortable_mexican_sofa',       'public/images/comfortable_mexican_sofa'
+    
+    gsub_file 'public/stylesheets/comfortable_mexican_sofa/content.css',
+      '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
+    gsub_file 'public/stylesheets/comfortable_mexican_sofa/widgets.css',
+      '/assets/comfortable_mexican_sofa/', '/images/comfortable_mexican_sofa/'
   end
   
   def generate_cms_seeds

data/test/integration/render_cms_test.rb

@@ -59,7 +59,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     page = cms_pages(:child)
     page.slug = 'render-explicit-404'
     page.save!
-    assert_exception_raised ActionView::MissingTemplate do
+    assert_exception_raised ComfortableMexicanSofa::MissingPage do
       get '/render-explicit'
     end
   end
@@ -70,6 +70,7 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
   end
   
   def test_get_render_update
+    return 'Not supported >= 3.1' if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
     get '/render-update'
     assert_response :success
   end