comfortable_mexican_sofa 1.8.5 → 1.9.0

data/app/models/cms/categorization.rb

@@ -4,8 +4,6 @@ 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,9 +4,6 @@ class Cms::Category < ActiveRecord::Base
   
   self.table_name = 'cms_categories'
   
-  attr_accessible :label,
-                  :categorized_type
-  
   # -- Relationships --------------------------------------------------------
   belongs_to :site
   has_many :categorizations,
@@ -22,7 +19,8 @@ class Cms::Category < ActiveRecord::Base
     :presence   => true
     
   # -- Scopes ---------------------------------------------------------------
-  default_scope order(:label)
+  default_scope{ order(:label) }
+  
   scope :of_type, lambda { |type|
     where(:categorized_type => type)
   }

data/app/models/cms/file.rb

@@ -10,14 +10,6 @@ class Cms::File < ActiveRecord::Base
   
   attr_accessor :dimensions
   
-  attr_accessible :site, :site_id,
-                  :file,
-                  :dimensions,
-                  :label,
-                  :description,
-                  :category_ids,
-                  :position
-  
   # -- 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
@@ -49,8 +41,8 @@ class Cms::File < ActiveRecord::Base
   after_destroy :reload_page_cache
   
   # -- Scopes ---------------------------------------------------------------
-  scope :images,      where(:file_content_type => IMAGE_MIMETYPES)
-  scope :not_images,  where('file_content_type NOT IN (?)', IMAGE_MIMETYPES)
+  scope :images,      -> { where(:file_content_type => IMAGE_MIMETYPES) }
+  scope :not_images,  -> { where('file_content_type NOT IN (?)', IMAGE_MIMETYPES) }
   
   # -- Instance Methods -----------------------------------------------------
   def is_image?

data/app/models/cms/layout.rb

@@ -8,14 +8,6 @@ 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
@@ -34,10 +26,10 @@ class Cms::Layout < ActiveRecord::Base
   validates :identifier,
     :presence   => true,
     :uniqueness => { :scope => :site_id },
-    :format     => { :with => /^\w[a-z0-9_-]*$/i }
+    :format     => { :with => /\A\w[a-z0-9_-]*\z/i }
     
   # -- Scopes ---------------------------------------------------------------
-  default_scope order('cms_layouts.position')
+  default_scope -> { order('cms_layouts.position') }
   
   # -- Class Methods --------------------------------------------------------
   # Tree-like structure for layouts

data/app/models/cms/page.rb

@@ -6,15 +6,6 @@ class Cms::Page < ActiveRecord::Base
     
   self.table_name = 'cms_pages'
   
-  attr_accessible :layout, :layout_id,
-                  :label,
-                  :slug,
-                  :parent, :parent_id,
-                  :blocks_attributes,
-                  :is_published,
-                  :target_page_id,
-                  :category_ids
-  
   cms_acts_as_tree :counter_cache => :children_count
   cms_is_categorized
   cms_is_mirrored
@@ -57,8 +48,8 @@ class Cms::Page < ActiveRecord::Base
   validate :validate_format_of_unescaped_slug
   
   # -- Scopes ---------------------------------------------------------------
-  default_scope order('cms_pages.position')
-  scope :published, where(:is_published => true)
+  default_scope -> { order('cms_pages.position') }
+  scope :published, -> { where(:is_published => true) }
   
   # -- Class Methods --------------------------------------------------------
   # Tree-like structure for pages

data/app/models/cms/revision.rb

@@ -6,12 +6,10 @@ class Cms::Revision < ActiveRecord::Base
   
   serialize :data
   
-  attr_accessible :data
-  
   # -- Relationships --------------------------------------------------------
   belongs_to :record, :polymorphic => true
   
   # -- Scopes ---------------------------------------------------------------
-  default_scope order('created_at DESC')
+  default_scope -> { order('created_at DESC') }
   
 end

data/app/models/cms/site.rb

@@ -4,13 +4,6 @@ class Cms::Site < ActiveRecord::Base
   
   self.table_name = 'cms_sites'
   
-  attr_accessible :identifier,
-                  :label,
-                  :hostname,
-                  :path,
-                  :locale,
-                  :is_mirrored
-  
   # -- Relationships --------------------------------------------------------
   with_options :dependent => :destroy do |site|
     site.has_many :layouts
@@ -31,23 +24,23 @@ class Cms::Site < ActiveRecord::Base
   validates :identifier,
     :presence   => true,
     :uniqueness => true,
