comfortable_mexican_sofa 1.12.3 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6288406fcc2f264c4289e644ef4968d45c1c127e
-  data.tar.gz: 1e60695eae961a65244861eaeed32016d8d399aa
+  metadata.gz: 8b57d6be9adeefcfafd8dfa2e17eb50bc7882799
+  data.tar.gz: 99b0f0e6a6d16000087dbebdba62a11e923c9c02
 SHA512:
-  metadata.gz: d006542f2574fa558cc49b4d4c1a2ac048cc76360598cad83de2becf828c577231a12b5ebc9f85eaaaf49a719389cf2448f4acaf3315e1346843e6258ecab9a6
-  data.tar.gz: 6b20e59908397502960f98e1699356b488e8fc8ba0bb1891979d636e8d6c038c2723446fc4ccbdf07366ef27aff85ce714ae505f99020ae9a39f78e1238f756f
+  metadata.gz: cb615a6907113332bcbe625766244eb321bca48cbce4d2336247bbfa8517420493af807425ff74c03b42b71cc49c834a4742d09a8793986d69bff074048179e2
+  data.tar.gz: 67770c64c90a8de4faeab88a0b05be01b6a2e55ca53f89748ba693f0b2a6271f8954c096e92bfa33daebfca2dd6d7a655d91be553e809699024656b8948861a5

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+before_install:
+  - gem install bundler
 before_script:
   - rake db:migrate
 script:
@@ -6,15 +8,19 @@ script:
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.5
+  - 2.2.0
 gemfile:
   - test/gemfiles/Gemfile.rails.4.0
   - test/gemfiles/Gemfile.rails.4.1
-  - test/gemfiles/Gemfile.rails.master
+  - test/gemfiles/Gemfile.rails.4.2
 branches:
   only:
     - master
 matrix:
   fast_finish: true
+  include:
+    - rvm: 2.2.0
+      gemfile: test/gemfiles/Gemfile.rails.master
   allow_failures:
-    - gemfile: test/gemfiles/Gemfile.rails.master
+    - gemfile: test/gemfiles/Gemfile.rails.master

data/Gemfile

@@ -2,7 +2,11 @@ source 'http://rubygems.org'
 
 gemspec
 
+# apps can also use will_paginate so there's no dependency in gemspec
+gem 'kaminari'
+
 group :development do
+
   gem 'awesome_print'
   gem 'better_errors'
   gem 'binding_of_caller'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2014 Oleg Khabarov
+Copyright (c) 2010-2015 Oleg Khabarov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,5 +1,5 @@
 # ComfortableMexicanSofa
-[![Gem Version](https://badge.fury.io/rb/comfortable_mexican_sofa.svg)](http://rubygems.org/gems/comfortable_mexican_sofa) [![Build Status](https://travis-ci.org/comfy/comfortable-mexican-sofa.svg?branch=master)](https://travis-ci.org/comfy/comfortable-mexican-sofa) [![Dependency Status](https://gemnasium.com/comfy/comfortable-mexican-sofa.png)](https://gemnasium.com/comfy/comfortable-mexican-sofa) [![Code Climate](https://codeclimate.com/github/comfy/comfortable-mexican-sofa.png)](https://codeclimate.com/github/comfy/comfortable-mexican-sofa) [![Coverage Status](https://coveralls.io/repos/comfy/comfortable-mexican-sofa/badge.png?branch=master)](https://coveralls.io/r/comfy/comfortable-mexican-sofa)
+[![Gem Version](https://img.shields.io/gem/v/comfortable_mexican_sofa.svg?style=flat)](http://rubygems.org/gems/comfortable_mexican_sofa) [![Gem Downloads](https://img.shields.io/gem/dt/comfortable_mexican_sofa.svg?style=flat)](http://rubygems.org/gems/comfortable_mexican_sofa) [![Build Status](https://img.shields.io/travis/comfy/comfortable-mexican-sofa.svg?style=flat)](https://travis-ci.org/comfy/comfortable-mexican-sofa) [![Dependency Status](https://img.shields.io/gemnasium/comfy/comfortable-mexican-sofa.svg?style=flat)](https://gemnasium.com/comfy/comfortable-mexican-sofa) [![Code Climate](https://img.shields.io/codeclimate/github/comfy/comfortable-mexican-sofa.svg?style=flat)](https://codeclimate.com/github/comfy/comfortable-mexican-sofa) [![Coverage Status](https://img.shields.io/coveralls/comfy/comfortable-mexican-sofa.svg?style=flat)](https://coveralls.io/r/comfy/comfortable-mexican-sofa?branch=master)
 
 ComfortableMexicanSofa is a powerful Rails 4 CMS Engine
 
@@ -17,17 +17,17 @@ ComfortableMexicanSofa is a powerful Rails 4 CMS Engine
 ## Installation
 
 Add gem definition to your Gemfile:
-    
+
 ```ruby
 gem 'comfortable_mexican_sofa', '~> 1.12.0'
-``` 
+```
 
 Then from the Rails project's root run:
-    
+
     bundle install
     rails generate comfy:cms
     rake db:migrate
-    
+
 Now take a look inside your `config/routes.rb` file. You'll see where routes attach for the admin area and content serving. Make sure that content serving route appears as a very last item.
 
 ```ruby
@@ -40,7 +40,7 @@ When upgrading from the older version please take a look at [Upgrading Comfortab
 ### Installation for Rails 3
 
 For Rails 3 apps feel free to use [1.8 release](https://github.com/comfy/comfortable-mexican-sofa/tree/1.8)
-    
+
 ```ruby
 gem 'comfortable_mexican_sofa', '~> 1.8.0'
 ```
@@ -54,7 +54,7 @@ Default username and password is 'username' and 'password'. You probably want to
 Before creating pages and populating them with content we need to create a Site. Site defines a hostname, content path and its language.
 
 After creating a Site, you need to make a Layout. Layout is the template of your pages; it defines some reusable content (like header and footer, for example) and places where the content goes. A very simple layout can look like this:
-    
+
 ```html
 <html>
   <body>
@@ -74,19 +74,18 @@ For more information please refer to [Wiki](https://github.com/comfy/comfortable
 
 #### Dependencies
 
-As long as you sucessfuly ran `bundle install` you should be ok. However, Paperclip requires *ImageMagick* to be installed to handle thumbnail generation.
+  * Install [ImageMagick](http://www.imagemagick.org/) for [paperclip](https://github.com/thoughtbot/paperclip)'s image processing
+  * Make sure that Gemfile has either [kaminari](https://github.com/amatsuda/kaminari) or [will_paginate](https://github.com/mislav/will_paginate)
 
 #### Help and Contact
 
 GoogleGroups: http://groups.google.com/group/comfortable-mexican-sofa
+
 Twitter: [@GroceryBagHead](http://twitter.com/#!/GroceryBagHead)
 
 ---
 
-ComfortableMexicanSofa is released under the [MIT license](https://github.com/comfy/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-2014 Oleg Khabarov
-
----
+Copyright 2009-2015 Oleg Khabarov
 
-DOGE: DMTBhZjcgUZunCKMpKCJogBXBhQx2h7h5c

data/app/controllers/comfy/admin/cms/base_controller.rb

@@ -52,4 +52,15 @@ protected
       flash.now[:danger] = I18n.t('comfy.admin.cms.base.fixtures_enabled')
     end
   end
+
+  # Wrapper to deal with WillPaginate vs Kaminari nonsense
+  def comfy_paginate(scope, per_page = 50)
+    if defined?(WillPaginate)
+      scope.paginate(:page => params[:page], :per_page => per_page)
+    elsif defined?(Kaminari)
+      scope.page(params[:page]).per(per_page)
+    else
+      scope
+    end
+  end
 end

data/app/controllers/comfy/admin/cms/files_controller.rb

@@ -7,8 +7,11 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
   before_action :authorize
 
   def index
-    @files = @site.files.not_page_file.includes(:categories).for_category(params[:category])
-      .order('comfy_cms_files.position').page(params[:page]).per(50)
+    files_scope = @site.files.not_page_file
+      .includes(:categories)
+      .for_category(params[:category])
+      .order('comfy_cms_files.position')
+    @files = comfy_paginate(files_scope, 50)
   end
 
   def new

data/app/controllers/comfy/cms/content_controller.rb

@@ -12,7 +12,7 @@ class Comfy::Cms::ContentController < Comfy::Cms::BaseController
 
   def show
     if @cms_page.target_page.present?
-      redirect_to @cms_page.target_page.url
+      redirect_to @cms_page.target_page.url(:relative)
     else
       respond_to do |format|
         format.html { render_page }

data/app/helpers/comfy/cms_helper.rb

@@ -0,0 +1,82 @@
+module Comfy::CmsHelper
+
+  # Wrapper around ComfortableMexicanSofa::FormBuilder
+  def comfy_form_for(record, options = {}, &proc)
+    options[:builder] = ComfortableMexicanSofa::FormBuilder
+    options[:layout] ||= :horizontal
+    bootstrap_form_for(record, options, &proc)
+  end
+
+  # Injects some content somewhere inside cms admin area
+  def cms_hook(name, options = {})
+    ComfortableMexicanSofa::ViewHooks.render(name, self, options)
+  end
+
+  # Content of a snippet. Examples:
+  #   cms_snippet_content(:my_snippet)
+  #   <%= cms_snippet_content(:my_snippet) do %>
+  #     Default content can go here.
+  #   <% end %>
+  def cms_snippet_content(identifier, cms_site = @cms_site, &block)
+    unless cms_site
+      host, path = request.host.downcase, request.fullpath if respond_to?(:request) && request
+      cms_site = Comfy::Cms::Site.find_site(host, path)
+    end
+    return '' unless cms_site
+
+    snippet = cms_site.snippets.find_by_identifier(identifier)
+
+    if !snippet && block_given?
+      snippet = cms_site.snippets.create(
+        :identifier => identifier,
+        :label      => identifier.to_s.titleize,
+        :content    => capture(&block)
+      )
+    end
+
+    snippet ? snippet.content : ''
+  end
+
+  # Same as cms_snippet_content but cms tags will be expanded
+  def cms_snippet_render(identifier, cms_site = @cms_site, &block)
+    return '' unless cms_site
+    content = cms_snippet_content(identifier, cms_site, &block)
+    render :inline => ComfortableMexicanSofa::Tag.process_content(
+      cms_site.pages.build, ComfortableMexicanSofa::Tag.sanitize_irb(content)
+    )
+  end
+
+  # Content of a page block. This is how you get content from page:field
+  # Example:
+  #   cms_block_content(:left_column, CmsPage.first)
+  #   cms_block_content(:left_column) # if @cms_page is present
+  def cms_block_content(identifier, blockable = @cms_page)
+    tag = blockable && (block = blockable.blocks.find_by_identifier(identifier)) && block.tag
+    return '' unless tag
+    tag.content
+  end
+
+  # For those times when we need to render content that shouldn't be renderable
+  # Example: {{cms:field}} tags
+  def cms_block_content_render(identifier, blockable = @cms_page)
+    tag = blockable && (block = blockable.blocks.find_by_identifier(identifier)) && block.tag
+    return '' unless tag
+    render :inline => ComfortableMexicanSofa::Tag.process_content(blockable, tag.content)
+  end
+
+  # Same as cms_block_content but with cms tags expanded
+  def cms_block_render(identifier, blockable = @cms_page)
+    tag = blockable && (block = blockable.blocks.find_by_identifier(identifier)) && block.tag
+    return '' unless tag
+    render :inline => ComfortableMexicanSofa::Tag.process_content(blockable, tag.render)
+  end
+
+  # Wrapper to deal with Kaminari vs WillPaginate
+  def comfy_paginate(collection)
+    if defined?(WillPaginate)
+      will_paginate collection
+    elsif defined?(Kaminari)
+      paginate collection, :theme => 'comfy'
+    end
+  end
+end

data/app/models/comfy/cms/block.rb

@@ -1,45 +1,63 @@
 class Comfy::Cms::Block < ActiveRecord::Base
   self.table_name = 'comfy_cms_blocks'
-  
+
+  FILE_CLASSES = %w(ActionDispatch::Http::UploadedFile Rack::Test::UploadedFile File).freeze
+
+  serialize :content
+
+  attr_accessor :temp_files
+
   # -- Relationships --------------------------------------------------------
   belongs_to :blockable,
     :polymorphic  => true
   has_many :files,
-    :autosave     => true,
-    :dependent    => :destroy
-  
-  # -- Callbacks ------------------------------------------------------------
-  before_save :prepare_files
-  
+    :autosave   => true,
+    :dependent  => :destroy
+
   # -- Validations ----------------------------------------------------------
   validates :identifier,
     :presence   => true,
     :uniqueness => { :scope => [:blockable_type, :blockable_id] }
-    
+
+  # -- Callbacks ------------------------------------------------------------
+  before_save :prepare_files
+
   # -- Instance Methods -----------------------------------------------------
   # Tag object that is using this block
   def tag
     @tag ||= blockable.tags(:reload).detect{|t| t.is_cms_block? && t.identifier == identifier}
   end
-  
+
+  # Intercepting assigns as we can't cram files into content directly anymore
+  def content=(value)
+    self.temp_files = [value].flatten.select do |f|
+      FILE_CLASSES.member?(f.class.name)
+    end
+
+    # correctly triggering dirty
+    value = nil               if self.temp_files.present?
+    write_attribute(:content, value)
+    self.content_will_change! if self.temp_files.present?
+  end
+
 protected
-  
+
+  # If we're passing actual files into content attribute, let's build them.
   def prepare_files
-    temp_files = [self.content].flatten.select do |f|
-      %w(ActionDispatch::Http::UploadedFile Rack::Test::UploadedFile File).member?(f.class.name)
-    end
-    
-    return if temp_files.blank?
-    
+    return if self.temp_files.blank?
+
     # only accepting one file if it's PageFile. PageFiles will take all
     single_file = self.tag.instance_of?(ComfortableMexicanSofa::Tag::PageFile)
-    temp_files = [temp_files.first].compact if single_file
-    
-    temp_files.each do |file|
+    self.temp_files = [self.temp_files.first].compact if single_file
+
+    self.temp_files.each do |file|
       self.files.collect{|f| f.mark_for_destruction } if single_file
-      self.files.build(:site => self.blockable.site, :dimensions => self.tag.try(:dimensions), :file => file)
+
+      self.files.build(
+        :site       => self.blockable.site,
+        :dimensions => self.tag.try(:dimensions),
+        :file       => file
+      )
     end
-    
-    self.content = nil unless self.content.is_a?(String)
   end
 end

data/app/models/comfy/cms/page.rb

@@ -2,7 +2,7 @@
 
 class Comfy::Cms::Page < ActiveRecord::Base
   self.table_name = 'comfy_cms_pages'
-  
+
   cms_acts_as_tree :counter_cache => :children_count
   cms_is_categorized
   cms_is_mirrored
@@ -14,7 +14,7 @@ class Comfy::Cms::Page < ActiveRecord::Base
   belongs_to :layout
   belongs_to :target_page,
     :class_name => 'Comfy::Cms::Page'
-  
+
   # -- Callbacks ------------------------------------------------------------
   before_validation :assigns_label,
                     :assign_parent,
@@ -23,9 +23,9 @@ class Comfy::Cms::Page < ActiveRecord::Base
   before_create     :assign_position
   after_save        :sync_child_full_paths!
   after_find        :unescape_slug_and_path
-  
+
   # -- Validations ----------------------------------------------------------
-  validates :site_id, 
+  validates :site_id,
     :presence   => true
   validates :label,
     :presence   => true
@@ -37,11 +37,11 @@ class Comfy::Cms::Page < ActiveRecord::Base
     :presence   => true
   validate :validate_target_page
   validate :validate_format_of_unescaped_slug
-  
+
   # -- Scopes ---------------------------------------------------------------
   default_scope -> { order('comfy_cms_pages.position') }
   scope :published, -> { where(:is_published => true) }
-  
+
   # -- Class Methods --------------------------------------------------------
   # Tree-like structure for pages
   def self.options_for_select(site, page = nil, current_page = nil, depth = 0, exclude_self = true, spacer = '. . ')
@@ -51,49 +51,55 @@ class Comfy::Cms::Page < ActiveRecord::Base
     current_page.children.each do |child|
       out += options_for_select(site, page, child, depth + 1, exclude_self, spacer)
     end if current_page.children_count.nonzero?
-    return out.compact 
+    return out.compact
   end
-  
+
   # -- Instance Methods -----------------------------------------------------
   # For previewing purposes sometimes we need to have full_path set. This
   # full path take care of the pages and its childs but not of the site path
   def full_path
     self.read_attribute(:full_path) || self.assign_full_path
   end
-  
+
   # Somewhat unique method of identifying a page that is not a full_path
   def identifier
     self.parent_id.blank?? 'index' : self.full_path[1..-1].slugify
   end
-  
+
   # Full url for a page
-  def url
+  def url(relative = false)
     public_cms_path = ComfortableMexicanSofa.config.public_cms_path || '/'
-    "//" + "#{self.site.hostname}/#{public_cms_path}/#{self.site.path}/#{self.full_path}".squeeze("/")
+    if relative
+      [public_cms_path, self.site.path, self.full_path].join('/').squeeze('/')
+    else
+      '//' + [self.site.hostname, public_cms_path, self.site.path, self.full_path].join('/').squeeze('/')
+    end
   end
-  
+
 protected
-  
+
   def assigns_label
     self.label = self.label.blank?? self.slug.try(:titleize) : self.label
   end
-  
+
   def assign_parent
     return unless site
     self.parent ||= site.pages.root unless self == site.pages.root || site.pages.count == 0
   end
-  
+
   def assign_full_path
-    self.full_path = self.parent ? "#{CGI::escape(self.parent.full_path).gsub('%2F', '/')}/#{self.slug}".squeeze('/') : '/'
+    self.full_path = self.parent ?
+      [CGI::escape(self.parent.full_path).gsub('%2F', '/'), self.slug].join('/').squeeze('/') :
+      '/'
   end
-  
+
   def assign_position
     return unless self.parent
     return if self.position.to_i > 0
     max = self.parent.children.maximum(:position)
     self.position = max ? max + 1 : 0
   end
-  
+
   def validate_target_page
     return unless self.target_page
     p = self
@@ -101,13 +107,13 @@ protected
       return self.errors.add(:target_page_id, 'Invalid Redirect') if (p = p.target_page) == self
     end
   end
-  
+
   def validate_format_of_unescaped_slug
     return unless slug.present?
     unescaped_slug = CGI::unescape(self.slug)
     errors.add(:slug, :invalid) unless unescaped_slug =~ /^\p{Alnum}[\.\p{Alnum}\p{Mark}_-]*$/i
   end
-  
+
   # Forcing re-saves for child pages so they can update full_paths
   def sync_child_full_paths!
     return unless full_path_changed?
@@ -127,5 +133,5 @@ protected
     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