scrivito_sdk 0.50.1 → 0.60.0.rc1

data/lib/scrivito/sdk_engine.rb

@@ -18,8 +18,8 @@ module ::Scrivito
     config.action_dispatch.rescue_responses.merge!("Scrivito::ResourceNotFound" => :not_found)
 
     initializer "scrivito.add_cms_routing_paths", :after => :add_routing_paths do |app|
-      cms_route = File.expand_path("cms_routes.rb", paths['config'].to_a.first)
-      app.routes_reloader.paths.push(cms_route)
+      precedence_route = File.expand_path("precedence_routes.rb", paths['config'].to_a.first)
+      app.routes_reloader.paths.unshift(precedence_route)
     end
 
     # Expose Scrivito SDK runtime to controller for logging.

data/lib/scrivito/test_request.rb

@@ -45,5 +45,15 @@ module Scrivito
     def for_cms_object(*args)
       raise "The method `for_cms_object' was removed. Please use `for_scrivito_obj' instead"
     end
+
+    #
+    # Make a test request to act as it's by a specific Scrivito user
+    #
+    # @api public
+    # @param [Scrivito::User] test_user requested +User+
+    #
+    def for_scrivito_user(test_user)
+      env[EditingContextMiddleware::ENVKEY] = EditingContext.new(editor: -> { test_user })
+    end
   end
 end

data/lib/scrivito/type_computer.rb

@@ -6,7 +6,11 @@ class TypeComputer
   end
 
   def compute_type(obj_class_name)
-    load_class(obj_class_name) || @fallback_class
+    compute_type_without_fallback(obj_class_name) || @fallback_class
+  end
+
+  def compute_type_without_fallback(obj_class_name)
+    load_class(obj_class_name)
   end
 
   def special_class?(klass)

data/lib/scrivito/widget_collection.rb

@@ -3,6 +3,8 @@ module Scrivito
   # The +WidgetCollection+ represents all {Scrivito::BasicWidget Widgets} referenced by an
   # {Scrivito::BasicObj Obj} or its subwidgets.
   class WidgetCollection
+    include Enumerable
+
     def initialize(obj)
       @obj = obj
     end
@@ -15,6 +17,19 @@ module Scrivito
       obj.widget_from_pool(widget_id)
     end
 
+    # @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
+    # and thereby provides methods like +map+ or +select+.
+    # @yield [Scrivito::BasicWidget] the {Scrivito::BasicWidget Widgets} of an {Scrivito::BasicObj Obj}
+    #
+    # @example Array of all widget ids
+    #   obj.widgets.map { |widget| widget.id }
+    def each(&block)
+      obj.all_widgets_from_pool.each(&block)
+    end
+
     private
 
     attr_reader :obj

data/lib/scrivito/widget_garbage_collection.rb

@@ -79,7 +79,7 @@ class WidgetGarbageCollection
       end
     else
       params.each do |key, value|
-        if content.type_of_attribute(key) == "widget"
+        if content.type_of_attribute(key) == 'widgetlist'
           current = content[key]
           new = value
 

data/lib/scrivito/widget_tag.rb

@@ -9,6 +9,8 @@ class WidgetTag < Struct.new(:view, :widget, :placement_modification)
 
   def content
     view.render(template: template, locals: {widget: widget})
+  rescue ActionView::MissingTemplate
+    %{Missing Ruby model class for "#{widget.obj_class_name}"} if view.scrivito_user
   end
 
   def options

data/lib/scrivito/workspace.rb

@@ -79,7 +79,7 @@ class Workspace
     all.detect { |workspace| workspace.title == title }
   end
 
-  delegate :content_state, :base_revision_id, :base_content_state, to: :data
+  delegate :content_state, :base_revision_id, :base_content_state, :uses_obj_classes, to: :data
 
   # Create a new workspace
   # @api public
@@ -244,6 +244,7 @@ class Workspace
   # Returns all obj classes of this working copy.
   #
   # @api public
+  # @deprecated
   #
   # @example Find the obj class named "Homepage" in the "rtc" {Workspace}.
   #   Workspace.find('rtc').obj_classes['Homepage']

data/lib/scrivito/workspace_data_from_service.rb

@@ -16,6 +16,7 @@ class WorkspaceDataFromService < WorkspaceData
   data_attr_reader :base_revision_id
   data_attr_reader :base_content_state_id
   data_attr_reader :diff
+  data_attr_reader :uses_obj_classes
 
   def content_state
     @content_state ||= ContentState.find_or_create(content_state_id) if content_state_id

data/lib/scrivito_sdk.rb

@@ -21,7 +21,7 @@ module Scrivito
   #
   # Configures which models Scrivito assumes as pages and widgets.
   #
-  # @api private
+  # @api public
   #
   # In order to display a page class selection dialog and a widget class selection dialog, Scrivito
   # needs to know which page models and widget models are available. That models can be defined in
@@ -123,6 +123,22 @@ module Scrivito
     end
   end
 
+  def self.obj_class_deprecated_message
+    %{
+The SDK now allows defining classes and attributes directly in your application source code.
+Please run the migration tool to have your model migrated automatically in order to use this version of the SDK.
+See https://scrivito.com/obj-class-migration for details.
+    }
+  end
+
+  def self.raise_obj_class_deprecated_error
+    raise ScrivitoError, obj_class_deprecated_message
+  end
+
+  def self.print_obj_class_deprecated_warning
+    Deprecation.warn(obj_class_deprecated_message)
+  end
+
   autoload_all_sources
 end
 

metadata

