comfortable_mexican_sofa 1.6.8 → 1.6.9

data/.travis.yml

@@ -1,3 +1,6 @@
+before_install:
+  - gem update --system
+  - gem --version
 rvm:
   - 1.8.7
   - 1.9.2

data/README.md

@@ -1,4 +1,4 @@
-# ComfortableMexicanSofa (Rails 3 CMS Engine) [![Build Status](https://secure.travis-ci.org/twg/comfortable-mexican-sofa.png)](http://travis-ci.org/twg/comfortable-mexican-sofa) [![Dependency Status](https://gemnasium.com/twg/comfortable-mexican-sofa.png)](https://gemnasium.com/twg/comfortable-mexican-sofa)
+# ComfortableMexicanSofa (Rails 3 CMS Engine) [![Build Status](https://secure.travis-ci.org/comfy/comfortable-mexican-sofa.png)](http://travis-ci.org/comfy/comfortable-mexican-sofa) [![Dependency Status](https://gemnasium.com/comfy/comfortable-mexican-sofa.png)](https://gemnasium.com/comfy/comfortable-mexican-sofa)
 
 ComfortableMexicanSofa is a powerful CMS Engine for your Rails 3 applications.
 
@@ -6,12 +6,12 @@ Features
 --------
 * Simple integration with Rails 3.0 and 3.1 apps
 * Build your application in Rails, not in CMS
