comfortable_mexican_sofa 1.2.2 → 1.2.3

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

data/app/controllers/cms_admin/base_controller.rb

@@ -6,7 +6,8 @@ class CmsAdmin::BaseController < ApplicationController
   include ComfortableMexicanSofa.config.authentication.to_s.constantize
   
   before_filter :authenticate,
-                :load_admin_cms_site
+                :load_admin_cms_site,
+                :load_fixtures
   
   layout 'cms_admin'
   
@@ -31,4 +32,10 @@ protected
       return redirect_to(cms_admin_sites_path)
     end
   end
+  
+  def load_fixtures
+    return unless ComfortableMexicanSofa.config.enable_fixtures
+    ComfortableMexicanSofa::Fixtures.sync(@cms_site)
+    flash.now[:error] = 'CMS Fixtures are enabled. All changes done here will be discarded.'
+  end
 end

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

@@ -2,10 +2,11 @@
   <meta http-equiv="Content-type" content="text/html; charset=utf-8">
   <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 %>
 
   <%= 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.2"
+  s.version = "1.2.3"
 
   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-13}
+  s.date = %q{2011-05-16}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [

data/config/initializers/comfortable_mexican_sofa.rb

@@ -1,10 +1,10 @@
 ComfortableMexicanSofa.configure do |config|
   # Title of the admin area
-  config.cms_title      = 'ComfortableMexicanSofa MicroCMS'
+  #   config.cms_title = 'ComfortableMexicanSofa MicroCMS'
   
   # Module responsible for authentication. You can replace it with your own.
   # It simply needs to have #authenticate method. See http_auth.rb for reference.
-  config.authentication = 'ComfortableMexicanSofa::HttpAuth'
+  #   config.authentication = 'ComfortableMexicanSofa::HttpAuth'
   
   # Default url to access admin area is http://yourhost/cms-admin/ 
   # You can change 'cms-admin' to 'admin', for example. To disable admin area
@@ -55,6 +55,7 @@ ComfortableMexicanSofa.configure do |config|
 end
 
 # Default credentials for ComfortableMexicanSofa::HttpAuth
+# YOU REALLY WANT TO CHANGE THIS BEFORE PUTTING YOUR SITE LIVE
 ComfortableMexicanSofa::HttpAuth.username = 'username'
 ComfortableMexicanSofa::HttpAuth.password = 'password'
 

data/config/initializers/paperclip.rb

@@ -1,3 +1,3 @@
 Paperclip.options[:command_path] = case Rails.env
-  when 'development' then "/opt/local/bin"  
+  when 'development' then "/usr/local/bin"  
 end

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -80,8 +80,7 @@ module ComfortableMexicanSofa::Fixtures
         end
       elsif page.new_record?
         page.label = slug.titleize
-        page.layout = site.layouts.find_by_slug(attributes[:layout]) || parent.try(:layout)
-        
+        page.layout = parent.try(:layout)
       end
       
       # updating content

data/public/javascripts/comfortable_mexican_sofa/cms.js

@@ -1,9 +1,9 @@
 $.CMS = function(){
   var current_path = window.location.pathname;
-  var admin_path_prefix = current_path.split('/')[1]
-  
+  var admin_path_prefix = $('meta[name="cms-admin-path"]').attr('content');
+
   $(function(){
-    
+
     $.CMS.slugify();
     $.CMS.tree_methods();
     $.CMS.load_page_blocks();
@@ -16,9 +16,9 @@ $.CMS = function(){
     if($('#page_save').get(0))        $.CMS.enable_page_save_widget();
     if($('#uploader_button').get(0))  $.CMS.enable_uploader();
   });
-  
+
   return {
-    
+
     enable_sortable_list: function(){
       $('ul.sortable, ul.sortable ul').sortable({
         handle: 'div.dragger',
@@ -28,7 +28,7 @@ $.CMS = function(){
         }
       })
     },
-    
+
     slugify: function(){
       $('input#slugify').bind('keyup.cms', function() {
         var slug_input = $('input#slug');
@@ -51,7 +51,7 @@ $.CMS = function(){
         return str;
       }
     },
-    
+
     // Load Page Blocks on layout change
     load_page_blocks: function(){
       $('select#cms_page_layout_id').bind('change.cms', function() {
@@ -60,14 +60,14 @@ $.CMS = function(){
           data: ({
             layout_id: $(this).val()
           }),
-          complete: function(){ 
+          complete: function(){
             $.CMS.enable_rich_text();
             $.CMS.enable_date_picker();
           }
         })
       });
     },
-    
+
     enable_rich_text: function(){
       $('textarea.rich_text').tinymce({
          theme : "advanced",
@@ -83,7 +83,7 @@ $.CMS = function(){
          theme_advanced_resize_horizontal : false
        });
     },
-    
+
     enable_codemirror: function(){
       $('textarea.code').each(function(i, element){
         CodeMirror.fromTextArea(element, {
@@ -97,7 +97,7 @@ $.CMS = function(){
           stylesheet: "/javascripts/comfortable_mexican_sofa/codemirror/codemirror.css"
         });
       });
-      
+
       $('textarea.code_css').each(function(i, element){
         CodeMirror.fromTextArea(element, {
           basefiles: [
@@ -107,7 +107,7 @@ $.CMS = function(){
           stylesheet: "/javascripts/comfortable_mexican_sofa/codemirror/codemirror.css"
         });
       });
-      
+
       $('textarea.code_js').each(function(i, element){
         CodeMirror.fromTextArea(element, {
           basefiles: [
@@ -118,18 +118,18 @@ $.CMS = function(){
         });
       });
     },
-    
+
     enable_date_picker: function(){
       $('input[type=datetime]').datepicker();
     },
-    
+
     enable_desc_toggle: function(){
       $('.form_element .desc .desc_toggle').click(function(){
         $(this).toggle();
         $(this).siblings('.desc_content').toggle();
       })
     },
-    
+
     tree_methods: function(){
       $('a.tree_toggle').bind('click.cms', function() {
         $(this).siblings('ul').toggle();
@@ -137,7 +137,7 @@ $.CMS = function(){
         // object_id are set in the helper (check cms_helper.rb)
         $.ajax({url: [current_path, object_id, 'toggle'].join('/')});
       });
-      
+
       $('ul.sortable').each(function(){
         $(this).sortable({
           handle: 'div.dragger',
@@ -148,11 +148,11 @@ $.CMS = function(){
         })
       });
     },
-    
+
     enable_page_save_widget : function(){
       $('#page_save input').attr('checked', $('input#cms_page_is_published').is(':checked'));
       $('#page_save button').html($('input#cms_page_submit').val());
-      
+
       $('#page_save input').bind('click', function(){
         $('input#cms_page_is_published').attr('checked', $(this).is(':checked'));
       })
@@ -163,7 +163,7 @@ $.CMS = function(){
         $('input#cms_page_submit').click();
       })
     },
-    
+
     enable_page_save_form : function(){
       $('input[name=commit]').click(function() {
         $(this).parents('form').attr('target', '');
@@ -172,7 +172,7 @@ $.CMS = function(){
         $(this).parents('form').attr('target', '_blank');
       });
     },
-    
+
     enable_uploader : function(){
       auth_token = $("meta[name=csrf-token]").attr('content');
       var uploader = new plupload.Uploader({
@@ -201,4 +201,4 @@ $.CMS = function(){
       });
     }
   }
-}();
+}();

data/test/integration/fixtures_test.rb

@@ -40,4 +40,22 @@ class FixturesTest < ActionDispatch::IntegrationTest
     end
   end
   
+  def test_fixtures_enabled_in_admin
+    ComfortableMexicanSofa.config.enable_fixtures = true
+    Cms::Layout.destroy_all
+    Cms::Page.destroy_all
+    Cms::Snippet.destroy_all
+    
+    assert_difference 'Cms::Page.count', 2 do
+      assert_difference 'Cms::Layout.count', 2 do
+        assert_difference 'Cms::Snippet.count', 1 do
+           http_auth :get, '/cms-admin/pages'
+           assert_response :success
+           assert_equal 'CMS Fixtures are enabled. All changes done here will be discarded.', flash[:error]
+        end
+      end
+    end
+    
+  end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors: 
 - Oleg Khabarov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 Z
+date: 2011-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -321,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1368989658120238952
+      hash: -4254881136775173761
       segments: 
       - 0
       version: "0"