infopark_fiona_connector 7.0.1.5.2.3.rc4 → 7.0.1.5.2.3.rc5

data/lib/rails_connector/date_attribute.rb

@@ -1,11 +1,10 @@
 module RailsConnector
-
   # Adds support for string columns which contain ISO dates
   module DateAttribute
     module ClassMethods
       def date_attribute(*names)
         names.each do |name|
-          module_eval %Q!
+          module_eval %!
             def #{name}
               DateAttribute.parse(#{name}_before_type_cast) unless #{name}_before_type_cast.nil?
             end
@@ -24,5 +23,4 @@ module RailsConnector
       raise "The value is not a valid ISO date time: #{iso_date_time.inspect}"
     end
   end
-
 end

data/lib/rails_connector/default_search_request.rb

@@ -3,4 +3,4 @@ module RailsConnector
   # It is used by {DefaultSearchController}.
   class DefaultSearchRequest < VeritySearchRequest
   end
-end
+end

data/lib/rails_connector/engine.rb

@@ -1,10 +1,10 @@
-require 'rails'
-require 'active_record/railtie'
-require 'action_view'
+require "rails"
+require "active_record/railtie"
+require "action_view"
 
-require 'jquery-rails'
+require "jquery-rails"
 
-require 'rails_connector/configuration'
+require "rails_connector/configuration"
 
 module ::RailsConnector
   class Engine < Rails::Engine
@@ -12,25 +12,25 @@ module ::RailsConnector
     config.after_initialize { RailsConnector::Configuration.after_initialize }
 
     # make sure our exceptions cause an adequate error page and http status code
-    config.action_dispatch.rescue_responses.merge!("RailsConnector::ResourceNotFound" => :not_found)
+    config.action_dispatch.rescue_responses["RailsConnector::ResourceNotFound"] = :not_found
 
-    initializer 'rails_connector.add_fiona_time_type' do
+    initializer "rails_connector.add_fiona_time_type" do
       ActiveRecord::Type.register(:fiona_datetime, ::FionaDateTime)
     end
 
-    initializer "rails_connector.add_cms_routing_paths", :after => :add_routing_paths do |app|
-      cms_route = File.expand_path("cms_routes.rb", paths['config'].to_a.first)
+    initializer "rails_connector.add_cms_routing_paths", after: :add_routing_paths do |app|
+      cms_route = File.expand_path("cms_routes.rb", paths["config"].to_a.first)
       app.routes_reloader.paths.push(cms_route)
     end
 
     initializer "rails_connector.add_assets" do |app|
-      app.config.assets.precompile += %w[
+      app.config.assets.precompile += %w(
         editmarker.css editmarker.js
-      ]
+      )
     end
 
     # Expose rails connector runtime to controller for logging.
-    initializer "rails_connector.log_runtime" do |app|
+    initializer "rails_connector.log_runtime" do |_app|
       runtime =
         begin
           RailsConnector::ControllerRuntime
@@ -46,22 +46,19 @@ module ::RailsConnector
       end
     end
 
-    initializer "rails_connector.configure_database", :before => :load_config_initializers do |app|
+    initializer "rails_connector.configure_database", before: :load_config_initializers do |_app|
       RailsConnector::Configuration.configure_cms_database
     end
 
     initializer "rails_connector.routing_helpers" do
-      if Rails.env == 'test'
-        ActionDispatch::TestRequest.__send__(:include, RailsConnector::CmsTestRequest)
-      end
+      ActionDispatch::TestRequest.include RailsConnector::CmsTestRequest if Rails.env == "test"
 
-      ActionController::Base.__send__(:include, CmsRoutingHelper)
-      ActionView::Base.__send__(:include, CmsRoutingHelper)
+      ActionController::Base.include CmsRoutingHelper
+      ActionView::Base.include CmsRoutingHelper
     end
 
-
-    config.autoload_paths += paths['lib'].to_a
-    config.autoload_once_paths += paths['lib'].to_a
+    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 }
   end

data/lib/rails_connector/errors.rb

@@ -1,9 +1,6 @@
 require "active_record/errors"
 
 module RailsConnector
-
-# @api public
-ResourceNotFound = ActiveRecord::RecordNotFound
-
+  # @api public
+  ResourceNotFound = ActiveRecord::RecordNotFound
 end # module RailsConnector
-

data/lib/rails_connector/fiona_datetime.rb

@@ -1,11 +1,11 @@
-require 'active_record/type'
+require "active_record/type"
 class FionaDateTime < ActiveRecord::Type::Time
   def type
     :fiona_datetime
   end
 
   def serialize(value)
-    value.to_iso if value
+    value&.to_iso
   end
 
   def deserialize(value)

data/lib/rails_connector/fiona_engine.rb

@@ -1,9 +1,8 @@
 module ::RailsConnector
   class FionaEngine < Rails::Engine
-    initializer 'rails_connector.config_local', :after => :load_config_initializers,
-        :before => :engines_blank_point do
-      Dir[Rails.root + 'config/local/*.rb'].map &method(:require)
+    initializer "rails_connector.config_local", after: :load_config_initializers,
+                                                before: :engines_blank_point do
+      Dir[Rails.root + "config/local/*.rb"].map(&method(:require))
     end
   end
 end
-

data/lib/rails_connector/html_string.rb

@@ -1,5 +1,4 @@
 module RailsConnector
-
   # Include this module in order to tag the string as one with HTML content
   module HtmlString
     include LinkResolvable
@@ -8,7 +7,6 @@ module RailsConnector
       true
     end
   end
-
 end
 
 class String

data/lib/rails_connector/job.rb

@@ -1,13 +1,10 @@
 module RailsConnector
-
   # This class allows us to read out basic information about jobs
   class Job < CmsBaseModel
-
     self.primary_key = "job_id"
 
     def self.table_name
       "#{table_name_prefix}" "jobs"
     end
   end
-
 end

data/lib/rails_connector/link.rb

@@ -3,7 +3,6 @@ module RailsConnector
   # To format a link for rendering in an html page, use the +cms_path+ or +cms_url+ methods.
   # @api public
   class Link
-
     extend ActiveModel::Naming
 
     def initialize(link_data, destination_object = nil)
@@ -67,7 +66,7 @@ module RailsConnector
     end
 
     def markdown?
-      'markdown' == @link_data[:source_format]
+      "markdown" == @link_data[:source_format]
     end
 
     # Returns the file extension (e.g. zip, pdf) of this link's (internal or external) target.
@@ -77,7 +76,11 @@ module RailsConnector
       if internal?
         destination_object ? destination_object.file_extension : ""
       else
-        path = URI.parse(url).path rescue nil
+        path = begin
+                 URI.parse(url).path
+               rescue StandardError
+                 nil
+               end
         path.blank? ? "" : File.extname(path)[1..-1] || ""
       end
     end
@@ -115,7 +118,7 @@ module RailsConnector
     # An external Link is always active.
     # @api public
     def active?
-      external? || (destination_object && destination_object.active?)
+      external? || destination_object&.active?
     end
 
     def external_prefix?

data/lib/rails_connector/link_list.rb

@@ -1,8 +1,6 @@
 module RailsConnector
-
   # @api public
   class LinkList < Array
-
     def initialize(link_definitions)
       if link_definitions.blank?
         super([])
@@ -13,7 +11,7 @@ module RailsConnector
 
     # @api public
     def destination_objects
-      self.map {|link| link.destination_object}.compact
+      map { |link| link.destination_object }.compact
     end
 
     private
@@ -26,7 +24,5 @@ module RailsConnector
         links << link if link.active?
       end
     end
-
   end
-
 end

data/lib/rails_connector/link_resolvable.rb

@@ -1,9 +1,5 @@
 module RailsConnector
-
   module LinkResolvable
     attr_accessor :source
-
   end
-
-
-end
+end

data/lib/rails_connector/lucene_search_request.rb

@@ -1,7 +1,6 @@
-require 'rsolr'
+require "rsolr"
 
 module RailsConnector
-
   # This class provides a basic implementation for accessing a Solr search server.
   # It can be activated by making it the superclass of SearchRequest
   # (instead of DefaultSearchRequest).
