comfortable_mexican_sofa 1.7.3 → 1.8.0

data/lib/comfortable_mexican_sofa/routing.rb

@@ -0,0 +1,59 @@
+module ComfortableMexicanSofa::Routing
+  
+  def self.admin(options = {})
+    options[:path] ||= 'cms-admin'
+    
+    Rails.application.routes.draw do
+      namespace :cms_admin, :path => options[:path], :except => :show do
+        get '/', :to => 'base#jump'
+        resources :sites do
+          resources :pages do
+            get  :form_blocks,    :on => :member
+            get  :toggle_branch,  :on => :member
+            put :reorder,         :on => :collection
+            resources :revisions, :only => [:index, :show, :revert] do
+              put :revert, :on => :member
+            end
+          end
+          resources :files do
+            put :reorder, :on => :collection
+          end
+          resources :layouts do
+            put :reorder, :on => :collection
+            resources :revisions, :only => [:index, :show, :revert] do
+              put :revert, :on => :member
+            end
+          end
+          resources :snippets do
+            put :reorder, :on => :collection
+            resources :revisions, :only => [:index, :show, :revert] do
+              put :revert, :on => :member
+            end
+          end
+          resources :categories
+          get 'dialog/:type' => 'dialogs#show', :as => 'dialog'
+        end
+      end
+    end
+  end
+  
+  def self.content(options = {})
+    
+    Rails.application.routes.draw do
+      namespace :cms_content, :path => options[:path] do
+        get 'cms-css/:site_id/:identifier' => :render_css,  :as => 'css'
+        get 'cms-js/:site_id/:identifier'  => :render_js,   :as => 'js'
+        
+        if options[:sitemap]
+          get '(:cms_path)/sitemap' => :render_sitemap,
+            :as           => 'sitemap',
+            :constraints  => {:format => /xml/},
+            :format       => :xml
+        end
+        
+        get '/' => :render_html, :as => 'html', :path => "(*cms_path)"
+      end
+    end
+  end
+  
+end

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.7.3"
+  VERSION = "1.8.0"
 end

data/lib/generators/comfy/cms/cms_generator.rb

@@ -25,6 +25,14 @@ module Comfy
           'config/initializers/comfortable_mexican_sofa.rb'
       end
       
+      def generate_routing
+        route "
+  ComfortableMexicanSofa::Routing.admin(:path => '/cms-admin')
+  
+  # Make sure this routeset is defined last
+  ComfortableMexicanSofa::Routing.content(:path => '/', :sitemap => false)"
+      end
+      
       def generate_cms_seeds
         directory 'db/cms_fixtures', 'db/cms_fixtures'
       end

data/test/gemfiles/Gemfile.rails.3.1

@@ -12,4 +12,5 @@ gem 'coffee-rails',   '>= 3.1.0'
 
 group :test do
   gem 'sqlite3'
+  gem 'coveralls', :require => false
 end

data/test/gemfiles/Gemfile.rails.3.2

@@ -12,4 +12,5 @@ gem 'coffee-rails',   '>= 3.1.0'
 
 group :test do
   gem 'sqlite3'
+  gem 'coveralls', :require => false
 end

data/test/gemfiles/Gemfile.rails.4.0

@@ -12,4 +12,5 @@ gem 'coffee-rails',   '~> 4.0.0.beta1'
 
 group :test do
   gem 'sqlite3'
+  gem 'coveralls', :require => false
 end

data/test/integration/render_cms_test.rb

@@ -3,6 +3,7 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 class RenderCmsTest < ActionDispatch::IntegrationTest
   
   def setup
+    super
     Rails.application.routes.draw do
       get '/render-basic'   => 'render_test#render_basic'
       get '/render-page'    => 'render_test#render_page'
@@ -12,11 +13,10 @@ class RenderCmsTest < ActionDispatch::IntegrationTest
     cms_pages(:child).update_attributes(:blocks_attributes => [
       { :identifier => 'content', :content => 'TestBlockContent' }
     ])
-    super
   end
   
   def teardown
-    load(File.expand_path('config/routes.rb', Rails.root))
+    Rails.application.reload_routes!
   end
   
   def create_site_b

data/test/test_helper.rb

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+require 'coveralls'
+Coveralls.wear!('rails')
+
 ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
@@ -21,10 +24,7 @@ class ActiveSupport::TestCase
       config.cms_title            = 'ComfortableMexicanSofa CMS Engine'
       config.admin_auth           = 'ComfortableMexicanSofa::HttpAuth'
       config.public_auth          = 'ComfortableMexicanSofa::DummyAuth'
