infopark_fiona7 0.30.0.2 → 0.70.0.1

data/lib/fiona7/builder/obj_class_builder.rb

@@ -1,25 +1,17 @@
-require 'fiona7/type_register_mixin'
 
 module Fiona7
   module Builder
     class ObjClassBuilder
-      include TypeRegisterMixin
 
       def initialize(values)
         @values     = values
-        @attrs_avail= @values.key?(:attributes)
         @attributes = @values.delete(:attributes) {|_| [] }
       end
 
       def build
         assert_valid
-        add_legacy_attributes
-        mode_dependant_attributes
-        namespace_attributes
         persist_attributes
         persist_obj_class
-        update_obj_class
-        load_cm_obj_class
       end
 
       def validate
@@ -37,47 +29,10 @@ module Fiona7
         ret
       end
 
-      def add_legacy_attributes
-        type = @values[:type].to_s
-        if type == 'generic' || type == 'image'
-          @attributes << {name: 'blob', type: :binary}
-          @attrs_avail = true
-        end
-        if type.present?
-          # legacy obj class
-          @attributes << {name: 'body', type: :html}
-          @attributes << {name: 'title', type: :html}
-          @attrs_avail = true
-        end
-      end
-
-      def mode_dependant_attributes
-        if Fiona7.mode == :standalone
-          # nop
-        elsif Fiona7.mode == :legacy
-          # in legacy mode body and title are always included
-          # and are mapped to built-in attributes, hence no 
-          # need for custom attributes
-          @attributes.delete_if {|a| n = a[:name].to_s ; n == 'body' || n == 'title' }
-        else
-          raise "Invalid Fiona7.mode = #{Fiona7.mode}"
-        end
-
-      end
-
-      def namespace_attributes
-        @attributes.each do |attribute|
-          # s_OBJ_CLASS__ATTRIBUTE_NAME
-          virtual_name = attribute[:name]
-          attribute[:name] = type_register.real_attribute_name(@values[:name], virtual_name)
-          attribute[:real_type] = type_register.map_virtual_to_real_type(attribute[:type])
-        end
-      end
-
       def persist_attributes
         @attributes.each do |attribute|
-          if !RailsConnector::Attribute.exists?(attribute_name: attribute[:name])
-            raw_attribute = Reactor::Cm::Attribute.create(attribute[:name].to_s, attribute[:real_type].to_s)
+          if !RailsConnector::Attribute.exists?(attribute_name: attribute[:real_name])
+            raw_attribute = Reactor::Cm::Attribute.create(attribute[:real_name].to_s, attribute[:real_type].to_s)
             raw_attribute.set(:helpText, ::ActiveSupport::JSON.encode({type: attribute[:type]}))
             raw_attribute.set(:values, attribute[:values]) if attribute[:values]
             raw_attribute.save!
@@ -86,25 +41,14 @@ module Fiona7
       end
 
       def persist_obj_class
-        # WARNING: in the never version no "type" is standard
         @values[:type] ||= 'publication'
         @raw_obj_class = Reactor::Cm::ObjClass.create(@values[:name].to_s, @values[:type].to_s)
-        user_attributes = @attributes.map {|a| a[:name] } if @attrs_avail
+        user_attributes = @attributes.map {|a| a[:real_name] }
         user_attributes ||= []
         built_in_attributes = ['X_widget_pool']
         @raw_obj_class.attributes = user_attributes + built_in_attributes
       end
 
-      def update_obj_class
-        if @values.key?(:is_active)
-          @raw_obj_class.set('isEnabled', @values[:is_active] ? '1' : '0')
-          @raw_obj_class.save!
-        end
-      end
-
-      def load_cm_obj_class
-        RailsConnector::ObjClass.find_by_obj_class_name(@values[:name])
-      end
     end
   end
 end

data/lib/fiona7/builder/obj_class_updater.rb

@@ -6,18 +6,6 @@ module Fiona7
       def validate
         existing_obj_class 
       end
-
-      def build
-        assert_valid
-        mode_dependant_attributes
-        namespace_attributes
-        persist_attributes
-        persist_obj_class
-        update_obj_class
-        gc_attributes
-        load_cm_obj_class
-      end
-
       protected
       def existing_obj_class
         ret = RailsConnector::ObjClass.exists?(obj_class_name: @values[:name])
