comfortable_mexican_sofa 1.6.31 → 1.7.0

data/config/application.rb

@@ -2,9 +2,12 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+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
 
 module ComfortableMexicanSofa
   class Application < Rails::Application
@@ -33,28 +36,33 @@ module ComfortableMexicanSofa
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # JavaScript files you want as :defaults (application.js is always included).
-
     # 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.
-    if config.active_record.respond_to?(:whitelist_attributes)
-      config.active_record.whitelist_attributes = true
-    end
-    
+    config.active_record.whitelist_attributes = true
+
     # Enable the asset pipeline
-    if config.respond_to?(:assets)
-      config.assets.enabled = true
-    end
+    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 => '_comfortable_mexican_sofa_session'
+    config.session_store :cookie_store, :key => '_comfy_session'
     config.secret_token = 'e0fef4ab56c1cacd8845864fe2cb2a27f5caad72823419f87b2774785187090a654b83229bf9cef70ce475a83bfa561dbbaa2015788181ea837c456964c1e0f6'
     
   end

data/config/environments/development.rb

@@ -2,7 +2,7 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # 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
+  # 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
 
@@ -21,5 +21,19 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  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
+  config.assets.debug = true
+end

data/config/environments/production.rb

@@ -11,13 +11,21 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # Disable Rails's static asset server (Apache or nginx will already do this)
   config.serve_static_assets = false
 
-  # Compress both stylesheets and JavaScripts
-  # config.assets.js_compressor  = :uglifier
-  # config.assets.css_compressor = :scss
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
+
+  # Defaults to nil and saved in location specified by config.assets.prefix
+  # config.assets.manifest = YOUR_PATH
 
   # Specifies the header that your server uses for sending files
-  # (comment out if your front-end server doesn't support this)
-  config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
@@ -25,13 +33,16 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
@@ -49,4 +60,8 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # 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

data/config/environments/test.rb

@@ -2,9 +2,9 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # 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
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # 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
@@ -29,10 +29,10 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test 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
+  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
   config.active_support.deprecation = :stderr

data/config/initializers/comfortable_mexican_sofa.rb

@@ -93,7 +93,7 @@ ComfortableMexicanSofa.configure do |config|
   
   # Site aliases, if you want to have aliases for your site. Good for harmonizing 
   # production env with dev/testing envs.
-  # e.g. config.site_aliases = {'host.com' => 'host.inv', 'host_a.com' => ['host.lvh.me', 'host.dev']}
+  # e.g. config.hostname_aliases = {'host.com' => 'host.inv', 'host_a.com' => ['host.lvh.me', 'host.dev']}
   # Default is nil (not used)
   #   config.hostname_aliases = nil
   

data/db/migrate/01_create_cms.rb

@@ -61,7 +61,7 @@ class CreateCms < ActiveRecord::Migration
     create_table :cms_blocks do |t|
       t.integer   :page_id,     :null => false
       t.string    :identifier,  :null => false
-      t.text      :content
+      t.text      :content,     text_limit
       t.timestamps
     end
     add_index :cms_blocks, [:page_id, :identifier]

data/lib/comfortable_mexican_sofa.rb

@@ -46,11 +46,6 @@ module ComfortableMexicanSofa
     end
     alias :config :configuration
     
-    # Checking if Rails3.1+ asset pipeline is enabled
-    def asset_pipeline_enabled?
-      Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1 && Rails.configuration.assets.enabled
-    end
-    
     # Establishing database connection if custom one is defined
     def establish_connection(klass)
       if ComfortableMexicanSofa.config.database_config && !Rails.env.test?

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -85,7 +85,7 @@ class ComfortableMexicanSofa::Configuration
     @admin_route_redirect = ''
     @use_default_routes   = true
     @enable_sitemap       = true
-    @upload_file_options  = { :url => '/system/:class/:id/:attachment/:style/:filename' }
+    @upload_file_options  = { }
     @enable_fixtures      = false
     @fixtures_path        = File.expand_path('db/cms_fixtures', Rails.root)
     @revisions_limit      = 25

data/lib/comfortable_mexican_sofa/engine.rb

@@ -1,8 +1,14 @@
+require 'rubygems'
 require 'comfortable_mexican_sofa'
 require 'rails'
