infopark_fiona7 1.2.0.0.1 → 1.2.0.1.1

data/lib/fiona7/attribute_writers/helpers/json_serializer.rb

@@ -0,0 +1,11 @@
+module Fiona7
+  module AttributeWriters
+    module Helpers
+      class JsonSerializer
+        def call(input)
+          input.to_json
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/helpers/link_serializer.rb

@@ -0,0 +1,37 @@
+module Fiona7
+  module AttributeWriters
+    module Helpers
+      class LinkSerializer
+        def initialize(obj, klass)
+          self.obj   = obj
+          self.klass = klass
+        end
+
+        def call(link)
+          link = link.symbolize_keys
+          new_link = {}
+
+          if link[:url]
+            # handle www.example.com
+            new_link[:url] = "external:#{link[:url]}" unless link[:url] =~ /\A[a-zA-Z][a-zA-Z0-9+.-]:/
+          elsif obj_id = link[:obj_id] 
+            # FIXME: use a repository here to speed up the lookup
+            new_link[:url] = self.klass.find(obj_id).path
+          end
+
+
+          new_link[:url] ||= link[:url] 
+          new_link[:title] = link[:title] if link[:title]
+          new_link[:target] = link[:target] if link[:target]
+          new_link[:url] = "#{new_link[:url]}?#{link[:query]}" if link[:query]
+            new_link[:url] = "#{new_link[:url]}##{link[:fragment]}" if link[:fragment]
+
+          new_link
+        end
+
+        protected
+        attr_accessor :obj, :klass
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/html_as_html.rb

@@ -0,0 +1,12 @@
+require 'fiona7/attribute_writers/attribute_writer'
+require 'fiona7/attribute_writers/helpers/html_serializer'
+
+module Fiona7
+  module AttributeWriters
+    class HtmlAsHtml < AttributeWriter
+      def call(value, claimed_type=nil)
+        self.obj.set(self.attr_name, Helpers::HtmlSerializer.new(self.obj, self.klass).call(value))
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/link_as_linklist.rb

@@ -0,0 +1,18 @@
+require 'fiona7/attribute_writers/attribute_writer'
+require 'fiona7/attribute_writers/helpers/link_serializer'
+
+module Fiona7
+  module AttributeWriters
+    class LinkAsLinklist < AttributeWriter
+      def call(value, claimed_type=nil)
+        value = value || {}
+        if value.empty?
+          self.obj.set(self.attr_name, [])
+        else
+          link = Helpers::LinkSerializer.new(self.obj, self.klass).call(value)
+          self.obj.set(self.attr_name, [link])
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/linklist_as_linklist.rb

@@ -0,0 +1,16 @@
+require 'fiona7/attribute_writers/attribute_writer'
+require 'fiona7/attribute_writers/helpers/link_serializer'
+
+module Fiona7
+  module AttributeWriters
+    class LinklistAsLinklist < AttributeWriter
+      def call(value, claimed_type=nil)
+        links = (value || []).map do |link|
+          Helpers::LinkSerializer.new(self.obj, self.klass).call(link)
+        end
+
+        self.obj.set(self.attr_name, links)
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/multienum_as_multienum.rb

@@ -0,0 +1,11 @@
+require 'fiona7/attribute_writers/attribute_writer'
+
+module Fiona7
+  module AttributeWriters
+    class MultienumAsMultienum < AttributeWriter
+      def call(value, claimed_type=nil)
+        self.obj.set(self.attr_name, value || [])
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/multienum_as_text.rb

@@ -0,0 +1,12 @@
+require 'fiona7/attribute_writers/attribute_writer'
+require 'fiona7/attribute_writers/helpers/json_serializer'
+
+module Fiona7
+  module AttributeWriters
+    class MultienumAsText < AttributeWriter
+      def call(value, claimed_type=nil)
+        self.obj.set(self.attr_name, Helpers::JsonSerializer.new.call(value || []))
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/number_as_string.rb

@@ -0,0 +1,11 @@
+require 'fiona7/attribute_writers/attribute_writer'
+
+module Fiona7
+  module AttributeWriters
+    class NumberAsString < AttributeWriter
+      def call(value, claimed_type=nil)
+        self.obj.set(self.attr_name, value.to_s)
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/reference_as_linklist.rb

@@ -0,0 +1,17 @@
+require 'fiona7/attribute_writers/attribute_writer'
+
+module Fiona7
+  module AttributeWriters
+    class ReferenceAsLinklist < AttributeWriter
+      def call(value, claimed_type=nil)
+        # FIXME: use a repository to improve performance
+        obj = self.klass.find(value) rescue nil
+        if obj
+          self.obj.set(self.attr_name, [obj.path])
+        else
+          self.obj.set(self.attr_name, [])
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/reference_as_string.rb

@@ -0,0 +1,11 @@
+require 'fiona7/attribute_writers/attribute_writer'
+
+module Fiona7
+  module AttributeWriters
+    class ReferenceAsString < AttributeWriter
+      def call(value, claimed_type=nil)
+        self.obj.set(self.attr_name, value.to_s)
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/referencelist_as_linklist.rb

@@ -0,0 +1,19 @@
+require 'fiona7/attribute_writers/attribute_writer'
+
+module Fiona7
+  module AttributeWriters
+    class ReferencelistAsLinklist < AttributeWriter
+      def call(value, claimed_type=nil)
+        # FIXME: use a repository to improve performance
+        ids = value || []
+        if ids.empty?
+          self.obj.set(self.attr_name, [])
+        else
+          objects_map = Hash[self.klass.where(obj_id: ids).map {|o| [o.id.to_s, o]}]
+          objects = ids.map {|id| objects_map[id] }.compact
+          self.obj.set(self.attr_name, objects)
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/referencelist_as_text.rb

@@ -0,0 +1,13 @@
+require 'fiona7/attribute_writers/attribute_writer'
+require 'fiona7/attribute_writers/helpers/json_serializer'
+
+module Fiona7
+  module AttributeWriters
+    class ReferencelistAsText < AttributeWriter
+      def call(value, claimed_type=nil)
+        ids = value || []
+        self.obj.set(self.attr_name, Helpers::JsonSerializer.new.call(ids))
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/simple.rb

@@ -0,0 +1,11 @@
+require 'fiona7/attribute_writers/attribute_writer'
+
+module Fiona7
+  module AttributeWriters
+    class Simple < AttributeWriter
+      def call(value, claimed_type=nil)
+        self.obj.set(self.attr_name, value)
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/stringlist_as_text.rb

@@ -0,0 +1,16 @@
+require 'fiona7/attribute_writers/attribute_writer'
+require 'fiona7/attribute_writers/helpers/json_serializer'
+
+module Fiona7
+  module AttributeWriters
+    class StringlistAsText < AttributeWriter
+      def call(value, claimed_type=nil)
+        if self.attr_name.to_s == "channels"
+          self.obj.set(:channels, value || [])
+        else
+          self.obj.set(self.attr_name, Helpers::JsonSerializer.new.call(value || []))
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_writers/widgetlist_as_linklist.rb

@@ -0,0 +1,33 @@
+require 'fiona7/attribute_writers/attribute_writer'
+
+module Fiona7
+  module AttributeWriters
+    class WidgetlistAsLinklist < AttributeWriter
+      def call(value, claimed_type=nil)
+        # TODO: widget_respository
+        links = []
+        if value.kind_of?(Array)
+          (value || []).each do  |widget_id|
+            if (path=self.widget_map[widget_id]||self.widget_map[widget_id.to_s])
+              links << {destination_object: path, title: widget_id}
+            else
+              raise Scrivito::ScrivitoError, "Inconsistent widget pool state detected, unable to store widgets (unable to find #{widget_id} in #{self.widget_map.inspect})"
+            end
+          end
+        elsif value.kind_of?(Hash)
+          # stupid shits could not use one consistent format
+          (value || {})["list"].each do  |crap|
+            widget_id = crap["widget"]
+            if (path=self.widget_map[widget_id]||self.widget_map[widget_id.to_s])
+              links << {destination_object: path, title: widget_id}
+            else
+              raise Scrivito::ScrivitoError, "Inconsistent widget pool state detected, unable to store widgets (unable to find #{widget_id} in #{self.widget_map.inspect})"
+            end
+          end
+        end
+        self.obj.set(self.attr_name, links)
+      end
+    end
+  end
+end
+

data/lib/fiona7/builder/obj_builder.rb

@@ -11,11 +11,10 @@ require 'fiona7/obj_class_name_demangler'
 #require 'fiona7/write_obj'
 #require 'fiona7/released_obj'
 require 'fiona7/builder/batch_widget_writer'
-require 'fiona7/link_converter/scrivito_to_fiona'
 require 'fiona7/widget_resolver'
-require 'fiona7/builder/lazy_blob_copier'
-require 'fiona7/builder/indirect_blob_builder'
-require 'fiona7/blob_id_generator'
+require 'fiona7/prefetch/obj_prefetch'
+
+require 'fiona7/attribute_writers/factory'
 
 
 module Fiona7
@@ -66,16 +65,11 @@ module Fiona7
 
         ensure_obj_class_exists
 
-        # bottom one is faster, but can only work when there are no widgets and no uploads
-        if (@widget_pool && !@widget_pool.empty?) || (@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.create!(name: @name, parent_obj_id: @parent.id, obj_class: @real_obj_class)
-        end
+        @obj = WriteObj.create!(name: @name, parent_obj_id: @parent.id, obj_class: @real_obj_class)
       end
 
       def write_widget_pool
-        resolver = WidgetResolver.new(@obj.attr_values["X_widget_pool"]||[], WriteObj)
+        resolver = WidgetResolver.new(@obj.attr_values["X_widget_pool"]||[], Prefetch::ObjPrefetch.new(WriteObj))
 
         @id_map = resolver.id_map
         @widget_path_map = resolver.path_map
@@ -115,171 +109,20 @@ module Fiona7
           @obj.reload
         end
         @obj.send(:reload_attributes)
-        type_definition = Fiona7::TypeRegister.instance.write(@obj_class)
-        if type_definition.nil?
-          raise "Definition not found for #{@obj_class}" 
-        end
-        @values.each do |attribute_name, possible_pair|
-          (claimed_type, value) = *possible_pair
-          attribute             = type_definition.find_attribute(attribute_name)
-          if attribute.nil?
-            #debugger
-            raise "Attribute #{attribute_name} not found in #{@obj_class}"
-          end
-
-          virtual_name          = attribute.name.to_sym
-          attribute_name        = real_name = attribute.real_name.to_sym
-          virtual_type          = attribute.type.to_sym
-
-          case virtual_type
-          when :linklist
-            links = (value || []).map do |link|
-              link = link.symbolize_keys
-              new_link = {}
-
-              if link[:url]
-                # handle www.example.com
-                new_link[:url] = "external:#{link[:url]}" unless link[:url] =~ /\A[a-zA-Z][a-zA-Z0-9+.-]:/
-              elsif obj_id = link[:obj_id] 
-                new_link[:url] = WriteObj.find(obj_id).path
-              end
 
+        factory = Fiona7::AttributeWriters::Factory.new(@obj, @obj_class, WriteObj, @widget_path_map)
 
-              new_link[:url] ||= link[:url] 
-              new_link[:title] = link[:title] if link[:title]
-              new_link[:target] = link[:target] if link[:target]
-              new_link[:url] = "#{new_link[:url]}?#{link[:query]}" if link[:query]
-                new_link[:url] = "#{new_link[:url]}##{link[:fragment]}" if link[:fragment]
-
-              new_link
-            end
-            @obj.set(attribute_name.to_s, links)
-          when :link
-            link = (value || {}).symbolize_keys
-            new_link = {}
-
-            if link[:url]
-              # handle www.example.com
-              new_link[:url] = "external:#{link[:url]}" unless link[:url] =~ /\A[a-zA-Z][a-zA-Z0-9+.-]:/
-            elsif obj_id = link[:obj_id] 
-              new_link[:url] = WriteObj.find(obj_id).path
-            end
-
-
-            new_link[:url] ||= link[:url] 
-            new_link[:title] = link[:title] if link[:title]
-            new_link[:target] = link[:target] if link[:target]
-            new_link[:url] = "#{new_link[:url]}?#{link[:query]}" if link[:query]
-              new_link[:url] = "#{new_link[:url]}##{link[:fragment]}" if link[:fragment]
+        @values.each do |attribute_name, possible_pair|
+          (claimed_type, value) = *possible_pair
 
-            new_link
-            if link.empty?
-              @obj.set(attribute_name.to_s, [])
-            else
-              @obj.set(attribute_name.to_s, [new_link])
-            end
-          when :reference
-            obj = WriteObj.find(value) rescue nil
-            if obj
-              @obj.set(attribute_name.to_s, [obj.path])
-            else
-              @obj.set(attribute_name.to_s, [])
-            end
-          when :referencelist
-            ids = value || []
-            if ids.empty?
-              @obj.set(attribute_name.to_s, [])
-            else
-              objects_map = Hash[WriteObj.where(obj_id: ids).map {|o| [o.id.to_s, o]}]
-              objects = ids.map {|id| objects_map[id] }.compact
-              @obj.set(attribute_name, objects)
-            end
-          when :widgetlist
-            links = []
-            if value.kind_of?(Array)
-              (value || []).each do  |widget_id|
-                if (path=@widget_path_map[widget_id]||@widget_path_map[widget_id.to_s])
-                  links << {destination_object: path, title: widget_id}
-                else
-                  raise Scrivito::ScrivitoError, "Inconsistent widget pool state detected, unable to store widgets (unable to find #{widget_id} in #{@widget_path_map.inspect})"
-                end
-              end
-            elsif value.kind_of?(Hash)
-              # stupid shits could not use one consistent format
-              (value || {})["list"].each do  |crap|
-                widget_id = crap["widget"]
-                if (path=@widget_path_map[widget_id]||@widget_path_map[widget_id.to_s])
-                  links << {destination_object: path, title: widget_id}
-                else
-                  raise Scrivito::ScrivitoError, "Inconsistent widget pool state detected, unable to store widgets (unable to find #{widget_id} in #{@widget_path_map.inspect})"
-                end
-              end
-            end
-            @obj.set(attribute_name.to_s, links)
-          when :text, :string, :enum, :multienum, :date
-            #if value.nil? && value != @obj[attribute_name]
-            @obj.set(attribute_name.to_s, value)
-            #end
-          when :number
-            @obj.set(attribute_name.to_s, value.to_s)
-          when :stringlist
-            if Fiona7.mode == :legacy && attribute_name.to_s == "channels"
-              @obj.set(:channels, value || [])
-            else
-              @obj.set(attribute_name.to_s, value.to_json)
-            end
-          when :html
-            converted_links = LinkConverter::ScrivitoToFiona.new(WriteObj, value.to_s).convert
-            @obj.set(attribute_name.to_s, converted_links)
-          when :binary
-            if value.kind_of?(String)
-              # NOTE: this code path has not been tested yet.
-              target = {title: value, destination_object: InternalReleasedObj.find(value.to_i)}
-              @obj.set(attribute_name.to_s, target)
-            elsif value.kind_of?(File)
-              if !Fiona7.mode == :legacy || attribute_name.to_s != "blob"
-                @obj.set(attribute_name.to_s, upload_file(value))
-              else
-                special_upload_handling(attribute_name, value)
-              end
-            elsif value.kind_of?(ActionDispatch::Http::UploadedFile)
-              if !Fiona7.mode == :legacy || attribute_name.to_s != "blob"
-                @obj.set(attribute_name.to_s, upload_uploaded_file(value))
-              else
-                special_upload_uploaded_handling(attribute_name, value)
-              end
-            elsif value.nil?
-              @obj.set(attribute_name.to_s, [])
-            elsif value.kind_of?(Hash)
-              source_blob_id = value["id"] || value["id_to_copy"]
-              filename       = value["filename"]
-              content_type   = value["content_type"]
-
-              # There is a little bit of magic behind this.
-              # This will pass some data directly to the crul_obj
-              # bypassing @obj.set(), but calling @obj.save
-              # afterwards still persists the data correctly
-              #
-              # This works the same way as Reactor::Tools::Uploader
-              Fiona7::Builder::LazyBlobCopier.new({
-                destination_obj:  @obj,
-                attr_name:        attribute_name.to_s,
-                source_blob_id:   source_blob_id,
-                filename:         filename,
-                content_type:     content_type
-              }).call
-
-              # NOTE: no @obj.set() required here
-            else
-              raise Scrivito::ClientError.new("Invalid input for binary field", 422)
-            end
-          else
-            raise Scrivito::ClientError.new("Unknown attribute type: #{virtual_type}", 418)
-          end
+          worker = factory.call(attribute_name)
+          worker.call(value, claimed_type)
         end
+
         if (@new_full_text)
           @obj.set(:X_full_text, @new_full_text)
         end
+
         @obj.set(:X_widget_pool, @new_widget_pool) if @new_widget_pool
         @obj.set(:permalink, @permalink) if @permalink
 
@@ -290,25 +133,6 @@ module Fiona7
         #end
       end
 
-      def special_upload_handling(attribute_name, file)
-        if !@obj.binary?
-          # standard handling!
-          @obj.set(attribute_name.to_s, upload_file(file))
-        else
-          ext  = ::File.extname(file.path).to_s[1..-1]
-          @obj.upload(file, ext)
-        end
-      end
-
-      def special_upload_uploaded_handling(attribute_name, file)
-        if !@obj.binary?
-          # standard handling!
-          @obj.set(attribute_name.to_s, upload_uploaded_file(file))
-        else
-          ext  = ::File.extname(file.original_filename).to_s[1..-1]
-          @obj.upload(file.open, ext)
-        end
-      end
 
       def rewrite_full_text
         full_text = ::YAML.load(@obj.attr_values["X_full_text"]) rescue {}
@@ -321,19 +145,6 @@ module Fiona7
         nil
       end
 
-      def upload_file(file)
-        upload = Fiona7::Builder::IndirectBlobBuilder.new(@obj, ::File.basename(file.path), file).call
-        encoded_id = Fiona7::BlobIdGenerator.new(upload.id, upload.last_changed).call
-        {title: encoded_id, destination_object: upload}
-      end
-
-      def upload_uploaded_file(file)
-        upload = Fiona7::Builder::IndirectBlobBuilder.new(@obj, file.original_filename, file.open).call
-        encoded_id = Fiona7::BlobIdGenerator.new(upload.id, upload.last_changed).call
-        {title: encoded_id, destination_object: upload}
-      end
-
-
       def name_and_parent_path_from_path(path)
         components = path.split('/')
         name       = components.pop.presence