scrivito_sdk 1.5.5 → 1.6.0.rc1

data/lib/scrivito/obj_ui_config.rb

@@ -0,0 +1,20 @@
+module Scrivito
+  class ObjUiConfig < Struct.new(:obj)
+    def self.mget(*ids)
+      objs = Obj.find(ids)
+
+      ids.map do |id|
+        if obj = objs.find { |o| o.id == id }
+          ObjUiConfig.new(obj)
+        end
+      end
+    end
+
+    def as_json
+      {
+        description_for_editor: obj.description_for_editor,
+        info_for_content_browser: obj.try(:info_for_content_browser),
+      }.compact
+    end
+  end
+end

data/lib/scrivito/publish_ability.rb

@@ -0,0 +1,14 @@
+module Scrivito
+  class PublishAbility < Struct.new(:scrivito_user, :obj_id)
+    def as_json
+      {restriction_messages: restriction_messages}
+    end
+
+    private
+
+    def restriction_messages
+      obj = Obj.find(obj_id)
+      scrivito_user.restriction_messages_for(obj)
+    end
+  end
+end

data/lib/scrivito/sdk_engine.rb

@@ -48,8 +48,10 @@ module ::Scrivito
       app.config.assets.precompile += %w[
         scrivito.css
         scrivito.js
+        scrivito_ui_redirect.js
         scrivito_ui.css
         scrivito_ui.js
+        scrivito_sdk.js
       ]
       app.config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif)
     end

data/lib/scrivito/ui_config.rb