@@ -28,15 +27,15 @@ module RailsConnector
     #
     # Uses the #filter_query and +options+ given in #new.
     def fetch_hits
-      solr = RSolr.connect(:url => @options[:solr_url])
-      solr_result = solr.get("select", :params => solr_query_parameters)
-      solr_response = solr_result['response']
-      build_search_result(solr_response['numFound'], solr_response['docs'], solr_response['maxScore'])
+      solr = RSolr.connect(url: @options[:solr_url])
+      solr_result = solr.get("select", params: solr_query_parameters)
+      solr_response = solr_result["response"]
+      build_search_result(solr_response["numFound"], solr_response["docs"], solr_response["maxScore"])
     end
 
     # Removes unwanted characters from +text+.
     def self.sanitize(text)
-      text.gsub(/[^\w\*]/, ' ').gsub(/\s+/, ' ').strip
+      text.gsub(/[^\w*]/, " ").gsub(/\s+/, " ").strip
     end
 
     def solr_query_for_query_string
@@ -65,8 +64,8 @@ module RailsConnector
     #   end
     def filter_query_conditions
       conditions = {}
-      conditions[:object_type] = 'NOT object_type:image'
-      conditions[:suppress_export] = 'NOT suppress_export:1'
+      conditions[:object_type] = "NOT object_type:image"
+      conditions[:suppress_export] = "NOT suppress_export:1"
       now = Time.now
       conditions[:valid_from] = "NOT valid_from:[#{(now + 1.second).to_iso} TO *]"
       conditions[:valid_until] = "NOT valid_until:[* TO #{now.to_iso}]"
@@ -77,30 +76,27 @@ module RailsConnector
 
     def solr_query_parameters
       {
-        :q => solr_query_for_query_string,
-        :fq => filter_query,
-        :fl => 'id,score',
-        :start => @options[:offset],
-        :rows => @options[:limit]
+        q: solr_query_for_query_string,
+        fq: filter_query,
+        fl: "id,score",
+        start: @options[:offset],
+        rows: @options[:limit]
       }.merge(@options[:solr_parameters] || {})
     end
 
     def build_search_result(total_hits, docs, max_score)
       result = SES::SearchResult.new(total_hits)
       docs.each do |doc|
-        begin
-          id = doc['id']
-          score = doc['score'] / max_score
-          hit = SES::Hit.new(id, score, doc)
-          if @options[:lazy_load].blank? && hit.obj.blank?
-            Rails.logger.warn("OBJ with ID ##{doc['id']} not found: This search result will not be shown")
-          else
-            result << hit
-          end
+        id = doc["id"]
+        score = doc["score"] / max_score
+        hit = SES::Hit.new(id, score, doc)
+        if @options[:lazy_load].blank? && hit.obj.blank?
+          Rails.logger.warn("OBJ with ID ##{doc["id"]} not found: This search result will not be shown")
+        else
+          result << hit
         end
       end
       result
     end
   end
-
 end

data/lib/rails_connector/markdown_string.rb

@@ -1,5 +1,4 @@
 module RailsConnector
-
   # Include this module in order to tag the string as one with Markdown content
   module MarkdownString
     include LinkResolvable
@@ -8,7 +7,6 @@ module RailsConnector
       true
     end
   end
-
 end
 
 class String

data/lib/rails_connector/meta.rb

@@ -1,15 +1,12 @@
 module RailsConnector
-
   module Meta
-
     # This method is an equivalent of Rails.logger.silence, which has been deprecated
-    def self.hello_im_rails_and_im_retarted_so_please_be_patient(&block)
-      begin
-        old_logger_level, Rails.logger.level = Rails.logger.level, Logger::ERROR
-        yield self
-      ensure
-        Rails.logger.level = old_logger_level
-      end
+    def self.hello_im_rails_and_im_retarted_so_please_be_patient
+      old_logger_level = Rails.logger.level
+      Rails.logger.level = Logger::ERROR
+      yield self
+    ensure
+      Rails.logger.level = old_logger_level
     end
 
     def self.included(base) #:nodoc:
