browsercms-artirix 4.0.0.rc1.art4 → 4.0.1.1

data/lib/cms/users_service/users_factory.rb

@@ -0,0 +1,50 @@
+module Cms
+  module UsersService
+    class UsersFactory
+      class << self
+        delegate :guest_user, :user, :extend_user, to: :factory
+      end
+
+      def self.factory
+        @factory || new
+      end
+
+      def guest_user
+        load_guest_user.tap { |u| extend_user u }
+      end
+
+      def user(login, group_codes: nil)
+        load_user(login).tap do |user|
+          extend_user(user, group_codes: group_codes)
+        end
+      end
+
+      def extend_user(user, group_codes: nil)
+        user.send :extend, CmsUserCompatibilityModule unless user.try :cms_user_compatible?
+        user.send :extend, UserGroupsByCodesModule unless user.respond_to? :group_codes=
+        add_groups_to_user(user, group_codes) if group_codes
+        user
+      end
+
+      private
+      def add_groups_to_user(user, group_codes)
+        user.group_codes = Array(group_codes)
+      end
+
+      def load_user(login)
+        Cms.user_class.where(Cms.user_key_field => login).first!
+      end
+
+      def load_guest_user
+        params = {
+          Cms.user_key_field  => Cms::Group::GUEST_CODE,
+          Cms.user_name_field => GUEST_NAME
+        }
+
+        Cms.user_class.new(params).tap do |guest_user|
+          guest_user.send :extend, GuestUserModule
+        end
+      end
+    end
+  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.0.rc1.art4"
+  VERSION = '4.0.1.1'
 
   # Return the current version of the CMS.
   def self.version

data/lib/generators/browser_cms/demo_site/templates/demo.seeds.rb

@@ -2,7 +2,7 @@ require 'cms/data_loader'
 include Cms::DataLoader
 
 # Load up data that was created in load seed data migration
-Cms::User.current = Cms::User.first(:conditions => {:login => 'cmsadmin'})
+Cms::UsersService.current = Cms::User.first(:conditions => {:login => 'cmsadmin'})
 root_section = Cms::Section.root.first
 home_page = Cms::Page.first(:conditions => {:name => "Home"})
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms-artirix
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1.art4
+  version: 4.0.1.1
 platform: ruby
 authors:
 - BrowserMedia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.13
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: devise_cas_authenticatable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -587,6 +601,7 @@ files:
 - app/controllers/cms/attachments_controller.rb
 - app/controllers/cms/base_controller.rb
 - app/controllers/cms/cache_controller.rb
+- app/controllers/cms/cas_sessions_controller.rb
 - app/controllers/cms/categories_controller.rb
 - app/controllers/cms/category_types_controller.rb
 - app/controllers/cms/connectors_controller.rb
@@ -662,6 +677,7 @@ files:
 - app/models/cms/connector.rb
 - app/models/cms/content.rb
 - app/models/cms/content_type.rb
+- app/models/cms/default_user.rb
 - app/models/cms/dynamic_view.rb
 - app/models/cms/email_message.rb
 - app/models/cms/email_message_mailer.rb
@@ -981,6 +997,11 @@ files:
 - lib/cms/responders/content_responder.rb
 - lib/cms/route_extensions.rb
 - lib/cms/users_service.rb
+- lib/cms/users_service/cms_login_user_controller_concern.rb
+- lib/cms/users_service/cms_user_compatibility_module.rb
+- lib/cms/users_service/guest_user_module.rb
+- lib/cms/users_service/user_groups_by_codes_module.rb
+- lib/cms/users_service/users_factory.rb
 - lib/cms/version.rb
 - lib/command_line.rb
 - lib/generators/browser_cms.rb
@@ -1035,9 +1056,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6