comfortable_mexican_sofa 1.6.19 → 1.6.20

data/VERSION

@@ -1 +1 @@
-1.6.19
+1.6.20

data/app/controllers/cms_admin/base_controller.rb

@@ -27,7 +27,9 @@ class CmsAdmin::BaseController < ApplicationController
 protected
   
   def load_admin_site
-    unless (@site = Cms::Site.find_by_id(params[:site_id]) || Cms::Site.first)
+    if @site = Cms::Site.find_by_id(params[:site_id] || session[:site_id]) || Cms::Site.first
+      session[:site_id] = @site.id
+    else
       I18n.locale = ComfortableMexicanSofa.config.admin_locale || I18n.default_locale
       flash[:error] = I18n.t('cms.base.site_not_found')
       return redirect_to(new_cms_admin_site_path)

data/app/controllers/cms_admin/sites_controller.rb

@@ -8,6 +8,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
 
   def index
     return redirect_to :action => :new if Cms::Site.count == 0
+    @site = Cms::Site.find_by_id(session[:site_id])
     @sites = Cms::Site.all
   end
 

data/app/models/cms/block.rb

@@ -4,6 +4,9 @@ class Cms::Block < ActiveRecord::Base
   
   self.table_name = 'cms_blocks'
   
+  attr_accessible :identifier,
+                  :content
+  
   # -- Relationships --------------------------------------------------------
   belongs_to :page
   has_many :files,

data/app/models/cms/categorization.rb

@@ -4,6 +4,8 @@ class Cms::Categorization < ActiveRecord::Base
   
   self.table_name = 'cms_categorizations'
   
+  attr_accessible :categorized
+  
   # -- Relationships --------------------------------------------------------
   belongs_to :category
   belongs_to :categorized,

data/app/models/cms/category.rb

@@ -4,6 +4,9 @@ class Cms::Category < ActiveRecord::Base
   
   self.table_name = 'cms_categories'
   
+  attr_accessible :label,
+                  :categorized_type
+  
   # -- Relationships --------------------------------------------------------
   belongs_to :site
   has_many :categorizations,

data/app/models/cms/file.rb

@@ -10,6 +10,12 @@ class Cms::File < ActiveRecord::Base
   
   attr_accessor :dimensions
   