@@ -27,43 +15,18 @@ module Fiona7
 
       def persist_obj_class
         @raw_obj_class = Reactor::Cm::ObjClass.get(@values[:name].to_s)
+        user_attributes = @attributes.map {|a| a[:real_name] }
+        user_attributes ||= []
 
-        # DRY: ObjClassBuilder
-        if @attrs_avail
-          user_attributes = @attributes.map {|a| a[:name] }
-          user_attributes ||= []
-        else
-          user_attributes = @raw_obj_class.attributes
-        end
-
+        existing_attributes = @raw_obj_class.attributes
         built_in_attributes = ['X_widget_pool']
-        @raw_obj_class.attributes = user_attributes + built_in_attributes
-      end
 
-      def persist_attributes
-        @attributes.each do |attribute|
-          # TODO: changing attribute types
-          if !RailsConnector::Attribute.exists?(attribute_name: attribute[:name])
-            raw_attribute = Reactor::Cm::Attribute.create(attribute[:name].to_s, attribute[:real_type].to_s)
-            raw_attribute.set(:helpText, ::ActiveSupport::JSON.encode({type: attribute[:type]}))
-            raw_attribute.set(:values, attribute[:values]) if attribute[:values]
-            raw_attribute.save!
-          end
-        end
-      end
-
-      def gc_attributes
-        return if Fiona7.mode == :legacy
-        return unless @attrs_avail
-        pattern = "s_#{@values[:name]}__%"
+        # NOTE: removing attributes is now impossible
+        new_attributes = (existing_attributes + built_in_attributes + user_attributes).map(&:to_s).uniq
 
-        fresh   = @attributes.map {|a| a[:name].to_s }
-        stale   = RailsConnector::Attribute.where('attribute_name LIKE ?', pattern).select(:attribute_name).map(&:name)
-
-        (stale - fresh).each do |attribute_name|
-          Reactor::Cm::Attribute.instance(attribute_name.to_s).delete!
-        end
+        @raw_obj_class.attributes = new_attributes
       end
+
     end
   end
 end

data/lib/fiona7/builder/obj_updater.rb

@@ -5,21 +5,39 @@ module Fiona7
   module Builder
     class ObjUpdater < ObjBuilder
       protected
+      def update?
+        true
+      end
+
       def validate
+        return true
+      end
+
+      def prepare_object
+        obj_id       = @values.delete(:_id)
+        @obj         = WriteObj.find(obj_id)
+        @path        = @values.delete(:_path)
+        @widget_pool = @values.delete(:_widget_pool)
+        @permalink   = @values.delete(:_permalink)
+
         # revert command sends this info. which is silly.
         @values.delete(:_last_changed)
 
-        return true
-      end
+        @name, parent_path = name_and_parent_path_from_path(@path) if (@path)
+        if obj_class = @values.delete(:_obj_class)
+          @obj_class      = obj_class
+          @real_obj_class = TypeRegister::NameAliaser.new(virtual: @obj_class).real_obj_class
+        else
+          @real_obj_class = @obj.obj_class
+          @obj_class      = TypeRegister::NameAliaser.new(real: @real_obj_class).virtual_obj_class
+        end
+
+        ensure_obj_class_exists
 
-      def create_object
-        @obj_id = @values.delete(:_id)
-        @obj = WriteObj.find(@obj_id)
         @obj.name = @name unless @name.blank?
-        @name = @obj.name
-        @obj_class ||= @obj.obj_class
         # TODO: move (parent change)
       end
+
     end
   end
 end

data/lib/fiona7/builder/widget_builder.rb

@@ -8,6 +8,30 @@ module Fiona7
       def initialize(owner_obj, widget_id, values, path_map)
         @owner_obj, @widget_id, @values, @widget_path_map = owner_obj, widget_id, values.symbolize_keys, path_map
       end
+
+      protected
+      def update?
+        false
+      end
+
+      def prepare_object
+        @path              = self.generate_widget_path
+        @obj_class         = @values.delete(:_obj_class)
+        @real_obj_class    = TypeRegister::NameAliaser.new(virtual: @obj_class).real_obj_class
+
+        @path = "/#{@path}" unless @path.start_with?('/')
+        @name, parent_path = name_and_parent_path_from_path(@path)
+        @parent            = ensure_parent_exists(parent_path) if parent_path
+
+        ensure_obj_class_exists
+
+        # bottom one is faster, but can only work when there are no uploads
+        if (@values.any? {|_, (_, v)| v.kind_of?(File) || v.kind_of?(ActionDispatch::Http::UploadedFile) } )
+          @obj = WriteObj.create!(name: @name, parent_obj_id: @parent.id, obj_class: @real_obj_class)
+        else
+          @obj = WriteObj.new(name: @name, parent_obj_id: @parent.id, obj_class: @real_obj_class)
+        end
+      end
     end
   end
 end

data/lib/fiona7/builder/widget_building.rb

@@ -10,8 +10,7 @@ module Fiona7
       end
 
       protected
-
-      def prepare_object
+      def generate_widget_path
         raise Scrivito::ScrivitoError, "Inconsistent internal state: unable to create widgets for nonexiting parent." if @owner_obj.path.nil?
         # only publication type can contain children (code = "5")
         # also handle / this way
@@ -20,11 +19,7 @@ module Fiona7
         else
           parent_path = "#{@owner_obj.path}/_widgets"
         end
-        @path       = "#{parent_path}/#{@widget_id}"
-        @name       = @widget_id.to_s
-        @parent     = ensure_parent_exists(parent_path)
-        raise Scrivito::ScrivitoError, "Error storing widget, container #{parent_path.inspect} not found." if @parent.nil?
-        @obj_class  = @values.delete(:_obj_class)
+        "#{parent_path}/#{@widget_id}"
       end
 
       def write_widget_pool

data/lib/fiona7/builder/widget_updater.rb

@@ -8,6 +8,27 @@ module Fiona7
       def initialize(owner_obj, widget_id, values, path_map)
         @owner_obj, @widget_id, @values, @widget_path_map = owner_obj, widget_id, values.symbolize_keys, path_map
       end
+
+      protected
+      def update?
+        true
+      end
+
+      def prepare_object
+        @path        = self.generate_widget_path
+        @obj         = WriteObj.find(@values.delete(:_id))
+        @name        = @widget_id
+
+        if obj_class = @values.delete(:_obj_class)
+          @obj_class      = obj_class
+          @real_obj_class = TypeRegister::NameAliaser.new(virtual: @obj_class).real_obj_class
+        else
+          @real_obj_class = @obj.obj_class
+          @obj_class      = TypeRegister::NameAliaser.new(real: @real_obj_class).virtual_obj_class
+        end
+
+        ensure_obj_class_exists
+      end
     end
   end
 end

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

@@ -43,33 +43,17 @@ module Fiona7
           if workspace_id && !SCRIVITO_DIFF_MODE_BROKEN
             workspace_id == 'published' ? ReleasedObj : EditedObj
           elsif revision_id
-            # no workspace_id given, we need to go by revision_id
-            rtc_workspace = Workspace.rtc
-            published_workspace = Workspace.published
-
-            # in most cases a query without workspace_id is caused
-            # by modification calculation, which compares the object
-            # with it's base revision (i.e. revision of published)
-            if revision_id[0] == 'f' && published_workspace.revision_id == 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' && rtc_workspace.revision_id == revision_id
+            elsif revision_id[0] == 'b'
               EditedObj
             else
-              # we don't know this revision (anymore), it may be that
-              # the content has been changed between requests (concurrent
-              # modification may cause race conditions),
-              # but we 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
+              Assert.input(
+                false,
+                "Invalid revision_id received: #{revision_id}"
+              )
             end
           else
             Assert.input(
@@ -96,22 +80,29 @@ module Fiona7
                    )
                  end
 
-          refs = {"refs" => objs.map {|o| {"id" => o.id} } }
+          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 =~ /^\/_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

data/lib/fiona7/controllers/rest_api/blob_controller.rb

@@ -2,8 +2,47 @@ module Fiona7
   module Controllers
     module RestAPI
       class BlobController