-* Powerful page templating capability using [Tags](https://github.com/twg/comfortable-mexican-sofa/wiki/Tags)
-* [Multiple Sites](https://github.com/twg/comfortable-mexican-sofa/wiki/Sites) from a single installation
+* Powerful page templating capability using [Tags](https://github.com/comfy/comfortable-mexican-sofa/wiki/Tags)
+* [Multiple Sites](https://github.com/comfy/comfortable-mexican-sofa/wiki/Sites) from a single installation
 * Multilingual
-* [Fixtures](https://github.com/twg/comfortable-mexican-sofa/wiki/Working-with-CMS-fixtures) for initial content population
-* [Revision History](https://github.com/twg/comfortable-mexican-sofa/wiki/Revisions)
-* [Great reusable admin interface](https://github.com/twg/comfortable-mexican-sofa/wiki/Reusing-sofa%27s-admin-area)
+* [Fixtures](https://github.com/comfy/comfortable-mexican-sofa/wiki/Working-with-CMS-fixtures) for initial content population
+* [Revision History](https://github.com/comfy/comfortable-mexican-sofa/wiki/Revisions)
+* [Great reusable admin interface](https://github.com/comfy/comfortable-mexican-sofa/wiki/Reusing-sofa%27s-admin-area)
 * Almost no 3rd party library dependencies
 
 Installation
@@ -26,13 +26,13 @@ Then from the Rails project's root run:
     rails generate cms
     rake db:migrate
     
-When upgrading from the older version please take a look at [Upgrading ComfortableMexicanSofa](https://github.com/twg/comfortable-mexican-sofa/wiki/Upgrading-ComfortableMexicanSofa)
+When upgrading from the older version please take a look at [Upgrading ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa/wiki/Upgrading-ComfortableMexicanSofa)
     
 Quick Start Guide
 -----------------
 After finishing installation you should be able to navigate to http://yoursite/cms-admin
 
-Default username and password is 'username' and 'password'. You probably want to change it right away. Admin credentials (among other things) can be found and changed in the cms initializer: [/config/initializers/comfortable\_mexican\_sofa.rb](https://github.com/twg/comfortable-mexican-sofa/blob/master/config/initializers/comfortable_mexican_sofa.rb)
+Default username and password is 'username' and 'password'. You probably want to change it right away. Admin credentials (among other things) can be found and changed in the cms initializer: [/config/initializers/comfortable\_mexican\_sofa.rb](https://github.com/comfy/comfortable-mexican-sofa/blob/master/config/initializers/comfortable_mexican_sofa.rb)
 
 Before creating pages and populating them with content we need to create a Site. Site defines a hostname, content path and it's language.
 
@@ -47,10 +47,10 @@ After creating a Site, you need to make a Layout. Layout is the template of your
 
 Once you have a layout, you may start creating pages and populating content. It's that easy.
 
-For more information please [see Wiki pages](https://github.com/twg/comfortable-mexican-sofa/wiki).
+For more information please [see Wiki pages](https://github.com/comfy/comfortable-mexican-sofa/wiki).
 
-![Sofa's Page Edit View](https://github.com/twg/comfortable-mexican-sofa/raw/master/doc/preview.png)
+![Sofa's Page Edit View](https://github.com/comfy/comfortable-mexican-sofa/raw/master/doc/preview.png)
 
-ComfortableMexicanSofa is released under the [MIT license](https://github.com/twg/comfortable-mexican-sofa/raw/master/LICENSE) 
+ComfortableMexicanSofa is released under the [MIT license](https://github.com/comfy/comfortable-mexican-sofa/raw/master/LICENSE) 
 
 Copyright 2009-2011 Oleg Khabarov, [The Working Group Inc](http://www.twg.ca)

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gem.summary     = 'ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications'
     gem.description = ''
     gem.email       = 'oleg@theworkinggroup.ca'
-    gem.homepage    = 'http://github.com/twg/comfortable-mexican-sofa'
+    gem.homepage    = 'http://github.com/comfy/comfortable-mexican-sofa'
     gem.authors     = ['Oleg Khabarov', 'The Working Group Inc']
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.6.8
+1.6.9

data/app/controllers/cms_content_controller.rb

@@ -5,7 +5,8 @@ class CmsContentController < ApplicationController
   
   before_filter :load_cms_site,
                 :load_fixtures
-  before_filter :load_cms_page, :authenticate,
+  before_filter :load_cms_page,
+                :authenticate,
     :only => :render_html
   before_filter :load_cms_layout,
     :only => [:render_css, :render_js]
@@ -19,6 +20,10 @@ class CmsContentController < ApplicationController
     end
   end
 
+  def render_sitemap
+    render
+  end
+
   def render_css
     render :text => @cms_layout.css, :content_type => 'text/css'
   end
@@ -43,7 +48,8 @@ protected
     
     if @cms_site
       if params[:cms_path].present?
-        params[:cms_path].gsub!(/^#{@cms_site.path}/, '').gsub!(/^\//, '')
+        params[:cms_path].gsub!(/^#{@cms_site.path}/, '')
+        params[:cms_path].to_s.gsub!(/^\//, '')
       end
       I18n.locale = @cms_site.locale
     else

data/app/models/cms/layout.rb

@@ -29,7 +29,7 @@ class Cms::Layout < ActiveRecord::Base
     :format     => { :with => /^\w[a-z0-9_-]*$/i }
     
   # -- Scopes ---------------------------------------------------------------
-  default_scope order(:position)
+  default_scope order('cms_layouts.position')
   
   # -- Class Methods --------------------------------------------------------
   # Tree-like structure for layouts

data/app/models/cms/page.rb

@@ -44,7 +44,7 @@ class Cms::Page < ActiveRecord::Base
   validate :validate_target_page
   
   # -- Scopes ---------------------------------------------------------------
-  default_scope order(:position)
+  default_scope order('cms_pages.position')
   scope :published, where(:is_published => true)
   
   # -- Class Methods --------------------------------------------------------

data/app/models/cms/snippet.rb

@@ -28,7 +28,7 @@ class Cms::Snippet < ActiveRecord::Base
     :format     => { :with => /^\w[a-z0-9_-]*$/i }
     
   # -- Scopes ---------------------------------------------------------------
-  default_scope order(:position)
+  default_scope order('cms_snippets.position')
   
 protected
   

data/app/views/cms_content/render_sitemap.xml.builder

@@ -0,0 +1,14 @@
+xml.instruct! :xml, :version => '1.0', :encoding => 'UTF-8'
+
+xml.urlset :xmlns => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
+  @cms_site.pages.published.each do |page|
+    xml.url do 
+      xml.loc "http://#{@cms_site.hostname}#{"/" + @cms_site.path unless @cms_site.path.blank? }#{page.full_path}"
+      # just take some guesses the closer to the root means higher priority
+      # start subtracting 0.1 for every additional child page, max out at 0.1
+      # "/" splits to 0, "/child_page" splits to 2, hence weird max -1 
+      xml.priority [1 - (0.1 * ( ( [page.full_path.split("/").count, 1].max - 1 ) ) ), 0.1].max
+      xml.lastmod page.updated_at.strftime('%Y-%m-%d')
+    end
+  end
+end

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.8"
+  s.version = "1.6.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 = "2012-01-18"
+  s.date = "2012-02-02"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -154,6 +154,7 @@ Gem::Specification.new do |s|
     "app/views/cms_admin/snippets/edit.html.erb",
     "app/views/cms_admin/snippets/index.html.erb",
     "app/views/cms_admin/snippets/new.html.erb",
+    "app/views/cms_content/render_sitemap.xml.builder",
     "app/views/layouts/cms_admin.html.erb",
     "app/views/layouts/cms_admin/_body.html.erb",
     "app/views/layouts/cms_admin/_center.html.erb",
@@ -312,7 +313,7 @@ Gem::Specification.new do |s|
     "test/unit/tags/snippet_test.rb",
     "test/unit/view_methods_test.rb"
   ]
-  s.homepage = "http://github.com/twg/comfortable-mexican-sofa"
+  s.homepage = "http://github.com/comfy/comfortable-mexican-sofa"
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.10"
   s.summary = "ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications"

data/config/routes.rb

@@ -34,6 +34,10 @@ Rails.application.routes.draw do
   scope :controller => :cms_content do
     get 'cms-css/:site_id/:identifier' => :render_css,  :as => 'cms_css'
     get 'cms-js/:site_id/:identifier'  => :render_js,   :as => 'cms_js'
+    get '(:cms_path)/sitemap' => :render_sitemap,
+      :as           => 'cms_sitemap',
+      :constraints  => {:format => /xml/},
+      :format       => :xml
     get '/' => :render_html,  :as => 'cms_html',  :path => "(*cms_path)"
   end
   

data/lib/comfortable_mexican_sofa.rb

@@ -56,6 +56,14 @@ module ComfortableMexicanSofa
         klass.establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
       end
     end
+
+    def logger=(new_logger)
+      @logger = new_logger
+    end
+
+    def logger
+      @logger ||= Rails.logger
+    end
     
   end
 end

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -15,7 +15,7 @@ module ComfortableMexicanSofa::Fixtures
   def self.import_layouts(to_hostname, from_hostname = nil, path = nil, root = true, parent = nil, layout_ids = [])
     site = Cms::Site.find_or_create_by_hostname(to_hostname)
     unless path ||= find_fixtures_path((from_hostname || to_hostname), 'layouts')
-      $stdout.puts 'Cannot find Layout fixtures'
+      ComfortableMexicanSofa.logger.warn('Cannot find Layout fixtures')
       return
     end
     
@@ -56,9 +56,9 @@ module ComfortableMexicanSofa::Fixtures
       layout.parent = parent
       if layout.changed?
         if layout.save
-          $stdout.puts "[Fixtures] Saved Layout {#{layout.identifier}}"
+          ComfortableMexicanSofa.logger.warn("[Fixtures] Saved Layout {#{layout.identifier}}")
         else
-          $stdout.puts "[Fixtures] Failed to save Layout {#{layout.errors.inspect}}"
+          ComfortableMexicanSofa.logger.error("[Fixtures] Failed to save Layout {#{layout.errors.inspect}}")
           return
         end
       end
@@ -71,7 +71,7 @@ module ComfortableMexicanSofa::Fixtures
     # removing all db entries that are not in fixtures
     if root
       site.layouts.where('id NOT IN (?)', layout_ids.uniq).each{ |l| l.destroy } 
-      $stdout.puts 'Imported Layouts!'
+      ComfortableMexicanSofa.logger.warn('Imported Layouts!')
     end
     
     # returning ids of layouts in fixtures
@@ -81,7 +81,7 @@ module ComfortableMexicanSofa::Fixtures
   def self.import_pages(to_hostname, from_hostname = nil, path = nil, root = true, parent = nil, page_ids = [])
     site = Cms::Site.find_or_create_by_hostname(to_hostname)
     unless path ||= find_fixtures_path((from_hostname || to_hostname), 'pages')
-      $stdout.puts 'Cannot find Page fixtures'
+      ComfortableMexicanSofa.logger.warn('Cannot find Page fixtures')
       return
     end
     
@@ -123,9 +123,9 @@ module ComfortableMexicanSofa::Fixtures
       page.blocks_attributes = blocks_attributes if blocks_attributes.present?
       if page.changed? || blocks_attributes.present?
         if page.save
-          $stdout.puts "[Fixtures] Saved Page {#{page.full_path}}"
+          ComfortableMexicanSofa.logger.warn("[Fixtures] Saved Page {#{page.full_path}}")
         else
-          $stdout.puts "[Fixtures] Failed to save Page {#{page.errors.inspect}}"
+          ComfortableMexicanSofa.logger.warn("[Fixtures] Failed to save Page {#{page.errors.inspect}}")
           return
         end
       end
@@ -138,7 +138,7 @@ module ComfortableMexicanSofa::Fixtures
     # removing all db entries that are not in fixtures
     if root
       site.pages.where('id NOT IN (?)', page_ids.uniq).each{ |p| p.destroy }
-      $stdout.puts 'Imported Pages!'
+      ComfortableMexicanSofa.logger.warn('Imported Pages!')
     end
     
     # returning ids of layouts in fixtures
@@ -148,7 +148,7 @@ module ComfortableMexicanSofa::Fixtures
   def self.import_snippets(to_hostname, from_hostname = nil)
     site = Cms::Site.find_or_create_by_hostname(to_hostname)
     unless path = find_fixtures_path((from_hostname || to_hostname), 'snippets')
-      $stdout.puts 'Cannot find Snippet fixtures'
+      ComfortableMexicanSofa.logger.warn('Cannot find Snippet fixtures')
       return
     end
     
@@ -177,9 +177,9 @@ module ComfortableMexicanSofa::Fixtures
       # saving
       if snippet.changed?
         if snippet.save
-          $stdout.puts "[Fixtures] Saved Snippet {#{snippet.identifier}}"
+          ComfortableMexicanSofa.logger.warn("[Fixtures] Saved Snippet {#{snippet.identifier}}")
         else
-          $stdout.puts "[Fixtures] Failed to save Snippet {#{snippet.errors.inspect}}"
+          ComfortableMexicanSofa.logger.warn("[Fixtures] Failed to save Snippet {#{snippet.errors.inspect}}")
           return
         end
       end
@@ -188,7 +188,7 @@ module ComfortableMexicanSofa::Fixtures
     
     # removing all db entries that are not in fixtures
     site.snippets.where('id NOT IN (?)', snippet_ids).each{ |s| s.destroy }
-    $stdout.puts 'Imported Snippets!'
+    ComfortableMexicanSofa.logger.warn('Imported Snippets!')
   end
   
   def self.export_layouts(from_hostname, to_hostname = nil)

data/lib/tasks/comfortable_mexican_sofa.rake

@@ -7,12 +7,20 @@ namespace :comfortable_mexican_sofa do
   namespace :fixtures do
     
     desc 'Import Fixture data into database (options: FROM=example.local TO=example.com)'
+
     task :import => :environment do
       to    = ENV['TO'] || ENV['FROM']
       from  = ENV['FROM']
       
       puts "Importing CMS Fixtures from Folder [#{from}] to Site [#{to}] ..."
+
+      # changing so that logger is going straight to screen
+      logger_org = ComfortableMexicanSofa.logger
+      ComfortableMexicanSofa.logger = Logger.new(STDOUT)
+
       ComfortableMexicanSofa::Fixtures.import_all(to, from)
+
+      ComfortableMexicanSofa.logger = logger_org
     end
     
     desc 'Export database data into Fixtures (options: FROM=example.com TO=example.local)'
@@ -21,7 +29,15 @@ namespace :comfortable_mexican_sofa do
       from  = ENV['FROM']
       
       puts "Exporting CMS data from Site [#{from}] to Folder [#{to}] ..."
+
+      # changing so that logger is going straight to screen
+      logger_org = ComfortableMexicanSofa.logger
+      ComfortableMexicanSofa.logger = Logger.new(STDOUT)
+
       ComfortableMexicanSofa::Fixtures.export_all(from, to)
+
+      ComfortableMexicanSofa.logger = logger_org
+      
       puts 'Done!'
     end
   end

data/test/fixtures/cms/layouts.yml

@@ -36,4 +36,5 @@ child:
     {{cms:page:right_column}}
   css: child_css
   js: child_js
-  position: 0
+  position: 0
+

data/test/fixtures/cms/sites.yml

@@ -3,4 +3,4 @@ default:
   identifier: default-site
   hostname: test.host
   path:
-  is_mirrored: false
+  is_mirrored: false

data/test/functional/cms_content_controller_test.rb

@@ -155,5 +155,31 @@ class CmsContentControllerTest < ActionController::TestCase
     get :render_js, :site_id => cms_sites(:default).id, :identifier => 'bogus'
     assert_response 404
   end
+
+  def test_render_sitemap
+    get :render_sitemap, :format => :xml
+    assert_response :success
+    assert_match '<loc>http://test.host/child-page</loc>', response.body
+  end
+
+  def test_render_sitemap_with_path
+    site = cms_sites(:default)
+    site.update_attribute(:path, 'en')
+    
+    get :render_sitemap, :cms_path => site.path, :format => :xml
+    assert_response :success
+    assert_equal cms_sites(:default), assigns(:cms_site)
+    assert_match '<loc>http://test.host/en/child-page</loc>', response.body
+  end
   
+  def test_render_sitemap_with_path_invalid_with_single_site
+    site = cms_sites(:default)
+    site.update_attribute(:path, 'en')
+    
+    get :render_sitemap, :cms_path => 'fr', :format => :xml
+    assert_response :success
+    assert_equal cms_sites(:default), assigns(:cms_site)
+    assert_match '<loc>http://test.host/en/child-page</loc>', response.body
+  end
+
 end

data/test/gemfiles/Gemfile.rails.3.2

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails',          '3.2.0.rc1'
+gem 'rails',          '~>3.2.0'
 gem 'active_link_to', '~>1.0.0'
 gem 'paperclip',      '~>2.3.0'
 

data/test/test_helper.rb

@@ -8,13 +8,6 @@ require 'rails/test_help'
 Paperclip::Attachment.default_options[:use_timestamp] = false
 
 class ActiveSupport::TestCase
-  
-  # Disabling the noise
-  $stdout_orig = $stdout
-  $stderr_orig = $stderr
-  $stdout = StringIO.new
-  $stderr = StringIO.new
-  
   fixtures :all
   include ActionDispatch::TestProcess
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-02-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70244556712160 !ruby/object:Gem::Requirement
+  requirement: &70228805602580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244556712160
+  version_requirements: *70228805602580
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70244556711620 !ruby/object:Gem::Requirement
+  requirement: &70228805602000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244556711620
+  version_requirements: *70228805602000
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70244556711080 !ruby/object:Gem::Requirement
+  requirement: &70228805601460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244556711080
+  version_requirements: *70228805601460
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -190,6 +190,7 @@ files:
 - app/views/cms_admin/snippets/edit.html.erb
 - app/views/cms_admin/snippets/index.html.erb
 - app/views/cms_admin/snippets/new.html.erb
+- app/views/cms_content/render_sitemap.xml.builder
 - app/views/layouts/cms_admin.html.erb
 - app/views/layouts/cms_admin/_body.html.erb
 - app/views/layouts/cms_admin/_center.html.erb
@@ -347,7 +348,7 @@ files:
 - test/unit/tags/partial_test.rb
 - test/unit/tags/snippet_test.rb
 - test/unit/view_methods_test.rb
-homepage: http://github.com/twg/comfortable-mexican-sofa
+homepage: http://github.com/comfy/comfortable-mexican-sofa
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -361,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 825798380146420282
+      hash: -1140535759846498867
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: