infopark_fiona_connector 7.0.1.5.2.3.rc4 → 7.0.1.5.2.3.rc5

data/lib/rails_connector/blob.rb

@@ -1,5 +1,4 @@
 module RailsConnector
-
   # A binary containing the blob data of a Content or CMS management
   # data of Attribute (fields), ObjClass (object classes), for example.
   class Blob < CmsBaseModel
@@ -13,7 +12,6 @@ module RailsConnector
 
       alias_method :find_without_excluded_blob_data, :find
       alias_method :find, :find_with_excluded_blob_data
-
     end
 
     def length
@@ -25,7 +23,7 @@ module RailsConnector
     end
 
     def path_of_stored_data(use_cached_file_if_older_than = Time.now)
-      store_data if !File.exists?(path) || file_size_differs? || stale?(use_cached_file_if_older_than)
+      store_data if !File.exist?(path) || file_size_differs? || stale?(use_cached_file_if_older_than)
       path
     end
 
@@ -38,7 +36,7 @@ module RailsConnector
       case adapter_name
       when /mysql$/i
         raise "Adapter 'mysql' no longer supported. " +
-            "Please change adapter in your database.yml to 'mysql2'."
+              "Please change adapter in your database.yml to 'mysql2'."
       when /mysql2/i
         require "rails_connector/blob_mysql"
         include BlobMysql
@@ -74,5 +72,4 @@ module RailsConnector
       blob_length != File.stat(path).size
     end
   end
-
 end

data/lib/rails_connector/blob_mapping.rb

@@ -1,8 +1,7 @@
-# -*- encoding : utf-8 -*-
 module RailsConnector
   class BlobMapping < CmsBaseModel
     def self.exists?
-      self.table_exists?
+      table_exists?
     end
 
     def self.get_fingerprint(name)
@@ -10,7 +9,7 @@ module RailsConnector
     end
 
     def self.get_fingerprint_map(blob_names)
-      Hash[self.where(:blob_name => blob_names).select([:blob_name, :fingerprint]).map {|b| [b.blob_name, b.fingerprint] }]
+      Hash[where(blob_name: blob_names).select(%i(blob_name fingerprint)).map { |b| [b.blob_name, b.fingerprint] }]
     end
   end
 end

data/lib/rails_connector/blob_mysql.rb

@@ -1,13 +1,12 @@
-require 'mysql2'
-require 'mysql_blob_streaming'
+require "mysql2"
+require "mysql_blob_streaming"
 
 module RailsConnector
-
   module BlobMysql
     def self.included(base)
       base.instance_eval do
         define_method :store_data do
-          store_data_atomically {|f| fetch_into_file(f)}
+          store_data_atomically { |f| fetch_into_file(f) }
         end
       end
     end
@@ -28,5 +27,4 @@ module RailsConnector
       end
     end
   end
-
 end

data/lib/rails_connector/blob_oracle.rb

@@ -1,10 +1,9 @@
 module RailsConnector
-
   module BlobOracle
     def self.included(base)
       base.instance_eval do
         define_method :store_data do
-          store_data_atomically {|f| fetch_into_file(f)}
+          store_data_atomically { |f| fetch_into_file(f) }
         end
       end
     end
@@ -17,17 +16,17 @@ module RailsConnector
         GC.start
       end
     ensure
-      blob.close if blob
+      blob&.close
     end
 
     private
 
     def sql
-      %{
+      %(
         SELECT blob_data
         FROM #{self.class.table_name}
         WHERE #{self.class.primary_key} = :1
-      }
+      )
     end
 
     def blob_handle
@@ -35,5 +34,4 @@ module RailsConnector
       con.exec(sql, id).fetch.first
     end
   end
-
-end
+end

data/lib/rails_connector/channel.rb

@@ -6,14 +6,13 @@ module RailsConnector
       "#{table_name_prefix}" "channels"
     end
 
-    has_many :news, :class_name => 'RailsConnector::News', :foreign_key => 'channel_name'
+    has_many :news, class_name: "RailsConnector::News", foreign_key: "channel_name"
     has_many :active_news,
