infopark_reactor 1.26.1 → 1.27.0.rc4

data/lib/reactor/cm/attribute_group.rb

@@ -1,15 +1,15 @@
-require 'reactor/cm/object_base'
+require "reactor/cm/object_base"
 
 module Reactor
   module Cm
-    class AttributeGroup < ObjectBase 
-      set_base_name 'attributeGroup'
+    class AttributeGroup < ObjectBase
+      set_base_name "attributeGroup"
 
       attribute :obj_class, name: :objClass
       attribute :name
       attribute :title
 
-      attribute :attributes, :except => [:set], :type => :list
+      attribute :attributes, except: [:set], type: :list
       attribute :index
 
       # virtual attribute!
@@ -31,15 +31,13 @@ module Reactor
 
         response = request.execute!
 
-        return response.ok?
-
-      rescue XmlRequestError => e
-        return false
+        response.ok?
+      rescue XmlRequestError
+        false
       end
 
-
-      def self.create(obj_class, name, index=nil)
-        pk = [obj_class, name].join('.')
+      def self.create(obj_class, name, index = nil)
+        pk = [obj_class, name].join(".")
         attributes = {
           objClass: obj_class,
           name: name
@@ -50,25 +48,24 @@ module Reactor
       end
 
       def add_attributes(attributes)
-        add_or_remove_attributes(attributes, 'add')
+        add_or_remove_attributes(attributes, "add")
       end
 
       def remove_attributes(attributes)
-        add_or_remove_attributes(attributes, 'remove')
+        add_or_remove_attributes(attributes, "remove")
       end
 
       def move_attribute(attribute, index)
         request = XmlRequest.prepare do |xml|
           xml.where_key_tag!(base_name, primary_key, primary_key_value)
           xml.tag!("#{base_name}-moveAttribute") do
-            xml.tag!('attribute') do
+            xml.tag!("attribute") do
               xml.text!(attribute.to_s)
             end
-            xml.tag!('index') do
+            xml.tag!("index") do
               xml.text!(index.to_s)
             end
           end
-
         end
 
         response = request.execute!
@@ -77,16 +74,17 @@ module Reactor
       end
 
       def set(attr, value)
-        self.send(:"#{attr}=", value)
+        send(:"#{attr}=", value)
       end
 
       protected
+
       def primary_key_value
-        "#{self.obj_class}.#{self.name}"
+        "#{obj_class}.#{name}"
       end
 
       def primary_key_value_set(value)
-        a = value.split('.')
+        a = value.split(".")
         self.obj_class = a.first
         self.name = a.last
       end
@@ -96,12 +94,11 @@ module Reactor
           xml.where_key_tag!(base_name, primary_key, primary_key_value)
           xml.tag!("#{base_name}-#{add_or_remove}Attributes") do
             attributes.each do |attribute|
-              xml.tag!('listitem') do
+              xml.tag!("listitem") do
                 xml.text!(attribute)
               end
             end
           end
-
         end
 
         response = request.execute!

data/lib/reactor/cm/blob_too_small_error.rb

@@ -1,9 +1,9 @@
 module Reactor
   module Cm
     class BlobTooSmallError < XmlRequestError
-      def initialize(msg=nil)
+      def initialize(msg = nil)
         super(msg ||
-'The blob is too small (smaller than tuning.minStreamingDataLength) to get streaming ticket id')
+          "The blob is too small (smaller than tuning.minStreamingDataLength) to get streaming ticket id")
       end
     end
   end

data/lib/reactor/cm/bridge.rb

@@ -1,18 +1,17 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Cm
     class Bridge
       # credit goes to Anton
       def self.login_for(sessionId)
         old_username = Reactor::Configuration.xml_access[:username]
-        Reactor::Configuration.xml_access[:username] = 'root'
+        Reactor::Configuration.xml_access[:username] = "root"
         begin
           response = Reactor::Cm::XmlRequest.prepare do |xml|
-            xml.tag!('licenseManager-logins')
+            xml.tag!("licenseManager-logins")
           end.execute!
           login = nil
-          result = response.xpath('//licenseManager-logins/listitem')
-          result = [result] unless result.kind_of?(Array)
+          result = response.xpath("//licenseManager-logins/listitem")
+          result = [result] unless result.is_a?(Array)
           result.each do |login_data_element|
             properties = deserialize_login_data(login_data_element.text)
             if properties[:sessionId] == sessionId && properties[:interface] == "X"
@@ -21,7 +20,7 @@ module Reactor
             end
           end
           login
-        rescue => e
+        rescue StandardError => e
           Rails.logger.error "Login to CM failed! #{e.class}: #{e.message}"
           nil
         ensure
@@ -29,19 +28,17 @@ module Reactor
         end
       end
 
-      private
       def self.deserialize_login_data(serialized_property_list)
         entry_delimiter = /;\r?\n/
         no_braces = serialized_property_list[1..(serialized_property_list.rindex(entry_delimiter) - 1)]
         property_list_lines = no_braces.split(entry_delimiter)
-        property_list_lines.inject(properties = {}) do |map, line|
+        property_list_lines.each_with_object(properties = {}) do |line, map|
           key, value = line.strip.scan(/^([^=]*) = (.*)$/).first
           if value[0..0] == '"'
             value = value[1..(value.length - 2)]
             value.gsub!(/\\(.)/, '\1')
           end
           map[key.to_sym] = value
-          map
         end
         properties
       end

data/lib/reactor/cm/channel.rb

@@ -1,17 +1,16 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/object_base'
+require "reactor/cm/object_base"
 
 module Reactor
   module Cm
     class Channel < ObjectBase
       # Attribute definitions
-      attribute :name, :except => [:set]
+      attribute :name, except: [:set]
       attribute :title
 
       primary_key :name
 
       def self.create(name)
-        super(name, {:name => name})
+        super(name, { name: name })
       end
     end
   end

data/lib/reactor/cm/editorial_group.rb

@@ -1,14 +1,10 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/group'
+require "reactor/cm/group"
 
 module Reactor
-
   module Cm
-
     # The EditorialGroup class respects the user management configured in the content manager and
     # handles all editorial groups. See @Group for further details.
     class EditorialGroup < Group
-
       primary_key :name
 
       protected
@@ -19,11 +15,8 @@ module Reactor
       end
 
       def self.base_name
-        'groupProxy'
+        "groupProxy"
       end
-
     end
-
   end
-
 end

data/lib/reactor/cm/group.rb

@@ -1,32 +1,27 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/xml_request'
-require 'reactor/cm/xml_response'
-require 'reactor/cm/xml_request_error'
-require 'reactor/tools/xml_attributes'
-require 'reactor/tools/response_handler/xml_attribute'
-require 'reactor/tools/where_query'
+require "reactor/cm/xml_request"
+require "reactor/cm/xml_response"
+require "reactor/cm/xml_request_error"
+require "reactor/tools/xml_attributes"
+require "reactor/tools/response_handler/xml_attribute"
+require "reactor/tools/where_query"
 
-require 'reactor/cm/permissions'
+require "reactor/cm/permissions"
 
 module Reactor
-
   module Cm
-
     # The Group class can be used to work with user groups defined or known to the content manager.
     # It allows you to create, edit and delete groups, handle users and permissions and get the
     # group meta data. The Group class does not respect the user management defined under
     # "config/userManagement.xml", but is the basis for class like @EditorialGroup or @LiveGroup
     # that respect the user management.
     class Group
-
       include XmlAttributes
       extend WhereQuery
 
       class << self
-
         # Method returns true if a group with the given +name+ exists, false otherwise.
         def exists?(name)
-          object = new(:name => name)
+          object = new(name: name)
 
           begin
             object.send(:get).present?
