infopark_fiona_connector 7.0.1 → 7.0.1.5.2.3.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f4b2e0a718e2f67d4a2092754a69789925df1aac
-  data.tar.gz: 025f28744570d96a908356714bd2dddd94e2fe35
+SHA256:
+  metadata.gz: 3016968e6569e5825fbaf32c6dfebc557246474586a6912e594257661241dd1c
+  data.tar.gz: 2da35bdfdbba9df92e6b7f5d40684540c0ee7c197c40b0e222f90fe332a1fbbf
 SHA512:
-  metadata.gz: bc4deff1c8bc5c50d1c7df11659aee44c7a2a5ea77c7b3abd094971ed10ab38116da33c6c3308f9352fc52bdc24ee63e4bdf8d066bf0885ad3d5baa1f07473fd
-  data.tar.gz: 25d4c796dd127a0a45a740a232bede4d40e1d8a0a26d0fae2289cd6895253736b7097571ed62333c9edbbb0e4899052fac1d7a1305521d26173c92e16a0435d6
+  metadata.gz: ed81faf6eb5b8093042ce75b6c69b3d7c33cba47d2bb5bf66f90441be4f1ee109b5a6d0c91d7e7538bafde5611fbd8fa301ae917117b7cdb68e601e087adef2c
+  data.tar.gz: 65a581c015442b5e8639c84dabd2903e74bfbf59f4165cafec1732acb8bbd0aafe65193bebec5433e62c5241d47657c8eaf97d3ccd193661e5959d82021d4459

data/app/controllers/rails_connector/default_cms_controller.rb

@@ -7,10 +7,10 @@ module RailsConnector
   # @api public
   class DefaultCmsController < ApplicationController
     include CmsAccessible
-    before_filter :load_object
-    before_filter :ensure_object_is_active
-    before_filter :ensure_object_is_permitted
-    before_filter :set_google_expire_header
+    before_action :load_object
+    before_action :ensure_object_is_active
+    before_action :ensure_object_is_permitted
+    before_action :set_google_expire_header
 
     # Default Action. Delivers files directly if their mime type is not text/html
     # @api public

data/lib/infopark_fiona_connector.rb

@@ -20,8 +20,9 @@ end
 
 require 'rails_connector/core_extensions'
 require 'rails_connector/rack_middlewares'
-require 'rails_connector/core_extensions'
-require "rails_connector/errors"
+require 'rails_connector/errors'
+require 'rails_connector/fiona_datetime'
+ActiveRecord::Type.register(:fiona_datetime, ::FionaDateTime)
 
 # @api public
 module RailsConnector
@@ -39,5 +40,5 @@ module RailsConnector
   autoload_all_sources
 end
 
-require "rails_connector/engine" if defined?(Rails)
-require "rails_connector/fiona_engine" if defined?(Rails)
+require 'rails_connector/engine' if defined?(Rails)
+require 'rails_connector/fiona_engine' if defined?(Rails)

data/lib/meta_eager_loader.rb

@@ -0,0 +1 @@
+require "rails_connector/meta/eager_loader"

data/lib/rails_connector/attr_dict.rb

@@ -9,7 +9,6 @@ module RailsConnector
   #
   # Any custom Attribute can be accessed directly or via [].
   class AttrDict
-    include DateAttribute
 
     def initialize(object, keys_and_values = {}, defs = {})
       @object = object
@@ -29,7 +28,7 @@ module RailsConnector
     end
 
     def sort_keys
-      [sort_key1, sort_key2, sort_key3]
+      [sort_key1, sort_key2, sort_key3].compact
     end
 
     # The body attribute may contain binary data for Obj.binary? or be an HtmlString.
@@ -78,17 +77,9 @@ module RailsConnector
 
     private
 
-    def object
-      @object
-    end
-
-    def blob_dict
-      @blob_dict
-    end
+    attr_reader :object, :blob_dict, :attr_defs
 
-    def attr_defs
-      @attr_defs
-    end
+    delegate :obj_class_def, to: :object, allow_nil: true
 
     def textual_body
       return nil if object.binary?
@@ -118,25 +109,49 @@ module RailsConnector
         when :markdown
           StringTagging.tag_as_markdown(raw, self)
         when :html
-          StringTagging.tag_as_html(raw, self)
+          StringTagging.tag_as_html(raw.to_s, self)
+        when :string, :text
+          raw.to_s
         when :date
-          DateAttribute.parse raw if raw
+          DateAttribute.parse(raw) if raw
         when :linklist
           LinkList.new(raw)
+        when :multienum
+          raw || []
         else
           raw
       end
     end
 
+    # this attributes are defined by cms
+    # but if not set, are not existend in attr_defs
+    def predefined_attribute?(key)
+      [:channels, :sort_key1, :sort_key2, :sort_key3].include?(key.to_sym)
+    end
+
     def has_attribute(key)
       key = key.to_sym
-      !(blob_dict[key] || attr_defs[key]).nil?
+      return true if predefined_attribute?(key)
+      blob_dict.key?(key) || attr_defs.key?(key) || class_defined_attributes.key?(key)
     end
 
     def type_of(key)
       key = key.to_sym
       return :linklist if key == :text_links
-      attr_defs[key]['type'].to_sym rescue nil
+      return :multienum if key == :channels
+      type_from_attr_defs(key) || type_from_class_defined_attributes(key)
+    end
+
+    def type_from_attr_defs(key)
+      attr_defs[key]['type'].to_sym  rescue nil
+    end
+
+    def type_from_class_defined_attributes(key)
+      class_defined_attributes[key].type.to_sym rescue nil
+    end
+
+    def class_defined_attributes
+      obj_class_def.try(:custom_attributes) || {}
     end
   end
 

data/lib/rails_connector/attribute.rb

@@ -0,0 +1,96 @@
+module RailsConnector
+
+  # The methods date?, enum?, html?, linklist?, markdown?, multienum?, string? and
+  # text? are created by meta programming have no documentation of their own.
+  # Warning: Dependent on the setup of your DB replication, most tables
+  # with meta information will not be available on your live system!
+  class Attribute < CmsBaseModel
+
+    # The possible types of an attribute.
+    TYPES = %w{date enum html linklist markdown multienum string text}
+
+    self.primary_key = :attribute_id
+
+    has_and_belongs_to_many :obj_class_definitions, :class_name => '::RailsConnector::ObjClass',
+        :join_table => "#{table_name_prefix}obj_class_attrs"
+
+    alias_method :obj_class_defs, :obj_class_definitions
+    alias_attribute :name, :attribute_name
+    alias_attribute :type, :attribute_type
+
+    # The (human readable) title.
+    def title(language = :de)
+      blob_data['titles'].presence && blob_data['titles'][language.to_s]
+    end
+
+    # The description of the attribute.
+    def help_text(language = :de)
+      blob_data['helpTexts'].presence && blob_data['helpTexts'][language.to_s]
+    end
+
+    # Searchable in Content Manager.
+    def searchable_in_cm?
+      blob_data['isSearchableInCM'].to_i != 0
+    end
+
+    # Returns the possible values if attribute is of type `enum' or `multienum'.
+    def values
+      blob_data['values']
+    end
+
+    def max_size
+      blob_data["maxSize"]
+    end
+
+    def min_size
+      blob_data["minSize"]
+    end
+
+    def edit_field
+      blob_data["editField"]
+    end
+
+    def callback
+      blob_data["callback"]
+    end
+
+    TYPES.each do |type|
+      self.class_eval <<EOM, __FILE__, __LINE__ + 1
+        def #{type}?
+          self.attribute_type == "#{type}"
+        end
+EOM
+    end
+
+    # Convenience method for find_by_attribute_name
+    def self.find_by_name(*args)
+      self.find_by_attribute_name(*args)
+    end
+
+    # Returns the blob as a JSON object.
+    def self.read_blob_data(name) #:nodoc:
+      blob = RailsConnector::Meta.hello_im_rails_and_im_retarted_so_please_be_patient do            # these queries really pollute our logs!
+        blob_name = if RailsConnector::BlobMapping.exists?
+          RailsConnector::BlobMapping.get_fingerprint("#{name}.jsonAttributeDict")
+        else
+          "#{name}.jsonAttributeDict"
+        end
+
+        RailsConnector::Blob.find_without_excluded_blob_data(blob_name)
+      end
+
+      return {} unless blob && blob.blob_data?
+
+      JSON.parse(blob.blob_data)
+    end
+
+    private
+
+    # load attribute details from blob
+    def blob_data #:nodoc:
+      @blob_data ||= self.class.read_blob_data(self.attribute_name)
+    end
+
+  end
+
+end

data/lib/rails_connector/basic_obj.rb

@@ -1,5 +1,6 @@
 require "json"
 require 'openssl'
+require 'rails_connector/fiona_datetime'
 
 module RailsConnector
 
@@ -9,14 +10,23 @@ module RailsConnector
   # [parent] the Obj of which this one is a child - nil for the root object
   # @api public
   class BasicObj < CmsBaseModel
+    include RailsConnector::Meta
+
     CRYPT_KEY = "\xd7\x28\x9c\x63\xd6\x29\xdf\x20\xcd\x32\xcf\x30\xcf\x30\xcf\x30\xdf\x20\xb6\x49"\
         "\x91\x6e\x99\x66\x90\x6f\x8f\x70\x9e\x61\x8d\x72\x94\x6b\xdf\x20\xbe\x41\xb8\x47\xc4\x3b"\
         "\xdf\x20\xbd\x42\x9a\x65\x8d\x72\x93\x6c\x96\x69\x91\x6e".freeze
 
-    include DateAttribute
+    PREDEFINED_ATTRIBUTES = %w(blob body title channels sort_key1 sort_type1 sort_key2 sort_type2
+      sort_key3 sort_type3 sort_order).freeze
+
 
     self.store_full_sti_class = false
 
+    def self.inherited(subclass)
+      super
+      subclass.delegate_attributes
+    end
+
     def self.configure_for_content(which)
       case which
       when :released then configure_column_information("objs", true)
@@ -36,10 +46,59 @@ module RailsConnector
       self.inheritance_column = "obj_class"
 
       @@use_cached_permissions = use_cached_permissions
+      descendants.each do |klass|
+        klass.reset_table_name
+        klass.initialize_attributes
+      end
+
+      RailsConnector::Meta::EagerLoader.instance.obj_classes.each do |class_name, obj_class|
+        next unless obj_class
+
+        if class_name =~ /^[A-Z]/
+          klass = class_name.safe_constantize
+          next unless klass
+          if klass < RailsConnector::BasicObj
+            klass.initialize_attributes
+          end
+        end
+      end
+    end
+
+    def self.initialize_attributes
+      PREDEFINED_ATTRIBUTES.each do |attribute|
+        self.send(:define_attribute, attribute, ActiveRecord::Type::String.new)
+      end
+
+      return if obj_class_definition.blank?
+
+      obj_class_definition.custom_attributes.each_key do |attribute|
+        self.send(:define_attribute, attribute, ActiveRecord::Type::String.new)
+      end
+    end
+
+    def self.delegate_attributes
+      PREDEFINED_ATTRIBUTES.each do |attribute|
+        delegate attribute, to: :attr_dict
+      end
+
+      return if obj_class_definition.blank?
+
+      obj_class_definition.custom_attributes.each_key do |attribute|
+        delegate attribute, to: :attr_dict
+      end
     end
 
-    # use released contents as a default
-    configure_for_content(:released)
+    attribute :last_changed, :fiona_datetime
+    attribute :valid_from, :fiona_datetime
+    attribute :valid_until, :fiona_datetime
+    attribute :suppress_export, :boolean
+    attribute :is_edited, :boolean
+    attribute :is_released, :boolean
+
+    delegate :sort_keys, to: :attr_dict
+    delegate :body_data_path, to: :attr_dict
+    delegate :empty?, to: :attr_dict
+    delegate :text_links, to: :attr_dict
 
     # Patch to avoid a type_condition being added by ActiveRecord::Base.add_conditions! for Obj.find(params):
     def self.descends_from_active_record?
@@ -65,6 +124,11 @@ module RailsConnector
       # We don't cache types at all here.
     end
 
+    def self.reset_reflections
+      has_many :children, :class_name => 'Obj', :foreign_key => 'parent_obj_id'
+      belongs_to :parent, :class_name => 'Obj', :foreign_key => 'parent_obj_id'
+    end
+
     # @api public
     def permissions
       @@use_cached_permissions ? attr_dict.permissions : arel_permissions
@@ -101,12 +165,6 @@ module RailsConnector
       @@homepage_id = nil
     end
 
-     # returns the obj's permalink.
-     # @api public
-     def permalink
-       self[:permalink]
-     end
-
     # This method determines the controller that should be invoked when the Obj is requested.
     # By default a controller matching the Obj's obj_class will be used.
     # If the controller does not exist, the CmsController will be used as a fallback.
@@ -208,13 +266,13 @@ module RailsConnector
     # and edited? will always return false in this case.
     # @api public
     def edited?