-      lambda { where(['valid_from <= :now AND valid_until >= :now', {:now => Time.now.to_s(:number)}]) },
-      :class_name => 'RailsConnector::News', :foreign_key => 'channel_name'
+             -> { where(["valid_from <= :now AND valid_until >= :now", { now: Time.now.to_s(:number) }]) },
+             class_name: "RailsConnector::News", foreign_key: "channel_name"
 
-    has_many :objects, :through => :news
-
-    scope :with_prefix, -> (prefix) {where(["channel_name LIKE ?", "#{prefix}%"])}
+    has_many :objects, through: :news
 
+    scope :with_prefix, ->(prefix) { where(["channel_name LIKE ?", "#{prefix}%"]) }
   end
 end

data/lib/rails_connector/cms_accessible.rb

@@ -1,9 +1,7 @@
 module RailsConnector
-
   # @api public
   module CmsAccessible
-
-  protected
+    protected
 
     # Filter method to load a CMS object.
     #
@@ -13,6 +11,7 @@ module RailsConnector
       CmsEnv.new(request.env).load
       loaded_obj = request.env[CmsEnv::OBJ_ENV_KEY]
       raise loaded_obj if loaded_obj.is_a?(StandardError)
+
       @obj = loaded_obj
     end
 
@@ -29,7 +28,7 @@ module RailsConnector
         @obj = nil
         render_obj_error(410, "gone")
       end
-      return true
+      true
     end
 
     # Filter method to check if access to the loaded object is permitted. If it is
@@ -43,7 +42,7 @@ module RailsConnector
         @obj = nil
         render_obj_error(403, "forbidden")
       end
-      return true
+      true
     end
 
     # This method is called when rendering an error caused by either {ensure_object_is_permitted}
@@ -54,10 +53,10 @@ module RailsConnector
     def render_obj_error(status, name)
       force_html_format
       render(
-        :template => "errors/#{status}_#{name}",
-        :layout => false,
-        :status => status,
-        :content_type => Mime[:html]
+        template: "errors/#{status}_#{name}",
+        layout: false,
+        status: status,
+        content_type: Mime[:html]
       )
     end
 
@@ -81,7 +80,7 @@ module RailsConnector
     # to the valid_until date of the current object.
     def set_google_expire_header
       if @obj && (date = @obj.valid_until)
-        headers['X-Robots-Tag: unavailable_after'] = date.rfc822
+        headers["X-Robots-Tag: unavailable_after"] = date.rfc822
       end
     end
 
@@ -91,20 +90,20 @@ module RailsConnector
     def deliver_file
       if @obj.body_data_url
         redirect_to enforce_protocol_from_request(@obj.body_data_url)
-      elsif stale?(:last_modified => @obj.last_changed.utc)
+      elsif stale?(last_modified: @obj.last_changed.utc)
         mime_type = @obj.mime_type
-        mime_type += '; charset=utf-8' if mime_type =~ /^text\//
+        mime_type += "; charset=utf-8" if %r{^text/}.match?(mime_type)
 
         if (filepath = @obj.body_data_path).present?
           send_file(File.expand_path(filepath), {
-            :type => mime_type,
-            :filename => @obj.filename,
-            :disposition => 'inline',
-          })
+                      type: mime_type,
+                      filename: @obj.filename,
+                      disposition: "inline"
+                    })
         else
           # generics should send its body, empty files should be delivered as
           # empty files - and not lead to an application error
-          send_data @obj.body || '', :type => mime_type, :filename => @obj.filename, :disposition => 'inline'
+          send_data @obj.body || "", type: mime_type, filename: @obj.filename, disposition: "inline"
         end
       end
     end

data/lib/rails_connector/cms_base_model.rb

@@ -1,12 +1,11 @@
 module RailsConnector
-
   # This is the abstract class from which all CMS models derive.
   # The database connection is set to "infopark_rails_connector_${RAILS_ENV}" and the table prefix is
   # determined from the instance_name.
   #
   # [instance_name] the name of the CMS instance
   class CmsBaseModel < ActiveRecord::Base