-      config.admin_route_prefix   = 'cms-admin'
       config.admin_route_redirect = ''
-      config.use_default_routes   = true
-      config.enable_sitemap       = true
       config.enable_fixtures      = false
       config.fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
       config.revisions_limit      = 25

data/test/unit/configuration_test.rb

@@ -4,14 +4,11 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ConfigurationTest < ActiveSupport::TestCase
   
-  def test_configuration_presense
+  def test_configuration_presence
     assert config = ComfortableMexicanSofa.configuration
     assert_equal 'ComfortableMexicanSofa CMS Engine', config.cms_title
     assert_equal 'ComfortableMexicanSofa::HttpAuth', config.admin_auth
     assert_equal 'ComfortableMexicanSofa::DummyAuth', config.public_auth
-    assert_equal 'cms-admin', config.admin_route_prefix
-    assert_equal true, config.use_default_routes
-    assert_equal true, config.enable_sitemap
     assert_equal '', config.admin_route_redirect
     assert_equal false, config.enable_fixtures
     assert_equal File.expand_path('db/cms_fixtures', Rails.root), config.fixtures_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -182,15 +182,16 @@ files:
 - app/assets/images/comfortable_mexican_sofa/icon_site.gif
 - app/assets/images/comfortable_mexican_sofa/icon_snippet.gif
 - app/assets/images/comfortable_mexican_sofa/nav_arrow.png
-- app/assets/javascripts/comfortable_mexican_sofa/application.js
+- app/assets/javascripts/comfortable_mexican_sofa/admin/application.js
+- app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee
 - app/assets/javascripts/comfortable_mexican_sofa/lib/bootstrap-datetimepicker.js
 - app/assets/javascripts/comfortable_mexican_sofa/lib/bootstrap-wysihtml5.js
 - app/assets/javascripts/comfortable_mexican_sofa/lib/bootstrap.js
 - app/assets/javascripts/comfortable_mexican_sofa/lib/codemirror.js
 - app/assets/javascripts/comfortable_mexican_sofa/lib/wysihtml5.js
+- app/assets/stylesheets/comfortable_mexican_sofa/admin/application.css
 - app/assets/stylesheets/comfortable_mexican_sofa/application.css.sass
 - app/assets/stylesheets/comfortable_mexican_sofa/base.css.sass
-- app/assets/stylesheets/comfortable_mexican_sofa/base_overrides.css.sass
 - app/assets/stylesheets/comfortable_mexican_sofa/bootstrap_overrides.css.sass
 - app/assets/stylesheets/comfortable_mexican_sofa/codemirror_overrides.css.sass
 - app/assets/stylesheets/comfortable_mexican_sofa/lib/bootstrap-datetimepicker.css
@@ -262,6 +263,7 @@ files:
 - app/views/layouts/cms_admin.html.haml
 - app/views/layouts/cms_admin/_body.html.haml
 - app/views/layouts/cms_admin/_center.html.haml
+- app/views/layouts/cms_admin/_footer.html.haml
 - app/views/layouts/cms_admin/_head.html.haml
 - app/views/layouts/cms_admin/_left.html.haml
 - app/views/layouts/cms_admin/_right.html.haml
@@ -326,6 +328,7 @@ files:
 - lib/comfortable_mexican_sofa/fixtures.rb
 - lib/comfortable_mexican_sofa/form_builder.rb
 - lib/comfortable_mexican_sofa/render_methods.rb
+- lib/comfortable_mexican_sofa/routing.rb
 - lib/comfortable_mexican_sofa/sitemap.rb
 - lib/comfortable_mexican_sofa/tag.rb
 - lib/comfortable_mexican_sofa/tags/asset.rb
@@ -388,7 +391,6 @@ files:
 - test/integration/fixtures_test.rb
 - test/integration/mirrors_test.rb
 - test/integration/render_cms_test.rb
-- test/integration/routing_extensions_test.rb
 - test/integration/sites_test.rb
 - test/integration/view_hooks_test.rb
 - test/test_helper.rb

data/app/assets/javascripts/comfortable_mexican_sofa/application.js

