scrivito_sdk 0.16.0 → 0.17.0

data/lib/scrivito/widget_garbage_collection.rb

@@ -39,12 +39,12 @@ class WidgetGarbageCollection
 
     deleted_by_dereference = dereferenced - newreferenced
 
-    recursivly_deleted = []
+    recursively_deleted = []
     deleted_by_dereference.each do |widget|
-      recursivly_deleted += all_widgets_contained_in_except(widget, newreferenced)
+      recursively_deleted += all_widgets_contained_in_except(widget, newreferenced)
     end
 
-    # we dont want to slow dont every request by scanning for orphans, so
+    # we dont want to slow down every request by scanning for orphans, so
     # we only do this when widgets are being deleted
     if deleted_by_dereference.present?
       orphans = @obj.all_widgets_from_pool - @obj.contained_widgets - newreferenced
@@ -52,7 +52,7 @@ class WidgetGarbageCollection
       orphans = []
     end
 
-    deleted_by_dereference + recursivly_deleted + orphans
+    deleted_by_dereference + recursively_deleted + orphans
   end
 
   private

data/lib/scrivito/workspace.rb

@@ -108,7 +108,7 @@ class Workspace
   # @api public
   def reload
     @workspace_data = CmsBackend.instance.find_workspace_data_by_id(self.id)
-    @revision = @base_revision = nil
+    @revision = @base_revision = @memberships = nil
   end
 
   # Updates this workspace's attributes
@@ -162,6 +162,14 @@ class Workspace
     @workspace_data.title
   end
 
+  # @api beta
+  # Returns the members of this workspace and their roles
+  #
+  # @return [MembershipsCollection]
+  def memberships
+    @memberships ||= MembershipsCollection.new(self)
+  end
+
   def data
     @workspace_data
   end
@@ -201,52 +209,11 @@ class Workspace
     raise ScrivitoError, 'rtc workspace may contain attribute and class changes' if rtc?
   end
 
-  # Find a {BasicObj Obj} by its id.
-  # If the parameter is an Array containing ids, return a list of corresponding Objs.
-  # @param [String, Integer, Array<String, Integer>]id_or_list
-  # @return [Obj, Array<Obj>]
-  # @api public
-  def find_obj(id_or_list)
-    find_filtering_deleted(id_or_list, false)
-  end
-
-  # Find a {BasicObj Obj} by its id.
-  # If the parameter is an Array containing ids, return a list of corresponding Objs.
-  # The results include deleted objects as well.
-  # @param [String, Integer, Array<String, Integer>]id_or_list
-  # @return [Obj, Array<Obj>]
-  # @api public
-  def find_obj_including_deleted(id_or_list)
-    find_filtering_deleted(id_or_list, true)
-  end
-
-  # Find the {BasicObj Obj} with the given path.
-  # Returns +nil+ if no matching Obj exists.
-  # @param [String] path Path of the {BasicObj Obj}.
-  # @return [Obj]
+  # {ObjsCollection} for this working copy
   # @api public
-  def find_obj_by_path(path)
-    find_objs_by(:path, [path]).first.first
-  end
-
-  # Returns the {BasicObj Obj} with the given permalink, or +nil+ if no matching Obj exists.
-  # @param [String] permalink The permalink of the {BasicObj Obj}.
-  # @return [Obj]
-  # @api public
-  def find_obj_by_permalink(permalink)
-    find_objs_by(:permalink, [permalink]).first.first
-  end
-
-  def find_objs_by_parent_path(path)
-    find_objs_by(:ppath, [path]).first
-  end
-
-  def find_obj_by_id(id)
-    find_objs_by(:id, [id]).first.first
-  end
-
-  def find_objs_by_paths(paths)
-    find_objs_by(:path, paths).map(&:first)
+  # @return {ObjsCollection}
+  def objs
+    @objs ||= ObjsCollection.new(self)
   end
 
   def inspect
@@ -255,38 +222,6 @@ class Workspace
 
   private
 
