infopark_fiona7 1.2.0.0.1 → 1.2.0.1.1

data/lib/fiona7/type_register.rb

@@ -5,6 +5,7 @@ require 'fiona7/type_synchronizer'
 require "fiona7/obj_class_name_mangler"
 require "fiona7/obj_class_name_demangler"
 require "fiona7/attribute_name_mangler"
+require 'fiona7/attribute_type_mapper'
 
 
 module Fiona7
@@ -68,7 +69,7 @@ module Fiona7
       end
 
       def add_attr(name, type, real_name=nil, real_type=nil, values=nil)
-        real_type ||= TYPE_MAP[type.to_sym] || type
+        real_type ||= Fiona7::AttributeTypeMapper.new(self.name.to_s).call(name.to_sym, type.to_sym)
         real_name = Fiona7::AttributeNameMangler.new(name, self.name).mangle
         self.attrs << Attribute.new(name.to_s, type.to_sym, real_name.to_s, real_type.to_sym, values)
       end
@@ -80,6 +81,13 @@ module Fiona7
         end
       end
 
+      def remove_attribute(name)
+        name = name.to_s
+        self.attrs.delete_if do |attr|
+          attr.name == name
+        end
+      end
+
       # TODO: conflict handling for type errors
       def merge(other_definition)
         other_definition.attrs.each do |other_attr|

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.2.0.0.1"
+  VERSION = "1.2.0.1.1"
 end

data/lib/fiona7/widget_resolver.rb

@@ -1,16 +1,16 @@
 module Fiona7
   class WidgetResolver
-    def initialize(widget_pool_value, klass=WriteObj)
-      self.value = widget_pool_value
-      self.klass = klass
+    def initialize(widget_pool_value, obj_repository)
+      self.value          = widget_pool_value
+      self.obj_repository = obj_repository
 
-      preload
+      self.preload
     end
 
     attr_reader :id_map, :path_map, :instance_map
 
     protected
-    attr_accessor :value, :klass
+    attr_accessor :value, :obj_repository
     attr_writer :id_map, :path_map, :instance_map
 
     def preload
@@ -18,7 +18,7 @@ module Fiona7
         self.value.map {|link| [link["title"], link["destination"]] }
       ]
       object_id_to_widget_instance_map = Hash[
-        self.klass.where(obj_id: widget_id_to_object_id_map.values).map {|obj| [obj.id, obj] }
+        self.obj_repository.find_many(widget_id_to_object_id_map.values).compact.map {|obj| [obj.id, obj] }
       ]
 
       self.id_map = widget_id_to_object_id_map.dup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.2.0.0.1
+  version: 1.2.0.1.1
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.3
+        version: 1.22.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.3
+        version: 1.22.4
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,49 @@ files:
 - lib/fiona7/attribute_name_mangler.rb
 - lib/fiona7/attribute_names_from_cms.rb
 - lib/fiona7/attribute_names_from_queries.rb
+- lib/fiona7/attribute_readers/attribute_reader.rb
+- lib/fiona7/attribute_readers/binary_as_binary.rb
+- lib/fiona7/attribute_readers/binary_as_linklist.rb
+- lib/fiona7/attribute_readers/date_as_date.rb
+- lib/fiona7/attribute_readers/factory.rb
+- lib/fiona7/attribute_readers/helpers/html_deserializer.rb
+- lib/fiona7/attribute_readers/helpers/json_deserializer.rb
+- lib/fiona7/attribute_readers/helpers/link_deserializer.rb
+- lib/fiona7/attribute_readers/html_as_html.rb
+- lib/fiona7/attribute_readers/link_as_linklist.rb
+- lib/fiona7/attribute_readers/linklist_as_linklist.rb
+- lib/fiona7/attribute_readers/multienum_as_multienum.rb
+- lib/fiona7/attribute_readers/multienum_as_text.rb
+- lib/fiona7/attribute_readers/number_as_string.rb
+- lib/fiona7/attribute_readers/reference_as_linklist.rb
+- lib/fiona7/attribute_readers/reference_as_string.rb
+- lib/fiona7/attribute_readers/referencelist_as_linklist.rb
+- lib/fiona7/attribute_readers/referencelist_as_text.rb
+- lib/fiona7/attribute_readers/simple.rb
+- lib/fiona7/attribute_readers/stringlist_as_text.rb
+- lib/fiona7/attribute_readers/widgetlist_as_linklist.rb
+- lib/fiona7/attribute_type_mapper.rb
+- lib/fiona7/attribute_writers/attribute_writer.rb
+- lib/fiona7/attribute_writers/binary_as_binary.rb
+- lib/fiona7/attribute_writers/binary_as_linklist.rb
+- lib/fiona7/attribute_writers/date_as_date.rb
+- lib/fiona7/attribute_writers/factory.rb
+- lib/fiona7/attribute_writers/helpers/html_serializer.rb
+- lib/fiona7/attribute_writers/helpers/json_serializer.rb
+- lib/fiona7/attribute_writers/helpers/link_serializer.rb
+- lib/fiona7/attribute_writers/html_as_html.rb
+- lib/fiona7/attribute_writers/link_as_linklist.rb
+- lib/fiona7/attribute_writers/linklist_as_linklist.rb
+- lib/fiona7/attribute_writers/multienum_as_multienum.rb
+- lib/fiona7/attribute_writers/multienum_as_text.rb
+- lib/fiona7/attribute_writers/number_as_string.rb
+- lib/fiona7/attribute_writers/reference_as_linklist.rb
+- lib/fiona7/attribute_writers/reference_as_string.rb
+- lib/fiona7/attribute_writers/referencelist_as_linklist.rb
+- lib/fiona7/attribute_writers/referencelist_as_text.rb
+- lib/fiona7/attribute_writers/simple.rb
+- lib/fiona7/attribute_writers/stringlist_as_text.rb
+- lib/fiona7/attribute_writers/widgetlist_as_linklist.rb
 - lib/fiona7/blob_id_generator.rb
 - lib/fiona7/builder/batch_widget_writer.rb
 - lib/fiona7/builder/indirect_blob_builder.rb
@@ -209,6 +252,8 @@ files:
 - lib/fiona7/obj_classes_from_queries.rb
 - lib/fiona7/permission_volatile_cache.rb
 - lib/fiona7/permitted_mixin.rb
+- lib/fiona7/prefetch/obj_prefetch.rb
+- lib/fiona7/prefetch/widget_resolver_prefetch.rb
 - lib/fiona7/recursive_object_finder.rb
 - lib/fiona7/routers/rest_api.rb
 - lib/fiona7/routing_monkey_patch.rb
@@ -222,6 +267,7 @@ files:
 - 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/date_attribute.rb
 - lib/fiona7/scrivito_patches/layout_tags.rb
 - lib/fiona7/scrivito_patches/link_parser.rb
 - lib/fiona7/scrivito_patches/log_subscriber.rb
@@ -238,6 +284,7 @@ files:
 - lib/fiona7/shadow_classes.rb
 - lib/fiona7/super_object_finder.rb
 - lib/fiona7/table_switcher.rb
+- lib/fiona7/tools/attribute_remover.rb
 - lib/fiona7/type_loader.rb
 - lib/fiona7/type_register.rb
 - lib/fiona7/type_synchronizer.rb