@@ -37,12 +32,12 @@ module Reactor
 
         # Returns all known group names as an array of strings.
         def all(match = nil)
-          self.where("groupText", match)
+          where("groupText", match)
         end
 
         # See @get.
         def get(name)
-          object = new(:name => name)
+          object = new(name: name)
           object.send(:get)
           object
         end
@@ -53,16 +48,15 @@ module Reactor
           object.send(:create)
           object
         end
-
       end
 
       include Permissions
 
-      attribute :name, :except => [:set]
-      attribute :display_title, :name => :displayTitle, :only => [:get]
-      attribute :real_name, :name => :realName
+      attribute :name, except: [:set]
+      attribute :display_title, name: :displayTitle, only: [:get]
+      attribute :real_name, name: :realName
       attribute :owner
-      attribute :users, :type => :list
+      attribute :users, type: :list
 
       primary_key :name
 
@@ -73,7 +67,7 @@ module Reactor
 
       # Add the given +users+ to the current set of group users.
       def add_users!(users)
-        users = users.kind_of?(Array) ? users : [users]
+        users = users.is_a?(Array) ? users : [users]
         users = self.users | users
 
         set_users(users)
@@ -81,7 +75,7 @@ module Reactor
 
       # Remove the given +users+ from the current set of group users.
       def remove_users!(users)
-        users = users.kind_of?(Array) ? users : [users]
+        users = users.is_a?(Array) ? users : [users]
         users = self.users - users
 
         set_users(users)
@@ -90,7 +84,7 @@ module Reactor
       # Set the group users to the given +users+.
       def set_users!(users)
         request = XmlRequest.prepare do |xml|
-          xml.where_key_tag!(base_name, self.class.primary_key, self.name)
+          xml.where_key_tag!(base_name, self.class.primary_key, name)
           xml.set_key_tag!(base_name, self.class.xml_attribute(:users).name, users)
         end
 
@@ -102,10 +96,10 @@ module Reactor
       # Saves all settable instance attributes to the Content Manager.
       def save!
         request = XmlRequest.prepare do |xml|
-          xml.where_key_tag!(base_name, self.class.primary_key, self.name)
+          xml.where_key_tag!(base_name, self.class.primary_key, name)
           xml.set_tag!(base_name) do
             self.class.attributes(:set).each do |name, xml_attribute|
-              value = self.send(name)
+              value = send(name)
 
               xml.value_tag!(xml_attribute.name, value)
             end
@@ -120,7 +114,7 @@ module Reactor
       # Deletes the current group instance.
       def delete!
         request = XmlRequest.prepare do |xml|
-          xml.where_key_tag!(base_name, self.class.primary_key, self.name)
+          xml.where_key_tag!(base_name, self.class.primary_key, name)
           xml.delete_tag!(base_name)
         end
 
@@ -134,15 +128,13 @@ module Reactor
       # group. The method returns the new group object.
       def rename!(name)
         new_attributes =
-        self.class.attributes.inject({}) do |hash, mapping|
-          key, _ = mapping
-
-          hash[key] = self.send(key)
+          self.class.attributes.each_with_object({}) do |mapping, hash|
+            key, = mapping
 
-          hash
-        end
+            hash[key] = send(key)
+          end
 
-        if self.delete!
+        if delete!
           new_attributes[:name] = name
 
           self.class.create(new_attributes)
@@ -162,7 +154,7 @@ module Reactor
       end
 
       def self.base_name
-        'group'
+        "group"
       end
 
       def initialize(attributes = {})
@@ -172,7 +164,7 @@ module Reactor
       # Retrieves a single group matching the name set in the current instance.
       def get
         request = XmlRequest.prepare do |xml|
-          xml.where_key_tag!(base_name, self.class.primary_key, self.name)
+          xml.where_key_tag!(base_name, self.class.primary_key, name)
           xml.get_key_tag!(base_name, self.class.xml_attribute_names)
         end
 
@@ -193,7 +185,7 @@ module Reactor
         request = XmlRequest.prepare do |xml|
           xml.create_tag!(base_name) do |xml|
             self.class.attributes(:create).each do |name, xml_attribute|
-              value = self.send(name)
+              value = send(name)
 
               xml.value_tag!(xml_attribute.name, value) if value.present?
             end
@@ -213,18 +205,13 @@ module Reactor
         self.class.attribute_names.each do |name|
           value = attributes[name]
 
-          if value.present?
-            set_attribute(name, value)
-          end
+          set_attribute(name, value) if value.present?
         end
       end
 
       def set_attribute(name, value) # :nodoc:
-        self.send("#{name}=", value)
+        send("#{name}=", value)
       end
-
     end
-
   end
-
 end

data/lib/reactor/cm/job.rb

@@ -1,36 +1,34 @@
-# -*- encoding : utf-8 -*-
-
-require 'reactor/cm/object_base'
+require "reactor/cm/object_base"
 
 module Reactor
   module Cm
     class Job < ObjectBase
-      attribute :name, :except => [:set]
+      attribute :name, except: [:set]
       attribute :title
-      attribute :is_active, :name => :isActive
+      attribute :is_active, name: :isActive
       attribute :comment
-      attribute :exec_login, :name => :execLogin
-      attribute :exec_perm, :name => :execPerm
+      attribute :exec_login, name: :execLogin
+      attribute :exec_perm, name: :execPerm
       # This attribute has the following format:
       # [{:years => ['2001', '2002']}, {:years => ['2002', '2003'], :minutes => ['11', '12']}]
-      attribute :schedule, :type => :schedule
+      attribute :schedule, type: :schedule
       attribute :script
 
       primary_key :name
 
       def self.serialize_attribute_to_xml(xml, xml_attribute, value)
         if xml_attribute.type.to_sym == :schedule
-          xml.tag!('schedule') do
+          xml.tag!("schedule") do
             (value || []).each do |schedule_entry|
-              xml.tag!('listitem') do
+              xml.tag!("listitem") do
                 schedule_entry.each do |dim, values|
-                  xml.tag!('dictitem') do
-                    xml.tag!('key') do
+                  xml.tag!("dictitem") do
+                    xml.tag!("key") do
                       xml.text!(dim.to_s)
                     end
-                    xml.tag!('value') do
+                    xml.tag!("value") do
                       values.each do |val|
-                        xml.tag!('listitem', val)
+                        xml.tag!("listitem", val)
                       end
                     end
                   end
@@ -43,37 +41,37 @@ module Reactor
         end
       end
 
-      def self.create(pk_value, attributes={})
+      def self.create(pk_value, attributes = {})
         request = XmlRequest.prepare do |xml|
           xml.create_tag!(base_name) do
-            attributes.merge(:name => pk_value).each do |attr_name, attr_value|
-              self.serialize_attribute_to_xml(xml, self.xml_attribute(attr_name), attr_value)
+            attributes.merge(name: pk_value).each do |attr_name, attr_value|
+              serialize_attribute_to_xml(xml, xml_attribute(attr_name), attr_value)
             end
           end
         end
 
-        response = request.execute!
+        request.execute!
 
-        return get(pk_value)
+        get(pk_value)
       end
 
       def exec
-        simple_commnad('exec')
+        simple_commnad("exec")
       end
 
       def cancel
-        simple_command('cancel')
+        simple_command("cancel")
       end
 
       protected
+
       def simple_command(cmd_name)
         request = XmlRequest.prepare do |xml|
-          xml.where_key_tag!(self.base_name, 'name', self.name)
-          xml.tag!("#{self.base_name}-#{cmd_name}")
+          xml.where_key_tag!(base_name, "name", name)
+          xml.tag!("#{base_name}-#{cmd_name}")
         end
-        response = request.execute!
+        request.execute!
       end
     end
   end
 end
-