@@ -1,194 +0,0 @@
-//= require jquery
-//= require jquery_ujs
-//= require jquery-ui
-//= require comfortable_mexican_sofa/lib/bootstrap
-//= require comfortable_mexican_sofa/lib/codemirror
-//= require comfortable_mexican_sofa/lib/wysihtml5
-//= require comfortable_mexican_sofa/lib/bootstrap-wysihtml5
-//= require comfortable_mexican_sofa/lib/bootstrap-datetimepicker
-
-$.CMS = function(){
-
-  var current_path = window.location.pathname;
-  var admin_path_prefix = $('meta[name="cms-admin-path"]').attr('content');
-
-  $(function(){
-    $.CMS.slugify();
-    $.CMS.tree_methods();
-    $.CMS.load_page_blocks();
-    $.CMS.enable_rich_text();
-    $.CMS.enable_codemirror();
-    $.CMS.enable_date_picker();
-    $.CMS.enable_sortable_list();
-    if($('#page_new, #page_edit, #new_page, #edit_page').length) $.CMS.enable_page_form();
-    if($('#mirrors').length)            $.CMS.enable_mirrors_widget();
-    if($('#form-save').length)          $.CMS.enable_form_save_widget();
-    if($('.file-uploader').length)      $.CMS.enable_uploader();
-    if($('.categories-widget').length)  $.CMS.enable_categories_widget();
-  });
-
-  return {
-    
-    enable_sortable_list: function(){
-      $('.sortable, ul.sortable ul').sortable({
-        handle: '.dragger',
-        axis:   'y',
-        update: function(){
-          $.post(current_path + '/reorder', '_method=put&'+$(this).sortable('serialize'));
-        }
-      })
-    },
-
-    slugify: function(){
-      $('input[data-slugify=true]').bind('keyup.cms', function() {
-        $('input[data-slug=true]').val(slugify($(this).val()));
-      });
-
-      function slugify(str){
-        str = str.replace(/^\s+|\s+$/g, '');
-        var from = "ÀÁÄÂÃÈÉËÊÌÍÏÎÒÓÖÔÕÙÚÜÛàáäâãèéëêìíïîòóöôõùúüûÑñÇç";
-        var to   = "aaaaaeeeeiiiiooooouuuuaaaaaeeeeiiiiooooouuuunncc";
-        for (var i = 0, l = from.length; i < l; i++){
-          str = str.replace(new RegExp(from[i], "g"), to[i]);
-        }
-        var chars_to_replace_with_delimiter = new RegExp('[·/,:;_]', 'g');
-        str = str.replace(chars_to_replace_with_delimiter, '-');
-        var chars_to_remove = new RegExp('[^a-zA-Z0-9 -]', 'g');
-        str = str.replace(chars_to_remove, '').replace(/\s+/g, '-').toLowerCase();
-        return str;
-      }
-    },
-
-    // Load Page Blocks on layout change
-    load_page_blocks: function(){
-      $('select#page_layout_id').bind('change.cms', function() {
-        $.ajax({
-          url: $(this).data('url'),
-          data: ({
-            layout_id: $(this).val()
-          }),
-          complete: function(){
-            $.CMS.enable_rich_text();
-            $.CMS.enable_date_picker();
-          }
-        })
-      });
-    },
-
-    enable_rich_text: function(){
-      $('textarea[data-rich-text]').each(function(i, element){
-        $(element).wysihtml5({
-          'html':         true,
-          'color':        false,
-          'stylesheets':  []
-        });
-      });
-    },
-
-    enable_codemirror: function(){
-      $('textarea[data-cm-mode]').each(function(i, element){
-        CodeMirror.fromTextArea(element, {
-          mode:           $(element).data('cm-mode'),
-          lineWrapping:   true,
-          autoCloseTags:  true,
-          lineNumbers:    true
-        });
-      });
-    },
-
-    enable_date_picker: function(){
-      $('input[type=text][data-datetime]').datetimepicker({
-        format:     'yyyy-mm-dd hh:ii',
-        minView:    'day',
-        autoclose:  true
-      });
-      $('input[type=text][data-date]').datetimepicker({
-        format:     'yyyy-mm-dd',
-        minView:    'minute',
-        autoclose:  true
-      });
-    },
-
-    tree_methods: function(){
-      $('a.tree_toggle').bind('click.cms', function() {
-        $(this).siblings('ul').toggle();
-        $(this).toggleClass('closed');
-        // 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',
-          axis: 'y',
-          update: function() {
-            $.post(current_path + '/reorder', '_method=put&'+$(this).sortable('serialize'));
-          }
-        })
-      });
-    },
-
-    enable_mirrors_widget: function(){
-      $('#mirrors select').change(function(){
-        window.location = $(this).val();
-      })
-    },
-
-    enable_form_save_widget : function(){
-      var widget = $('#form-save');
-      $('input', widget).prop('checked', $('input#page_is_published').is(':checked'));
-      $('button', widget).html($('input[name=commit]').val());
-
-      $('input', widget).click(function(){
-        $('input#page_is_published').prop('checked', $(this).is(':checked'));
-      });
-      $('input#page_is_published').click(function(){
-        $('input', widget).prop('checked', $(this).is(':checked'));
-      });
-      $('button', widget).click(function(){
-        $('input[name=commit]').click();
-      });
-    },
-
-    enable_page_form : function(){
-      $('input[name=commit]').click(function() {
-        $(this).parents('form').attr('target', '');
-      });
-      $('input[name=preview]').click(function() {
-        $(this).parents('form').attr('target', '_blank');
-      });
-    },
-
-    enable_uploader : function(){
-      var action = $('.file-uploader form').attr('action');
-      $('.file-uploader input[type=file]').change(function(){
-        var files = $($(this).get(0).files);
-        files.each(function(i, file){
-          var xhr = new XMLHttpRequest();
-          xhr.onreadystatechange = function(e){
-            if (xhr.readyState == 4 && xhr.status == 200) {
-              eval(xhr.responseText);
-            }
-          }
-          xhr.open('POST', action, true);
-          xhr.setRequestHeader('Accept', 'application/javascript');
-          xhr.setRequestHeader('X-CSRF-Token', $('meta[name=csrf-token]').attr('content'));
-          xhr.setRequestHeader('Content-Type', file.content_type || file.type);
-          xhr.setRequestHeader('X-File-Name', file.name);
-          xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
-          xhr.send(file);
-        });
-      });
-    },
-
-    enable_categories_widget : function(){
-      $('a', '.categories-widget .action-links').click(function(){
-        $('.categories.read', '.categories-widget').toggle();
-        $('.categories.editable', '.categories-widget').toggle();
-        $('.edit', '.categories-widget').toggle();
-        $('.done', '.categories-widget').toggle();
-        return false;
-      });
-    }
-  }
-}();

data/app/assets/stylesheets/comfortable_mexican_sofa/base_overrides.css.sass

@@ -1,6 +0,0 @@
-// Within parent application it's possible to create 
-// assets/stylesheets/comfortable_mexican_sofa/base_overrides.css
-// to add more css that's required in the admin area
-
-// #body.comfy
-//   color: red

data/test/integration/routing_extensions_test.rb

@@ -1,61 +0,0 @@
-require File.expand_path('../test_helper', File.dirname(__FILE__))
-
-class RoutingExtensionsTest < ActionDispatch::IntegrationTest
-  
-  def teardown
-    reset_config
-    Rails.application.reload_routes!
-  end
-  
-  def test_get_admin_with_admin_route_prefix
-    ComfortableMexicanSofa.config.admin_route_prefix = 'custom-admin'
-    Rails.application.reload_routes!
-    
-    assert_exception_raised ActionController::RoutingError, 'Page Not Found' do
-      http_auth :get, '/cms-admin/sites'
-    end
-    
-    http_auth :get, '/custom-admin/sites'
-    assert_response :success
-  end
-  
-  def test_get_admin_with_admin_route_redirect
-    ComfortableMexicanSofa.config.admin_route_redirect = '/cms-admin/sites'
-    Rails.application.reload_routes!
-    
-    http_auth :get, '/cms-admin'
-    assert_response :redirect
-    assert_redirected_to cms_admin_sites_path
-  end
-  
-  def test_get_admin_with_admin_route_prefix_disabled
-    ComfortableMexicanSofa.config.admin_route_prefix = ''
-    Rails.application.reload_routes!
-    
-    assert_exception_raised ActionController::RoutingError, 'Page Not Found' do
-      http_auth :get, '/cms-admin'
-    end
-  end
-  
-  def test_get_admin_with_all_routes_disabled
-    ComfortableMexicanSofa.config.use_default_routes = false
-    Rails.application.reload_routes!
-    
-    assert_exception_raised ActionController::RoutingError do
-      http_auth :get, '/'
-    end
-  end
-  
-  def test_get_sitemap
-    get '/sitemap', :format => 'xml'
-    assert_response :success
-    
-    ComfortableMexicanSofa.config.enable_sitemap = false
-    Rails.application.reload_routes!
-    
-    assert_exception_raised ActionController::RoutingError, 'Page Not Found' do
-      get '/sitemap', :format => 'xml'
-    end
-  end
-  
-end