-    :format     => { :with => /^\w[a-z0-9_-]*$/i }
+    :format     => { :with => /\A\w[a-z0-9_-]*\z/i }
   validates :label,
     :presence   => true
   validates :hostname,
     :presence   => true,
     :uniqueness => { :scope => :path },
-    :format     => { :with => /^[\w\.\-]+(?:\:\d+)?$/ }
+    :format     => { :with => /\A[\w\.\-]+(?:\:\d+)?\z/ }
     
   # -- Scopes ---------------------------------------------------------------
-  scope :mirrored, where(:is_mirrored => true)
+  scope :mirrored, -> { where(:is_mirrored => true) }
   
   # -- Class Methods --------------------------------------------------------
   # returning the Cms::Site instance based on host and path
   def self.find_site(host, path = nil)
     return Cms::Site.first if Cms::Site.count == 1
     cms_site = nil
-    Cms::Site.find_all_by_hostname(real_host_from_aliases(host)).each do |site|
+    Cms::Site.where(:hostname => real_host_from_aliases(host)).each do |site|
       if site.path.blank?
         cms_site = site
       elsif "#{path.to_s.split('?')[0]}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
@@ -62,7 +55,7 @@ class Cms::Site < ActiveRecord::Base
   # When removing entire site, let's not destroy content from other sites
   # Since before_destroy doesn't really work, this does the trick
   def destroy
-    self.class.update_all({:is_mirrored => false}, :id => self.id) if self.is_mirrored?
+    self.class.where(:id => self.id).update_all(:is_mirrored => false) if self.is_mirrored?
     super
   end
 

data/app/models/cms/snippet.rb

@@ -8,11 +8,6 @@ class Cms::Snippet < ActiveRecord::Base
   cms_is_mirrored
   cms_has_revisions_for :content
   
-  attr_accessible :identifier,
-                  :label,
-                  :content,
-                  :category_ids
-  
   # -- Relationships --------------------------------------------------------
   belongs_to :site
   
@@ -30,10 +25,10 @@ class Cms::Snippet < ActiveRecord::Base
   validates :identifier,
     :presence   => true,
     :uniqueness => { :scope => :site_id },
-    :format     => { :with => /^\w[a-z0-9_-]*$/i }
+    :format     => { :with => /\A\w[a-z0-9_-]*\z/i }
     
   # -- Scopes ---------------------------------------------------------------
-  default_scope order('cms_snippets.position')
+  default_scope -> { order('cms_snippets.position') }
   
 protected
   
@@ -45,7 +40,7 @@ protected
   # gotta reload every single page. Kinda sucks, but might be ok unless there
   # are hundreds of pages.
   def clear_cached_page_content
-    site.pages.all.each do |p|
+    site.pages.each do |p|
       Cms::Page.where(:id => p.id).update_all(:content => p.content(true))
     end
   end

data/app/views/cms_admin/layouts/edit.html.haml

@@ -3,7 +3,7 @@
   %h2= t('.title')
 
 - content_for :right_column do
-  = render :partial => 'cms_admin/sites/mirrors', :object => @layout
+  = render 'cms_admin/sites/mirrors', :object => @layout
 
 = comfy_form_for @layout, :as => :layout, :url => {:action => :update} do |form|
   = render form

data/app/views/cms_admin/pages/_form_blocks.html.haml

@@ -1,5 +1,5 @@
 - namespace = { }
-- tags = @page.tags(true).select{ |t| t.is_cms_block? }.uniq_by{|t| t.identifier} 
+- tags = @page.tags(true).select{|t| t.is_cms_block?}.uniq{|t| t.identifier} 
 - tags.each do |tag|
   - namespace[tag.namespace || 'default'] ||= []
   - namespace[tag.namespace || 'default'] << tag

data/app/views/cms_admin/pages/edit.html.haml

@@ -3,7 +3,7 @@
   %h2= t('.title')
 
 - content_for :right_column do
-  = render :partial => 'cms_admin/sites/mirrors', :object => @page
+  = render 'cms_admin/sites/mirrors', :object => @page
 
 = comfy_form_for @page, :as => :page, :url => {:action => :update}, :html => {:multipart => true} do |form|
   = render form

data/app/views/cms_admin/sites/_mirrors.html.haml

@@ -1,5 +1,6 @@
-- object ||= mirrors
 - return unless @site.is_mirrored?
