scrivito_sdk 1.2.0 → 1.3.0.rc1

data/lib/scrivito/user.rb

@@ -138,7 +138,8 @@ module Scrivito
       @suggest_users_proc = options[:suggest_users_proc]
       @restriction_set    = options[:restriction_set]
 
-      @explicit_rules.each_key { |rule| assert_valid_verb(rule.second) }
+      @explicit_rules.each { |rule| assert_valid_verb(rule.second) }
+      @explicit_rules_set = Set.new(@explicit_rules.map { |rule| rule.take(3) })
     end
 
     def can?(verb, workspace)
@@ -156,12 +157,12 @@ module Scrivito
 
     def can_always?(verb, subject)
       assert_valid_verb(verb)
-      @explicit_rules.has_key?([:can_always, verb, subject])
+      @explicit_rules_set.include?([:always, verb, subject])
     end
 
     def can_never?(verb, subject)
       assert_valid_verb(verb)
-      @explicit_rules.has_key?([:can_never, verb, subject])
+      @explicit_rules_set.include?([:never, verb, subject])
     end
 
     def owner_of?(workspace)

data/lib/scrivito/user_definition.rb

@@ -5,7 +5,7 @@ module Scrivito
   class UserDefinition
     def initialize(user_id)
       @user_id = user_id
-      @explicit_rules = {}
+      @explicit_rules = []
     end
 
     #
@@ -39,8 +39,8 @@ module Scrivito
     #   end
     #
     def can_always(verb, subject, message = nil)
-      assert_no_conflict(:can_never, verb, subject)
-      @explicit_rules[[:can_always, verb, subject]] = message
+      assert_no_conflict(:never, verb, subject)
+      @explicit_rules << [:always, verb, subject, message]
     end
 
     #
@@ -77,8 +77,8 @@ module Scrivito
     #   end
     #
     def can_never(verb, subject, message = nil)
-      assert_no_conflict(:can_always, verb, subject)
-      @explicit_rules[[:can_never, verb, subject]] = message
+      assert_no_conflict(:always, verb, subject)
+      @explicit_rules << [:never, verb, subject, message]
     end
 
     #
@@ -88,7 +88,7 @@ module Scrivito
     # @api public
     #
     def is_admin!
-      User::VERBS.each { |verb| @explicit_rules[[:can_always, verb, :workspace]] ||= nil }
+      @explicit_rules = User::VERBS.map { |verb| [:always, verb, :workspace, nil] }
     end
 
     #
@@ -217,7 +217,7 @@ module Scrivito
     end
 
     def assert_no_conflict(type, verb, subject)
-      if @explicit_rules.has_key?([type, verb, subject])
+      if @explicit_rules.detect { |rule| rule.take(3) == [type, verb, subject] }
         raise ScrivitoError.new("Conflicting rules for verb '#{verb}' and subject '#{subject}'")
       end
     end

data/lib/scrivito/workspace.rb

@@ -126,13 +126,22 @@ class Workspace
   end
 
   delegate :content_state_id, :base_content_state_id, :content_state,
-    :base_revision_id, :base_content_state, to: :data
+    :base_revision_id, :auto_update?, :base_content_state, to: :data
 
   # Create a new workspace.
-  # @example Create a workspace, providing its title:
-  #   Scrivito::Workspace.create(title: "Jane")
   # @api public
   # @param [Hash] attributes
+  # @option attributes [String] :title title of the workspace.
+  # @option attributes [Boolean] :auto_update Specifies whether changes published intermediately
+  #   are applied automatically and instantly to the working copy. The default is +true+. Setting
+  #   this option to +false+ requires {#rebase rebasing} the working copy (manually) to keep it up
+  #   to date.
+  # @example Create a workspace, providing its title:
+  #   Scrivito::Workspace.create(title: "Jane")
+  # @example Create a workspace, providing auto_update:
+  #   # Workspace will not be updated until it is published.
+  #   Scrivito::Workspace.create(auto_update: false)
+  #
   # @return [Scrivito::Workspace]
   def self.create(attributes)
     find(create_async(attributes).result['id'])
@@ -140,6 +149,7 @@ class Workspace
 
   def self.create_async(attributes)
     Task.new do
+      attributes = attributes.reverse_merge(auto_update: true)
       CmsRestApi.task_unaware_request(:post, 'workspaces', workspace: attributes)
     end
   end
@@ -239,6 +249,7 @@ class Workspace
 
   # Rebases the current workspace from the published content in order to integrate the changes
   # that were published in the meantime.
+  # @note This action is not required for auto-updated workspaces.
   # @api public
   def rebase
     rebase_async.result

data/lib/scrivito/workspace_data.rb

