infopark_fiona7 0.71.1.12 → 1.1.0.0.0

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "0.71.1.12"
+  VERSION = "1.1.0.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 0.71.1.12
+  version: 1.1.0.0.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.71'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: scrivito_sdk
   requirement: !ruby/object:Gem::Requirement
@@ -156,10 +156,10 @@ files:
 - app/models/fiona7/released_obj.rb
 - app/models/fiona7/write_obj.rb
 - app/models/fiona7_login_page.rb
-- app/models/rails_connector/abstract_obj.rb
 - app/models/x_container.rb
 - app/models/x_generic.rb
 - app/models/x_image.rb
+- app/views/fiona7/release/preview.html.erb
 - app/views/fiona7_login_page/index.html.erb
 - app/views/layouts/fiona7_login_page_layout.html.erb
 - app/views/scrivito/ui/index.html.erb
@@ -169,6 +169,9 @@ files:
 - infopark_fiona7.gemspec
 - lib/fiona7/access_permission_check.rb
 - lib/fiona7/assert.rb
+- lib/fiona7/attribute_name_mangler.rb
+- lib/fiona7/attribute_names_from_cms.rb
+- lib/fiona7/attribute_names_from_queries.rb
 - lib/fiona7/builder/batch_widget_writer.rb
 - lib/fiona7/builder/obj_builder.rb
 - lib/fiona7/builder/obj_class_builder.rb
@@ -177,9 +180,8 @@ files:
 - lib/fiona7/builder/widget_builder.rb
 - lib/fiona7/builder/widget_building.rb
 - lib/fiona7/builder/widget_updater.rb
+- lib/fiona7/complex_object.rb
 - lib/fiona7/controller_helper.rb
-- lib/fiona7/controllers/content_service/obj_controller.rb
-- lib/fiona7/controllers/content_service/workspace_controller.rb
 - lib/fiona7/controllers/rest_api/blob_controller.rb
 - lib/fiona7/controllers/rest_api/obj_controller.rb
 - lib/fiona7/controllers/rest_api/workspace_controller.rb
@@ -187,6 +189,7 @@ files:
 - lib/fiona7/custom_verity_accessor.rb
 - lib/fiona7/editing_env_check.rb
 - lib/fiona7/engine.rb
+- lib/fiona7/facet_builder.rb
 - lib/fiona7/fiona_connector_patches/basic_obj.rb
 - lib/fiona7/fiona_connector_patches/cms_accessible.rb
 - lib/fiona7/in_editable_view.rb
@@ -208,10 +211,13 @@ files:
 - lib/fiona7/mode_switch/composite.rb
 - lib/fiona7/mode_switch/views.rb
 - lib/fiona7/naive_search_engine.rb
+- lib/fiona7/obj_class_name_demangler.rb
+- lib/fiona7/obj_class_name_mangler.rb
+- lib/fiona7/obj_classes_from_cms.rb
+- lib/fiona7/obj_classes_from_queries.rb
 - lib/fiona7/permission_volatile_cache.rb
 - lib/fiona7/permitted_mixin.rb
-- lib/fiona7/recursive_link_resolver.rb
-- lib/fiona7/routers/content_service.rb
+- lib/fiona7/recursive_object_finder.rb
 - lib/fiona7/routers/rest_api.rb
 - lib/fiona7/routing_monkey_patch.rb
 - lib/fiona7/scrivito_patches/attribute_content.rb
@@ -220,18 +226,17 @@ files:
 - lib/fiona7/scrivito_patches/basic_widget.rb
 - lib/fiona7/scrivito_patches/binary.rb
 - lib/fiona7/scrivito_patches/child_list_tag.rb
-- lib/fiona7/scrivito_patches/client_config.rb
 - lib/fiona7/scrivito_patches/cms_backend.rb
 - lib/fiona7/scrivito_patches/cms_field_tag.rb
 - lib/fiona7/scrivito_patches/cms_rest_api.rb
 - lib/fiona7/scrivito_patches/cms_routing.rb
-- lib/fiona7/scrivito_patches/controller_actions.rb
 - lib/fiona7/scrivito_patches/layout_tags.rb
 - lib/fiona7/scrivito_patches/link_parser.rb
+- lib/fiona7/scrivito_patches/log_subscriber.rb
 - lib/fiona7/scrivito_patches/migrator.rb
-- lib/fiona7/scrivito_patches/obj_class.rb
-- lib/fiona7/scrivito_patches/obj_data_from_rest.rb
 - lib/fiona7/scrivito_patches/page_config.rb
+- lib/fiona7/scrivito_patches/preset_routes.rb
+- lib/fiona7/scrivito_patches/routing_extensions.rb
 - lib/fiona7/scrivito_patches/type_computer.rb
 - lib/fiona7/scrivito_patches/workspace.rb
 - lib/fiona7/scrivito_user.rb

data/app/models/rails_connector/abstract_obj.rb

@@ -1,24 +0,0 @@
-# Overwrite the class provided by reactor
-module RailsConnector
-  if Fiona7.mode == :legacy
-    root_class = ::RailsConnector::BasicObj
-
-    AbstractObj = begin
-                    if ::Obj < root_class
-                      ::Obj
-                    else
-                      root_class
-                    end
-                  rescue NameError
-                    root_class
-                  end
-  else
-    AbstractObj = ::RailsConnector::BasicObj
-  end
-
-  class AbstractObj
-    def self.compute_type(type_name)
-      try_type { type_name.constantize } || self 
-    end
-  end
-end

data/lib/fiona7/controllers/content_service/obj_controller.rb

@@ -1,121 +0,0 @@
-require 'set'
-#require 'fiona7/released_obj'
-#require 'fiona7/edited_obj'
-require 'fiona7/assert'
-require 'fiona7/workspace'
-require 'fiona7/json/obj_decorator'
-
-module Fiona7
-  module Controllers
-    module ContentService
-      class ObjController
-        SCRIVITO_DIFF_MODE_BROKEN = true
-
-        def fetch_multiple(params)
-          @queries     = params[:queries]
-          workspace_id = params[:workspace_id]
-          revision_id  = params[:revision_id]
-          @klass       = self.get_matching_class(workspace_id, revision_id)
-
-          all_refs = Set.new
-          all_objs = Set.new
-
-          @queries.each do |query|
-            objs, refs = process_query(query)
-
-            all_objs.merge(objs)
-            all_refs << refs
-          end
-
-          r = {results: all_refs, objs: all_objs}
-          return ::JSON.parse(::ActiveSupport::JSON.encode(r))
-        end
-
-        protected
-        def get_matching_class(workspace_id, revision_id)
-          Assert.input(
-            workspace_id.nil? || (
-              workspace_id == 'published' || workspace_id == 'rtc'
-            ),
-            "Invalid workspace_id: #{workspace_id}"
-          )
-
-          if workspace_id && !SCRIVITO_DIFF_MODE_BROKEN
-            workspace_id == 'published' ? ReleasedObj : EditedObj
-          elsif revision_id
-            # iwe know that published revisions start with a 'f'
-            # and rtc revisions start with a 'b'
-            if revision_id[0] == 'f'
-              ReleasedObj
-            elsif revision_id[0] == 'b'
-              EditedObj
-            else
-              Assert.input(
-                false,
-                "Invalid revision_id received: #{revision_id}"
-              )
-            end
-          else
-            Assert.input(
-              false,
-              "Neither workspace_id nor revision_id given, unable to identify content"
-            )
-          end
-        end
-
-        def process_query(query)
-          objs = case query[:type]
-                 when "id"
-                   find_by_id(query[:param])
-                 when "path"
-                   find_by_path(query[:param])
-                 when "ppath"
-                   find_by_parent_path(query[:param])
-                 when "permalink"
-                   find_by_permalink(query[:param])
-                 else
-                   Assert.input(
-                     false,
-                     "Invalid query type #{query[:type]}"
-                   )
-                 end
-
-          refs = {"refs" => objs.map {|o| {"id" => o.id.to_s} } }
-          objs = objs.map {|o| JSON::ObjDecorator.new(@klass, o) }
-
-          return objs, refs
-        end
-
-        def find_by_id(id)
-          if id.kind_of?(Array)
-            id = id.map(&:to_i)
-          else
-            id = id.to_i
-          end
-          @klass.where(obj_id: id).limit(1).to_a
-        end
-
-        def find_by_path(path)
-          return [] if path.nil?
-          return [] if path =~ /^\/_orphaned/
-          path = path.gsub('.', '_')
-          @klass.where(path: path).limit(1).to_a
-        end
-
-        def find_by_parent_path(path)
-          return [] if path =~ /^\/_orphaned/
-          parent = @klass.find_by_path(path)
-          parent ? parent.children : []
-        end
-
-        def find_by_permalink(permalink)
-          if permalink
-            @klass.where(permalink: permalink).limit(1).to_a
-          else
-            []
-          end
-        end
-      end
-    end
-  end
-end

data/lib/fiona7/controllers/content_service/workspace_controller.rb

@@ -1,19 +0,0 @@
-require 'fiona7/workspace'
-require 'fiona7/assert'
-
-module Fiona7
-  module Controllers
-    module ContentService
-      class WorkspaceController
-        def fetch(playload)
-          id = playload[:workspace_id]
-          id = id.to_sym
-          return {} if id != :published && id != :rtc
-
-          w = {'workspace' => Workspace.new(id)}
-          return ::JSON.parse(::ActiveSupport::JSON.encode(w))
-        end
-      end
-    end
-  end
-end

data/lib/fiona7/recursive_link_resolver.rb