@@ -21,7 +18,7 @@ module RailsConnector
     # This will always return a proper object, even if no custom
     # Ruby class exists.
     def obj_class_definition
-      @obj_class_definition ||= RailsConnector::Meta::EagerLoader.instance.obj_class(self.obj_class)
+      @obj_class_definition ||= RailsConnector::Meta::EagerLoader.instance.obj_class(obj_class)
     end
     alias_method :obj_class_def, :obj_class_definition
 
@@ -33,12 +30,12 @@ module RailsConnector
 
     # Returns the custom attributes in the form of a Hash.
     def custom_attributes
-      self.obj_class_definition.custom_attributes
+      obj_class_definition.custom_attributes
     end
 
     # Returns true, if the file format has an attribute of the given name.
     def custom_attribute?(attr)
-      self.obj_class_definition.custom_attribute?(attr)
+      obj_class_definition.custom_attribute?(attr)
     end
 
     # Returns an Array of String of all mandatory attributes, no mather if it's
@@ -48,12 +45,12 @@ module RailsConnector
     # <tt>:only_custom_attributes</tt>:: Return only custom attributes, omit
     # built-in attributes like content_type or valid_from.
     def mandatory_attribute_names(options = {})
-      self.obj_class_definition.mandatory_attribute_names(options)
+      obj_class_definition.mandatory_attribute_names(options)
     end
 
     # Returns true, if the file format has an mandatory attribute of the given name.
     def mandatory_attribute?(attr)
-      self.obj_class_definition.mandatory_attribute?(attr)
+      obj_class_definition.mandatory_attribute?(attr)
     end
 
     # Returns the version of this object. This number is increased every time
@@ -67,7 +64,7 @@ module RailsConnector
     def reminder_from
       load_meta_details
       @object_with_meta_data.reminder_from.presence &&
-          ::ActiveModel::Type::DateTime.new.deserialize(@object_with_meta_data.reminder_from)
+        ::ActiveModel::Type::DateTime.new.deserialize(@object_with_meta_data.reminder_from)
     end
 
     # Returns the reminder comment, if a reminder is set.
@@ -90,17 +87,18 @@ module RailsConnector
 
       load_meta_details
 
-      content_id = if self.edited?
-        @object_with_meta_data.edited_content_id
-      else
-        @object_with_meta_data.released_cont_id
-      end
+      content_id =
+        if edited?
+          @object_with_meta_data.edited_content_id
+        else
+          @object_with_meta_data.released_cont_id
+        end
 
       if content_id
         content = RailsConnector::Content.find(content_id)
         @editor = content.editor
       else
-        @editor = ''
+        @editor = ""
       end
     end
 
@@ -115,23 +113,23 @@ module RailsConnector
     def load_meta_details #:nodoc:
       return if @object_with_meta_data
 
-      @object_with_meta_data = RailsConnector::ObjectWithMetaData.find(self.id)
+      @object_with_meta_data = RailsConnector::ObjectWithMetaData.find(id)
 
       # reset depending instance variables
       @editor = nil
     end
 
-
     # the methods in this module will become class methods
     module ClassMethods
-
       # The RailsConnector::ObjClass object for this file format.
       # This will only return a proper object if a custom Ruby class exists
       # and will throw a RuntimeError otherwise.
       def obj_class_definition
-        raise "Obtaining the obj_class_definition of an Obj without custom Ruby class " \
-                  "is logically impossible." unless is_custom_ruby_class?
-        @obj_class_definition ||= RailsConnector::Meta::EagerLoader.instance.obj_class(self.name)
+        unless is_custom_ruby_class?
+          raise "Obtaining the obj_class_definition of an Obj without custom Ruby class " \
+                    "is logically impossible."
+        end
+        @obj_class_definition ||= RailsConnector::Meta::EagerLoader.instance.obj_class(name)
       end
       alias_method :obj_class_def, :obj_class_definition
 
@@ -140,9 +138,6 @@ module RailsConnector
       def is_custom_ruby_class?
         self != RailsConnector::BasicObj
       end
-
     end
-
   end
-
 end