browsercms-artirix 4.0.1.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c583e14fa12a74f972234f11511a962188130dbe
-  data.tar.gz: 11cc22e7c560d79463b17162c340663f72e198ed
+  metadata.gz: a57902749d033539ac45bb99f421e92e3f9daf29
+  data.tar.gz: 13dcbcd60d6db9caade2157947c28e95a5b4bd06
 SHA512:
-  metadata.gz: 8ae938f94dd7d6135bee6c3b041533730171449f1da563087bfd1570b3222bfef97ce1746c7fc4addeb41f3f0a543670b212680b5a69426fc9758cf92dee1ba0
-  data.tar.gz: 2a28a07e19f40207217060314715102733189ff936e33cc05b4ec2f5eee4d060d0377d1e17c2fcd046fde4ed6cb94e607ae6d1f0509b60db6eb8e1105a50c09b
+  metadata.gz: 0eb504ff8c8d24e30270e068ef7782e6fc0b7f7ca9bd457663fe3573c8f709212bc2dd5e86c8dfa510c1744d2750c5b94a801c39aa50a9c2621a117006d3548d
+  data.tar.gz: acfd15b494b1e6d1ef6d7b3fa402724e8a14e4496ebc7b7eaca5cbd18baccf837a19bfaf8df522e661df0221e7e8c4a47862b688e9abcbf6837d56b8b3f5b107

data/app/controllers/cms/application_controller.rb

@@ -1,7 +1,13 @@
 module Cms
   class ApplicationController < ::ApplicationController
     include Cms::AdminController
-    
+
+    unless Cms.allow_guests?
+      before_filter :redirect_to_cms_site
+      before_action :authenticate_cms_user!
+      before_filter :cms_access_required
+    end
+
     before_action :no_browser_caching
     
     def no_browser_caching

data/app/controllers/cms/base_controller.rb

@@ -13,6 +13,7 @@ module Cms
     #
     # @param [Array<Symbol>] methods List of methods to disable security for.
     def self.allow_guests_to(methods)
+      return true unless Cms.allow_guests?
       skip_before_action :redirect_to_cms_site, only: methods
       skip_before_action :authenticate_cms_user!, only: methods
       skip_before_action :cms_access_required, only: methods

data/app/controllers/cms/content_controller.rb

@@ -75,7 +75,7 @@ module Cms
 
     def render_page
       prepare_connectables_for_render
-      prepend_view_path DynamicView.resolver
+      prepend_view_path DynamicView.resolver if Cms.allow_dynamic_views?
       respond_with @page, determine_page_layout
     end
 

data/app/models/cms/guest_user.rb

@@ -9,8 +9,14 @@ module Cms
 
     include Cms::UsersService::GuestUserModule
 
+    DEFAULT_ATTRIBUTES = {
+      login:      Cms::Group::GUEST_CODE,
+      first_name: 'Anonymous',
+      last_name:  'User'
+    }
+
     def initialize(attributes={})
-      super({:login => Cms::Group::GUEST_CODE, :first_name => "Anonymous", :last_name => "User"}.merge(attributes))
+      super DEFAULT_ATTRIBUTES.merge(attributes)
       @guest = true
     end
 

data/lib/cms/configuration.rb

@@ -21,11 +21,19 @@ module Cms
     end
 
     def markdown?
-      Object.const_defined?("Markdown")
+      Object.const_defined?('Markdown')
     end
 
     def reserved_paths
-      @reserved_paths ||= ["/cms", "/cache"]
+      @reserved_paths ||= ['/cms', '/cache']
+    end
+
+    def allow_dynamic_views?
+      Rails.application.config.cms.allow_dynamic_views
+    end
+
+    def allow_guests?
+      Rails.application.config.cms.allow_guests
     end
 
     # User Class
@@ -153,7 +161,7 @@ module Cms
   module Errors
     class AccessDenied < StandardError
       def initialize
-        super("Access Denied")
+        super('Access Denied')
       end
     end
 

data/lib/cms/engine.rb

@@ -8,6 +8,9 @@ module Cms
 
     config.cms = ActiveSupport::OrderedOptions.new
 
+    config.cms.allow_guests = true
+    config.cms.allow_dynamic_views = true
+
     # USER BASE defaults
     config.cms.user_class_name = 'Cms::PersistentUser'
     config.cms.user_key_field  = :login
@@ -167,7 +170,7 @@ module Cms
       ActiveSupport::Dependencies.autoload_paths += %W( #{Rails.root}/app/portlets )
       ActiveSupport::Dependencies.autoload_paths += %W( #{Rails.root}/app/presenters )
       ActiveSupport::Dependencies.autoload_paths += %W( #{Rails.root}/app/portlets/helpers )
-      ActionController::Base.append_view_path DynamicView.base_path
+      ActionController::Base.append_view_path DynamicView.base_path if Cms.allow_dynamic_views?
       ActionController::Base.append_view_path %W( #{self.root}/app/views)
       require 'jdbc_adapter' if defined?(JRUBY_VERSION)
     end

data/lib/cms/users_service/cms_user_compatibility_module.rb

@@ -58,15 +58,15 @@ module Cms
       end
 
       def permissions
-        @permissions ||= Cms::Permission.by_group_ids groups.map(&:id)
+        @permissions ||= load_permissions
       end
 
       def viewable_sections
-        @viewable_sections ||= Cms::Section.by_group_ids groups.map(&:id)
+        @viewable_sections ||= load_viewable_sections
       end
 
       def modifiable_sections
-        @modifiable_sections ||= Cms::Section.by_group_ids groups_with_cms_access.map(&:id)
+        @modifiable_sections ||= load_modifiable_sections
       end
 
       # Expects a list of codes of Permissions
@@ -132,6 +132,20 @@ module Cms
       def cms_access?
         groups.cms_access.present?
       end
+
+      private
+
+      def load_permissions
+        Cms::Permission.by_group_ids groups.map(&:id)
+      end
+
+      def load_viewable_sections
+        Cms::Section.by_group_ids groups.map(&:id)
+      end
+
+      def load_modifiable_sections
+        Cms::Section.by_group_ids groups_with_cms_access.map(&:id)
+      end
     end
   end
 end

data/lib/cms/users_service/guest_user_module.rb

@@ -37,6 +37,19 @@ module Cms
       def save(_perform_validation = true)
         false
       end
+
+      def permissions
+        @permissions ||= Cms.allow_guests? ? load_permissions : Cms::Permission.none
+      end
+
+      def viewable_sections
+        @viewable_sections ||= Cms.allow_guests? ? load_viewable_sections : Cms::Section.none
+      end
+
+      def modifiable_sections
+        @modifiable_sections ||= Cms.allow_guests? ? load_modifiable_sections : Cms::Section.none
+      end
+
     end
   end
-end
+end

data/lib/cms/users_service/users_factory.rb

@@ -10,7 +10,7 @@ module Cms
       end
 
       def guest_user
-        load_guest_user.tap { |u| extend_user u }
+        load_guest_user
       end
 
       def user(login, group_codes: nil)
@@ -42,6 +42,7 @@ module Cms
         }
 
         Cms.user_class.new(params).tap do |guest_user|
+          extend_user guest_user
           guest_user.send :extend, GuestUserModule
         end
       end

data/lib/cms/version.rb

@@ -2,7 +2,7 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = '4.0.1.1'
+  VERSION = '4.0.2'
 
   # Return the current version of the CMS.
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms-artirix
 version: !ruby/object:Gem::Version
-  version: 4.0.1.1
+  version: 4.0.2
 platform: ruby
 authors:
 - BrowserMedia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails