infopark_reactor 1.26.1 → 1.27.0.rc4

data/lib/reactor/cm/workflow.rb

@@ -1,34 +1,33 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/object_base'
+require "reactor/cm/object_base"
 
 module Reactor
   module Cm
     class Workflow < ObjectBase
       # Attribute definitions
-      attribute :name, :except => [:set]
+      attribute :name, except: [:set]
       attribute :title
-      attribute :is_enabled, :name => :isEnabled
-      attribute :edit_groups, :name => :editGroups, :type => :list
-      attribute :mutiple_signatures, :name => :allowsMultipleSignatures
+      attribute :is_enabled, name: :isEnabled
+      attribute :edit_groups, name: :editGroups, type: :list
+      attribute :mutiple_signatures, name: :allowsMultipleSignatures
       # This attribute should be used as follows:
       # workflow.signatures = [{:attribute => 'mySigAttr', :group => 'myGroup'},{:attribute => 'mySigAttr', :group => 'myOtherGroup'}]
-      attribute :signatures, :name => :signatureDefs, :type => :signaturelist
+      attribute :signatures, name: :signatureDefs, type: :signaturelist
 
       primary_key :name
 
       # Creates a workflow with given name. A list of edit groups
       # may also be specified - otherwise it defaults to empty list
       def self.create(name, edit_groups = [])
-        super(name, {:name => name, :editGroups => edit_groups})
+        super(name, { name: name, editGroups: edit_groups })
       end
 
       def self.serialize_attribute_to_xml(xml, xml_attribute, value)
         if xml_attribute.name.to_sym == :signatureDefs
-          xml.tag!('signatureDefs') do
+          xml.tag!("signatureDefs") do
             (value || []).each do |hash|
-              xml.tag!('listitem') do
-                xml.tag!('listitem', hash[:attribute])
-                xml.tag!('listitem', hash[:group])
+              xml.tag!("listitem") do
+                xml.tag!("listitem", hash[:attribute])
+                xml.tag!("listitem", hash[:group])
               end
             end
           end

data/lib/reactor/cm/xml_attribute.rb

@@ -1,36 +1,27 @@
-# -*- encoding : utf-8 -*-
 module Reactor
-
   module Cm
-
     class XmlAttribute
+      AVAILABLE_SCOPES = %i(get set create).freeze
 
-      AVAILABLE_SCOPES = [:get, :set, :create]
-
-      attr_accessor :name
-      attr_accessor :type
-      attr_accessor :scopes
+      attr_accessor :name, :type, :scopes
 
       def initialize(name, type, options)
         @name = name
         @type = type.presence || :string
 
         @scopes =
-        if options[:except].present?
-          AVAILABLE_SCOPES - options[:except]
-        elsif options[:only].present?
-          options[:only]
-        else
-          AVAILABLE_SCOPES
-        end
+          if options[:except].present?
+            AVAILABLE_SCOPES - options[:except]
+          elsif options[:only].present?
+            options[:only]
+          else
+            AVAILABLE_SCOPES
+          end
       end
 
       def scope?(name)
-        self.scopes.include?(name)
+        scopes.include?(name)
       end
-
     end
-
   end
-
 end

data/lib/reactor/cm/xml_markup.rb

@@ -1,10 +1,8 @@
-# -*- encoding : utf-8 -*-
-require 'builder'
+require "builder"
 
 module Reactor
   module Cm
     class XmlMarkup < Builder::XmlMarkup
-
       def where_key_tag!(base_name, key, value)
         where_tag!(base_name) do |xml|
           xml.tag!(key.to_s) do
@@ -31,10 +29,10 @@ module Reactor
 
       def get_key_tag!(base_name, key)
         get_tag!(base_name) do |xml|
-          if key.kind_of?(::Array)
-            key.each {|k| xml.tag!(k.to_s) }
+          if key.is_a?(::Array)
+            key.each { |k| xml.tag!(k.to_s) }
           else
-            xml.tag!(key.to_s) ; end
+            xml.tag!(key.to_s); end
         end
       end
 
@@ -57,8 +55,8 @@ module Reactor
       end
 
       def value_tag!(key, value, options = {})
-        if value.kind_of? ::Array then array_value_tag!(key, value, options)
-        elsif value.kind_of? ::Hash then hash_value_tag!(key, value)
+        if value.is_a? ::Array then array_value_tag!(key, value, options)
+        elsif value.is_a? ::Hash then hash_value_tag!(key, value)
         else tag!(key.to_s) { text!(value.to_s) }
         end
       end
@@ -66,7 +64,7 @@ module Reactor
       def array_value_tag!(name, values, options = {})
         tag!(name.to_s, options) do
           values.each do |value|
-            tag!('listitem') do
+            tag!("listitem") do
               text!(value.to_s)
             end
           end
@@ -80,7 +78,6 @@ module Reactor
           end
         end
       end
-
     end
   end
 end

data/lib/reactor/cm/xml_multi_request_error.rb

@@ -1,10 +1,8 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/xml_request_error'
+require "reactor/cm/xml_request_error"
 
 module Reactor
   module Cm
     class XmlMultiRequestError < XmlRequestError