-    @@instance_name = 'default'
+    @@instance_name = "default"
     cattr_accessor :instance_name
     self.abstract_class = true
 
@@ -46,9 +45,8 @@ module RailsConnector
       #
       # ActiveRecord::Base::primary_key_prefix_type has no effect here.
       def table_name_prefix
-        @@instance_name.blank? ? '' : (@@instance_name + '_')
+        @@instance_name.blank? ? "" : (@@instance_name + "_")
       end
     end
   end
-
 end

data/lib/rails_connector/cms_dispatch_controller.rb

@@ -1,14 +1,11 @@
 module RailsConnector
-
   class CmsDispatchController < ActionController::Metal
     def process(action)
       CmsEnv.new(request.env).load
       controller = target_controller(request.env)
       request.env["action_dispatch.request.path_parameters"][:controller] = controller.controller_path
 
-      if !obj_not_found? && action == 'index'
-        action = loaded_obj.controller_action_name
-      end
+      action = loaded_obj.controller_action_name if !obj_not_found? && action == "index"
 
       request.env["action_dispatch.request.path_parameters"][:action] = action
 
@@ -17,8 +14,9 @@ module RailsConnector
 
     private
 
-    def target_controller(env)
+    def target_controller(_env)
       return default_controller if obj_not_found?
+
       controller = "#{loaded_obj.controller_name}Controller".constantize
 
       if controller.respond_to?(:use_for_obj_dispatch?) && controller.use_for_obj_dispatch?
@@ -42,5 +40,4 @@ module RailsConnector
       CmsController
     end
   end
-
 end

data/lib/rails_connector/cms_env.rb

@@ -1,8 +1,6 @@
 module RailsConnector
-
   class CmsEnv
-
-    OBJ_ENV_KEY = "INFOPARK_OBJ"
+    OBJ_ENV_KEY = "INFOPARK_OBJ".freeze
 
     def initialize(env)
       @env = env
@@ -10,6 +8,7 @@ module RailsConnector
 
     def load
       return if env[OBJ_ENV_KEY]
+
       load_object
     end
 
@@ -48,7 +47,7 @@ module RailsConnector
 
       if found_obj.suppressed?
         raise RailsConnector::ResourceNotFound,
-          "Tried to access Obj #{found_obj.inspect}, but it is suppressed (suppress_export is set)!"
+              "Tried to access Obj #{found_obj.inspect}, but it is suppressed (suppress_export is set)!"
       end
 
       found_obj
@@ -59,10 +58,8 @@ module RailsConnector
     end
 
     def self.find_permalink_by_param(permalink_param)
-      permalink =  Array(permalink_param).join("/")
+      permalink = Array(permalink_param).join("/")
       Obj.find_by_permalink!(permalink)
     end
-
   end
-
 end

data/lib/rails_connector/cms_test_request.rb

@@ -1,6 +1,6 @@
 module RailsConnector
   module CmsTestRequest
-    def for_cms_object(test_obj=nil)
+    def for_cms_object(test_obj = nil)
       # prepare the env as if the given obj was loaded by CmsEnv
       env[RailsConnector::CmsEnv::OBJ_ENV_KEY] = test_obj if test_obj
     end

data/lib/rails_connector/configuration.rb

@@ -1,23 +1,21 @@
 require "helpful_configuration"
-require 'rails_connector/cms_base_model'
+require "rails_connector/cms_base_model"
 require "rails_connector/blob"
 
 module RailsConnector
-
   # @api public
   class Configuration
     # @api public
     DEFAULT_MODE = :live
 
     class << self
-
       # there are three available modes for the rails connector:
       # <tt>live</tt> (show released contents only),
       # <tt>preview</tt> (show edited contents)
       # <tt>editor</tt> (show edited contents and editor interface (e.g. edit markers))
       # Default mode is <tt>live</tt>.
       # @api public
-      attr_accessor :mode
+      attr_accessor :blob_cache_dir, :choose_homepage_callback
 
       # default options for {SearchRequest}
       # @api public
@@ -32,12 +30,12 @@ module RailsConnector
       # define a non-default blob cache dir.
       # +fiona connector+ only. has no effect when used with the +cloud connector+.
       # @api public
-      attr_accessor :blob_cache_dir
 
       # @api public
       def mode=(new_mode)
         new_mode = new_mode.to_sym
-        raise ArgumentError, "Unknown Mode #{new_mode}" unless [:editor, :preview, :live].include?(new_mode)
+        raise ArgumentError, "Unknown Mode #{new_mode}" unless %i(editor preview live).include?(new_mode)
+
         @mode = new_mode
       end
 
@@ -91,8 +89,6 @@ module RailsConnector
         RailsConnector::CmsBaseModel.configure_database(:cms)
       end
 
-      attr_accessor :choose_homepage_callback
-
       # Configure a callback to be invoked when the rails connector delivers the homepage.
       # The given callback will receive the rack env
       # and must return an Obj to be used as the homepage.
@@ -102,15 +98,15 @@ module RailsConnector
         self.choose_homepage_callback = block
       end
 
-      def cms_routes(*args)
-        raise <<-EOS.gsub(/\s+/, ' ')
+      def cms_routes(*_args)
+        raise <<-EOS.gsub(/\s+/, " ")
         Calling RailsConnector::Configuration.cms_routes is not needed anymore.
         Please remove it from config/routes.rb
         EOS
       end
 
-      def use_x_sendfile=(value)
-        raise 'Configuration.use_x_sendfile is now available as Rails configuration:'\
+      def use_x_sendfile=(_value)
+        raise "Configuration.use_x_sendfile is now available as Rails configuration:"\
               ' config.action_dispatch.x_sendfile_header = "X-Sendfile"'
       end
 
@@ -130,11 +126,11 @@ module RailsConnector
       protected
 
       def enable_authentication
-        ::ApplicationController.__send__(:include, RailsConnector::Authenticable)
+        ::ApplicationController.include RailsConnector::Authenticable
       end
 
       def read_local_config_file
-        contents = YAML.load_file(local_config_file_name) if File.exists?(local_config_file_name)
+        contents = YAML.load_file(local_config_file_name) if File.exist?(local_config_file_name)
         contents ||= {}
 
         config = HelpfulConfiguration.new(
@@ -161,12 +157,12 @@ module RailsConnector
           "cms_api",
           "a hash of options that specify access to the cms api"
         )
-        config.explain 'content_service', 'a hash of options that specify access to content service'
+        config.explain "content_service", "a hash of options that specify access to content service"
         config
       end
 
       def enable_ses
-        require 'rails_connector/ses'
+        require "rails_connector/ses"
 
         RailsConnector::SES.enable
       end

data/lib/rails_connector/content.rb

@@ -1,11 +1,7 @@
 module RailsConnector
-
   # This class allows us to read out the editor of an Obj,
   # if it has edited content
   class Content < CmsBaseModel
-
     self.primary_key = :content_id
-
   end
-
 end

data/lib/rails_connector/core_extensions/time.rb

@@ -1,10 +1,10 @@
 class Time
-
   # Returns a new Time created from the ISO date format String "YYYYMMDDhhmmss"
   def self.from_iso(t)
     return nil unless t
+
     if t.to_s =~ /^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/
-      utc($1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i)
+      utc(Regexp.last_match(1).to_i, Regexp.last_match(2).to_i, Regexp.last_match(3).to_i, Regexp.last_match(4).to_i, Regexp.last_match(5).to_i, Regexp.last_match(6).to_i)
     else
       raise ArgumentError, "invalid iso time format: #{t}"
     end
@@ -12,7 +12,6 @@ class Time
 
   # Returns the Time as ISO date format String "YYYYMMDDhhmmss"
   def to_iso
-    getutc.strftime('%Y%m%d%H%M%S')
+    getutc.strftime("%Y%m%d%H%M%S")
   end
-
 end