-require 'paperclip'
+require 'formatted_form'
 require 'active_link_to'
-require 'mime/types'
+require 'paperclip'
+require 'redcarpet'
+require 'jquery-rails'
+require 'haml-rails'
+require 'sass-rails'
+require 'coffee-rails'
 
 module ComfortableMexicanSofa
   class Engine < ::Rails::Engine

data/lib/comfortable_mexican_sofa/extensions/rails.rb

@@ -1,7 +1,7 @@
 class String
   # Converts string to something suitable to be used as an element id
-  def idify
-    self.strip.gsub(/\W/, '_').gsub(/\s|^_*|_*$/, '').squeeze('_')
+  def slugify
+    self.strip.gsub(/\W|_/, '-').gsub(/\s|^_*|_*$/, '').squeeze('-')
   end
 end
 

data/lib/comfortable_mexican_sofa/form_builder.rb

@@ -1,97 +1,38 @@
-class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
-  
-  helpers = field_helpers -
-    %w(hidden_field fields_for) +
-    %w(select collection_select)
-    
-  helpers.each do |name|
-    class_eval %Q^
-      def #{name}(field, *args)
-        options = args.extract_options!
-        args << options
-        return super if options.delete(:disable_builder)
-        default_field('#{name}', field, options){ super }
-      end
-    ^
-  end
-  
-  def default_field(type, field, options = {}, &block)
-    errors = if object.respond_to?(:errors) && object.errors[field].present?
-      "<div class='errors'>#{[object.errors[field]].flatten.first}</div>"
-    end
-    if desc = options.delete(:desc)
-      desc = "<div class='desc'>#{desc}</div>"
-    end
-    %(
-      <div class='form_element #{type}_element #{'errors' if errors}'>
-        <div class='label'>#{label_for(field, options)}</div>
-        <div class='value'>#{yield}</div>
-        #{desc}
-        #{errors}
-      </div>
-    ).html_safe
-  end
-  
-  def simple_field(label = nil, content = nil, options = {}, &block)
-    content ||= @template.capture(&block) if block_given?
-    %(
-      <div class='form_element simple_field #{options.delete(:class)}'>
-        <div class='label'>#{label}</div>
-        <div class='value'>#{content}</div>
-      </div>
-    ).html_safe
-  end
-  
-  def label_for(field, options={})
-    label = options.delete(:label) || object.class.human_attribute_name(field)
-    for_value = options[:id] || "#{object_name}_#{field}"
-    %Q{<label for="#{for_value}">#{label}</label>}.html_safe
-  end
-  
-  def submit(value, options = {}, &block)
-    return super if options.delete(:disable_builder)
-    extra_content = @template.capture(&block) if block_given?
-    simple_field(nil, "#{super(value, options)} #{extra_content}", :class => 'submit_element')
-  end
+class ComfortableMexicanSofa::FormBuilder < FormattedForm::FormBuilder
   
   # -- Tag Field Fields -----------------------------------------------------
-  def default_tag_field(tag, index, options = {})
-    method    = options.delete(:method) || :text_field_tag
+  def default_tag_field(tag, index, method = :text_field_tag, options = {})
+    
     label     = tag.page.class.human_attribute_name(tag.identifier.to_s)
     css_class = tag.class.to_s.demodulize.underscore
     content   = ''
     
-    input_class = case tag
-    when ComfortableMexicanSofa::Tag::PageDateTime, ComfortableMexicanSofa::Tag::FieldDateTime
-      'datetime'
-    when ComfortableMexicanSofa::Tag::PageText, ComfortableMexicanSofa::Tag::FieldText
-      'code'
-    when ComfortableMexicanSofa::Tag::PageRichText, ComfortableMexicanSofa::Tag::FieldRichText
-      'rich_text'
-    end
-    
     case method
     when :file_field_tag
-      input_params = {:id => nil, :class => input_class}
-      input_params.merge!(:multiple => true) if options[:multiple]
+      input_params = {:id => nil}
       name = "page[blocks_attributes][#{index}][content]"
-      name << '[]' if options[:multiple]
+      
+      if options.delete(:multiple)
+        input_params.merge!(:multiple => true)
+        name << '[]'
+      end
+      
       content << @template.send(method, name, input_params)
       content << @template.render(:partial => 'cms_admin/files/page_form', :object => tag.block)
     else
-      content << @template.send(method, "page[blocks_attributes][#{index}][content]", tag.content, :id => nil, :class => input_class)
+      content << @template.send(method, "page[blocks_attributes][#{index}][content]", tag.content, options)
     end
     content << @template.hidden_field_tag("page[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
     
-    simple_field(label, content, :class => css_class)
+    element(label, content.html_safe)
   end
   
   def field_date_time(tag, index)
-    default_tag_field(tag, index)
+    default_tag_field(tag, index, :text_field_tag, :data => {:datetime => true})
   end
   
   def field_integer(tag, index)
-    default_tag_field(tag, index, :method => :number_field_tag)
+    default_tag_field(tag, index, :number_field_tag)
   end
   
   def field_string(tag, index)
@@ -99,19 +40,19 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   end
   
   def field_text(tag, index)
-    default_tag_field(tag, index, :method => :text_area_tag)
+    default_tag_field(tag, index, :text_area_tag, :data => {:cm_mode => 'text/html'})
   end
   
   def field_rich_text(tag, index)
-    default_tag_field(tag, index, :method => :text_area_tag)
+    default_tag_field(tag, index, :text_area_tag, :data => {:rich_text => true})
   end
   
   def page_date_time(tag, index)
-    default_tag_field(tag, index)
+    default_tag_field(tag, index, :text_field_tag, :data => {:datetime => true})
   end
   
   def page_integer(tag, index)
-    default_tag_field(tag, index, :method => :number_field_tag)
+    default_tag_field(tag, index, :number_field_tag)
   end
   
   def page_string(tag, index)
@@ -119,19 +60,23 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
   end
   
   def page_text(tag, index)
-    default_tag_field(tag, index, :method => :text_area_tag)
+    default_tag_field(tag, index, :text_area_tag, :data => {:cm_mode => 'text/html'})
   end
   
   def page_rich_text(tag, index)
-    default_tag_field(tag, index, :method => :text_area_tag)
+    default_tag_field(tag, index, :text_area_tag, :data => {:rich_text => true})
   end
   
   def page_file(tag, index)
-    default_tag_field(tag, index, :method => :file_field_tag)
+    default_tag_field(tag, index, :file_field_tag)
   end
   
   def page_files(tag, index)
-    default_tag_field(tag, index, :method => :file_field_tag, :multiple => true)
+    default_tag_field(tag, index, :file_field_tag, :multiple => true)
+  end
+  
+  def page_markdown(tag, index)
+    default_tag_field(tag, index, :text_area_tag, :data => {:cm_mode => 'text/x-markdown'})
   end
   
   def collection(tag, index)
@@ -146,7 +91,7 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
       :id => nil
     )
     content << @template.hidden_field_tag("page[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
-    simple_field(tag.identifier.titleize, content, :class => tag.class.to_s.demodulize.underscore )
+    element(tag.identifier.titleize, content, :class => tag.class.to_s.demodulize.underscore )
   end
   
 end

data/lib/comfortable_mexican_sofa/tag.rb

@@ -37,7 +37,7 @@ module ComfortableMexicanSofa::Tag
       if match = tag_signature.match(regex_tag_signature)
         
         params = begin
-          (CSV.parse_line(match[2].to_s, (RUBY_VERSION < '1.9.2' ? ':' : {:col_sep => ':'})) || []).compact
+          (CSV.parse_line(match[2].to_s, :col_sep => ':') || []).compact
         rescue
           []
         end.map{|p| p.gsub(/\\|'/) { |c| "\\#{c}" } }

data/lib/comfortable_mexican_sofa/tags/page_markdown.rb

@@ -0,0 +1,22 @@
+class ComfortableMexicanSofa::Tag::PageMarkdown
+  include ComfortableMexicanSofa::Tag
+  
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= IDENTIFIER_REGEX
+    /\{\{\s*cms:page:(#{identifier}):markdown\s*\}\}/
+  end
+  
+  def content
+    block.content
+  end
+  
+  def render
+    md = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
+      :autolink           => true,
+      :no_intra_emphasis  => true,
+      :fenced_code_blocks => true,
+      :lax_spacing        => true
+    )
+    md.render(content.to_s)
+  end
+end