+  attr_accessible :site, :site_id,
+                  :file,
+                  :dimentions,
+                  :label,
+                  :description
+  
   # -- AR Extensions --------------------------------------------------------
   has_attached_file :file, ComfortableMexicanSofa.config.upload_file_options.merge(
     # dimensions accessor needs to be set before file assignment for this to work

data/app/models/cms/layout.rb

@@ -8,6 +8,14 @@ class Cms::Layout < ActiveRecord::Base
   cms_is_mirrored
   cms_has_revisions_for :content, :css, :js
   
+  attr_accessible :label,
+                  :identifier,
+                  :content,
+                  :css,
+                  :js,
+                  :parent, :parent_id,
+                  :app_layout
+  
   # -- Relationships --------------------------------------------------------
   belongs_to :site
   has_many :pages, :dependent => :nullify

data/app/models/cms/page.rb

@@ -5,6 +5,12 @@ class Cms::Page < ActiveRecord::Base
     
   self.table_name = 'cms_pages'
   
+  attr_accessible :layout, :layout_id,
+                  :label,
+                  :slug,
+                  :parent, :parent_id,
+                  :blocks_attributes
+  
   cms_acts_as_tree :counter_cache => :children_count
   cms_is_categorized
   cms_is_mirrored
@@ -25,12 +31,12 @@ class Cms::Page < ActiveRecord::Base
   # -- Callbacks ------------------------------------------------------------
   before_validation :assigns_label,
                     :assign_parent
-  after_validation :escape_slug
-  before_create :assign_position
-  before_save :assign_full_path,
-              :set_cached_content
-  after_save  :sync_child_pages
-  after_find :unescape_slug_and_path
+  after_validation  :escape_slug
+  before_create     :assign_position
+  before_save       :assign_full_path,
+                    :set_cached_content
+  after_save        :sync_child_pages
+  after_find        :unescape_slug_and_path
   
   # -- Validations ----------------------------------------------------------
   validates :site_id, 
@@ -178,8 +184,8 @@ protected
 
   # Unescape the slug and full path back into their original forms unless they're nonexistent
   def unescape_slug_and_path
-    self.slug = CGI::unescape(self.slug) unless self.slug.nil?
-    self.full_path = CGI::unescape(self.full_path) unless self.full_path.nil?
+    self.slug       = CGI::unescape(self.slug)      unless self.slug.nil?
+    self.full_path  = CGI::unescape(self.full_path) unless self.full_path.nil?
   end
   
 end

data/app/models/cms/revision.rb

@@ -6,6 +6,8 @@ class Cms::Revision < ActiveRecord::Base
   
   serialize :data
   
+  attr_accessible :data
+  
   # -- Relationships --------------------------------------------------------
   belongs_to :record, :polymorphic => true
   

data/app/models/cms/site.rb

@@ -4,6 +4,13 @@ class Cms::Site < ActiveRecord::Base
   
   self.table_name = 'cms_sites'
   
+  attr_accessible :identifier,
+                  :label,
+                  :hostname,
+                  :path,
+                  :locale,
+                  :is_mirrored
+  
   # -- Relationships --------------------------------------------------------
   has_many :layouts,    :dependent => :delete_all
   has_many :pages,      :dependent => :delete_all

data/app/models/cms/snippet.rb

@@ -8,6 +8,10 @@ class Cms::Snippet < ActiveRecord::Base
   cms_is_mirrored
   cms_has_revisions_for :content
   
+  attr_accessible :identifier,
+                  :label,
+                  :content
+  
   # -- Relationships --------------------------------------------------------
   belongs_to :site
   

data/app/views/cms_admin/files/_file.html.erb

@@ -12,7 +12,7 @@
     <div class='details'>
       <input type='text' value='<%= file.file.url %>'/>
       <div class='file_type'><%= file.file_content_type %></div>
-      <div class='file_size'><%= number_to_human_size(file.file_file_size) %></div>
+      <div class='file_size'><%= number_to_human_size(file.file_file_size, :locale => :en) %></div>
     </div>
   </div>
 </div>

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

@@ -1,6 +1,6 @@
 <ul class='nav'>
   <li><%= active_link_to t('cms_admin.base.sites'), cms_admin_sites_path, :active => :exclusive %></li>
-  <% if @site && params[:controller] != 'cms_admin/sites' %>
+  <% if @site && !@site.new_record? %>
     <li><%= active_link_to t('cms_admin.base.layouts'), cms_admin_site_layouts_path(@site) %></li>
     <li><%= active_link_to t('cms_admin.base.pages'), cms_admin_site_pages_path(@site) %></li>
     <li><%= active_link_to t('cms_admin.base.snippets'), cms_admin_site_snippets_path(@site) %></li>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.19"
+  s.version = "1.6.20"
 
   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-05-24"
+  s.date = "2012-05-28"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [

data/config/application.rb

@@ -41,8 +41,16 @@ module ComfortableMexicanSofa
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
     
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    if config.active_record.respond_to?(:whitelist_attributes)
+      config.active_record.whitelist_attributes = true
+    end
+    
     # Enable the asset pipeline
-    if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
+    if config.respond_to?(:assets)
       config.assets.enabled = true
     end
     

data/lib/comfortable_mexican_sofa/extensions/is_mirrored.rb

@@ -50,7 +50,7 @@ module ComfortableMexicanSofa::IsMirrored
             :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_identifier(self.layout.identifier)
+            :layout     => site.layouts.find_by_identifier(self.layout.try(:identifier))
           }
           m
         when Cms::Snippet
@@ -62,7 +62,11 @@ module ComfortableMexicanSofa::IsMirrored
         end
         
         mirror.is_mirrored = true
-        mirror.save!
+        begin
+          mirror.save!
+        rescue ActiveRecord::RecordInvalid
+          logger.detailed_error($!)
+        end
       end
     end
     

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -89,7 +89,7 @@ module ComfortableMexicanSofa::Fixtures
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
       slug = path.split('/').last
       page = if parent
-        parent.children.find_by_slug(slug) || parent.children.new(:slug => slug, :site => site)
+        parent.children.find_by_slug(slug) || site.pages.new(:parent => parent, :slug => slug)
       else
         site.pages.root || site.pages.new(:slug => slug)
       end

data/test/functional/cms_admin/pages_controller_test.rb

@@ -8,7 +8,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert assigns(:pages)
     assert_template :index
   end
-
+  
   def test_get_index_with_no_pages
     Cms::Page.delete_all
     get :index, :site_id => cms_sites(:default)
@@ -214,6 +214,13 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert assigns(:page).layout
   end
   
+  def test_get_edit_with_non_english_locale
+    site = cms_sites(:default)
+    site.update_attribute(:locale, 'es')
+    get :edit, :site_id => site, :id => cms_pages(:default)
+    assert_response :success
+  end
+  
   def test_creation
     assert_difference 'Cms::Page.count' do
       assert_difference 'Cms::Block.count', 2 do

data/test/functional/cms_admin/sites_controller_test.rb

@@ -67,8 +67,10 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
   def test_update
     site = cms_sites(:default)
     put :update, :id => site, :site => {
-      :label    => 'New Site',
-      :hostname => 'new.site.local'
+      :label        => 'New Site',
+      :hostname     => 'new.site.local',
+      :locale       => 'es',
+      :is_mirrored  => '1'
     }
     assert_response :redirect
     assert_redirected_to :action => :edit, :id => site
@@ -76,6 +78,8 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
     site.reload
     assert_equal 'New Site', site.label
     assert_equal 'new.site.local', site.hostname
+    assert_equal 'es', site.locale
+    assert site.is_mirrored?
   end
 
   def test_update_failure

data/test/unit/models/block_test.rb

@@ -16,8 +16,7 @@ class CmsBlockTest < ActiveSupport::TestCase
   
   def test_creation_via_page_nested_attributes
     assert_difference ['Cms::Page.count', 'Cms::Block.count'] do
-      page = Cms::Page.create!(
-        :site       => cms_sites(:default),
+      page = cms_sites(:default).pages.create!(
         :layout     => cms_layouts(:default),
         :label      => 'test page',
         :slug       => 'test_page',
@@ -38,8 +37,7 @@ class CmsBlockTest < ActiveSupport::TestCase
   
   def test_creation_via_page_nested_attributes_as_hash
     assert_difference ['Cms::Page.count', 'Cms::Block.count'] do
-      page = Cms::Page.create!(
-        :site       => cms_sites(:default),
+      page = cms_sites(:default).pages.create!(
         :layout     => cms_layouts(:default),
         :label      => 'test page',
         :slug       => 'test_page',
@@ -60,8 +58,7 @@ class CmsBlockTest < ActiveSupport::TestCase
   
   def test_creation_via_page_nested_attributes_as_hash_with_duplicates
     assert_difference ['Cms::Page.count', 'Cms::Block.count'] do
-      page = Cms::Page.create!(
-        :site       => cms_sites(:default),
+      page = cms_sites(:default).pages.create!(
         :layout     => cms_layouts(:default),
         :label      => 'test page',
         :slug       => 'test_page',
@@ -90,8 +87,7 @@ class CmsBlockTest < ActiveSupport::TestCase
     
     page = nil
     assert_difference ['Cms::Page.count', 'Cms::Block.count', 'Cms::File.count'] do
-      page = Cms::Page.create!(
-        :site       => cms_sites(:default),
+      page = cms_sites(:default).pages.create!(
         :layout     => layout,
         :label      => 'test page',
         :slug       => 'test_page',
@@ -134,8 +130,7 @@ class CmsBlockTest < ActiveSupport::TestCase
     page = nil
     assert_difference ['Cms::Page.count', 'Cms::Block.count'] do
       assert_difference 'Cms::File.count', 2 do
-        page = Cms::Page.create!(
-          :site       => cms_sites(:default),
+        page = cms_sites(:default).pages.create!(
           :layout     => layout,
           :label      => 'test page',
           :slug       => 'test_page',
@@ -177,8 +172,7 @@ class CmsBlockTest < ActiveSupport::TestCase
     
     assert_difference 'Cms::Page.count' do
       assert_difference 'Cms::Block.count', 3 do
-        page = Cms::Page.create!(
-          :site       => cms_sites(:default),
+        page = cms_sites(:default).pages.create!(
           :layout     => layout,
           :label      => 'test page',
           :slug       => 'test_page',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.19
+  version: 1.6.20
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -384,7 +384,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1154446217690371427
+      hash: 3514363953654359561
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: