scrivito_sdk 1.3.0.rc2 → 1.3.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d1442e15679c332992fb3c8af22db2aa2beea44
-  data.tar.gz: 15f40e970f9aee7630120ac34475d2328d5bcb61
+  metadata.gz: d1a53aae675467a88a901cfd6f35149cecc24675
+  data.tar.gz: 4ef81f19d941b658384eadee4a05e48bd397e76a
 SHA512:
-  metadata.gz: 2bc8d4fbb380f8d4b39947725691e79aacc9b125895065a6f0e2d6181f059645a042a1896a3c5b94797f4b3c550fe019bae774f910f7b5f1a7430031c6b20060
-  data.tar.gz: 455a1d78a551fc3e9a6c9db9385220475906fc63c41e47bd736039c8684f12465f06246ea3f463bfab9dad6e87012ab17d3ec9bc909b7fcc175a3602434c7614
+  metadata.gz: aabab6cdfa1f2e604b0348ea796080b879277f7140e1d6ca8404dd38b16377c1d236776766b0c43f708f943f756e638ac93d5a72dba07606c00c10e121845a57
+  data.tar.gz: f471c6fdac76c0729e572b976b5cda86b92ce59cc247846739e30430f55919df4636eadfa778e196b1e6cab5d7aec773b1cc185040517c8cca8ed8d93d6c066b

data/app/controllers/scrivito/legacy_redirect_controller.rb

@@ -4,8 +4,8 @@ module Scrivito
     include Rails.application.routes.url_helpers
 
     def index
-      route = Route.find(_routes, :slug_id)
-      redirect_to route.generate_path(self, params.slice(:id, :slug).symbolize_keys)
+      route = Route.find(self, :slug_id)
+      redirect_to route.generate_path(params.slice(:id, :slug).symbolize_keys)
     end
   end
 end

data/config/ca-bundle.crt

@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Thu Apr 28 10:37:42 2016
+## Certificate data from Mozilla as of: Wed May  4 10:04:08 2016
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates

data/lib/scrivito/basic_obj.rb

@@ -20,6 +20,8 @@ module Scrivito
   # @api public
   #
   class BasicObj