@@ -1,162 +1,162 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 0.50.1
+  version: 0.60.0.rc1
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: hyp_diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.7
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2.2
-description: ' Scrivito: A professional Cloud CMS built for Ruby on Rails. '
+description: " Scrivito: A professional Cloud CMS built for Ruby on Rails. "
 email: info@scrivito.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
+- ".yardopts"
 - README.md
 - app/controllers/scrivito/blobs_controller.rb
 - app/controllers/scrivito/default_cms_controller.rb
@@ -168,21 +168,23 @@ files:
 - app/controllers/scrivito/workspaces_controller.rb
 - app/helpers/scrivito_helper.rb
 - app/models/scrivito/content_widget.rb
+- app/views/cms/index.html.erb
 - app/views/google_maps_widget/show.html.erb
 - app/views/scrivito/_editing_auth_warning.html.erb
 - app/views/scrivito/blobs/upload_permission.json.jbuilder
 - app/views/scrivito/content_widget/show.html.erb
 - app/views/scrivito/objs/copy_widget.html.erb
 - app/views/scrivito/objs/create_widget.html.erb
+- app/views/scrivito/objs/destroy.json.jbuilder
 - app/views/scrivito/objs/format_missing_error.json.jbuilder
-- app/views/scrivito/objs/modification.json.jbuilder
 - app/views/scrivito/objs/obj.json.jbuilder
 - app/views/scrivito/objs/page_class_selection.json.jbuilder
 - app/views/scrivito/objs/search.json.jbuilder
 - app/views/scrivito/objs/search_only_size.json.jbuilder
+- app/views/scrivito/objs/show.json.jbuilder
 - app/views/scrivito/objs/update.json.jbuilder
+- app/views/scrivito/objs/widget.json.jbuilder
 - app/views/scrivito/objs/widget_class_selection.json.jbuilder
-- app/views/scrivito/objs/widget_modification.json.jbuilder
 - app/views/scrivito/tasks/show.json.jbuilder
 - app/views/scrivito/ui/index.html.erb
 - app/views/scrivito/users/suggest.json.jbuilder
@@ -196,13 +198,13 @@ files:
 - app/views/scrivito/workspaces/show.json.jbuilder
 - app/views/scrivito/workspaces/task.json.jbuilder
 - config/ca-bundle.crt
-- config/cms_routes.rb
 - config/locales/de.scrivito.errors.yml
 - config/locales/de.scrivito.lib.yml
 - config/locales/de.scrivito.models.yml
 - config/locales/en.scrivito.errors.yml
 - config/locales/en.scrivito.lib.yml
 - config/locales/en.scrivito.models.yml
+- config/precedence_routes.rb
 - config/routes.rb
 - lib/assets/images/180x120.gif
 - lib/assets/images/scrivito/image_placeholder.png
@@ -242,11 +244,9 @@ files:
 - lib/generators/scrivito/page/templates/controller.erb
 - lib/generators/scrivito/page/templates/details.html.erb
 - lib/generators/scrivito/page/templates/index.html.erb
-- lib/generators/scrivito/page/templates/migration.erb
 - lib/generators/scrivito/page/templates/model.erb
 - lib/generators/scrivito/page/templates/thumbnail.html.erb
 - lib/generators/scrivito/widget/templates/details.html.erb
-- lib/generators/scrivito/widget/templates/migration.erb
 - lib/generators/scrivito/widget/templates/model.erb
 - lib/generators/scrivito/widget/templates/show.html.erb
 - lib/generators/scrivito/widget/templates/thumbnail.html.erb
@@ -259,6 +259,8 @@ files:
 - lib/scrivito/attribute_definition.rb
 - lib/scrivito/attribute_definition_collection.rb
 - lib/scrivito/attribute_definition_migrator.rb
+- lib/scrivito/attribute_deserializer.rb
+- lib/scrivito/attribute_serializer.rb
 - lib/scrivito/backend_error.rb
 - lib/scrivito/basic_obj.rb
 - lib/scrivito/basic_widget.rb
@@ -279,7 +281,7 @@ files:
 - lib/scrivito/cms_env.rb
 - lib/scrivito/cms_field_tag.rb
 - lib/scrivito/cms_rest_api.rb
-- lib/scrivito/cms_rest_api/attribute_serializer.rb
+- lib/scrivito/cms_rest_api/legacy_attribute_serializer.rb
 - lib/scrivito/cms_rest_api/widget_extractor.rb
 - lib/scrivito/cms_routing.rb
 - lib/scrivito/communication_error.rb
@@ -372,14 +374,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      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/objs/modification.json.jbuilder

@@ -1 +0,0 @@
-json.extract! current_obj, :modification

data/config/cms_routes.rb

@@ -1,22 +0,0 @@
-Rails.application.routes.draw do
-  get '/' => 'scrivito/cms_dispatch#index', as: :scrivito_root
-
-  get '__scrivito/render_widget/:id/show_widget/:widget_id' => 'scrivito/cms_dispatch#show_widget'
-  get '__scrivito/render_widget/:id/widget_details/:widget_id' => 'scrivito/cms_dispatch#widget_details'
-
-  get '__scrivito/page_details/:id' => 'scrivito/cms_dispatch#page_details'
-
-  get '/__scrivito/resource_details/:resource_id' => 'scrivito/cms_dispatch#resource_details'
-
-  match ':id(/*slug)',
-    to: 'scrivito/cms_dispatch#index',
-    constraints: { id: /\d+|[0-9a-f]{16}/ },
-    as: 'cms_id',
-    via: :all
-
-  match '/*permalink',
-    to: 'scrivito/cms_dispatch#index',
-    as: :scrivito_permalink,
-    format: false,
-    via: :all
-end