infopark_fiona_connector 7.0.1.5.2.3.rc4 → 7.0.1.5.2.3.rc5

data/app/helpers/rails_connector/table_of_contents_helper.rb

@@ -1,11 +1,9 @@
 module RailsConnector
-
   #
   # This module contains a helper that can be used to build a table of contents of an object.
   #
   # @api public
   module TableOfContentsHelper
-
     #
     # The <tt>table_of_contents</tt> helper method gets an object as argument and returns an array,
     # which can be used as the table of contents of the given object.
@@ -16,7 +14,7 @@ module RailsConnector
     #
     # @api public
     def table_of_contents(obj)
-      obj.sorted_toclist.reject { |o| not o.permitted_for_user?(current_user) }
+      obj.sorted_toclist.reject { |o| !o.permitted_for_user?(current_user) }
     end
   end
 end

data/config/cms_routes.rb

@@ -1,17 +1,17 @@
 Rails.application.routes.draw do
-  root to: 'rails_connector/cms_dispatch#index'
-  match ':id(/*slug)',
-    to: 'rails_connector/cms_dispatch#index',
-    constraints: { id: /\d+|[0-9a-f]{16}/ },
-    as: "cms_id",
-    via: :all
-  match 'toggle_markers/:id',
-    to: 'rails_connector/cms_dispatch#toggle_editmarkers',
-    as: "toggle_markers",
-    via: :all
-  match '/*permalink',
-    to: 'rails_connector/cms_dispatch#index',
-    as: 'cms_permalink',
-    format: false,
-    via: :all
+  root to: "rails_connector/cms_dispatch#index"
+  match ":id(/*slug)",
+        to: "rails_connector/cms_dispatch#index",
+        constraints: { id: /\d+|[0-9a-f]{16}/ },
+        as: "cms_id",
+        via: :all
+  match "toggle_markers/:id",
+        to: "rails_connector/cms_dispatch#toggle_editmarkers",
+        as: "toggle_markers",
+        via: :all
+  match "/*permalink",
+        to: "rails_connector/cms_dispatch#index",
+        as: "cms_permalink",
+        format: false,
+        via: :all
 end

data/lib/gem_dependencies.rb

@@ -1,6 +1,6 @@
 class GemDependencies
   def self.dependency_for(gem_name)
-    dependencies.detect{ |dep| dep[:name] == gem_name }
+    dependencies.detect { |dep| dep[:name] == gem_name }
   end
 
   # generates code that should be included or eval'ed inside a Gemfile.
@@ -14,7 +14,7 @@ class GemDependencies
     dependencies_minimum_versions = dependencies.map do |dependency|
       minimum_version = calculate_minimum_version(dependency[:version])
       if minimum_version
-        dependency.merge(:version => "= #{minimum_version}")
+        dependency.merge(version: "= #{minimum_version}")
       else
         dependency.delete(:version)
       end
@@ -23,7 +23,8 @@ class GemDependencies
 
     dependencies_minimum_versions.map do |dependency|
       gem_name = dependency[:name]
-      next if gem_name == 'rails'
+      next if gem_name == "rails"
+
       gem_options = ""
       gem_options << ", '#{dependency[:version]}'" if dependency[:version]
       gem_options <<
@@ -41,11 +42,11 @@ class GemDependencies
     end.join("\n")
   end
 
-  def self.minimum_version_for(gem, version=nil)
-    version ||= dependencies.select do |dep|
+  def self.minimum_version_for(gem, version = nil)
+    dependency ||= dependencies.detect do |dep|
       dep[:name] == gem
-    end.first[:version]
-
+    end
+    version ||= dependency[:version]
     calculate_minimum_version(version)
   end
 

data/lib/generators/rails_connector/install/install_generator.rb

@@ -6,19 +6,19 @@ module RailsConnector
       # Normally, you'd just call 'source_root' as a class method from here,
       # but we need to glob the dir ourselves. Hence our own method.
       def self.source_root
-        @source_root ||= File.expand_path('../templates', __FILE__)
+        @source_root ||= File.expand_path("templates", __dir__)
       end
 
       def install_configuration
         copy_file "initializers/rails_connector.rb", "config/initializers/rails_connector.rb"
-        template 'app/models/obj.rb.erb', 'app/models/obj.rb'
+        template "app/models/obj.rb.erb", "app/models/obj.rb"
         copy_file "local/configuration.rb", "config/local/configuration.rb"
       end
 
       def append_asset_manifests
         append_file("app/assets/javascripts/application.js", "//= require infopark_rails_connector")
         gsub_file("app/assets/stylesheets/application.css", "*= require_tree .",
-            "*= require_tree .\n *= require infopark_rails_connector")
+                  "*= require_tree .\n *= require infopark_rails_connector")
       end
 
       def remove_public_index_html
@@ -28,10 +28,10 @@ module RailsConnector
 
       def patch_default_application_layout
         gsub_file("app/views/layouts/application.html.erb", %r{</head>},
-            "<%= rails_connector_header_tags %>\n</head>")
+                  "<%= rails_connector_header_tags %>\n</head>")
         gsub_file("app/views/layouts/application.html.erb", %r{</body>},
-            "<%= rails_connector_after_content_tags %>\n</body>")
+                  "<%= rails_connector_after_content_tags %>\n</body>")
       end
     end
   end
-end
+end

data/lib/generators/rails_connector/install/templates/initializers/rails_connector.rb

@@ -1,2 +1,2 @@
 # Name of the CMS Fiona Instance to access
-RailsConnector::Configuration.instance_name = 'default'
+RailsConnector::Configuration.instance_name = "default"

data/lib/infopark_fiona_connector.rb

@@ -1,7 +1,7 @@
 # @api public
 module ::RailsConnector
-  PLATFORM_CLOUD = :cloud.freeze
-  PLATFORM_FIONA = :fiona.freeze
+  PLATFORM_CLOUD = :cloud
+  PLATFORM_FIONA = :fiona
 
   # return either <tt>:fiona</tt> or <tt>:cloud</tt> depending on the app's configuration.
   # @return [Symbol]
@@ -18,16 +18,16 @@ module ::RailsConnector
   end
 end
 
-require 'rails_connector/core_extensions'
-require 'rails_connector/rack_middlewares'
-require 'rails_connector/errors'
-require 'rails_connector/fiona_datetime'
+require "rails_connector/core_extensions"
+require "rails_connector/rack_middlewares"
+require "rails_connector/errors"
+require "rails_connector/fiona_datetime"
 ActiveRecord::Type.register(:fiona_datetime, ::FionaDateTime)
 
 # @api public
 module RailsConnector
   def self.autoload_all_sources
-    source_files = Dir.glob(File.expand_path("../rails_connector/*.rb", __FILE__)).map do |file|
+    source_files = Dir.glob(File.expand_path("rails_connector/*.rb", __dir__)).map do |file|
       File.basename(file)
     end
 
@@ -40,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/rails_connector/attr_dict.rb

@@ -1,15 +1,13 @@
-require 'mime/types'
-require 'ostruct'
+require "mime/types"
+require "ostruct"
 
 module RailsConnector
-
   # The page related and custom data belonging to a CMS object
   #
   # [editor] The login of the current editor of the edited content, if set
   #
   # Any custom Attribute can be accessed directly or via [].
   class AttrDict
-
     def initialize(object, keys_and_values = {}, defs = {})
       @object = object
       @blob_dict = keys_and_values.symbolize_keys
@@ -34,7 +32,7 @@ module RailsConnector
     # The body attribute may contain binary data for Obj.binary? or be an HtmlString.
     def body
       if object.binary?
-        binary_body.data if binary_body
+        binary_body&.data
       else
         StringTagging.tag_as_html(textual_body, self)
       end
@@ -54,7 +52,8 @@ module RailsConnector
     def body_data_path
       # TODO: Braucht/will jemand Text gestreamt?
       return nil unless object.binary?
-      binary_body.path_of_stored_data(object.last_changed) if binary_body
+
+      binary_body&.path_of_stored_data(object.last_changed)
     end
 
     def [](key)
@@ -68,10 +67,10 @@ module RailsConnector
     end
 
     def permissions
-      @permissions ||= OpenStruct.new({ :live => permitted_groups })
+      @permissions ||= OpenStruct.new({ live: permitted_groups })
     end
 
-    def respond_to?(method_id, include_private=false)
+    def respond_to?(method_id, include_private = false)
       super || has_attribute(method_id)
     end
 
@@ -83,29 +82,33 @@ module RailsConnector
 
     def textual_body
       return nil if object.binary?
+
       blob_dict[:blob]
     end
 
     def binary_body
       return nil unless object.binary? && has_attribute(:blob)
+
       @binary_body ||= Blob.find(blob)
     rescue RailsConnector::ResourceNotFound
       nil
     end
 
     def method_missing(method_id, *args)
-      raise NoMethodError.new("missing method - #{method_id}") unless args.empty?
-      return attribute_value(method_id.to_s)
+      raise NoMethodError, "missing method - #{method_id}" unless args.empty?
+
+      attribute_value(method_id.to_s)
     rescue UnknownAttributeError
-      raise NoMethodError.new("missing method - #{method_id}")
+      raise NoMethodError, "missing method - #{method_id}"
     end
 
     def attribute_value(key)
-      raise UnknownAttributeError.new unless has_attribute(key)
+      raise UnknownAttributeError unless has_attribute(key)
 
       key = key.to_sym
       raw = blob_dict[key]
-      @attr_cache[key] ||= case type_of(key)
+      @attr_cache[key] ||=
+        case type_of(key)
         when :markdown
           StringTagging.tag_as_markdown(raw, self)
         when :html
@@ -120,18 +123,19 @@ module RailsConnector
           raw || []
         else
           raw
-      end
+        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)
+      %i(channels sort_key1 sort_key2 sort_key3).include?(key.to_sym)
     end
 
     def has_attribute(key)
       key = key.to_sym
       return true if predefined_attribute?(key)
+
       blob_dict.key?(key) || attr_defs.key?(key) || class_defined_attributes.key?(key)
     end
 
@@ -139,15 +143,20 @@ module RailsConnector
       key = key.to_sym
       return :linklist if key == :text_links
       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
+      attr_defs[key]["type"].to_sym
+    rescue StandardError
+      nil
     end
 
     def type_from_class_defined_attributes(key)
-      class_defined_attributes[key].type.to_sym rescue nil
+      class_defined_attributes[key].type.to_sym
+    rescue StandardError
+      nil
     end
 
     def class_defined_attributes
@@ -157,5 +166,4 @@ module RailsConnector
 
   class UnknownAttributeError < StandardError
   end
-
 end

data/lib/rails_connector/attribute.rb

@@ -1,18 +1,16 @@
 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}
+    TYPES = %w(date enum html linklist markdown multienum string text).freeze
 
     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"
+    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
@@ -20,22 +18,22 @@ module RailsConnector
 
     # The (human readable) title.
     def title(language = :de)
-      blob_data['titles'].presence && blob_data['titles'][language.to_s]
+      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]
+      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
+      blob_data["isSearchableInCM"].to_i != 0
     end
 
     # Returns the possible values if attribute is of type `enum' or `multienum'.
     def values
-      blob_data['values']
+      blob_data["values"]
     end
 
     def max_size
@@ -55,7 +53,7 @@ module RailsConnector
     end
 
     TYPES.each do |type|
-      self.class_eval <<EOM, __FILE__, __LINE__ + 1
+      class_eval <<EOM, __FILE__, __LINE__ + 1
         def #{type}?
           self.attribute_type == "#{type}"
         end
@@ -64,22 +62,23 @@ EOM
 
     # Convenience method for find_by_attribute_name
     def self.find_by_name(*args)
-      self.find_by_attribute_name(*args)
+      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
+      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?
+      return {} unless blob&.blob_data?
 
       JSON.parse(blob.blob_data)
     end
@@ -88,9 +87,7 @@ EOM
 
     # load attribute details from blob
     def blob_data #:nodoc:
-      @blob_data ||= self.class.read_blob_data(self.attribute_name)
+      @blob_data ||= self.class.read_blob_data(attribute_name)
     end
-
   end
-
 end

data/lib/rails_connector/authenticable.rb

@@ -5,6 +5,7 @@ module RailsConnector
         unless instance_method_defined?(mod, method_name)
           mod.class_eval do
             private
+
             define_method(method_name, InstanceMethods.method(method_name).to_proc)
           end
         end
@@ -14,12 +15,18 @@ module RailsConnector
     end
 
     module InstanceMethods
-      def self.logged_in?; false; end
-      def self.admin?; false; end
-      def self.current_user; nil; end
-    end
+      def self.logged_in?
+        false
+      end
 
-    private
+      def self.admin?
+        false
+      end
+
+      def self.current_user
+        nil
+      end
+    end
 
     def self.instance_method_defined?(mod, method_name)
       (

data/lib/rails_connector/basic_obj.rb

@@ -1,9 +1,8 @@
 require "json"
-require 'openssl'
-require 'rails_connector/fiona_datetime'
+require "openssl"
+require "rails_connector/fiona_datetime"
 
 module RailsConnector
-
   # The CMS file class
   #
   # [children] an Array of objects, Obj, of which this one is the parent
@@ -17,8 +16,7 @@ module RailsConnector
         "\xdf\x20\xbd\x42\x9a\x65\x8d\x72\x93\x6c\x96\x69\x91\x6e".freeze
 
     PREDEFINED_ATTRIBUTES = %w(blob body title channels sort_key1 sort_type1 sort_key2 sort_type2
-      sort_key3 sort_type3 sort_order).freeze
-
+                               sort_key3 sort_type3 sort_order).freeze
 
     self.store_full_sti_class = false
 
@@ -32,7 +30,7 @@ module RailsConnector
       when :released then configure_column_information("objs", true)
       when :edited
         configure_column_information("preview_objs", false)
-        has_many(:arel_permissions, :class_name => "::RailsConnector::Permission", :foreign_key => "object_id")
+        has_many(:arel_permissions, class_name: "::RailsConnector::Permission", foreign_key: "object_id")
       else
         raise "configure_for_content called with unknown parameter #{which}"
       end
@@ -54,25 +52,24 @@ module RailsConnector
       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
+        next unless /^[A-Z]/.match?(class_name)
+
+        klass = class_name.safe_constantize
+        next unless klass
+
+        klass.initialize_attributes if klass < RailsConnector::BasicObj
       end
     end
 
     def self.initialize_attributes
       PREDEFINED_ATTRIBUTES.each do |attribute|
-        self.send(:define_attribute, attribute, ActiveRecord::Type::String.new)
+        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)
+        send(:define_attribute, attribute, ActiveRecord::Type::String.new)
       end
     end
 
@@ -125,8 +122,8 @@ module RailsConnector
     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'
+      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
@@ -189,7 +186,7 @@ module RailsConnector
     # and thus requires no extra database access.
     # @api public
     def homepage?
-      self.id == (@@homepage_id ||= self.class.homepage.id)
+      id == (@@homepage_id ||= self.class.homepage.id)
     end
 
     # This method is used to calculate a part of a URL of an obj.
@@ -208,15 +205,17 @@ module RailsConnector
     # Returns the title of the content or the name.
     # @api public
     def display_title
-      self.title || name
+      title || name
     end
 
-    OBJECT_TYPES = {
-      '2' => :document,
-      '5' => :publication,
-      'B' => :image,
-      'C' => :generic
-    }.freeze unless defined?(OBJECT_TYPES)
+    unless defined?(OBJECT_TYPES)
+      OBJECT_TYPES = {
+        "2" => :document,
+        "5" => :publication,
+        "B" => :image,
+        "C" => :generic
+      }.freeze
+    end
 
     # Returns the type of the object: :document, :publication, :image or :generic
     # @api public
@@ -227,7 +226,7 @@ module RailsConnector
     # Returns true if image? or generic?
     # @api public
     def binary?
-      [:image, :generic].include? object_type
+      %i(image generic).include? object_type
     end
 
     # Returns true if object_type == :image
@@ -257,7 +256,8 @@ module RailsConnector
     # Returns true if this object is active.
     # @api public
     def active?
-      return false if !valid_from
+      return false unless valid_from
+
       valid_from <= Time.now && (!valid_until || Time.now <= valid_until)
     end
 
@@ -311,14 +311,14 @@ module RailsConnector
     def root?
       parent_obj_id.nil?
     end
-    #
 
     # Returns a list of exportable? children excluding the binary? ones unless :all is specfied.
     # This is mainly used for navigations.
     # @api public
     def toclist(*args)
       return [] unless publication?
-      toclist = children.to_a.select{ |toc| toc.exportable? }
+
+      toclist = children.to_a.select { |toc| toc.exportable? }
       toclist = toclist.reject { |toc| toc.binary? } unless args.include?(:all)
       toclist
     end
@@ -326,20 +326,20 @@ module RailsConnector
     # Returns the sorted +toclist+, respecting sort order and type of this Obj.
     # @api public
     def sorted_toclist(*args)
-      list = self.toclist(*args)
+      list = toclist(*args)
       return [] if list.blank?
 
-      cached_sort_key1 = self.sort_key1
-      cached_sort_type1 = self.sort_type1
+      cached_sort_key1 = sort_key1
+      cached_sort_type1 = sort_type1
 
       sorted_list =
         if cached_sort_key1.blank?
-          list.sort { |left_obj, right_obj| left_obj.name <=> right_obj.name }
+          list.sort_by(&:name)
         else