+
+- object ||= nil
   
 - options = case object
   - when Cms::Layout

data/app/views/cms_admin/snippets/edit.html.haml

@@ -3,7 +3,7 @@
   %h2= t('.title')
 
 - content_for :right_column do
-  = render :partial => 'cms_admin/sites/mirrors', :object => @snippet
+  = render 'cms_admin/sites/mirrors', :object => @snippet
 
 = comfy_form_for @snippet, :as => :snippet, :url => {:action => :update} do |form|
   = render form

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

@@ -11,5 +11,4 @@ xml.urlset :xmlns => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
       xml.lastmod page.updated_at.strftime('%Y-%m-%d')
     end
   end
-  ComfortableMexicanSofa::Sitemap.process(@cms_site, self, xml)
 end

data/comfortable_mexican_sofa.gemspec

@@ -9,14 +9,14 @@ Gem::Specification.new do |s|
   s.authors       = ["Oleg Khabarov", "The Working Group Inc"]
   s.email         = ["oleg@khabarov.ca"]
   s.homepage      = "http://github.com/comfy/comfortable-mexican-sofa"
-  s.summary       = "CMS Engine for Rails 3 apps"
+  s.summary       = "CMS Engine for Rails 4 apps"
   s.description   = "ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications"
   
   s.files         = `git ls-files`.split("\n")
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
   
-  s.add_dependency 'rails',           '~> 3.1'
+  s.add_dependency 'rails',           '~> 4.0'
   s.add_dependency 'formatted_form',  '>= 2.1.0'
   s.add_dependency 'active_link_to',  '>= 1.0.0'
   s.add_dependency 'paperclip',       '>= 3.4.0'

data/config/application.rb

@@ -2,32 +2,18 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-if defined?(Bundler)
-  # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-  # If you want your assets lazily compiled in production, use this line
-  # Bundler.require(:default, :assets, Rails.env)
-end
+# Assets should be precompiled for production (so we don't need the gems loaded then)
+Bundler.require(*Rails.groups(assets: %w(development test)))
 
 module ComfortableMexicanSofa
   class Application < Rails::Application
     
-    require 'comfortable_mexican_sofa'
+    require_relative '../lib/comfortable_mexican_sofa'
     
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -35,35 +21,8 @@ module ComfortableMexicanSofa
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable escaping HTML in JSON.
-    config.active_support.escape_html_entities_in_json = true
-
-    # Use SQL instead of Active Record's schema dumper when creating the database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # 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.
-    config.active_record.whitelist_attributes = true
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
-    
-    config.session_store :cookie_store, :key => '_comfy_session'
-    config.secret_token = 'e0fef4ab56c1cacd8845864fe2cb2a27f5caad72823419f87b2774785187090a654b83229bf9cef70ce475a83bfa561dbbaa2015788181ea837c456964c1e0f6'
     
+    # Making sure we don't load our dev routes as part of the engine
+    config.paths['config/routes.rb'] << 'config/cms_routes.rb'
   end
 end

data/config/boot.rb

@@ -1,6 +1,5 @@
-require 'rubygems'
-
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+File.exists?(ENV['BUNDLE_GEMFILE'])

data/config/cms_routes.rb

@@ -0,0 +1,4 @@
+ComfortableMexicanSofa::Application.routes.draw do
+  ComfortableMexicanSofa::Routing.admin
+  ComfortableMexicanSofa::Routing.content :sitemap => true
+end

data/config/environments/development.rb

@@ -1,39 +1,27 @@
 defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Application.configure do
-  # Settings specified here will take precedence over those in config/application.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 web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # 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
+  # Raise an error on page load if there are pending migrations
+  config.active_record.migration_error = :page_load
 
-  unless Rails.version <= '3.2.0'
-    # Raise exception on mass assignment protection for Active Record models
-    config.active_record.mass_assignment_sanitizer = :strict
-    
-    # Log the query plan for queries taking more than this (works
-    # with SQLite, MySQL, and PostgreSQL)
-    config.active_record.auto_explain_threshold_in_seconds = 0.5
-  end
-
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
+  # Debug mode disables concatenation and preprocessing of assets.
   config.assets.debug = true
 end

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/application.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,33 +7,30 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
+
+  # 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
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  unless Rails.version <= '3.2.0'
-    # Raise exception on mass assignment protection for Active Record models
-    config.active_record.mass_assignment_sanitizer = :strict
-  end
-
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 end