-      (is_edited == 1)
+      is_edited
     end
 
     # Returns true if this object has released content
     # @api public
     def released?
-      (is_released == 1)
+      is_released
     end
 
     # Returns true if the Obj is suppressed.
@@ -223,7 +281,7 @@ module RailsConnector
     # as a standalone web page.
     # @api public
     def suppressed?
-      suppress_export == 1
+      suppress_export
     end
 
     # Returns true if the export of the object is not suppressed and the content is active?
@@ -253,9 +311,7 @@ module RailsConnector
     def root?
       parent_obj_id.nil?
     end
-
-    has_many :children, :class_name => 'Obj', :foreign_key => 'parent_obj_id'
-    belongs_to :parent, :class_name => 'Obj', :foreign_key => 'parent_obj_id'
+    #
 
     # Returns a list of exportable? children excluding the binary? ones unless :all is specfied.
     # This is mainly used for navigations.
@@ -300,18 +356,6 @@ module RailsConnector
       return self.sort_order == "descending" ? sorted_list.reverse : sorted_list
     end
 
-    def sort_key1
-      self[:sort_key1]
-    end
-
-    def sort_key2
-      self[:sort_key2]
-    end
-
-    def sort_key3
-      self[:sort_key3]
-    end
-
     # Returns an Array of all the ancestor objects, starting at the root and ending at this object's parent.
     # @api public
     def ancestors
@@ -336,26 +380,17 @@ module RailsConnector
     # Passing an invalid key will not raise an error, but return nil.
     # @api public
     def [](key)
-      # convenience access to name
-      return name if key.to_sym == :name
+      if has_attribute?(key)
+        begin
+          if attr_dict.respond_to?(key)
+            return attr_dict.send(key)
+          end
 
-      # regular activerecord attributes
-      if @attributes.key?(key.to_s)
-        if key == :valid_from or key == :valid_until or key == :last_changed
-          return as_date(super(key))
-        else
-          return super(key)
+          read_attribute(key)
+        rescue NoMethodError
+          nil
         end
       end
-
-      # Unknown Obj attributes are delegated to the corresponding instance of AttrDict.
-      begin
-        return (attr_dict.send key)
-      rescue NoMethodError
-      end
-
-      # fallback
-      return nil
     end
 
     # Reloads the attributes of this object from the database, invalidates custom attributes
@@ -384,9 +419,7 @@ module RailsConnector
     # for binary Objs body_length equals the file size
     # for non-binary Objs body_length equals the number of characters in the body (main content)
     # @api public
-    def body_length
-      attr_dict.body_length
-    end
+    delegate :body_length, to: :attr_dict
 
     # Override this method to provide an external url
     # where the content (the body) of this Obj can be downloaded.
@@ -462,27 +495,6 @@ module RailsConnector
       rslt
     end
 
-    # @api public
-    def last_changed
-      self[:last_changed]
-    end
-
-    # @api public
-    def valid_from
-      self[:valid_from]
-    end
-
-    # @api public
-    def valid_until
-      self[:valid_until]
-    end
-
-    # deprecated, use file_extension instead
-    def content_type
-      logger.warn "DEPRECATION WARNING: Obj#content_type is deprecated, use file_extension instead"
-      file_extension
-    end
-
     # Returns the MIME-type as determined from the file_extension - see MIME::Types
     # @api public
     def mime_type
@@ -503,30 +515,6 @@ module RailsConnector
 
     private
 
-    def as_date(value)
-      DateAttribute.parse(value) unless value.nil?
-    end
-
-    # Forwards any unknown method call to a corresponding instance
-    # of AttrDict and thus provides access to object fields, i.e. content.
-    #
-    # In case of an invalid method call, an error is raised.
-    #
-    # Hint: Use [] instead to suppress error messages.
-    def method_missing(method_id, *args)
-      super
-    rescue NoMethodError, NameError
-      # prevent infinite recursion when calling "attr_*" below,
-      # since rails checks the absence of an "_attr_*" method internally
-      raise if %w(_attr_dict _attr_defs _attr_values).include?(method_id.to_s)
-
-      if attr_dict.respond_to?(method_id)
-        attr_dict.send method_id, *args
-      else
-        raise
-      end
-    end
-
     def fiona_fields
       @fiona_fields ||=
         ['name', 'obj_class', 'workflow', 'suppressexport', 'permalink'].inject({}) do |all,field|
@@ -574,4 +562,3 @@ module RailsConnector
   end
 
 end
-