-          cached_sort_key2 = self.sort_key2
-          cached_sort_type2 = self.sort_type2
-          cached_sort_key3 = self.sort_key3
-          cached_sort_type3 = self.sort_type3
+          cached_sort_key2 = sort_key2
+          cached_sort_type2 = sort_type2
+          cached_sort_key3 = sort_key3
+          cached_sort_type3 = sort_type3
 
           list.sort do |left_obj, right_obj|
             compare = compare_on_sort_key(left_obj, right_obj, cached_sort_key1, cached_sort_type1)
@@ -353,7 +353,7 @@ module RailsConnector
           end
         end
 
-      return self.sort_order == "descending" ? sorted_list.reverse : sorted_list
+      sort_order == "descending" ? sorted_list.reverse : sorted_list
     end
 
     # Returns an Array of all the ancestor objects, starting at the root and ending at this object's parent.
@@ -370,9 +370,10 @@ module RailsConnector
     # returns nil if no object with the given name was found.
     # @api public
     def find_nearest(name)
-      obj = self.children.find_by_name(name)
-      return obj if obj and obj.active?
-      parent.find_nearest(name) unless self.root?
+      obj = children.find_by_name(name)
+      return obj if obj&.active?
+
+      parent.find_nearest(name) unless root?
     end
 
     # Returns the value of the attribute specified by its name.
@@ -382,9 +383,7 @@ module RailsConnector
     def [](key)
       if has_attribute?(key)
         begin
-          if attr_dict.respond_to?(key)
-            return attr_dict.send(key)
-          end
+          return attr_dict.send(key) if attr_dict.respond_to?(key)
 
           read_attribute(key)
         rescue NoMethodError
@@ -455,11 +454,13 @@ module RailsConnector
       @attr_values ||= begin
         encoded_and_encrypted_attr_values = read_attribute(:attr_values)
         return {} unless encoded_and_encrypted_attr_values
+
         encrypted_attr_values = Base64.decode64(encoded_and_encrypted_attr_values)
-        if !encrypted_attr_values.starts_with?('Salted__') || encrypted_attr_values.length < 16
-          raise 'attr_values has wrong format'
+        if !encrypted_attr_values.starts_with?("Salted__") || encrypted_attr_values.length < 16
+          raise "attr_values has wrong format"
         end
-        cipher = OpenSSL::Cipher.new('rc4')
+
+        cipher = OpenSSL::Cipher.new("rc4")
         cipher.decrypt
         salt = encrypted_attr_values[8..15]
         cipher.pkcs5_keyivgen(CRYPT_KEY, salt, 1)
@@ -501,13 +502,13 @@ module RailsConnector
       @mime_type ||= compute_mime_type
     end
 
-    def respond_to?(method_id, include_private=false)
+    def respond_to?(method_id, include_private = false)
       if super
         true
       elsif %w(_attr_dict _attr_defs _attr_values).include?(method_id.to_s)
         # prevent infinite recursion when calling "attr_*" below,
         # since rails checks the absence of an "_attr_*" method internally
-        return false
+        false
       else
         attr_dict.respond_to?(method_id)
       end
@@ -517,18 +518,18 @@ module RailsConnector
 
     def fiona_fields
       @fiona_fields ||=
-        ['name', 'obj_class', 'workflow', 'suppressexport', 'permalink'].inject({}) do |all,field|
+        %w(name obj_class workflow suppressexport permalink).inject({}) do |all, field|
           all.merge! field => {
-            'titles' => {'de' => field.humanize, 'en' => field.humanize},
-            'type' => 'string',
-            'help_texts' => {'de' => field, 'en' => field}
+            "titles" => { "de" => field.humanize, "en" => field.humanize },
+            "type" => "string",
+            "help_texts" => { "de" => field, "en" => field }
           }
         end
     end
 
     def compute_mime_type
       MIME::Types.type_for(file_extension).first.content_type
-    rescue
+    rescue StandardError
       binary? ? "application/octet-stream" : "text/plain"
     end
 
@@ -545,7 +546,15 @@ module RailsConnector
         left_value <=> right_value
       else
         if my_sort_type == "numeric"
-          (left_value.to_i rescue 0) <=> (right_value.to_i rescue 0)
+          (begin
+             left_value.to_i
+           rescue StandardError
+             0
+           end) <=> (begin
+                                            right_value.to_i
+                     rescue StandardError
+                       0
+                                          end)
         else
           left_value.to_s.downcase <=> right_value.to_s.downcase
         end
@@ -558,7 +567,5 @@ module RailsConnector
     rescue NameError, ActiveRecord::ActiveRecordError
       nil
     end
-
   end
-
 end