-        def fetch(blob_id)
-          raise ::Scrivito::ClientError.new("This API is not supported by Fiona7 and should not be called, try using Scrivito::Binary#content or scrivito_url(obj) when appropriate", 412)
+        def fetch(blob_id, transformation=false)
+          public_get_url = BinaryHandling::UrlGenerator.new(blob_id, 'public_access', 'get', transformation).generate
+          # all URLs are identic!
+          # private_get_url = BinaryHandling::UrlGenerator.new(blob_id, 'private_access', 'get', false).generate
+          # public_head_url = BinaryHandling::UrlGenerator.new(blob_id, 'public_access', 'head', false).generate
+          # private_head_url = BinaryHandling::UrlGenerator.new(blob_id, 'private_access', 'head', false).generate
+          private_head_url = public_head_url = private_get_url = public_get_url
+
+          return {
+            'public_access' => {
+              'get' => {
+                'url' => public_get_url
+              },
+              'head' => {
+                'url' => public_head_url
+              }
+            },
+            'private_access' => {
+              'get' => {
+                'url' => private_get_url
+              },
+              'head' => {
+                'url' => private_head_url
+              }
+            }
+          }
+        end
+        def metadata(blob_id)
+          meta_binary = BinaryHandling::MetaBinary.new(blob_id)
+          content_type = meta_binary.mime_type
+          content_length = meta_binary.length
+          width = meta_binary.width
+          height = meta_binary.height
+          {
+            'meta_data' => {
+              'content_type' => ['string', content_type],
+              'content_length' => ['number', content_length],
+              'width' => ['number', width],
+              'height' => ['number', height]
+            }
+          }
         end
       end
     end

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

@@ -9,6 +9,7 @@ require 'fiona7/naive_search_engine'
 
 require 'fiona7/assert'
 
+require 'fiona7/json/reverse_obj_decorator'
 require 'fiona7/json/typeless_obj_decorator'
 
 module Fiona7
@@ -18,6 +19,9 @@ module Fiona7
         def create(workspace_id, values)
           assert_writable(workspace_id)
 
+          # some stupid creators give us an id. fck them
+          values[:obj].delete("_id")
+          values[:obj].delete(:_id)
           # This is a hack to make it seem as if the root obj does not exist
           if values[:obj][:_path] != '/' && values[:obj]["_path"] != '/'
             obj = Builder::ObjBuilder.new(values[:obj].dup).build
@@ -26,7 +30,7 @@ module Fiona7
           end
 
           klass = EditedObj
-          decorated = Fiona7::JSON::TypelessObjDecorator.new(klass, obj)
+          decorated = Fiona7::JSON::ReverseObjDecorator.new(klass, obj)
           
           return ::JSON.parse(::ActiveSupport::JSON.encode(decorated))
         end
@@ -43,7 +47,7 @@ module Fiona7
             404
           )
 
-          decorated = Fiona7::JSON::TypelessObjDecorator.new(klass, obj)
+          decorated = Fiona7::JSON::ReverseObjDecorator.new(klass, obj)
           return ::JSON.parse(::ActiveSupport::JSON.encode(decorated))
         end
 
@@ -57,8 +61,9 @@ module Fiona7
             404
           )
 
-          decorated = Fiona7::JSON::TypelessObjDecorator.new(klass, obj)
-          return ::JSON.parse(::ActiveSupport::JSON.encode(decorated))
+          decorated = Fiona7::JSON::ReverseObjDecorator.new(klass, obj)
+          response = ::JSON.parse(::ActiveSupport::JSON.encode(decorated))
+          return response
         end
 
         def fetch_by_id_from_revision(revision_id, obj_id)
@@ -73,16 +78,23 @@ module Fiona7
             404
           )
 
-          decorated = Fiona7::JSON::TypelessObjDecorator.new(klass, obj)
+          decorated = Fiona7::JSON::ReverseObjDecorator.new(klass, obj)
           return ::JSON.parse(::ActiveSupport::JSON.encode(decorated))
         end
 
         def search(workspace_id, params)
           klass = matching_class(workspace_id)
 
+          if params[:query].blank?
+            return ::JSON.parse(::ActiveSupport::JSON.encode({
+              total: 0,
+              results: []
+            }))
+          end
+
           offset = params[:offset] || 0
           size   = params[:size] || 100
-          query  = params[:query] || []
+          query  = (params[:query] || []).dup
           order  = (params[:sort_order] || :asc).to_sym
           sort   = (params[:sort_by] || :id).to_sym
 
@@ -101,7 +113,7 @@ module Fiona7
 
           obj = Builder::ObjUpdater.new(values[:obj].dup.with_indifferent_access).build
           klass = EditedObj
-          decorated = Fiona7::JSON::TypelessObjDecorator.new(klass, obj)
+          decorated = Fiona7::JSON::ReverseObjDecorator.new(klass, obj)
           return ::JSON.parse(::ActiveSupport::JSON.encode(decorated))
         end