-  def find_filtering_deleted(id_or_list, include_deleted)
-    case id_or_list
-    when Array
-      find_objs_by(:id, id_or_list, include_deleted).map(&:first).compact
-    else
-      obj = find_objs_by(:id, [id_or_list.to_s], include_deleted).first.first
-      obj or raise ResourceNotFound, "Could not find Obj with id #{id_or_list}"
-    end
-  end
-
-  # accepts the name of an "obj_by" - view, a list of keys
-  # and an "include_deleted" flag
-  # returns a list of lists of Objs: a list of Objs for each given keys.
-  def find_objs_by(view, keys, include_deleted = false)
-    if include_deleted
-      finder_method_name = :find_obj_data_including_deleted_by
-    else
-      finder_method_name = :find_obj_data_by
-    end
-
-    result = CmsBackend.instance.public_send(finder_method_name, revision, view, keys)
-
-    result.map do |list|
-      list.map do |obj_data|
-        obj = BasicObj.instantiate(obj_data)
-        obj.revision = revision
-
-        obj
-      end
-    end
-  end
-
   def backend_url
     "/workspaces/#{id}"
   end

data/lib/scrivito/workspace_data_from_service.rb

@@ -24,6 +24,7 @@ class WorkspaceDataFromService
   data_attr_reader :base_revision_id
   data_attr_reader :base_content_state_id
   data_attr_reader :diff
+  data_attr_reader :memberships
 
   def initialize(data)
     @data = data
@@ -68,6 +69,7 @@ class WorkspaceDataFromService
       'content_state_id'      => content_state_id,
       'base_revision_id'      => base_revision_id,
       'base_content_state_id' => base_content_state_id,
+      'memberships'           => memberships,
     }
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,8 @@ files:
 - lib/generators/cms/widget/widget_generator.rb
 - lib/obj.rb
 - lib/scrivito/access_denied.rb
+- lib/scrivito/attribute.rb
+- lib/scrivito/attribute_collection.rb
 - lib/scrivito/attribute_content.rb
 - lib/scrivito/backend_error.rb
 - lib/scrivito/basic_obj.rb
@@ -231,10 +233,13 @@ files:
 - lib/scrivito/editing_context_middleware.rb
 - lib/scrivito/engine.rb
 - lib/scrivito/errors.rb
+- lib/scrivito/gem_info.rb
 - lib/scrivito/html_string.rb
 - lib/scrivito/link.rb
 - lib/scrivito/link_parser.rb
 - lib/scrivito/log_subscriber.rb
+- lib/scrivito/membership.rb
+- lib/scrivito/memberships_collection.rb
 - lib/scrivito/migration.rb
 - lib/scrivito/migrations.rb
 - lib/scrivito/migrations/cms_backend.rb
@@ -248,18 +253,23 @@ files:
 - lib/scrivito/modification.rb
 - lib/scrivito/named_link.rb
 - lib/scrivito/network_error.rb
+- lib/scrivito/obj_class.rb
 - lib/scrivito/obj_data.rb
 - lib/scrivito/obj_data_from_hash.rb
 - lib/scrivito/obj_data_from_service.rb
 - lib/scrivito/obj_params_parser.rb
 - lib/scrivito/obj_search_builder.rb
 - lib/scrivito/obj_search_enumerator.rb
+- lib/scrivito/objs_collection.rb
 - lib/scrivito/rate_limit_exceeded.rb
+- lib/scrivito/restriction_set.rb
 - lib/scrivito/revision.rb
 - lib/scrivito/string_tagging.rb
 - lib/scrivito/text_link.rb
 - lib/scrivito/text_link_conversion.rb
 - lib/scrivito/type_computer.rb
+- lib/scrivito/user.rb
+- lib/scrivito/user_definition.rb
 - lib/scrivito/widget_field_params.rb
 - lib/scrivito/widget_garbage_collection.rb
 - lib/scrivito/workspace.rb
@@ -289,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: SDK for the Scrivito CMS