infopark_reactor 1.26.1 → 1.27.0.rc4

data/lib/reactor/tools/xml_attributes.rb

@@ -1,11 +1,8 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/xml_attribute'
-require 'reactor/tools/response_handler/xml_attribute'
+require "reactor/cm/xml_attribute"
+require "reactor/tools/response_handler/xml_attribute"
 
 module Reactor
-
   module XmlAttributes
-
     extend ActiveSupport::Concern
 
     included do
@@ -17,7 +14,6 @@ module Reactor
     end
 
     module ClassMethods
-
       # This method can act as both getter and setter.
       # I admit, that it is not the best design ever.
       # But it makes a pretty good DSL
@@ -36,14 +32,14 @@ module Reactor
 
         attribute = Reactor::Cm::XmlAttribute.new(xml_name, type, options)
 
-        self._attributes[name.to_sym] = attribute
+        _attributes[name.to_sym] = attribute
 
         attr_accessor name
       end
 
       def attributes(scopes = [])
         scopes = Array(scopes)
-        attributes = self._attributes
+        attributes = _attributes
 
         if scopes.present?
           attributes.reject { |_, xml_attribute| (xml_attribute.scopes & scopes).blank? }
@@ -53,19 +49,16 @@ module Reactor
       end
 
       def xml_attribute(name)
-        self._attributes[name.to_sym]
+        _attributes[name.to_sym]
       end
 
       def xml_attribute_names
-        self._attributes.values.map(&:name)
+        _attributes.values.map(&:name)
       end
 
       def attribute_names
-        self._attributes.keys
+        _attributes.keys
       end
-
     end
-
   end
-
 end

data/lib/reactor/tools/xpath_extractor.rb

@@ -8,7 +8,8 @@ module Reactor
       arr = REXML::XPath.match(@node, expr)
 
       return arr.first if arr.length == 1
-      return arr
+
+      arr
     end
   end
 end

data/lib/reactor/validations.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   # This module provides standard validations for Objs (:permalink, :parent_obj_id, :name, :obj_class),
   # and presence validations for all mandatory fields.
@@ -8,14 +7,14 @@ module Reactor
   # @todo link validations?
   module Validations
     module Base
-     def self.included(base)
+      def self.included(base)
         base.extend(ClassMethods)
         # Common validations for all Objs
         base.class_eval do
-          validates :permalink,     :format => { :with => /\A[-_$.\/a-zA-Z0-9]*\Z/ }
-          validates :parent_obj_id, :numericality => { :only_integer => true }, :on => :create
-          validates :name,          :presence => true, :on => :create
-          validates :obj_class,     :presence => true, :on => :create
+          validates :permalink,     format: { with: %r{\A[-_$./a-zA-Z0-9]*\Z} }
+          validates :parent_obj_id, numericality: { only_integer: true }, on: :create
+          validates :name,          presence: true, on: :create
+          validates :obj_class,     presence: true, on: :create
         end
       end
 
@@ -23,8 +22,9 @@ module Reactor
       # in :release context before release. Raises exception when invalid.
       # @raise [ActiveRecord::RecordInvalid] validations registered for :release failed
       def release!(*args)
-        raise(ActiveRecord::RecordInvalid.new(self)) unless valid?(:release)
-        return super
+        raise ActiveRecord::RecordInvalid, self unless valid?(:release)
+
+        super
       end
     end
 
@@ -34,19 +34,23 @@ module Reactor
 
         # Add validation for each mandatory attribute
         mandatory_attrs = __mandatory_cms_attributes(subclass.name)
-        mandatory_attrs.each  do |attr|
-          subclass.send(:validates_presence_of, attr.to_sym, :on => :release)
-        end if mandatory_attrs
+        mandatory_attrs&.each  do |attr|
+          subclass.send(:validates_presence_of, attr.to_sym, on: :release)
+        end
 
-        cms_attributes  = __cms_attributes(subclass).values
+        cms_attributes = __cms_attributes(subclass).values
         # Add validation for linklist & multienum [minSize/maxSize]
-        array_attributes= cms_attributes.select {|attr| ["linklist", "multienum"].include?(attr.attribute_type) }
+        array_attributes = cms_attributes.select { |attr| %w(linklist multienum).include?(attr.attribute_type) }
         array_attributes.each do |attr|
           length_hash = {}
-          length_hash[:minimum] = attr.min_size if attr.min_size && "linklist" != attr.attribute_type # CMS ignores minimum for linklists.
+          if attr.min_size && "linklist" != attr.attribute_type
+            length_hash[:minimum] = attr.min_size
+          end # CMS ignores minimum for linklists.
           length_hash[:maximum] = attr.max_size if attr.max_size
-        
-          subclass.send(:validates, attr.attribute_name.to_sym, :length => length_hash, :on => :release) unless length_hash.empty?
+
+          unless length_hash.empty?
+            subclass.send(:validates, attr.attribute_name.to_sym, length: length_hash, on: :release)
+          end
         end
 
         subclass

data/lib/reactor/version.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.26.1"
+  VERSION = "1.27.0.rc4".freeze
 end

data/lib/reactor/workflow.rb

@@ -1,6 +1,6 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/workflow/standard'
-require 'reactor/workflow/empty'
+require "reactor/workflow/standard"
+require "reactor/workflow/empty"
+require "reactor/workflow/comment"
 
 module Reactor
   module Workflow
@@ -9,39 +9,16 @@ module Reactor
       # Returns instance of Standard (or Empty..)
       # For the API See Reactor::Workflow::Standard
       def workflow
-        @workflow ||= if ((meta=RailsConnector::ObjectWithMetaData.find_by_object_id(self.obj_id)).workflow_name.present?)
-          Standard.new(self,meta)
-        else
-          Empty.new(self)
-        end
+        @workflow ||=
+          if (meta = RailsConnector::ObjectWithMetaData.find_by_object_id(obj_id)).workflow_name.present?
+            Standard.new(self, meta)
+          else
+            Empty.new(self)
+          end
       end
 
       def workflow_comments
-        Reactor::Cm::LogEntry.where(:objectId => self.id).map {|entry| Comment.new(entry) }
-      end
-    end
-
-    class Comment < Struct.new(:time, :text, :type, :object_id, :receiver, :user)
-      def initialize(log_entry)
-        super(
-          parse_time(log_entry['logTime']),
-          log_entry['logText'],
-          log_entry['logType'],
-          log_entry['objectId'],
-          log_entry['receiver'],
-          log_entry['userLogin']
-        )
-      end
-
-      def object
-        ::AbstractObj.find(self.object_id)
-      end
-
-      alias obj object
-
-      protected
-      def parse_time(time)
-        Time.from_iso(time)
+        Reactor::Cm::LogEntry.where(objectId: id).map { |entry| Comment.new(entry) }
       end
     end
   end

data/lib/reactor/workflow/comment.rb

@@ -0,0 +1,28 @@
+module Reactor
+  module Workflow
+    class Comment < Struct.new(:time, :text, :type, :obj_id, :receiver, :user)
+      def initialize(log_entry)
+        super(
+          parse_time(log_entry["logTime"]),
+          log_entry["logText"],
+          log_entry["logType"],
+          log_entry["objectId"],
+          log_entry["receiver"],
+          log_entry["userLogin"]
+        )
+      end
+
+      def object
+        ::AbstractObj.find(obj_id)
+      end
+
+      alias_method :obj, :object
+
+      protected
+
+      def parse_time(time)
+        Time.from_iso(time)
+      end
+    end
+  end
+end

data/lib/reactor/workflow/empty.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Workflow
     class Empty < Standard

data/lib/reactor/workflow/standard.rb

@@ -1,11 +1,11 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Workflow
     class Standard
-      WORKFLOW_ACTIONS = [:take, :forward, :reject, :commit, :release, :sign]
+      WORKFLOW_ACTIONS = %i(take forward reject commit release sign).freeze
 
       def initialize(obj, meta_obj)
-        @obj, @meta_obj = obj, meta_obj
+        @obj = obj
+        @meta_obj = meta_obj
       end
 
       def empty?
@@ -27,6 +27,7 @@ module Reactor
       end
 
       protected
+
       def valid_action?(action)
         @obj.send(:crul_obj).valid_actions.include?(action.to_s)
       end

data/lib/tasks/cm_migrate.rake

@@ -1,8 +1,8 @@
 namespace :cm do
   desc "Migrate CM"
-  task :migrate => :environment do
-    require 'reactor/tools/migrator'
+  task migrate: :environment do
+    require "reactor/tools/migrator"
     migrator = Reactor::Migrator.new("#{Rails.root}/cm/migrate", ENV["VERSION"])
     migrator.migrate
   end
-end
+end

data/lib/tasks/cm_seeds.rake

@@ -1,41 +1,34 @@
 namespace :cm do
-
   desc "Load the seed data from cm/seeds.rb"
-  task :seed => :environment do
-    require 'reactor/tools/sower'
+  task seed: :environment do
+    require "reactor/tools/sower"
     sower = Reactor::Sower.new("#{Rails.root}/cm/seeds.rb")
     sower.sow
   end
 
   namespace :seed do
-
     desc "Load the seed data from cm/seeds-develop.rb"
-    task :develop => :environment do
-      require 'reactor/tools/sower'
+    task develop: :environment do
+      require "reactor/tools/sower"
       sower = Reactor::Sower.new("#{Rails.root}/cm/seeds-develop.rb")
       sower.sow
     end
 
-    task :test => :environment do
-      require 'reactor/tools/sower'
+    task test: :environment do
+      require "reactor/tools/sower"
       sower = Reactor::Sower.new("#{Rails.root}/cm/seeds-test.rb")
       sower.sow
     end
   end
 
   namespace :maintenance do
-
     Dir["#{Rails.root}/cm/maintenance-scripts/*.rb"].each do |maint_script|
-
       desc "Execute seed in cm/maintenance-scripts/#{File.basename(maint_script)}"
-      task File.basename(maint_script, '.rb').to_sym => :environment do
-        require 'reactor/tools/sower'
+      task File.basename(maint_script, ".rb").to_sym => :environment do
+        require "reactor/tools/sower"
         sower = Reactor::Sower.new(maint_script)
         sower.sow
       end
-
     end
-
   end
-
-end
+end

metadata

@@ -1,35 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.26.1
+  version: 1.27.0.rc4
 platform: ruby
 authors:
 - Tomasz Przedmojski
+- Anton Mezin
+- Roman Lemekha
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: infopark_fiona_connector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 7.0.1.5.2.3.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.10
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 7.0.1.5.2.3.rc5
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +40,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +68,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.87.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.87.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -76,31 +114,25 @@ description: Use the ActiveRecord mimicking API to write into CM and enjoy all t
   benefits of callbacks, validations and permission checking
 email:
 - tomasz.przedmojski@infopark.de
+- anton.mezin@infopark.de
+- roman.lemekha@infopark.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - Gemfile
 - LICENSE
 - Rakefile
-- app/models/rails_connector/abstract_model.rb
 - app/models/rails_connector/abstract_obj.rb
-- app/models/rails_connector/attribute.rb
-- app/models/rails_connector/blob_mapping.rb
-- app/models/rails_connector/channel.rb
-- app/models/rails_connector/content.rb
-- app/models/rails_connector/job.rb
-- app/models/rails_connector/obj_class.rb
-- app/models/rails_connector/obj_class_attr.rb
-- app/models/rails_connector/object_with_meta_data.rb
 - config/routes.rb
 - infopark_reactor.gemspec
 - lib/generators/cm/migration/USAGE
 - lib/generators/cm/migration/migration_generator.rb
 - lib/generators/cm/migration/templates/template.rb
 - lib/infopark_reactor.rb
-- lib/rails_connector/meta/eager_loader.rb
 - lib/reactor/already_released.rb
 - lib/reactor/attributes.rb
 - lib/reactor/attributes/date_serializer.rb
@@ -109,6 +141,7 @@ files:
 - lib/reactor/attributes/link_list_from_accessor.rb
 - lib/reactor/attributes/link_list_from_attr_values.rb
 - lib/reactor/attributes/link_list_serializer.rb
+- lib/reactor/attributes_handlers.rb
 - lib/reactor/cache/permission.rb
 - lib/reactor/cache/user.rb
 - lib/reactor/cm/attribute.rb
@@ -179,12 +212,14 @@ files:
 - lib/reactor/plans/update_job.rb
 - lib/reactor/plans/update_obj.rb
 - lib/reactor/plans/update_obj_class.rb
-- lib/reactor/rails_connector_meta.rb
 - lib/reactor/rc_independent.rb
 - lib/reactor/session.rb
 - lib/reactor/session/observers.rb
 - lib/reactor/session/user.rb
-- lib/reactor/session_helper.rb
+- lib/reactor/session_helper/auth_filter.rb
+- lib/reactor/session_helper/auth_helper.rb
+- lib/reactor/session_helper/rsession_helper.rb
+- lib/reactor/session_helper/session_state.rb
 - lib/reactor/streaming_upload.rb
 - lib/reactor/sudo.rb
 - lib/reactor/support/link_matcher.rb
@@ -201,6 +236,7 @@ files:
 - lib/reactor/validations.rb
 - lib/reactor/version.rb
 - lib/reactor/workflow.rb
+- lib/reactor/workflow/comment.rb
 - lib/reactor/workflow/empty.rb
 - lib/reactor/workflow/standard.rb
 - lib/tasks/cm_migrate.rake
@@ -220,12 +256,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Write into CM in familiar, Rails-like way