+    extend ::ActiveSupport::DescendantsTracker
+
     PublicSystemAttributeDefinition = Class.new(AttributeDefinition)
 
     SYSTEM_ATTRIBUTES = AttributeDefinitionCollection.new(

data/lib/scrivito/basic_widget.rb

@@ -8,6 +8,7 @@ module Scrivito
 # @api public
 class BasicWidget
   extend AttributeContent::ClassMethods
+  extend ::ActiveSupport::DescendantsTracker
   include AttributeContent
 
   def self.type_computer

data/lib/scrivito/class_collection.rb

@@ -7,7 +7,7 @@ class ClassCollection
   include Enumerable
 
   def initialize(classes)
-    @classes = classes.compact.uniq
+    @classes = classes
   end
 
   #

data/lib/scrivito/cms_routing.rb

@@ -77,15 +77,15 @@ class CmsRouting < Struct.new(:request, :context, :scrivito_engine, :image_optio
 
   def path_or_url_for_objs(obj, path_or_url, options)
     permalink = obj.permalink
-    if permalink && route_defined?(:permalink) && permalink.split('/').first != 'scrivito'
-      use_route(:permalink, path_or_url, options.merge(:permalink => permalink))
-    elsif homepage?(obj) && route_defined?(:homepage)
-      use_route(:homepage, path_or_url, options)
+    if permalink && (route = find_route(:permalink)) && permalink.split('/').first != 'scrivito'
+      route.generate(path_or_url, options.merge(:permalink => permalink))
+    elsif homepage?(obj) && route = find_route(:homepage)
+      route.generate(path_or_url, options)
     elsif obj.binary?
       binary_obj_url(obj) || LINK_TO_EMPTY_BLOB
-    elsif route_defined?(:slug_id)
+    elsif route = find_route(:slug_id)
       slug = obj.slug.present? ? obj.slug.sub(/^\//, '') : nil
-      id_path_or_url_for_objs(obj, path_or_url, options.merge(slug: slug))
+      route.generate(path_or_url, options.merge(id: obj.id, slug: slug))
     else
       raise ScrivitoError, "The required scrivito route 'slug_id' is not defined. "\
         "Please add a 'slug_id' definition to your routes.rb. See the documentation"\
@@ -93,22 +93,8 @@ class CmsRouting < Struct.new(:request, :context, :scrivito_engine, :image_optio
     end
   end
 
-  def id_path_or_url_for_objs(obj, path_or_url, options)
-    options[:id] = obj.id
-
-    # Options must have the key slug.
-    # Otherwise Rails will use the slug from current request params.
-    options[:slug] ||= nil
-
-    use_route(:slug_id, path_or_url, options)
-  end
-
-  def route_defined?(name)
-    Route.defined?(context._routes, name)
-  end
-
-  def use_route(name, path_or_url, options)
-    Route.find(context._routes, name).generate(context, path_or_url, options)
+  def find_route(name)
+    Route.find(context, name)
   end
 
   def homepage?(obj)

data/lib/scrivito/model_library.rb

@@ -20,10 +20,11 @@ class ModelLibrary
   # @see Scrivito.models
   #
   def clear_cache
-    @pages   = nil
-    @widgets = nil
-    @objs    = nil
-    @paths   = nil
+    @pages                = nil
+    @widgets              = nil
+    @objs                 = nil
+    @paths                = nil
+    @require_dependencies = nil
   end
 
   #
@@ -44,7 +45,7 @@ class ModelLibrary
   # @return [Scrivito::ClassCollection] available page classes
   #
   def pages
-    @pages ||= load_models('page', Scrivito::BasicObj)
+    @pages ||= build_class_collection { valid_page_classes }
   end
 
   #
@@ -55,7 +56,7 @@ class ModelLibrary
   # @return [Scrivito::ClassCollection] available widget classes
   #
   def widgets
-    @widgets ||= load_models('widget', Scrivito::BasicWidget)
+    @widgets ||= build_class_collection { valid_widget_classes }
   end
 
   #
@@ -66,15 +67,7 @@ class ModelLibrary
   # @return [Scrivito::ClassCollection] available CMS object classes
   #
   def objs
-    @objs ||= load_obj_models
-  end
-
-  def load_obj_models
-    base_class = Scrivito::BasicObj
-    model_classes = load_models_from_paths('obj', base_class) +
-      load_custom_models('obj', base_class) +
-      load_custom_models('page', base_class)
-    ClassCollection.new(model_classes)
+    @objs ||= build_class_collection { BasicObj.descendants.select(&:name) }
   end
 
   #
@@ -90,41 +83,42 @@ class ModelLibrary
 
   private
 
-  def load_models(type, base_class)
-    model_classes = load_models_from_paths(type, base_class) + load_custom_models(type, base_class)
-    ClassCollection.new(model_classes)
+  def build_class_collection
+    require_dependencies
+    ClassCollection.new(yield)
   end
 
-  def load_models_from_paths(type, base_class)
-    paths.map { |path| load_models_from_path(type, path, base_class) }.flatten
+  def valid_widget_classes
+    BasicWidget.descendants.select { |descendant| valid_widget_class?(descendant) }
   end
 
-  def load_models_from_path(type, path, base_class)
-    candidates_from_path(type, path).map do |file_path|
-      load_model(file_path.gsub(path, '').gsub('.rb', '').camelize, base_class)
-    end
+  def valid_widget_class?(model_class)
+    model_class = model_class.to_s
+    return true if custom_widgets.include?(model_class)
+
+    model_class != 'Widget' && model_class.ends_with?('Widget')
   end
 
-  def candidates_from_path(type, path)
-    Dir["#{path}/**/*.rb"].select do |file_path|
-      case type
-      when 'page'   then file_path.ends_with?('page.rb')
-      when 'widget' then file_path.ends_with?('_widget.rb')
-      else true
-      end
-    end
+  def valid_page_classes
+    BasicObj.descendants.select { |descendant| valid_page_class?(descendant) }
   end
 
-  def load_model(class_name, base_class)
-    model_class = class_name.constantize
-    model_class if model_class.ancestors.include?(base_class)
-  rescue LoadError
-    # Ignore files with invalid models, e.g. empty files.
+  def valid_page_class?(model_class)
+    model_class = model_class.to_s
+    model_class.downcase.ends_with?('page') || custom_pages.include?(model_class)
   end
 
-  def load_custom_models(type, base_class)
-    send("custom_#{type}s").map do |class_name|
-      load_model(class_name, base_class)
+  def require_dependencies
+    @require_dependencies ||= begin
+      paths.each do |path|
+        Dir["#{path}/**/*.rb"].sort.each do |file_path|
+          begin
+            require_dependency(file_path)
+          rescue TypeError => e
+            raise e if file_path.starts_with?(Rails.root.to_s)
+          end
+        end
+      end
     end
   end
 

data/lib/scrivito/route.rb

@@ -10,12 +10,16 @@ class Route
       registry(route_set)[name] = new(name)
     end
 
-    def defined?(route_set, name)
-      !!registry(route_set)[name]
-    end
+    def find(given_context, name)
+      available_contexts(given_context).each do |context|
+        route = registry(context._routes)[name]
+
+        if route && route.defined_in?(context)
+          return route.apply_to(context)
+        end
+      end
 
-    def find(route_set, name)
-      registry(route_set)[name] or raise InternalError, "route #{name} not found"
+      nil
     end
 
     private
@@ -32,6 +36,13 @@ class Route
             %("#{name}" is not a valid scrivito route name. Valid values are: #{valid_values}.)
       end
     end
+
+    def available_contexts(context)
+      [
+        context,
+        context.try(:main_app)
+      ].compact
+    end
   end
 
   def initialize(name)
@@ -41,20 +52,33 @@ class Route
   def helper_name
     # use a random name to prevent users from getting the idea
     # that the internally unsed routing helpers might be a stable API
-    random_segment = Digest::SHA1.hexdigest(@name.to_s)[0..15]
-    @helper_name ||= "scrivito_#{random_segment}"
+    @helper_name ||=
+      begin
+        random_segment = Digest::SHA1.hexdigest(@name.to_s)[0..15]
+        "scrivito_#{random_segment}"
+      end
   end
 
-  def generate_path(context, options = {})
-    generate(context, :path, options)
+  def defined_in?(context)
+    context.respond_to?("#{helper_name}_path")
   end
 
-  def generate_url(context, options = {})
-    generate(context, :url, options)
+  def apply_to(context)
+    RouteApplication.new(self, context)
   end
 
-  def generate(context, path_or_url, options = {})
-    context.public_send("#{helper_name}_#{path_or_url}", options)
+  class RouteApplication < Struct.new(:route, :context)
+    def generate_path(options = {})
+      generate(:path, options)
+    end
+
+    def generate_url(options = {})
+      generate(:url, options)
+    end
+
+    def generate(path_or_url, options = {})
+      context.public_send("#{route.helper_name}_#{path_or_url}", options)
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_sdk
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc2
+  version: 1.3.0.rc3
 platform: ruby
 authors:
 - Infopark AG
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable