infopark_fiona7 1.2.0.0.1 → 1.2.0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7d3bb2d10bc2f11b32b9754210ed0ef10341556
-  data.tar.gz: fd71316becc16a5f10c1c546ca1c97389cb9afbb
+  metadata.gz: 8a6ec5e35fd0d8751ebef7a921e1041b74b6991f
+  data.tar.gz: 0340bd069fc11e65504711408488f8a6b088a7ec
 SHA512:
-  metadata.gz: 454999faa3d435587f987af8f1af4a636e75b767e50938bf2e2235541e1a35fe3a4cf7133b407f407e31d5ce936fecbcab41b6fb3d43a29ce4585008463f7356
-  data.tar.gz: 0271a2e3031ec96cdc812903d97d29bdb445a9efc5c77afe712f081c012ffaba693c61289a74fe2199838897d674371e34033a3d6f5b44217e7b0b2accbde1e3
+  metadata.gz: 9c37220478fa274a9afaff2535af1bdfcf6cdc4d25b14ea6f9f219738fa36a6c4314b633317977c86be20ea3f8d055480141bcd5b9c99f4c0860a5337a4e8127
+  data.tar.gz: 23adf98f303eb22bfe138f66934fc421b9f0dbbdf11619ef99bfdce3f1df1dd897ef5acfa7f66430a242c494f9bd4d986643378743aca3bfc33376864d553c91

data/app/assets/javascripts/scrivito_patches/models/obj.js

@@ -232,7 +232,7 @@
     $.each(attrs, function (key, value) {
       if (value && value.is_uploaded_binary && value.filename) {
         default_name = value.filename;
-      } else if (instance_of_anywhere(value, 'File')) {
+      } else if (is_file(value)) {
         default_name = value.name;
       }
     });
@@ -273,7 +273,7 @@
     $.each(attributes, function (key, value) {
       if (value && value.is_uploaded_binary) {
         has_binary=true;
-      } else if (instance_of_anywhere(value, 'File')) {
+      } else if (is_file(value)) {
         has_binary=true
       }
     });
@@ -344,10 +344,6 @@
       _.isString(object.name);
   };
 
-  var instance_of_anywhere = function (object, ctor_name) {
-    return (object && (typeof object === 'object') && object.constructor && object.constructor.name === ctor_name);
-  };
-
   var format_date_number = function(number) {
     var string = number.toString();
     return string.length === 1 ? '0' + string : string;

data/infopark_fiona7.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "scrivito_sdk"
   s.add_dependency "scrivito_editors"
   s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"
-  s.add_dependency "infopark_reactor", ">= 1.22.3"
+  s.add_dependency "infopark_reactor", ">= 1.22.4"
   s.add_dependency "mini_magick"
   #s.add_development_dependency "ruby-prof"
 end

data/lib/fiona7/attribute_readers/attribute_reader.rb

@@ -0,0 +1,17 @@
+module Fiona7
+  module AttributeReaders
+    class AttributeReader
+      def initialize(obj, attr_name, widget_resolver)
+        self.obj             = obj
+        self.attr_name       = attr_name
+        self.widget_resolver = widget_resolver
+      end
+
+      def call
+      end
+
+      protected
+      attr_accessor :obj, :attr_name, :widget_resolver
+    end
+  end
+end

data/lib/fiona7/attribute_readers/binary_as_binary.rb

@@ -0,0 +1,12 @@
+require 'fiona7/attribute_readers/attribute_reader'
+require 'fiona7/blob_id_generator'
+
+module Fiona7
+  module AttributeReaders
+    class BinaryAsBinary < AttributeReader
+      def call
+        {id: Fiona7::BlobIdGenerator.new(self.obj.id, self.obj.last_changed).call}
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_readers/binary_as_linklist.rb

@@ -0,0 +1,26 @@
+require 'fiona7/attribute_readers/attribute_reader'
+require 'fiona7/blob_id_generator'
+
+module Fiona7
+  module AttributeReaders
+    class BinaryAsLinklist < AttributeReader
+      def call
+        if !Fiona7.mode == :legacy || !self.obj.binary?
+          deserialize_binary(self.obj.attr_values[self.attr_name].try(:first))
+        else
+          {id: Fiona7::BlobIdGenerator.new(self.obj.id, self.obj.last_changed).call}
+        end
+      end
+
+      protected
+      def deserialize_binary(link)
+        if link
+          binary_id = link["title"]
+          if binary_id.length == 32 
+            {id: binary_id}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_readers/date_as_date.rb

@@ -0,0 +1,18 @@
+require 'fiona7/attribute_readers/attribute_reader'
+
+module Fiona7
+  module AttributeReaders
+    class DateAsDate < AttributeReader
+      def call
+        # NOTE: this is a bug in fiona connector 
+        # [valid_(from|until)] returns a raw string
+        if ["valid_from", "valid_until"].include?(self.attr_name.to_s)
+          self.obj[self.attr_name]
+        else
+          self.obj[self.attr_name].try(:utc).try(:to_iso)
+        end
+      end
+    end
+  end
+end
+

data/lib/fiona7/attribute_readers/factory.rb

@@ -0,0 +1,91 @@
+require 'fiona7/attribute_readers/binary_as_binary'
+require 'fiona7/attribute_readers/binary_as_linklist'
+require 'fiona7/attribute_readers/date_as_date'
+require 'fiona7/attribute_readers/html_as_html'
+require 'fiona7/attribute_readers/link_as_linklist'
+require 'fiona7/attribute_readers/linklist_as_linklist'
+require 'fiona7/attribute_readers/multienum_as_multienum'
+require 'fiona7/attribute_readers/multienum_as_text'
+require 'fiona7/attribute_readers/number_as_string'
+require 'fiona7/attribute_readers/reference_as_linklist'
+require 'fiona7/attribute_readers/reference_as_string'
+require 'fiona7/attribute_readers/referencelist_as_linklist'
+require 'fiona7/attribute_readers/referencelist_as_text'
+require 'fiona7/attribute_readers/simple'
+require 'fiona7/attribute_readers/stringlist_as_text'
+require 'fiona7/attribute_readers/widgetlist_as_linklist'
+
+module Fiona7
+  module AttributeReaders
+    class Factory
+      def initialize(obj, type_def, widget_resolver)
+        self.obj             = obj
+        self.type_def        = type_def
+        self.widget_resolver = widget_resolver
+      end
+
+      def call(attribute, virtual_type, real_type)
+        virtual = virtual_type.to_sym
+        real    = real_type.to_sym
+
+        worker = case [virtual, real]
+                 when [:linklist, :linklist]
+                   Fiona7::AttributeReaders::LinklistAsLinklist
+                 when [:link, :linklist]
+                   Fiona7::AttributeReaders::LinkAsLinklist
+                 when [:reference, :linklist]
+                   Fiona7::AttributeReaders::ReferenceAsLinklist
+                 when [:reference, :string], [:reference, :text]
+                   Fiona7::AttributeReaders::ReferenceAsString
+                 when [:referencelist, :linklist]
+                   Fiona7::AttributeReaders::ReferencelistAsLinklist
+                 when [:referencelist, :text], [:referencelist, :string]
+                   Fiona7::AttributeReaders::ReferencelistAsText
+                 when [:widgetlist, :linklist]
+                   Fiona7::AttributeReaders::WidgetlistAsLinklist
+                 when [:multienum, :text], [:multienum, :string]
+                   Fiona7::AttributeReaders::MultienumAsText
+                 when [:multienum, :multienum]
+                   Fiona7::AttributeReaders::MultienumAsMultienum
+                 when [:number, :string], [:number, :text]
+                   Fiona7::AttributeReaders::NumberAsString
+                 when [:html, :html]
+                   Fiona7::AttributeReaders::HtmlAsHtml
+                 when [:binary, :linklist]
+                   Fiona7::AttributeReaders::BinaryAsLinklist
+                 when [:binary, :binary]
+                   Fiona7::AttributeReaders::BinaryAsBinary
+                 when [:stringlist, :text], [:stringlist, :string]
+                   Fiona7::AttributeReaders::StringlistAsText
+                 when [:stringlist, :multienum]
+                   Fiona7::AttributeReaders::Simple
+                 when [:stringlist, :stringlist]
+                   # NOTE: this is practically only used for "channels"
+                   Fiona7::AttributeReaders::Simple
+                 else
+                   case virtual
+                   when :text, :string, :enum, :markdown
+                     Fiona7::AttributeReaders::Simple
+                   when :date
+                     Fiona7::AttributeReaders::DateAsDate
+                   else
+                     # It would perhaps be practical to raise this error here
+                     # but also risky: broken configurations may surface
+                     # (attributes which had their attribute types changed).
+                     # This would break some pages
+                     #
+                     # raise(Fiona7::TypeSystemError.new("Unable to read #{attribute} in #{self.type_def.name} with typing #{virtual}:#{real}"))
+                     #
+                     # So instead, it is better to "lose" some information.
+                     return nil
+                   end
+                 end
+
+        worker.new(self.obj, attribute, self.widget_resolver)
+      end
+
+      protected
+      attr_accessor :obj, :obj_class, :type_def, :widget_resolver
+    end
+  end
+end

data/lib/fiona7/attribute_readers/helpers/html_deserializer.rb

@@ -0,0 +1,21 @@
+require 'fiona7/link_converter/fiona_to_scrivito'
+
+module Fiona7
+  module AttributeReaders
+    module Helpers
+      class HtmlDeserializer
+        def initialize(obj)
+          self.link_converter = Fiona7::LinkConverter::FionaToScrivito.new(obj)
+        end
+
+        def call(value)
+          self.link_converter.convert(value)
+        end
+
+        protected
+        attr_accessor :link_converter
+      end
+    end
+  end
+end
+

data/lib/fiona7/attribute_readers/helpers/json_deserializer.rb

@@ -0,0 +1,11 @@
+module Fiona7
+  module AttributeReaders
+    module Helpers
+      class JsonDeserializer
+        def call(value)
+          ::JSON.parse(value) rescue nil
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_readers/helpers/link_deserializer.rb

@@ -0,0 +1,32 @@
+module Fiona7
+  module AttributeReaders
+    module Helpers
+      class LinkDeserializer
+        def call(link)
+          if link
+            deserialized = {
+              # remove possible external prefix for protcol-less urls
+              url: link["url"].try(:gsub, /\Aexternal:/, ''),
+              title: link["title"],
+              target: link["target"],
+              # content service uses destination
+              destination: link["destination"].to_s,
+              # rest api uses obj_id
+              obj_id: link["destination"].to_s,
+              query: link["search"],
+              fragment: link["fragment"]
+            }
+
+            # TODO: refactor this code
+            if deserialized[:url].present?
+              deserialized.delete(:destination)
+              deserialized.delete(:obj_id)
+            end
+
+            deserialized
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_readers/html_as_html.rb

@@ -0,0 +1,14 @@
+require 'fiona7/attribute_readers/attribute_reader'
+require 'fiona7/attribute_readers/helpers/html_deserializer'
+
+module Fiona7
+  module AttributeReaders
+    class HtmlAsHtml < AttributeReader
+      def call
+        value = self.obj[self.attr_name].to_s
+        Helpers::HtmlDeserializer.new(self.obj).call(value)
+      end
+    end
+  end
+end
+

data/lib/fiona7/attribute_readers/link_as_linklist.rb

@@ -0,0 +1,13 @@
+require 'fiona7/attribute_readers/attribute_reader'
+require 'fiona7/attribute_readers/helpers/link_deserializer'
+
+module Fiona7
+  module AttributeReaders
+    class LinkAsLinklist < AttributeReader
+      def call
+        link = self.obj.attr_values[self.attr_name].try(:first)
+        Helpers::LinkDeserializer.new.call(link)
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_readers/linklist_as_linklist.rb

@@ -0,0 +1,15 @@
+require 'fiona7/attribute_readers/attribute_reader'
+require 'fiona7/attribute_readers/helpers/link_deserializer'
+
+module Fiona7
+  module AttributeReaders
+    class LinklistAsLinklist < AttributeReader
+      def call
+        links = self.obj.attr_values[self.attr_name] || []
+        links.map do |link|
+          Helpers::LinkDeserializer.new.call(link)
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_readers/multienum_as_multienum.rb

@@ -0,0 +1,12 @@
+require 'fiona7/attribute_readers/attribute_reader'
+
+module Fiona7
+  module AttributeReaders
+    class MultienumAsMultienum < AttributeReader
+      def call
+        self.obj[self.attr_name] || []
+      end
+    end
+  end
+end
+

data/lib/fiona7/attribute_readers/multienum_as_text.rb

@@ -0,0 +1,14 @@
+require 'fiona7/attribute_readers/attribute_reader'
+require 'fiona7/attribute_readers/helpers/json_deserializer'
+
+module Fiona7
+  module AttributeReaders
+    class MultienumAsText < AttributeReader
+      def call
+        value = self.obj[self.attr_name]
+        Helpers::JsonDeserializer.new.call(value).presence || []
+      end
+    end
+  end
+end
+

data/lib/fiona7/attribute_readers/number_as_string.rb

@@ -0,0 +1,11 @@
+require 'fiona7/attribute_readers/attribute_reader'
+
+module Fiona7
+  module AttributeReaders
+    class NumberAsString < AttributeReader
+      def call
+        self.obj[self.attr_name].to_f
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_readers/reference_as_linklist.rb

@@ -0,0 +1,14 @@
+require 'fiona7/attribute_readers/attribute_reader'
+
+module Fiona7
+  module AttributeReaders
+    class ReferenceAsLinklist < AttributeReader
+      def call
+        link = self.obj.attr_values[self.attr_name].try(:first)
+        if link && link["type"] == "internal"
+          link["destination"].to_s
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_readers/reference_as_string.rb

@@ -0,0 +1,11 @@
+require 'fiona7/attribute_readers/attribute_reader'
+
+module Fiona7
+  module AttributeReaders
+    class ReferenceAsString < AttributeReader
+      def call
+        self.obj.attr_values[self.attr_name]
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_readers/referencelist_as_linklist.rb

@@ -0,0 +1,16 @@
+require 'fiona7/attribute_readers/attribute_reader'
+
+module Fiona7
+  module AttributeReaders
+    class ReferencelistAsLinklist < AttributeReader
+      def call
+        links = self.obj.attr_values[self.attr_name] || []
+        links.map do |link|
+          if link && link["type"] == "internal"
+            link["destination"].to_s
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fiona7/attribute_readers/referencelist_as_text.rb

@@ -0,0 +1,14 @@
+require 'fiona7/attribute_readers/attribute_reader'
+require 'fiona7/attribute_readers/helpers/json_deserializer'
+
+module Fiona7
+  module AttributeReaders
+    class ReferencelistAsText < AttributeReader
+      def call
+        value = self.obj[self.attr_name]
+        Helpers::JsonDeserializer.new.call(value).presence || []
+      end
+    end
+  end
+end
+