infopark_cloud_connector 7.0.2 → 7.1.0

data/lib/rails_connector/content_service.rb

@@ -88,7 +88,7 @@ class ContentService
         begin
           sleep delay.next_sleep_time(e.retry_after)
         rescue MaxSleepTimeReached
-          raise BackendNotAvailable.new('rate limit exceeded', 429)
+          raise ::RailsConnector::RateLimitExceeded.new('rate limit exceeded', 429)
         end
         retry
       end
@@ -109,7 +109,7 @@ class ContentService
       elsif response.code == "429"
         raise RateLimitExceeded.new(response["Retry-After"])
       else
-        raise BackendNotAvailable.new("Server responded with status code #{response.code}", response.code)
+        raise NetworkError.new("Server responded with status code #{response.code}", response.code)
       end
     end
 

data/lib/rails_connector/engine.rb

@@ -50,7 +50,8 @@ module ::RailsConnector
     config.autoload_paths += paths['lib'].to_a
     config.autoload_once_paths += paths['lib'].to_a
 
-    RailsConnector.rack_middlewares.each { |middleware| config.app_middleware.use middleware }
+    config.app_middleware.use "RailsConnector::CacheMiddleware"
+    config.app_middleware.use "RailsConnector::WorkspaceSelectionMiddleware"
   end
 end
 

data/lib/rails_connector/html_string.rb

@@ -2,7 +2,6 @@ module RailsConnector
 
   # Include this module in order to tag the string as one with HTML content
   module HtmlString
-    include LinkResolvable
     # Returns whether the String contains HTML (default to true, overrides String.html?).
     def html?
       true

data/lib/rails_connector/link.rb

@@ -6,6 +6,16 @@ module RailsConnector
 
     extend ActiveModel::Naming
 
+    # Parses a url and returns a {Link} object. Determines internal urls based on the given
+    # +hostname+ and +port+.
+    # @api public
+    # @param [String] url
+    # @param host [String] the hostname of internal urls
+    # @param port [String] the port of internal urls
+    def self.parse(url, host, port)
+      LinkParser.new(host, port).parse(url)
+    end
+
     # Create a new link obj
     # @api public
     # @param [Hash] link_data
@@ -92,33 +102,14 @@ module RailsConnector
       @link_data[:fragment] = value
     end
 
-    # Returns the browser window or browser frame to be used as a target for this link.
-    # Example: Links that should be opened in a new window will return "_blank" as their target.
-    # @api public
     def target
       @link_data[:target]
     end
 
-    # Set the browser window or browser frame to be used as a target for this link.
-    # Example: Links that should be opened in a new window will return "_blank" as their target.
-    # @api public
-    # @param value [String] the target of the link
     def target=(value)
       @link_data[:target] = value
     end
 
-    def id
-      @link_data[:link_id]
-    end
-
-    def tag_name
-      @link_data[:tag_name]
-    end
-
-    def tag_name=(value)
-      @link_data[:tag_name] = value
-    end
-
     # Returns the file extension (e.g. zip, pdf) of this link's (internal or external) target.
     # Returns an empty string if the file extension is can not be determined.
     # @api public
@@ -171,10 +162,6 @@ module RailsConnector
       external? || (obj && obj.active?)
     end
 
-    def external_prefix?
-      nil != (url =~ /\s?external:/)
-    end
-
     def resolved?
       external? || !obj.nil?
     end
@@ -188,14 +175,6 @@ module RailsConnector
       obj
     end
 
-    def html_attribute_snippet
-      parts = []
-      parts << %{alt="#{title}"} if tag_name == 'img' || tag_name == 'input'
-      parts << %{title="#{title}"} if (tag_name == 'a' || tag_name == 'link') && title.present?
-      parts << %{target="#{target}"} if target.present?
-      parts.join(' ')
-    end
-
     def query_and_fragment
       str = ''
       str << "?#{query}" if query.present?
@@ -207,9 +186,38 @@ module RailsConnector
       "objid:#{obj.id}"
     end
 
-    def external_url
-      external_prefix? ? url.gsub(/external:/, '').strip : url
+    def to_cms_api_html_url
+      if internal?
+        "#{internal_url}#{query_and_fragment}"
+      else
+        begin
+          parsed = Addressable::URI.parse(url)
+        rescue Addressable::URI::InvalidURIError
+          return url
+        end
+
+        if parsed.relative? && parsed.path.present?
+          "external:#{url}"
+        else
+          url
+        end
+      end
     end
 
+    def to_cms_api_linklist_params
+      params = {}
+
+      if internal?
+        params[:obj_id] = obj.id
+        params[:title] = title if title
+        params[:query] = query if query
+        params[:fragment] = fragment if fragment
+      else
+        params[:url] = url
+        params[:title] = title if title
+      end
+
+      params
+    end
   end
 end

