comfortable_mexican_sofa 1.12.2 → 1.12.3

data/app/views/kaminari/comfy/_paginator.html.haml

@@ -1,12 +1,11 @@
 = paginator.render do
-  .pagination
-    %ul
-      = first_page_tag unless current_page.first?
-      = prev_page_tag unless current_page.first?
-      - each_page do |page|
-        - if page.left_outer? || page.right_outer? || page.inside_window?
-          = page_tag page
-        - elsif !page.was_truncated?
-          = gap_tag
-      = next_page_tag unless current_page.last?
-      = last_page_tag unless current_page.last?
+  %ul.pagination.pagination-sm
+    = first_page_tag unless current_page.first?
+    = prev_page_tag unless current_page.first?
+    - each_page do |page|
+      - if page.left_outer? || page.right_outer? || page.inside_window?
+        = page_tag page
+      - elsif !page.was_truncated?
+        = gap_tag
+    = next_page_tag unless current_page.last?
+    = last_page_tag unless current_page.last?

data/app/views/layouts/comfy/admin/cms.html.haml

@@ -1,4 +1,5 @@
 !!!
 %html{:lang => I18n.locale}
-  = render :partial => 'layouts/comfy/admin/cms/head'
-  = render :partial => 'layouts/comfy/admin/cms/body'
+  = render 'layouts/comfy/admin/cms/head'
+  = render 'layouts/comfy/admin/cms/body'
+  = render 'comfy/admin/cms/files/modal' if @site && !@site.new_record?

data/app/views/layouts/comfy/admin/cms/_body.html.haml

@@ -5,13 +5,14 @@
   .body-wrapper
     .left-column
       .left-column-content
-        = render :partial => 'layouts/comfy/admin/cms/left'
+        = render 'layouts/comfy/admin/cms/left'
     .right-column
       .right-column-content
-        = render :partial => 'layouts/comfy/admin/cms/right'
+        = render 'layouts/comfy/admin/cms/right'
     .center-column
-      = render :partial => 'layouts/comfy/admin/cms/center'
-      
-      = render :partial => 'layouts/comfy/admin/cms/footer'
-  
-  = render :partial => 'layouts/comfy/admin/cms/footer_js'
+      = render 'layouts/comfy/admin/cms/flash'
+      .center-column-content
+        = yield
+      = render 'layouts/comfy/admin/cms/footer'
+
+  = render 'layouts/comfy/admin/cms/footer_js'

data/app/views/layouts/comfy/admin/cms/{_center.html.haml → _flash.html.haml}

@@ -2,6 +2,3 @@
   .alert{:class => "alert-#{type}"}
     %button.close{:type => 'button', :class => "close", :data => {:dismiss => 'alert'}} ×
     = message
-
-.center-column-content
-  = yield

data/app/views/layouts/comfy/admin/cms/_footer_js.html.haml

@@ -3,7 +3,3 @@
 - if content_for(:javascript)
   :javascript
     #{yield :javascript}
-    
-- if @site && !@site.new_record?
-  :javascript
-    CMS.file_upload_path = "#{comfy_admin_cms_site_files_path(@site)}"

data/app/views/layouts/comfy/admin/cms/_left.html.haml

@@ -2,15 +2,20 @@
 
 %ul.navigation
   %li= active_link_to t('comfy.admin.cms.base.sites'), comfy_admin_cms_sites_path, :active => ['comfy/admin/cms/sites']
-  
+
   - if @site && !@site.new_record?
     %li= active_link_to t('comfy.admin.cms.base.layouts'), comfy_admin_cms_site_layouts_path(@site)
     %li= active_link_to t('comfy.admin.cms.base.pages'), comfy_admin_cms_site_pages_path(@site)
     %li= active_link_to t('comfy.admin.cms.base.snippets'), comfy_admin_cms_site_snippets_path(@site)
-    %li= active_link_to t('comfy.admin.cms.base.files'), comfy_admin_cms_site_files_path(@site)
-    
+    %li
+      - unless is_active_link?(comfy_admin_cms_site_files_path(@site))
+        %a.cms-files-open-modal{:href => '#', :title => 'Open library'}
+          %span.glyphicon.glyphicon-th-list
+      = active_link_to t('comfy.admin.cms.base.files'), comfy_admin_cms_site_files_path(@site)
+
+
   = cms_hook :navigation
-    
+
   = render 'comfy/admin/cms/partials/navigation_inner'
-    
+
 = render 'comfy/admin/cms/partials/navigation_after'

data/comfortable_mexican_sofa.gemspec

@@ -12,26 +12,27 @@ Gem::Specification.new do |s|
   s.summary       = "Rails 4 CMS Engine"
   s.description   = "ComfortableMexicanSofa is a powerful Rails 4 CMS Engine"
   s.license       = 'MIT'