-
     end
   end
 end

data/lib/reactor/cm/xml_request.rb

@@ -1,21 +1,14 @@
-# -*- encoding : utf-8 -*-
-require 'net/http'
-require 'reactor/cm/xml_response'
-require 'reactor/cm/xml_single_request_error'
-require 'reactor/cm/xml_markup'
-require 'reactor/tools/smart_xml_logger'
+require "net/http"
+require "reactor/cm/xml_response"
+require "reactor/cm/xml_single_request_error"
+require "reactor/cm/xml_markup"
+require "reactor/tools/smart_xml_logger"
 
 module Reactor
   module Cm
-
-    if Rails.env.development? && false
-      #LOGGER = SmartXmlLogger.new(Rails.logger, :debug)
-      LOGGER = SmartXmlLogger.new(Kernel, :puts)
-    else
-      LOGGER = SmartXmlLogger.new(nil)   # turn off logging
-    end
-    LOGGER.configure(:request, :xpath => 'cm-payload/cm-request/*', :start_indent => 2)
-    LOGGER.configure(:response, :xpath => 'cm-payload/cm-response/*', :start_indent => 2)
+    LOGGER = SmartXmlLogger.new(nil) # turn off logging
+    LOGGER.configure(:request, xpath: "cm-payload/cm-request/*", start_indent: 2)
+    LOGGER.configure(:response, xpath: "cm-payload/cm-response/*", start_indent: 2)
 
     class XmlRequest
       cattr_accessor :timeout
@@ -26,18 +19,17 @@ module Reactor
       end
 
       def self.prepare
-        access = Configuration::xml_access
+        access = Configuration.xml_access
         sanity_check(access)
         xml = XmlMarkup.new
-        ret = nil
         xml.instruct!
-        ret = xml.tag!('cm-payload', 'payload-id' =>'abcabc', 'timestamp' => Time.now.getutc.strftime('%Y%m%d%H%M%S'), 'version' => '6.7.3') do
-          xml.tag!('cm-header') do
-            xml.tag!('cm-sender', 'sender-id' => access[:id], 'name' => "ruby-simple-client")
-            xml.tag!('cm-authentication', 'login' => access[:username], 'token' => token(access[:username],access[:secret]))
+        ret = xml.tag!("cm-payload", "payload-id" => "abcabc", "timestamp" => Time.now.getutc.strftime("%Y%m%d%H%M%S"), "version" => "6.7.3") do
+          xml.tag!("cm-header") do
+            xml.tag!("cm-sender", "sender-id" => access[:id], "name" => "ruby-simple-client")
+            xml.tag!("cm-authentication", "login" => access[:username], "token" => token(access[:username], access[:secret]))
           end
-          id = self.generate_id
-          xml.tag!('cm-request', 'request-id' => id) do |xml2|
+          id = generate_id
+          xml.tag!("cm-request", "request-id" => id) do |xml2|
             yield xml2 if block_given?
           end
         end
@@ -45,21 +37,22 @@ module Reactor
       end
 
       def execute!
-        access = Configuration::xml_access
+        access = Configuration.xml_access
         payload = @xml
 
         res = Net::HTTP.new(access[:host], access[:port]).start do |http|
           http.read_timeout = self.class.timeout
-          req = Net::HTTP::Post.new('/xml')
-          Reactor::Cm::LOGGER.log('REQUEST:')
+          req = Net::HTTP::Post.new("/xml")
+          Reactor::Cm::LOGGER.log("REQUEST:")
           Reactor::Cm::LOGGER.log_xml(:request, payload)
           req.body = payload
           http.request(req)
         end
-        Reactor::Cm::LOGGER.log('RESPONSE:')
+        Reactor::Cm::LOGGER.log("RESPONSE:")
         Reactor::Cm::LOGGER.log_xml(:response, res.body)
         response = XmlResponse.new(res.body)
         raise XmlSingleRequestError, response unless response.ok?
+
         response
       end
 
@@ -67,7 +60,7 @@ module Reactor
         protected
 
         def generate_id
-          rand(10000)
+          rand(10_000)
         end
 
         def sanity_check(access)
@@ -80,7 +73,6 @@ module Reactor
       def initialize(xml)
         @xml = xml
       end
-
     end
   end
 end

data/lib/reactor/cm/xml_request_error.rb

@@ -1,11 +1,9 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Cm
     class XmlRequestError < StandardError
       def phrase
-        self.message
+        message
       end
-
     end
   end
 end

data/lib/reactor/cm/xml_response.rb

@@ -1,16 +1,11 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/tools/response_handler/xml_attribute'
-require 'reactor/tools/xpath_extractor'
-require 'rexml/document'
+require "reactor/tools/response_handler/xml_attribute"
+require "reactor/tools/xpath_extractor"
+require "rexml/document"
 
 module Reactor
-
   module Cm
-
     class XmlResponse
-
-      attr_reader :xml
-      attr_reader :xml_str
+      attr_reader :xml, :xml_str
 
       def initialize(xml)
         @xml_str = xml