@@ -1,93 +0,0 @@
-module Fiona7
-  class RecursiveLinkResolver
-    attr_reader :id_map, :path_map
-
-    def initialize(klass)
-      @processed_ids = Set[]
-      @id_map = {}
-      @path_map = {}
-      @klass = klass
-    end
-
-    def resolve(obj)
-      resolve_recursive([obj])
-    end
-
-    protected
-    def resolve_recursive(remaining_objects)
-      return if remaining_objects.empty?
-      return resolve_recursive(process_objects(remaining_objects))
-    end
-
-
-    def process_objects(objects)
-      found_objects = []
-
-      widget_id_to_obj_id_map = {}
-
-      objects.each do |object|
-        widget_id_to_obj_id_map.merge!(widget_id_to_obj_id_map_from_object(object))
-      end
-
-      @processed_ids.merge(objects.map(&:id))
-
-      unprocessed_object_ids = filter_unprocessed_ids(widget_id_to_obj_id_map.values)
-      if !unprocessed_object_ids.empty?
-        found_objects = @klass.find(unprocessed_object_ids)
-
-        id_object_map = create_id_object_map(found_objects)
-
-        widget_id_to_obj_id_map.each do |widget_id, obj_id|
-          if fetched_object = id_object_map[obj_id]
-            @id_map[widget_id] = fetched_object.id
-            @path_map[widget_id] = fetched_object.path
-          end
-        end
-      end
-
-      found_objects
-    end
-
-    def widget_id_to_obj_id_map_from_object(object)
-      widget_id_to_obj_id_map = {}
-
-      object.attr_values.each do |_, value|
-        links_from_attribute = gather_links(value)
-        widget_id_to_obj_id_map.merge!(links_from_attribute)
-      end
-
-      widget_id_to_obj_id_map
-    end
-
-
-    def gather_links(attribute_value)
-      links = {}
-
-      if attribute_value.kind_of?(Array) && !attribute_value.empty? && attribute_value.all? {|c| c.kind_of?(Hash)}
-        attribute_value.each do |link|
-          if (title = link['title'].presence) && (id = link['destination'].to_i) != 0
-            links[title] = id
-          end
-        end
-      end
-
-      links
-    end
-
-    def filter_unprocessed_ids(object_ids)
-      unprocessed_ids = []
-      object_ids.each do |object_id|
-        unprocessed_ids << object_id unless @processed_ids.include?(object_id)
-      end
-      unprocessed_ids
-    end
-
-    def create_id_object_map(objects)
-      id_object_map = {}
-      objects.each do |object|
-        id_object_map[object.id] = object
-      end
-      id_object_map
-    end
-  end
-end

data/lib/fiona7/routers/content_service.rb

@@ -1,19 +0,0 @@
-require "fiona7/controllers/content_service/obj_controller"
-require "fiona7/controllers/content_service/workspace_controller"
-
-class Scrivito::ContentService
-  class << self
-    alias_method :original_query, :query
-    def query(path, payload, options={})
-      #$stdout.puts "DEBUG CS GET: #{path} < #{payload.inspect} >"
-      case path
-      when /\Aworkspaces\/query/
-        Fiona7::Controllers::ContentService::WorkspaceController.new.fetch(payload)
-      when /\Aobjs\/query/
-        Fiona7::Controllers::ContentService::ObjController.new.fetch_multiple(payload)
-      else
-        original_query(path, payload, options)
-      end
-    end
-  end
-end

data/lib/fiona7/scrivito_patches/controller_actions.rb

@@ -1,6 +0,0 @@
-require 'scrivito/controller_actions'
-
-module Scrivito
-  module ControllerActions
-  end
-end

data/lib/fiona7/scrivito_patches/obj_class.rb

@@ -1,16 +0,0 @@
-require 'scrivito/obj_class'
-
-module Scrivito
-  class ObjClass
-    # there are no legacy types.
-    def is_binary
-      raise ScrivitoError,
-        %(`is_binary' and `binary?' can only be called on ObjClasses with a legacy_type.)
-    end
-    alias_method :binary?, :is_binary
-
-    def legacy_type?
-      false
-    end
-  end
-end

data/lib/fiona7/scrivito_patches/obj_data_from_rest.rb

@@ -1,30 +0,0 @@
-require 'scrivito/backend/obj_data_from_rest'
-
-module Scrivito
-  module Backend
-    class ObjDataFromRest
-      private
-      # nil values for links are handled incorrectly
-      def legacy_compatible(value, type)
-        if type == "linklist"
-          value.map(&method(:legacy_link)).compact
-        elsif type == "link"
-          legacy_link(value)
-        else
-          value
-        end
-      end
-
-      # nil values for links are handled incorrectly
-      def legacy_link(link)
-        return nil unless link
-        return link unless link["obj_id"]
-
-        transformed = link.dup
-        transformed["destination"] = transformed.delete("obj_id")
-
-        transformed
-      end
-    end
-  end
-end