data/lib/rails_connector/link_parser.rb

@@ -0,0 +1,72 @@
+require 'addressable/uri'
+
+module RailsConnector
+  class LinkParser
+    def initialize(host, port)
+      @host = host
+      @port = port
+    end
+
+    def parse(url)
+      uri = Addressable::URI.parse(url)
+      link_params = {}
+
+      if obj = find_obj(uri)
+        link_params[:obj] = obj
+      else
+        if application_uri?(uri)
+          uri.path = '/' unless uri.path.present?
+          uri.port = nil
+          uri.host = nil
+          uri.scheme = nil
+        end
+
+        link_params[:url] = uri.to_s
+      end
+
+      link_params[:query] = uri.query
+      link_params[:fragment] = uri.fragment
+
+      Link.new(link_params)
+    rescue Addressable::URI::InvalidURIError
+      Link.new(url: url)
+    end
+
+    private
+
+    def application_uri?(uri)
+      uri.absolute? && internal_uri?(uri) || uri.relative? && uri.path.present?
+    end
+
+    def internal_uri?(uri)
+      if uri.port.present?
+        uri.host == @host && uri.port == Integer(@port)
+      else
+        uri.host == @host
+      end
+    end
+
+    def find_obj(uri)
+      return nil unless application_uri?(uri) && application_route?(uri)
+
+      route_params = route(uri)
+
+      if id = route_params[:id]
+        Obj.find(id)
+      elsif permalink = route_params[:permalink]
+        Obj.find_by_permalink(permalink)
+      end
+    rescue RailsConnector::ResourceNotFound
+    end
+
+    def application_route?(uri)
+      route_params = route(uri)
+      route_params && route_params[:controller] == 'rails_connector/cms_dispatch'
+    end
+
+    def route(uri)
+      Rails.application.routes.recognize_path(uri.to_s, method: :get)
+    rescue ActionController::RoutingError
+    end
+  end
+end

data/lib/rails_connector/migrations/migration_dsl.rb

@@ -84,7 +84,11 @@ module RailsConnector
       #
       # @return nothing
       # @api public
+      #
+      # @deprecated use {BasicObj.create Obj.create} instead
       def create_obj(attributes = {})
+        Deprecation.warn_method('create_obj', 'Obj.create')
+
         endpoint = "workspaces/#{Workspace.current.id}/objs"
 
         CmsRestApi.post(endpoint, obj: attributes)
@@ -117,7 +121,11 @@ module RailsConnector
       #
       # @return nothing
       # @api public
+      #
+      # @deprecated use {BasicObj#destroy Obj#destroy} instead
       def delete_obj(id)
+        Deprecation.warn_method('delete_obj', 'Obj#destroy')
+
         endpoint = "workspaces/#{Workspace.current.id}/objs/#{id}"
 
         CmsRestApi.delete(endpoint)
@@ -166,7 +174,10 @@ module RailsConnector
       #
       # @return nothing
       # @api public
+      #
+      # @deprecated use {BasicObj#update Obj#update} instead
       def update_obj(id, attributes = {})
+        Deprecation.warn_method('update_obj', 'Obj#update')
         endpoint = "workspaces/#{Workspace.current.id}/objs/#{id}"
 
         CmsRestApi.put(endpoint, obj: attributes)
@@ -202,7 +213,9 @@ module RailsConnector
       #
       # @return The blob of the uploaded file that can be stored on a CMS object.
       # @api public
+      # @deprecated use {BasicObj.create Obj.create} or {BasicObj#update Obj#update} instead
       def upload_file(file)
+        Deprecation.warn_method("upload_file", "Obj.create or Obj#update")
         upload_permission = RailsConnector::CmsRestApi.get('blobs/upload_permission')
 
         fields = upload_permission['fields'].map { |name, value| [name, value] }

data/lib/rails_connector/{backend_not_available.rb → network_error.rb}

@@ -1,16 +1,11 @@
 module RailsConnector
 
-  class BackendNotAvailable < StandardError
+  class NetworkError < RailsConnector::CommunicationError
     attr_reader :http_code
 
     def self.from_socket_error(socket_error)
       new(socket_error.message, 503)
     end
-
-    def initialize(message, http_code)
-      @http_code = http_code.to_i
-      super(message)
-    end
   end
 
 end

data/lib/rails_connector/obj_data.rb

@@ -17,6 +17,10 @@ module RailsConnector
       raise "implement in subclass"
     end
 
+    def all_custom_attributes
+      raise "implement in subclass"
+    end
+
     private
 
     def type_of_internal(key)