@@ -24,19 +19,16 @@ module Reactor
       end
 
       def ok?
-        xp = xpath('//cm-code')
+        xp = xpath("//cm-code")
 
         if xp.is_a?(Array)
-          codes = xp.map { |result| result.attribute('numeric').value }.uniq
+          codes = xp.map { |result| result.attribute("numeric").value }.uniq
 
-          return codes.size == 1 && codes.first == '200'
+          return codes.size == 1 && codes.first == "200"
         end
 
-        xp.attribute('numeric').value == '200'
+        xp.attribute("numeric").value == "200"
       end
-
     end
-
   end
-
 end

data/lib/reactor/cm/xml_single_request_error.rb

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/xml_request_error'
+require "reactor/cm/xml_request_error"
 
 module Reactor
   module Cm
@@ -10,12 +9,11 @@ module Reactor
       end
 
       def phrase
-        result = @response.xpath('//phrase/text()')
-        result = [result] unless result.kind_of?(Array)
+        result = @response.xpath("//phrase/text()")
+        result = [result] unless result.is_a?(Array)
 
         result.map(&:to_s).join("\n")
       end
-
     end
   end
 end

data/lib/reactor/configuration.rb

@@ -1,9 +1,7 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   class Configuration
     class << self
-      attr_accessor :xml_access
-      attr_accessor :sanitize_obj_name
+      attr_accessor :xml_access, :sanitize_obj_name
     end
 
     self.sanitize_obj_name = true

data/lib/reactor/engine.rb

@@ -1,8 +1,4 @@
-require 'reactor/session_helper'
-
-# -*- encoding : utf-8 -*-
 module Reactor
-
   class Engine < Rails::Engine
     rake_tasks do
       load "tasks/cm_migrate.rake"
@@ -10,18 +6,17 @@ module Reactor
     end
 
     initializer "reactor.upgrade" do
-      if Gem::Specification.find_all_by_name('infopark_reactor_migrations').any? || Gem::Specification.find_all_by_name('infopark_rails_connector_meta').any?
+      if Gem::Specification.find_all_by_name("infopark_reactor_migrations").any? || Gem::Specification.find_all_by_name("infopark_rails_connector_meta").any?
         raise "Please remove 'infopark_reactor_migrations' and 'infopark_rails_connector_meta' from your Gemfile. They are deprecated and no longer needed."
       end
     end
 
-    initializer "reactor.rsession" do |app|
-      ActionController::Base.__send__(:include, Reactor::SessionHelper::RsessionHelper)
+    initializer "reactor.rsession" do |_app|
+      ActionController::Base.include Reactor::SessionHelper::RsessionHelper
       ActionController::Base.__send__(:helper_method, :rsession)
 
-      ActionController::Base.__send__(:include, Reactor::SessionHelper::AuthHelper)
+      ActionController::Base.include Reactor::SessionHelper::AuthHelper
+      ActionController::Base.include Reactor::SessionHelper::AuthFilter
     end
-
   end
-
 end

data/lib/reactor/legacy.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   # This is a collection of legacy method,s that have not found any better place to live.
   module Legacy
@@ -11,14 +10,14 @@ module Reactor
       # @option options :no_children if true prevents deletion unless there are no children
       # @option options :img_children_only if true prevents deletion unless there are exclusively img children
       # @option options [Array] :children if true prevents deletion if there are other children besides the specified ones (array of names)
-      def delete_children!(options={})
+      def delete_children!(options = {})
         # TODO: provide better discrimination mechanisms (blocks?)
         f_nochild   = options.delete(:no_children)
         f_imgchild  = options.delete(:img_children_only)
         f_children  = options.delete(:children)
 
-        mychildren  = self.children
-        image_children, other_children = mychildren.partition {|obj| obj.obj_class == 'Image'}
+        mychildren = children
+        other_children = mychildren.reject { |obj| obj.obj_class == "Image" }
 
         # are there any links pointing to this container
         return false if has_super_links?
@@ -27,16 +26,16 @@ module Reactor
         # is the flag set and are there any children besides images
         return false if f_imgchild && !other_children.empty?
         # is the flag set and are there any children besides the specified ones
-        return false if f_children && !((mychildren.map(&:name) - f_children).empty?)
+        return false if f_children && !(mychildren.map(&:name) - f_children).empty?
 
         # check children for any links pointing to them
         return false if mychildren.detect(&:has_super_links?)
         # check if there are any grandchildren
-        return false if mychildren.detect {|child| !child.children.empty?}
+        return false if mychildren.detect { |child| !child.children.empty? }
 
         # delete children
         mychildren.each(&:destroy)
-        return true
+        true
       end
     end
     module ClassMethods

data/lib/reactor/link/external.rb

@@ -1,15 +1,18 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Link
     class External
       attr_accessor :url
 
-      def external? ; true  ; end
-      def internal? ; false ; end
+      def external?
+        true
+      end
+
+      def internal?
+        false
+      end
 
-      def initialize(url)
+      def initialize(_url)
         raise TypeError, "#{self.class.name} is deprecated!"
-        self.url = url
       end
 
       def id