@@ -87,9 +87,7 @@ class UiConfig < Struct.new(:editing_context, :resource, :return_to, :app_extens
 
   def user_config
     {
-      current: {
-        id: editor.id
-      }
+      current: editor.as_json,
     }
   end
 

data/lib/scrivito/user.rb

@@ -108,6 +108,10 @@ module Scrivito
         end
       end
 
+      def mget(*ids)
+        ids.map(&method(:find))
+      end
+
       private
 
       def define_user(id = nil)
@@ -224,6 +228,14 @@ module Scrivito
       id.nil?
     end
 
+    def as_json
+      {
+        id: id,
+        description: description,
+        explicit_rules: explicit_rules_as_json,
+      }
+    end
+
     private
 
     def calculate_description
@@ -242,11 +254,15 @@ module Scrivito
 
     def sandbox_suggest_user_proc(input)
       suggest_users_proc.call(input)
-    rescue Exception => e
+    rescue StandardError => e
       message = %{Method `suggest_users' of the user "#{id}" raised an error on input "#{input}"}
       Warning.error(message, e)
 
       nil
     end
+
+    def explicit_rules_as_json
+      @explicit_rules.map { |(adverb, verb, _)| "#{adverb}-#{verb}" }
+    end
   end
 end

data/lib/scrivito/widget_collection.rb

@@ -20,7 +20,7 @@ module Scrivito
     # @api public
     #
     # Enables you to iterate the {Scrivito::BasicWidget Widgets} of an {Scrivito::BasicObj Obj}.
-    # Includes the {http://ruby-doc.org/core-2.1.0/Enumerable.html Enumerable} mixin
+    # Includes the {https://ruby-doc.org/core-2.1.0/Enumerable.html Enumerable} mixin
     # and thereby provides methods like +map+ or +select+.
     # @yield [Scrivito::BasicWidget] the {Scrivito::BasicWidget Widgets} of an {Scrivito::BasicObj Obj}
     #

data/lib/scrivito/workspace.rb

@@ -357,22 +357,6 @@ class Workspace
     "<#{self.class} id=\"#{id}\" title=\"#{title}\">"
   end
 
-  def has_modification_for?(obj_id)
-    !!objs.find_including_deleted(obj_id).modification
-  rescue Scrivito::ResourceNotFound
-    false
-  end
-
-  def self.all_with_modification_for(obj_id)
-    all.select do |ws|
-      ws.has_modification_for?(obj_id)
-    end
-  end
-
-  def conflict_warning_for(obj_id)
-    self.class.all_with_modification_for(obj_id) - [self]
-  end
-
   private
 
   def update_data(new_data)

data/lib/scrivito/workspace/publish_checker.rb

@@ -98,10 +98,10 @@ module Scrivito
           response[:from].to_i
         end
 
-        last_until = sorted_responses.inject(-1) do |last_until, response|
-          if last_until == 'END'
+        last_until = sorted_responses.inject(-1) do |inner_last_until, response|
+          if inner_last_until == 'END'
             raise_invalid_certificates_error
-          elsif (last_until + 1) == response[:from].to_i
+          elsif (inner_last_until + 1) == response[:from].to_i
             if response[:until] == 'END'
               'END'
             else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.0.rc1
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -181,6 +181,7 @@ files:
 - app/controllers/scrivito/resolve_paths_controller.rb
 - app/controllers/scrivito/sessions_controller.rb
 - app/controllers/scrivito/tasks_controller.rb
+- app/controllers/scrivito/ui_configs_controller.rb
 - app/controllers/scrivito/ui_controller.rb
 - app/controllers/scrivito/users_controller.rb
 - app/controllers/scrivito/webservice_controller.rb
@@ -211,7 +212,9 @@ files:
 - 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
+- app/views/scrivito/ui_configs/ui_configs.json.jbuilder
+- app/views/scrivito/users/publish_ability.json.jbuilder
+- app/views/scrivito/users/users.json.jbuilder
 - app/views/scrivito/webservice/_workspace.json.jbuilder
 - app/views/scrivito/webservice/empty.json
 - app/views/scrivito/webservice/error.json.jbuilder
@@ -234,7 +237,9 @@ files:
 - lib/assets/images/scrivito/source_too_large.png
 - lib/assets/images/scrivito/source_type_invalid.png
 - lib/assets/javascripts/scrivito.js
+- lib/assets/javascripts/scrivito_sdk.js
 - lib/assets/javascripts/scrivito_ui.js
+- lib/assets/javascripts/scrivito_ui_redirect.js
 - lib/assets/stylesheets/scrivito.css
 - lib/assets/stylesheets/scrivito_ui.css
 - lib/generators/scrivito/install/install_generator.rb
@@ -278,6 +283,7 @@ files:
 - lib/generators/scrivito/widget/widget_generator.rb
 - lib/obj.rb
 - lib/scrivito/access_denied.rb
+- lib/scrivito/associations.rb
 - lib/scrivito/attribute_content.rb
 - lib/scrivito/attribute_definition.rb
 - lib/scrivito/attribute_definition_collection.rb
@@ -367,17 +373,17 @@ files:
 - lib/scrivito/obj_data.rb
 - lib/scrivito/obj_data_from_hash.rb
 - lib/scrivito/obj_facet_value.rb
-- lib/scrivito/obj_params_parser.rb
 - lib/scrivito/obj_search_builder.rb
 - 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/obj_ui_config.rb
 - lib/scrivito/page_config.rb
 - lib/scrivito/parent_path.rb
 - lib/scrivito/preset_routes.rb
+- lib/scrivito/publish_ability.rb
 - lib/scrivito/rate_limit_exceeded.rb
 - lib/scrivito/request_homepage.rb
 - lib/scrivito/restriction_set.rb
@@ -421,9 +427,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

data/app/views/scrivito/users/suggest.json.jbuilder

@@ -1 +0,0 @@
-json.array! @suggested_users, :id, :description

data/lib/scrivito/obj_params_parser.rb

@@ -1,36 +0,0 @@
-module Scrivito
-  class ObjParamsParser < Struct.new(:host, :port, :context)
-    class UnknownWidgetAction < ScrivitoError
-    end
-
-    def parse(params)
-      params = params.deep_dup
-      convert_params(params)
-      params
-    end
-
-    private
-
-    def convert_field_params(params, attribute_definitions)
-      params.each_pair do |key, value|
-        params[key] = case type = attribute_definitions[key.to_s].try(:type)
-          when 'binary'     then parse_binary_params(value)
-          when 'html'       then ContentConversion.convert_html_links(value, host, port)
-          when 'link'       then ContentConversion.convert_link(value, host, port)
-          when 'linklist'   then ContentConversion.convert_linklist_urls(value, host, port)
-          when 'date'       then DateConversion.deserialize_from_client(value)
-          else value
-          end
-      end
-    end
-
-    def parse_binary_params(params)
-      return unless params
-      UploadedBinary.new(params)
-    end
-
-    def raise_widget_not_found_error(widget_id)
-      raise ResourceNotFound, "Could not find Widget with id #{widget_id}"
-    end
-  end
-end

data/lib/scrivito/obj_update_params_parser.rb

@@ -1,28 +0,0 @@
-module Scrivito
-  class ObjUpdateParamsParser < ObjParamsParser
-    private
-
-    def obj
-      context[:current_obj]
-    end
-
-    def convert_params(params)
-      convert_field_params(params, obj.attribute_definitions)
-      convert_widget_pool_params(params)
-    end
-
-    def convert_widget_pool_params(params)
-      return unless params['_widget_pool']
-
-      widget_pool = {}
-      params['_widget_pool'].each_pair do |widget_id, widget_params|
-        if widget_params.present?
-          widget = obj.widgets[widget_id]
-          raise_widget_not_found_error(widget_id) unless widget
-          widget_pool[widget] = convert_field_params(widget_params, widget.attribute_definitions)
-        end
-      end
-      params['_widget_pool'] = widget_pool
-    end
-  end
-end