infopark_fiona7 0.30.0.2 → 0.70.0.1

data/app/assets/stylesheets/fiona7.css.scss

@@ -1,18 +1,8 @@
 /*
-*= require scrivito
-*= require scrivito_editors
-*/
-/* here goes logo */
-body > div.scrivito_topbar > div > div.scrivito_button_bar.scrivito_app.scrivito_no_hover {
-  width: 170px !important;
-}
-body > div.scrivito_topbar > div > div.scrivito_button_bar.scrivito_app.scrivito_no_hover .scrivito_logo {
-  background-image: asset-url('fiona7-logo.png') !important;
-  height: 43px !important;
-  width: 163px !important;
-  top: 0px;
-  left: 0px;
-}
+ *= require scrivito
+ *= require_self
+ */
+
 /* colors */
 body.scrivito_widget_dragging_active[data-scrivito-display-mode="editing"] *[data-scrivito-widget-obj-class],
 body.scrivito_widget_dragging_active[data-scrivito-display-mode="editing"] *[data-scrivito-widget-obj-class] *[data-scrivito-field-type="widget"],
@@ -59,25 +49,3 @@ body.scrivito_widget_dragging_active[data-scrivito-display-mode="editing"] *[dat
 .scrivito_editing_marker {
   padding: 0 !important;
 }
-.scrivito_input_new_ws_name, #scrivito_delete_workspace, #scrivito_rename_workspace, #scrivito_create_workspace, #scrivito_rebase_workspace, #scrivito_workspace_settings {
-  display: none !important;
-}
-
-.scrivito_editing_widget_visualization .scrivito_icon {
-  line-height: 118px !important;
-}
-
-/* for removing edit toggle */
-.scrivito_viewmodes_wrapper {
-  text-align: center !important;
-}
-.scrivito_viewmodes {
-  width: auto !important;
-  display: inline-block !important;
-}
-.scrivito_viewmodes.scrivito_viewmode_diff_active .scrivito_viewmode_pill,
-.scrivito_viewmodes.scrivito_viewmode_deleted_active .scrivito_viewmode_pill,
-.scrivito_viewmodes.scrivito_viewmode_added_active .scrivito_viewmode_pill {
-  left: auto !important;
-  right: 0px !important;
-}

data/app/assets/stylesheets/fiona7_ui.css.scss

@@ -0,0 +1,39 @@
+body > div.scrivito_topbar > div > div.scrivito_button_bar.scrivito_app.scrivito_no_hover {
+  width: 170px !important;
+}
+body > div.scrivito_topbar > div > div.scrivito_button_bar.scrivito_app.scrivito_no_hover .scrivito_logo {
+  background-image: asset-url('fiona7-logo.png') !important;
+  height: 43px !important;
+  width: 163px !important;
+  top: 0px;
+  left: 0px;
+}
+
+.scrivito_menu_box #scrivito_sdk_workspace_settings, .scrivito_menu_box #scrivito_sdk_rename_workspace, .scrivito_menu_box #scrivito_sdk_rebase_workspace, .scrivito_menu_box #scrivito_sdk_delete_workspace, .scrivito_menu_box #scrivito_sdk_create_workspace {
+  display: none;
+}
+
+/*
+.scrivito_input_new_ws_name, #scrivito_delete_workspace, #scrivito_rename_workspace, #scrivito_create_workspace, #scrivito_rebase_workspace, #scrivito_workspace_settings {
+  display: none !important;
+}
+
+.scrivito_editing_widget_visualization .scrivito_icon {
+  line-height: 118px !important;
+}
+
+// for removing edit toggle
+.scrivito_viewmodes_wrapper {
+  text-align: center !important;
+}
+.scrivito_viewmodes {
+  width: auto !important;
+  display: inline-block !important;
+}
+.scrivito_viewmodes.scrivito_viewmode_diff_active .scrivito_viewmode_pill,
+.scrivito_viewmodes.scrivito_viewmode_deleted_active .scrivito_viewmode_pill,
+.scrivito_viewmodes.scrivito_viewmode_added_active .scrivito_viewmode_pill {
+  left: auto !important;
+  right: 0px !important;
+}
+*/

data/app/controllers/fiona7/blobs_controller.rb

@@ -1,34 +1,24 @@
 module Fiona7
   class BlobsController < ActionController::Base
-    # required for ensure_object_is_permitted
-    cattr_accessor :current_user_proc
-    self.current_user_proc = proc { nil }
 
-    include RailsConnector::CmsAccessible
-    before_filter :load_object
-    before_filter :ensure_object_is_active
-    before_filter :ensure_object_is_permitted
-    before_filter :set_google_expire_header
+    include Fiona7::BinaryHandling::DeliveryMixin
 
-    def show
-      if @obj.binary?
-        deliver_file
-      else
-        head :bad_request
-      end
+    protected
+
+    def binary_id_from_params
+      params[:id]
     end
 
-    protected
-    def load_object
-      obj_id = params[:id].to_i
-      @obj = InternalReleasedObj.find(obj_id)
-    rescue ActiveRecord::RecordNotFound
-      head :not_found
-      return false
+    def transformation_from_params
+      if params[:t]
+        BinaryHandling::ParamEncoder.new.decode(
+          params[:t]
+        )
+      end
     end
 
-    def current_user
-      self.class.current_user_proc.try(:call, self)
+    def set_header(name, value)
+      response.headers[name] = value
     end
   end
 end

data/app/controllers/fiona7/release_controller.rb

@@ -9,6 +9,7 @@ module Fiona7
       @releasable << @obj
 
       @releasable.each do |obj|
+        obj.take
         obj.release! if obj.really_edited?
       end
 

data/app/controllers/fiona7/sessions_controller.rb

@@ -39,11 +39,9 @@ module Fiona7
     end
 
     def valid_credentials?(login, password)
-      current_login = rsession.user_name
-      rsession.user_name = 'root'
-      Reactor::Cm::User.new(login).has_password?(password)
-    ensure
-      rsession.user_name = current_login unless rsession.user_name == current_login
+      Reactor::Sudo.su(Fiona7.root) do
+        Reactor::Cm::User.new(login).has_password?(password)
+      end
     end
   end
 end

data/app/helpers/fiona7_override_helper.rb

@@ -16,7 +16,7 @@ module Fiona7OverrideHelper
 
   def scrivito_body_tags
     obj = @obj.kind_of?(RailsConnector::BasicObj) ? @obj.scrivito_obj : @obj
-    Scrivito::LayoutTags.new(self).client_config(obj, @scrivito_resource)
+    Scrivito::LayoutTags.new(self).page_config(obj)
   end
 
   def fiona7_head_tags
@@ -37,9 +37,13 @@ module Fiona7OverrideHelper
   def fiona7_tag_list(tag_name, obj, field_name, options = {}, &block)
     raise "This method can only be used in legacy mode" unless Fiona7.mode == :legacy
 
+    fiona_obj = obj.kind_of?(RailsConnector::BasicObj) ? obj : obj.fiona_obj
     obj = obj.kind_of?(RailsConnector::BasicObj) ? obj.scrivito_obj : obj
+    children_map = Hash[fiona_obj.children.map {|c| [c.id.to_s, c] }]
+
     scrivito_tag_list(tag_name, obj, field_name, options) do |list, scrivito_child|
-      block.call(list, scrivito_child.fiona_obj)
+      fiona_child = children_map[scrivito_child.id]
+      block.call(list, fiona_child)
     end
   end
 

data/app/models/fiona7/edited_obj.rb

@@ -7,7 +7,12 @@ module Fiona7
     has_many :children, :class_name => self.name, :foreign_key => 'parent_obj_id'
     belongs_to :parent, :class_name => self.name, :foreign_key => 'parent_obj_id'
 
-    default_scope { where('suppress_export = 0 AND obj_class NOT IN (?)', ['X_Generic', 'X_Image', 'X_Container']) }
+    if Fiona7.mode == :standalone
+      default_scope { where('suppress_export = 0 AND obj_class NOT IN (?)', ['X_Generic', 'X_Image', 'X_Container']) }
+    else
+      # suppress_export can be misused in legacy mode
+      default_scope { where('obj_class NOT IN (?)', ['X_Generic', 'X_Image', 'X_Container']) }
+    end
 
     # disable STI
     self.inheritance_column = :_type_disabled

data/app/models/fiona7/released_obj.rb

@@ -7,9 +7,17 @@ module Fiona7
     has_many :children, :class_name => self.name, :foreign_key => 'parent_obj_id'
     belongs_to :parent, :class_name => self.name, :foreign_key => 'parent_obj_id'
 
-    default_scope do
-      now = Time.now.utc.to_iso
-      where("is_released = 1 AND suppress_export = 0").where('obj_class NOT IN (?)', ['X_Generic', 'X_Image', 'X_Container']).where("(valid_from IS NULL or valid_from <= :now) and (valid_until IS NULL or valid_until >= :now)", :now => now)
+    if Fiona7.mode == :standalone
+      default_scope do
+        now = Time.now.utc.to_iso
+        where("is_released = 1 AND suppress_export = 0").where('obj_class NOT IN (?)', ['X_Generic', 'X_Image', 'X_Container']).where("(valid_from IS NULL or valid_from <= :now) and (valid_until IS NULL or valid_until >= :now)", :now => now)
+      end
+    else
+      # suppress_export can be misused in legacy mode
+      default_scope do
+        now = Time.now.utc.to_iso
+        where("is_released = 1").where('obj_class NOT IN (?)', ['X_Generic', 'X_Image', 'X_Container']).where("(valid_from IS NULL or valid_from <= :now) and (valid_until IS NULL or valid_until >= :now)", :now => now)
+      end
     end
 
     # disable STI

data/app/models/fiona7/write_obj.rb

@@ -14,9 +14,19 @@ module Fiona7
       'Fiona7::InternalReleasedObj'
     ]
 
-    self.configure_for_content(:edited)
-    # disable STI
+    # in legacy mode the app decides the default
+    # and per request table-switching does the rest
+    if Fiona7.mode == :standalone
+      self.configure_for_content(:edited)
+    end
+
+    # Workaround for constant reloading breaking 
+    # otherwise dangling references
+    # Obj.reflections["children"].klass != Obj
+    has_many :children, :class_name => 'RailsConnector::AbstractObj', :foreign_key => 'parent_obj_id'
+    belongs_to :parent, :class_name => 'RailsConnector::AbstractObj', :foreign_key => 'parent_obj_id'
 
+    # disable STI
     if Fiona7.mode == :standalone
       # In standalone mode Obj belongs to scrivito
       # hence no inheritance
@@ -25,6 +35,10 @@ module Fiona7
       def self.descends_from_active_record?
         true
       end
+
+      def self.subclass_from_attributes(attrs)
+        nil
+      end
     else
       # If this method returns true no STI handling occurs
       def self.descends_from_active_record?
@@ -44,9 +58,10 @@ module Fiona7
     end
 
     # TODO: use this to simulate deleted objects
+    # but not in legacy mode !!
     #default_scope { where('suppress_export != 0') }
 
-    self.logger = Logger.new(nil)
+    #self.logger = Logger.new(nil)
 
     include RailsConnector::Meta
 

data/app/models/fiona7_login_page.rb

@@ -1,4 +1,7 @@
 class Fiona7LoginPage < Scrivito::BasicObj
+  attribute :title, :string
+  attribute :body, :html
+
   def self.instance
     self.all.first
   end

data/app/views/scrivito/ui/index.html.erb

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Fiona7</title>
+  <%= stylesheet_link_tag 'scrivito_ui'  %>
+  <%= stylesheet_link_tag 'fiona7_ui' %>
+  <%= javascript_include_tag 'scrivito_ui' %>
+  <%= javascript_include_tag 'scrivito_ui_extensions' %>
+  <%= javascript_include_tag 'fiona7_ui' %>
+  <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
+</head>
+<body id="scrivito_ui">
+  <iframe name="scrivito_application" src="<%= @application_src %>"></iframe>
+  <%= content_tag(:div, '', 'data-scrivito-private-ui-config' => @ui_config) %>
+</body>
+</html>

data/config/routes.rb

@@ -1,6 +1,8 @@
 Rails.application.routes.draw do
   get '/_b/:id(/:name)' => 'fiona7/blobs#show', as: :fiona7_blob
 
+  match '/_b/:id(/:name)' => 'fiona7/blobs#query', as: :fiona7_blob_meta, via: [:head]
+
   post '/_f7/login', to: 'fiona7/sessions#create', as: :fiona7_login
 
   delete '/_f/logout', to: 'fiona7/sessions#destroy', as: :fiona7_logout

data/infopark_fiona7.gemspec

@@ -16,10 +16,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md", "infopark_fiona7.gemspec"]
 
-  s.add_dependency "rails", "~> 4.1.5"
-  s.add_dependency "scrivito", "~> 0.30"
+  s.add_dependency "rails", "~> 4.2.2"
+  s.add_dependency "scrivito", "= 0.70.0.rc1"
   s.add_dependency "scrivito_sdk"
   s.add_dependency "scrivito_editors"
-  s.add_dependency "infopark_fiona_connector", "~> 7.0.0"
-  s.add_dependency "infopark_reactor", "1.12.0"
+  s.add_dependency "infopark_fiona_connector", "= 7.0.1.beta2"
+  s.add_dependency "infopark_reactor", "= 1.15.0.beta1"
+  s.add_dependency "mini_magick"
+  s.add_development_dependency "ruby-prof"
 end

data/lib/fiona7/builder/batch_widget_writer.rb

@@ -43,9 +43,13 @@ module Fiona7
 
         def dependencies
           Set.new.tap do |dependencies|
-            values.each do |_, value|
-              if value.kind_of?(Hash) && (list = value[:list] || value["list"])
-                dependencies.merge(list.map {|c| c[:widget] || c['widget']})
+            values.each do |attribute_name, (type, val)|
+              if type == "widgetlist"
+                if val.kind_of?(Array)
+                  dependencies.merge(val)
+                elsif val.kind_of?(Hash)
+                  dependencies.merge((val["list"]||[]).map {|w| w["widget"] })
+                end
               end
             end
           end

data/lib/fiona7/builder/obj_builder.rb

@@ -5,7 +5,7 @@ module Fiona7
   end
 end
 
-require 'fiona7/type_register_mixin'
+require 'fiona7/type_register'
 require 'fiona7/recursive_link_resolver'
 #require 'fiona7/write_obj'
 #require 'fiona7/released_obj'
@@ -17,19 +17,21 @@ require 'fiona7/widget_resolver'
 module Fiona7
   module Builder
     class ObjBuilder
-      include TypeRegisterMixin
 
       def initialize(values)
         @values = values.symbolize_keys
+        # garbage
+        @values.delete(:_modification)
+        # revert command sends this info. which is silly.
+        @values.delete(:_last_changed)
+        puts "CREATING/UPDATING: #{@values.inspect}"
       end
 
       def build
         assert_valid
         prepare_object
 
-        create_object
         write_widget_pool
-        namespace_attributes
         store_attributes
 
         @obj
@@ -40,37 +42,37 @@ module Fiona7
       end
 
       protected
+      def update?
+        false
+      end
+
       def assert_valid
         validate || (raise Scrivito::ClientError.new(@error_msg || "Invalid input", 422))
       end
 
       def prepare_object
-        @path              = @values.delete(:_path)
+        @path              = @values.delete(:_path) || generate_orphaned_path
         @obj_class         = @values.delete(:_obj_class)
+        @real_obj_class    = TypeRegister::NameAliaser.new(virtual: @obj_class).real_obj_class
         @widget_pool       = @values.delete(:_widget_pool)
         @permalink         = @values.delete(:_permalink)
-        if @path
-          @path = "/#{@path}" unless @path.start_with?('/')
-          @name, parent_path = name_and_parent_path_from_path(@path)
-        end
+
+        @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
-      end
 
-      def namespace_attributes
-        # nop
-      end
+        ensure_obj_class_exists
 
-      def create_object
         # 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: @obj_class)
+        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.new(name: @name, parent_obj_id: @parent.id, obj_class: @obj_class)
+          @obj = WriteObj.create!(name: @name, parent_obj_id: @parent.id, obj_class: @real_obj_class)
         end
       end
 
       def write_widget_pool
-        resolver = WidgetResolver.new(@obj[:X_widget_pool]||[])
+        resolver = WidgetResolver.new(@obj.attr_values["X_widget_pool"]||[], WriteObj)
 
         @id_map = resolver.id_map
         @widget_path_map = resolver.path_map
@@ -83,25 +85,45 @@ module Fiona7
           if @widgets.pool_changed?
             # after widget writing this either has new widgets
             # or some widgets have been removed
-            @new_widget_pool = @widget_path_map.map do |widget_id, path|
-              {title: widget_id, destination_object: path}
+
+            @new_widget_pool = @widget_pool.map do |widget_id, definition|
+              # widget deleted
+              next if definition.nil?
+              {title: widget_id, destination_object: @widget_path_map[widget_id]}
+            end.compact
+
+            # newly added widgets
+            @widget_path_map.each do |widget_id, path|
+              next if !@widget_pool[widget_id].nil?
+              @new_widget_pool << {title: widget_id, destination_object: path}
             end
+
           end
         end
       end
 
       def store_attributes
-        if @obj.obj_class != @obj_class
-          @obj.obj_class = @obj_class
+        if @obj.obj_class != @real_obj_class
+          @obj.obj_class = @real_obj_class
           @obj.save!
           @obj.reload
         end
-        # TODO: reload into singleton class
         @obj.send(:reload_attributes)
-        @values.each do |attribute_name, value|
-          virtual_name    = attribute_name.to_sym
-          attribute_name  = real_name = type_register.real_attribute_name(@obj.obj_class, virtual_name)
-          virtual_type    = type_register.attribute_type(@obj.obj_class, virtual_name)
+        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
@@ -162,38 +184,64 @@ module Fiona7
             if ids.empty?
               @obj.set(attribute_name.to_s, [])
             else
-              objects_map = Hash[WriteObj.where(obj_id: ids).map {|o| [o.id, o]}]
+              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 :widget
+          when :widgetlist
             links = []
-            value = (value || {}).symbolize_keys
-            (value[:list] || []).each do |crap|
-              widget_id = (crap[:widget] || crap['widget']).to_sym
-
-              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"
+            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 :stringlist
+            @obj.set(attribute_name.to_s, value.to_json)
           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: ReleasedObj.find(value.to_i)}
+              target = {title: value, destination_object: InternalReleasedObj.find(value.to_i)}
               @obj.set(attribute_name.to_s, target)
             elsif value.kind_of?(File)
-              @obj.set(attribute_name.to_s, upload_file(value))
+              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)
-              @obj.set(attribute_name.to_s, upload_uploaded_file(value))
+              if !Fiona7.mode == :legacy || attribute_name.to_s != "blob"
+                @obj.set(attribute_name.to_s, upload_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)
+              #TODO: legacy mode!
+              target = {title: value["id"], destination_object: InternalReleasedObj.find(value["id"].to_i)}
+              @obj.set(attribute_name.to_s, target)
             else
               raise Scrivito::ClientError.new("Invalid input for binary field", 422)
             end
@@ -203,11 +251,37 @@ module Fiona7
         end
         @obj.set(:X_widget_pool, @new_widget_pool) if @new_widget_pool
         @obj.set(:permalink, @permalink) if @permalink
+
         @obj.save!
 
-        @obj.edit! unless @obj.really_edited?
+        #if !@values.empty? || !@new_widget_pool.nil?
+          @obj.edit! unless @obj.really_edited?
+        #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 upload_file(file)
         # only publication type can contain children (code = "5")
         # also handle / this way
@@ -290,7 +364,21 @@ module Fiona7
           end
         end
 
-        WriteObj.find_by_path(original)
+        WriteObj.find_by_path(original) || (raise "Tried to make sure that the parent under '#{original}' exist, but it does not :(")
+      end
+
+      def generate_orphaned_path
+        return nil if update?
+        "_orphaned/#{SecureRandom.hex(16)}"
+      end
+
+      def ensure_obj_class_exists
+        values    = @values.with_indifferent_access
+        obj_class = @obj_class
+
+        Fiona7::TypeRegister.instance.ad_hoc_synchronize(
+          Fiona7::TypeRegister::AdHocTypeDefinition.new(values, obj_class).type_definition
+        )
       end
     end
   end