-  
+
   s.files         = `git ls-files`.split("\n")
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ['lib']
-  
+
   s.required_ruby_version = '>= 1.9.3'
-  
-  s.add_dependency 'rails',             '>= 4.0.0'
-  s.add_dependency 'rails-i18n',        '~> 4.0.0'
-  s.add_dependency 'bootstrap_form',    '~> 2.1.1'
+
+  s.add_dependency 'rails',             '>= 4.0.0', '< 5'
+  s.add_dependency 'rails-i18n',        '>= 4.0.0'
+  s.add_dependency 'bootstrap_form',    '>= 2.2.0'
   s.add_dependency 'active_link_to',    '>= 1.0.0'
   s.add_dependency 'paperclip',         '>= 4.0.0'
   s.add_dependency 'kramdown',          '>= 1.0.0'
   s.add_dependency 'jquery-rails',      '>= 3.0.0'
   s.add_dependency 'jquery-ui-rails',   '>= 5.0.0'
   s.add_dependency 'haml-rails',        '>= 0.3.0'
-  s.add_dependency 'sass-rails',        '>= 4.0.1'
+  s.add_dependency 'sass-rails',        '>= 4.0.3'
   s.add_dependency 'coffee-rails',      '>= 3.1.0'
   s.add_dependency 'codemirror-rails',  '>= 3.0.0'
   s.add_dependency 'kaminari',          '>= 0.14.0'
   s.add_dependency 'tinymce-rails',     '>= 4.0.0'
-  s.add_dependency 'bootstrap-sass',    '~> 3.1.0'
+  s.add_dependency 'bootstrap-sass',    '>= 3.2.0'
+  s.add_dependency 'plupload-rails',    '>= 1.2.1'
 end

data/config/cms_routes.rb

@@ -1,6 +1,6 @@
 ComfortableMexicanSofa::Application.routes.draw do
-  
+
   comfy_route :cms_admin
   comfy_route :cms, :sitemap => true
-  
+
 end

data/config/initializers/comfortable_mexican_sofa.rb

@@ -9,12 +9,17 @@ ComfortableMexicanSofa.configure do |config|
 
   # Module responsible for authentication. You can replace it with your own.
   # It simply needs to have #authenticate method. See http_auth.rb for reference.
-  #   config.admin_auth = 'ComfortableMexicanSofa::HttpAuth'
+  #   config.admin_auth = 'ComfyAdminAuthentication'
+
+  # Module responsible for authorization on admin side. It should have #authorize
+  # method that returns true or false based on params and loaded instance
+  # variables available for a given controller.
+  #   config.admin_authorization = 'ComfyAdminAuthorization'
 
   # Module responsible for public authentication. Similar to the above. You also
   # will have access to @cms_site, @cms_layout, @cms_page so you can use them in
   # your logic. Default module doesn't do anything.
-  #   config.public_auth = 'ComfortableMexicanSofa::DummyAuth'
+  #   config.public_auth = 'ComfyPublicAuthentication'
 
   # When arriving at /cms-admin you may chose to redirect to arbirtary path,
   # for example '/cms-admin/users'
@@ -89,15 +94,28 @@ ComfortableMexicanSofa.configure do |config|
 
 end
 
-# Default credentials for ComfortableMexicanSofa::HttpAuth
+# Default credentials for ComfortableMexicanSofa::AccessControl::AdminAuthentication
 # YOU REALLY WANT TO CHANGE THIS BEFORE PUTTING YOUR SITE LIVE
-ComfortableMexicanSofa::HttpAuth.username = 'username'
-ComfortableMexicanSofa::HttpAuth.password = 'password'
-
-# You can use bcrypt (gem 'bcrypt-ruby') if you want to:
-#   require 'bcrypt'
-#   ComfortableMexicanSofa::HttpAuth.username = 'username'
-#   ComfortableMexicanSofa::HttpAuth.password = BCrypt::Password.new '... bcrypt hash ...'
-#
-# To create a bcrypt hash:
-#   BCrypt::Password.create('password').to_s
+ComfortableMexicanSofa::AccessControl::AdminAuthentication.username = 'username'
+ComfortableMexicanSofa::AccessControl::AdminAuthentication.password = 'password'
+
+# Uncomment this module and `config.admin_auth` above to use custom admin authentication
+# module ComfyAdminAuthentication
+#   def authenticate
+#     return true
+#   end
+# end
+
+# Uncomment this module and `config.admin_authorization` above to use custom admin authorization
+# module ComfyAdminAuthorization
+#   def authorize
+#     return true
+#   end
+# end
+
+# Uncomment this module and `config.public_auth` above to use custom public authentication
+# module ComfyPublicAuthentication
+#   def authenticate
+#     return true
+#   end
+# end