data/lib/rails_connector/obj_data_from_hash.rb

@@ -14,6 +14,12 @@ module RailsConnector
       @hash.has_key?(name)
     end
 
+    def all_custom_attributes
+      @hash.select do |attribute_name, _|
+        has_custom_attribute?(attribute_name)
+      end.keys
+    end
+
   end
 
 end

data/lib/rails_connector/obj_data_from_service.rb

@@ -17,10 +17,16 @@ module RailsConnector
         else
           raise RailsConnectorError.new("Illegal attribute name #{attribute_name}")
         end
-      elsif value_and_type.length == 1
-        [value_and_type.first, type_of_internal(attribute_name)]
       else
-        value_and_type
+        raw_value = value_and_type.first
+        type =
+          if value_and_type.length == 1
+            type_of_internal(attribute_name)
+          else
+            value_and_type[1]
+          end
+
+        [convert_value(raw_value, type), type]
       end
     end
 
@@ -28,8 +34,35 @@ module RailsConnector
       is_custom_attribute?(attribute_name) && !!@data[attribute_name]
     end
 
+    def all_custom_attributes
+      @data.select do |attribute_name, _|
+        has_custom_attribute?(attribute_name)
+      end.keys
+    end
+
     private
 
+    def convert_value(value, type)
+      if type == "html"
+        text_links_conversion.convert(value)
+      else
+        value
+      end
+    end
+
+    def text_links_conversion
+      @text_links_conversion = TextLinkConversion.new(text_links_map)
+    end
+
+    def text_links_map
+      text_links = @data["_text_links"]
+      return nil unless text_links
+
+      text_links.first.each_with_object({}) do |link, map|
+        map[link["link_id"]] = TextLink.new(link)
+      end
+    end
+
     def value_and_type_of_widget_pool
       [value_of_widget_pool, nil]
     end
@@ -52,6 +85,7 @@ module RailsConnector
 
     internal_key_list = %w[
       last_changed
+      modification
       permalink
       sort_key1
       sort_key2

data/lib/rails_connector/obj_params_parser.rb

@@ -0,0 +1,50 @@
+module RailsConnector
+  class ObjParamsParser
+    def initialize(host, port)
+      @host = host
+      @port = port
+    end
+
+    def parse(obj, params)
+      raise "Required parameter 'obj' is missing." unless params.present?
+      raise "Parameter 'obj' is not a hash." unless params.is_a?(Hash)
+
+      if obj
+        convert_params(params, obj)
+
+        if widget_pool_params = params['_widget_pool']
+          convert_widget_pool_params(widget_pool_params, obj)
+        end
+      end
+
+      params
+    end
+
+    private
+
+    def convert_widget_pool_params(widget_pool_params, obj)
+      widget_pool_params.each_pair do |widget_id, widget_params|
+        widget = obj.widget_from_pool(widget_id)
+
+        if widget_params.present?
+          convert_params(widget_params, widget)
+        end
+      end
+    end
+
+    def convert_params(params, obj)
+      params.each do |key, value|
+        type = obj.type_of_attribute(key.to_s)
+
+        params[key] = case type
+        when 'html'
+          ContentConversion.convert_html_links(value, @host, @port)
+        when 'linklist'
+          ContentConversion.convert_linklist_urls(value, @host, @port)
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/rails_connector/obj_search_builder.rb

@@ -0,0 +1,62 @@
+module RailsConnector
+
+class ObjSearchBuilder < Struct.new(:query)
+
+  def build
+    reset_enumerator
+
+    set_predicates
+    set_offset
+    set_order
+    set_batch_size
+    set_format
+    set_include_deleted
+
+    enumerator
+  end
+
+  private
+
+  def reset_enumerator
+    @enumerator = nil
+  end
+
+  def enumerator
+    @enumerator ||= ObjSearchEnumerator.new(nil)
+  end
+
+  def set_predicates
+    query[:predicates].each do |p|
+      if p[:negate]
+        enumerator.and_not(p[:field], p[:operator], p[:value])
+      else
+        enumerator.and(p[:field], p[:operator], p[:value], p[:boost])
+      end
+    end
+  end
+
+  def set_offset
+    enumerator.offset(query[:offset].to_i) if query[:offset]
+  end
+
+  def set_order
+    enumerator.order(query[:order]) if query[:order]
+    enumerator.reverse_order if query[:reverse_order]
+  end
+
+  def set_batch_size
+    enumerator.batch_size(query[:batch_size]) if query[:batch_size]
+  end
+
+  def set_format
+    enumerator.format(query[:format]) if query[:format]
+  end
+
+  def set_include_deleted
+    enumerator.include_deleted if query[:include_deleted]
+  end
+
+end
+
+end
+