@@ -22,6 +22,10 @@ module Scrivito
       @data["content_state_id"].present?
     end
 
+    def auto_update?
+      @data["auto_update"]
+    end
+
     def base_content_state_id
       @data["base_content_state_id"] or raise InternalError
     end
@@ -58,6 +62,7 @@ module Scrivito
         'base_revision_id'      => base_revision_id,
         'base_content_state_id' => base_csid,
         'memberships'           => memberships,
+        'auto_update'           => auto_update?,
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.rc1
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -177,7 +177,11 @@ files:
 - app/controllers/scrivito/completion_controller.rb
 - app/controllers/scrivito/default_cms_controller.rb
 - app/controllers/scrivito/legacy_redirect_controller.rb
+- app/controllers/scrivito/obj_class_controller.rb
 - app/controllers/scrivito/objs_controller.rb
+- app/controllers/scrivito/proxy/objs_controller.rb
+- app/controllers/scrivito/resolve_paths_controller.rb
+- app/controllers/scrivito/sessions_controller.rb
 - app/controllers/scrivito/tasks_controller.rb
 - app/controllers/scrivito/ui_controller.rb
 - app/controllers/scrivito/users_controller.rb
@@ -193,6 +197,7 @@ files:
 - app/views/scrivito/completion/suggest.json.jbuilder
 - app/views/scrivito/content_widget/show.html.erb
 - app/views/scrivito/fallback_thumbnail.html.erb
+- app/views/scrivito/obj_class/defaults.json.jbuilder
 - app/views/scrivito/objs/binary_no_cache.json.jbuilder
 - app/views/scrivito/objs/destroy.json.jbuilder
 - app/views/scrivito/objs/is_outdated.json.jbuilder
@@ -208,6 +213,9 @@ files:
 - app/views/scrivito/objs/widget.json.jbuilder
 - app/views/scrivito/objs/widget_class_selection.json.jbuilder
 - app/views/scrivito/page_details.html.erb
+- app/views/scrivito/proxy/index.json.jbuilder
+- app/views/scrivito/resolve_paths/resolve.json.jbuilder
+- app/views/scrivito/sessions/update.json.jbuilder
 - app/views/scrivito/tasks/show.json.jbuilder
 - app/views/scrivito/ui/index.html.erb
 - app/views/scrivito/users/suggest.json.jbuilder
@@ -228,7 +236,7 @@ files:
 - config/locales/en.scrivito.models.yml
 - config/precedence_routes.rb
 - config/routes.rb
-- lib/assets/images/scrivito/image_placeholder.png
+- lib/assets/images/scrivito/image_placeholder.gif
 - lib/assets/images/scrivito/source_invalid.png
 - lib/assets/images/scrivito/source_too_large.png
 - lib/assets/images/scrivito/source_type_invalid.png
@@ -328,7 +336,7 @@ files:
 - lib/scrivito/controller_actions.rb
 - lib/scrivito/controller_helper.rb
 - lib/scrivito/controller_runtime.rb
-- lib/scrivito/date_attribute.rb
+- lib/scrivito/date_conversion.rb
 - lib/scrivito/deprecation.rb
 - lib/scrivito/dialog_size_helper.rb
 - lib/scrivito/diff.rb
@@ -336,11 +344,13 @@ files:
 - lib/scrivito/editing_context_middleware.rb
 - lib/scrivito/errored_widget_tag.rb
 - lib/scrivito/errors.rb
+- lib/scrivito/float_conversion.rb
 - lib/scrivito/future_binary.rb
 - lib/scrivito/gem_info.rb
 - lib/scrivito/generator_helper.rb
 - lib/scrivito/html_string.rb
 - lib/scrivito/image_tag.rb
+- lib/scrivito/integer_conversion.rb
 - lib/scrivito/layout_tags.rb
 - lib/scrivito/link.rb
 - lib/scrivito/link_parser.rb
@@ -369,6 +379,7 @@ files:
 - lib/scrivito/obj_search_enumerator.rb
 - lib/scrivito/obj_search_enumerator/batch.rb
 - lib/scrivito/obj_search_enumerator/batch_iterator.rb
+- lib/scrivito/obj_search_enumerator/facet_query.rb
 - lib/scrivito/obj_search_enumerator/query_executor.rb
 - lib/scrivito/obj_update_params_parser.rb
 - lib/scrivito/page_config.rb
@@ -381,6 +392,7 @@ files:
 - lib/scrivito/route.rb
 - lib/scrivito/routing_extensions.rb
 - lib/scrivito/sdk_engine.rb
+- lib/scrivito/session.rb
 - lib/scrivito/string_tagging.rb
 - lib/scrivito/tag_renderer.rb
 - lib/scrivito/task.rb
@@ -416,9 +428,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5