data/config/initializers/plupload.rb

@@ -0,0 +1,9 @@
+# Set a custom mime type to identify requests from plupload.
+#
+#   respond_to do |format|
+#     format.plupload { render :nothing => true, :status => :created }
+#   end
+
+unless Mime::Type.lookup_by_extension(:plupload)
+  Mime::Type.register 'text/plupload', :plupload
+end

data/config/locales/en.yml

@@ -39,26 +39,26 @@ en:
         description: Description
       comfy/cms/snippet:
         identifier: Identifier
-        
+
   comfy:
     cms:
       content:
         site_not_found: Site Not Found
         layout_not_found: Layout Not Found
         page_not_found: Page Not Found
-    
+
     admin:
       cms:
         base:
           site_not_found: Site not found
           fixtures_enabled: CMS Fixtures are enabled. All changes done here will be discarded.
-          
+
           sites: Sites
           layouts: Layouts
           pages: Pages
           snippets: Snippets
           files: Files
-  
+
         sites:
           created: Site created
           creation_failure: Failed to create site
@@ -66,7 +66,7 @@ en:
           update_failure: Failed to update site
           deleted: Site deleted
           not_found: Site not found
-          
+
           index:
             title: Sites
             new_link: Create New Site
@@ -83,7 +83,7 @@ en:
             cancel: Cancel
             update: Update Site
             is_mirrored: Mirrored
-  
+
         layouts:
           created: Layout created
           creation_failure: Failed to create layout
@@ -91,7 +91,7 @@ en:
           update_failure: Failed to update layout
           deleted: Layout deleted
           not_found: Layout not found
-          
+
           index:
             title: Layouts
             new_link: Create New Layout
@@ -116,7 +116,7 @@ en:
             create: Create Layout
             cancel: Cancel
             update: Update Layout
-  
+
         pages:
           created: Page created
           creation_failure: Failed to create page
@@ -125,7 +125,7 @@ en:
           deleted: Page deleted
           not_found: Page not found
           layout_not_found: No Layouts found. Please create one.
-          
+
           index:
             title: Pages
             new_link: Create New Page
@@ -152,7 +152,7 @@ en:
             no_tags: |-
               Layout has no content tags defined.<br/>
               Edit the content to include a page or field tag. For example: <code>{{cms:page:content}}</code>
-  
+
         snippets:
           created: Snippet created
           creation_failure: Failed to create snippet
@@ -160,7 +160,7 @@ en:
           update_failure: Failed to update snippet
           deleted: Snippet deleted
           not_found: Snippet not found
-          
+
           index:
             title: Snippets
             new_link: Create New Snippet
@@ -177,12 +177,12 @@ en:
             create: Create Snippet
             cancel: Cancel
             update: Update Snippet
-  
+
         revisions:
           reverted: Content Reverted
           record_not_found: Record Not Found
           not_found: Revision Not Found
-          
+
           show:
             title: Revisions for
             revision: Revision
@@ -193,7 +193,7 @@ en:
             changes: Changes
             previous: Previous
             current: Current
-  
+
         files:
           created: Files uploaded
           creation_failure: Failed to upload files
@@ -201,7 +201,7 @@ en:
           update_failure: Failed to update file
           deleted: File deleted
           not_found: File not found
-          
+
           index:
             title: Files
             new_link: Upload New File
@@ -218,11 +218,13 @@ en:
             create: Upload File
             cancel: Cancel
             update: Update File
+            delete: Delete File
+            are_you_sure: Are you sure?
           page_form:
             are_you_sure: Are you sure?
           file:
             are_you_sure: Are you sure?
-        
+
         categories:
           index:
             label: Categories

data/db/upgrade_migrations/08_upgrade_to_1_12_0.rb

@@ -17,6 +17,9 @@ class UpgradeTo1120 < ActiveRecord::Migration
     rename_table :cms_blocks,           :comfy_cms_blocks
     rename_table :cms_snippets,         :comfy_cms_snippets
     rename_table :cms_files,            :comfy_cms_files
+    rename_index :cms_revisions,
+      'index_cms_revisions_on_record_type_and_record_id_and_created_at',
+      'index_cms_revisions_on_record_type_id_and_created'
     rename_table :cms_revisions,        :comfy_cms_revisions
     rename_index :cms_categories,
       'index_cms_categories_on_site_id_and_categorized_type_and_label',

data/lib/comfortable_mexican_sofa.rb

@@ -7,8 +7,9 @@ require_relative 'comfortable_mexican_sofa/version'
 require_relative 'comfortable_mexican_sofa/error'
 require_relative 'comfortable_mexican_sofa/configuration'
 require_relative 'comfortable_mexican_sofa/routing'
-require_relative 'comfortable_mexican_sofa/authentication/http_auth'
-require_relative 'comfortable_mexican_sofa/authentication/dummy_auth'
+require_relative 'comfortable_mexican_sofa/access_control/admin_authentication'
+require_relative 'comfortable_mexican_sofa/access_control/admin_authorization'
+require_relative 'comfortable_mexican_sofa/access_control/public_authentication'
 require_relative 'comfortable_mexican_sofa/render_methods'
 require_relative 'comfortable_mexican_sofa/view_hooks'
 require_relative 'comfortable_mexican_sofa/view_methods'
@@ -33,7 +34,7 @@ end
 
 module ComfortableMexicanSofa
   class << self
-    
+
     # Modify CMS configuration
     # Example:
     #   ComfortableMexicanSofa.configure do |config|
@@ -42,7 +43,7 @@ module ComfortableMexicanSofa
     def configure
       yield configuration
     end
-    
+
     # Accessor for ComfortableMexicanSofa::Configuration
     def configuration
       @configuration ||= Configuration.new
@@ -56,6 +57,6 @@ module ComfortableMexicanSofa
     def logger
       @logger ||= Rails.logger
     end
-    
+
   end
 end

data/lib/comfortable_mexican_sofa/access_control/admin_authentication.rb

@@ -0,0 +1,20 @@
+module ComfortableMexicanSofa::AccessControl
+  module AdminAuthentication
+    # Set username and password in config/initializers/comfortable_mexican_sofa.rb
+    # Like this:
+    #   ComfortableMexicanSofa::AccessControl::AdminAuthentication = 'myname'
+    #   ComfortableMexicanSofa::AccessControl::AdminAuthentication = 'mypassword'
+
+    mattr_accessor  :username,
+                    :password
+
+    # Simple http_auth. When implementing some other form of authentication
+    # this method should return +true+ if everything is great, or redirect user
+    # to some other page, thus denying access to cms admin section.
+    def authenticate
+      authenticate_or_request_with_http_basic do |username, password|
+        self.username == username && self.password == password
+      end
+    end
+  end
+end

data/lib/comfortable_mexican_sofa/access_control/admin_authorization.rb

@@ -0,0 +1,8 @@
+module ComfortableMexicanSofa::AccessControl
+  module AdminAuthorization
+    # By default there's no authorization of any kind
+    def authorize
+      true
+    end
+  end
+end

data/lib/comfortable_mexican_sofa/access_control/public_authentication.rb

@@ -0,0 +1,8 @@
+module ComfortableMexicanSofa::AccessControl
+  module PublicAuthentication
+    # By defaut all published pages are accessible
+    def authenticate
+      true
+    end
+  end
+end

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -12,6 +12,9 @@ class ComfortableMexicanSofa::Configuration
   # Module that will handle authentication to access cms-admin area
   attr_accessor :admin_auth
 
+  # Module that will handle authorization against admin cms resources
+  attr_accessor :admin_authorization
+
   # Module that will handle authentication for public pages
   attr_accessor :public_auth
 
@@ -69,12 +72,16 @@ class ComfortableMexicanSofa::Configuration
   # Default is false.
   attr_accessor :reveal_cms_partials
 
+  # Auto-setting parameter derived from the routes
+  attr_accessor :public_cms_path
+
   # Configuration defaults
   def initialize
     @cms_title            = 'ComfortableMexicanSofa CMS Engine'
     @base_controller      = 'ApplicationController'
-    @admin_auth           = 'ComfortableMexicanSofa::HttpAuth'
-    @public_auth          = 'ComfortableMexicanSofa::DummyAuth'
+    @admin_auth           = 'ComfortableMexicanSofa::AccessControl::AdminAuthentication'
+    @admin_authorization  = 'ComfortableMexicanSofa::AccessControl::AdminAuthorization'
+    @public_auth          = 'ComfortableMexicanSofa::AccessControl::PublicAuthentication'
     @seed_data_path       = nil
     @admin_route_redirect = ''
     @enable_sitemap       = true
@@ -98,7 +105,7 @@ class ComfortableMexicanSofa::Configuration
       'it'    => 'Italiano',
       'da'    => 'Dansk',
       'cs'    => 'Česky',
-      'nb' => 'Norsk'
+      'nb'    => 'Norsk'
     }
     @admin_locale         = nil
     @admin_cache_sweeper  = nil
@@ -107,6 +114,7 @@ class ComfortableMexicanSofa::Configuration
     @allowed_partials     = nil
     @hostname_aliases     = nil
     @reveal_cms_partials  = false
+    @public_cms_path      = nil
   end
 
 end