infopark_reactor 1.26.1 → 1.27.0.rc4

data/lib/reactor/cm/language.rb

@@ -1,45 +1,45 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Cm
     class Language
       def self.get(username = nil)
         begin
           options = {}
-          options = {:login => username} if username
+          options = { login: username } if username
           request = XmlRequest.prepare do |xml|
-            xml.tag!('userConfig-getTexts', options) do
-              xml.tag!('listitem') do
-                 xml.text!('languages.language')
-               end
-             end
-           end
+            xml.tag!("userConfig-getTexts", options) do
+              xml.tag!("listitem") do
+                xml.text!("languages.language")
+              end
+            end
+          end
           response = request.execute!
-          response.xpath('//listitem').text
-        rescue => e
-          return nil
+          response.xpath("//listitem").text
+        rescue StandardError
+          nil
         end
       end
 
       # FIXME: broken ([011003] Die Klasse '%s' wird nicht unterstützt.)
       def self.set(*args)
         username = language = nil
-        raise ArgumentError.new('set requires one or two parameters') unless [1,2].include? args.length
+        raise ArgumentError, "set requires one or two parameters" unless [1, 2].include? args.length
 
         username, language = *args if args.length == 2
         language = *args if args.length == 1
 
-        raise ArgumentError.new('language cannot be nil') if language.nil?
+        raise ArgumentError, "language cannot be nil" if language.nil?
+
         options = {}
-        options = {:login => username} if username
+        options = { login: username } if username
 
         begin
           request = XmlRequest.prepare do |xml|
-            xml.tag!('userConfig.setTexts', options) do
-              xml.tag!('dictitem') do
-                xml.tag!('key') do
-                  xml.text!('languages.language')
+            xml.tag!("userConfig.setTexts", options) do
+              xml.tag!("dictitem") do
+                xml.tag!("key") do
+                  xml.text!("languages.language")
                 end
-                xml.tag!('value') do
+                xml.tag!("value") do
                   xml.text!(language)
                 end
               end
@@ -47,11 +47,10 @@ module Reactor
           end
           response = request.execute!
           response.ok?
-        rescue => e
-          return false
+        rescue StandardError
+          false
         end
       end
-
     end
   end
 end

data/lib/reactor/cm/link.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Cm
     class Link
@@ -6,22 +5,22 @@ module Reactor
       attr_accessor :title, :target, :position
 
       def self.exists?(id)
-        return !Link.get(id).nil?
-      rescue XmlRequestError => e
-        return false
+        !Link.get(id).nil?
+      rescue XmlRequestError
+        false
       end
 
       def self.get(id)
         link = Link.new
-        link.send(:get,id)
+        link.send(:get, id)
         link
       end
 
-      def self.create_inside(obj, attr, url, title=nil, target=nil)
+      def self.create_inside(obj, attr, url, title = nil, target = nil)
         create(obj.edited_content, attr, url, title, target)
       end
 
-      def self.create(content, attr, url, title=nil, target=nil)
+      def self.create(content, attr, url, title = nil, target = nil)
         link = Link.new
         link.send(:create, content, attr, url, title, target)
         link
@@ -42,65 +41,64 @@ module Reactor
       end
 
       def dest_url=(url)
-        @is_external  = (/^\// =~ url).nil?
+        @is_external  = (%r{^/} =~ url).nil?
         @dest_obj_id  = Obj.get(url).obj_id unless @is_external
         @dest_url     = url
       end
 
       def save!
         request = XmlRequest.prepare do |xml|
-          xml.where_key_tag!(base_name, 'id', @link_id)
+          xml.where_key_tag!(base_name, "id", @link_id)
           xml.set_tag!(base_name) do
-            xml.tag!('target', @target) if @target
-            xml.tag!('title', @title) if @title
-            xml.tag!('destinationUrl', @dest_url) if @dest_url
-            xml.tag!('position', @position) if @position
+            xml.tag!("target", @target) if @target
+            xml.tag!("title", @title) if @title
+            xml.tag!("destinationUrl", @dest_url) if @dest_url
+            xml.tag!("position", @position) if @position
           end
         end
-        response = request.execute!
+        request.execute!
       end
 
       def hash
         # yes, to_s.to_is is neccesary,
         # because self.link_id is of type REXML::Text for the most of the time
-        self.link_id.to_s.to_i
+        link_id.to_s.to_i
       end
 
-
       def eql?(other)
-        self.link_id == other.link_id
+        link_id == other.link_id
       end
 
       def delete!
         request = XmlRequest.prepare do |xml|
-          xml.where_key_tag!(base_name, 'id', @link_id)
+          xml.where_key_tag!(base_name, "id", @link_id)
           xml.tag!("#{base_name}-delete")
         end
-        response = request.execute!
+        request.execute!
       end
 
       protected
-      def initialize
-      end
+
+      def initialize; end
 
       def base_name
-        'link'
+        "link"
       end
 
       def get(id)
         request = XmlRequest.prepare do |xml|
-          xml.where_key_tag!(base_name, 'id', id)
-          xml.get_key_tag!(base_name, ['id', 'isExternalLink', 'target', 'title', 'destination', 'destinationUrl', 'position'])
+          xml.where_key_tag!(base_name, "id", id)
+          xml.get_key_tag!(base_name, %w(id isExternalLink target title destination destinationUrl position))
         end
-        response      = request.execute!
+        response = request.execute!
 
-        @link_id      = response.xpath('//id/text()')
-        @is_external  = response.xpath('//isExternalLink/text()') == '1'
-        @target       = response.xpath('//target/text()').presence
-        @title        = response.xpath('//title/text()').presence
-        @dest_obj_id  = response.xpath('//destination/text()').presence
-        @dest_url     = response.xpath('//destinationUrl/text()').presence
-        @position     = response.xpath('//position/text()').presence
+        @link_id      = response.xpath("//id/text()")
+        @is_external  = response.xpath("//isExternalLink/text()") == "1"
+        @target       = response.xpath("//target/text()").presence
+        @title        = response.xpath("//title/text()").presence
+        @dest_obj_id  = response.xpath("//destination/text()").presence
+        @dest_url     = response.xpath("//destinationUrl/text()").presence
+        @position     = response.xpath("//position/text()").presence
 
         self
       end
@@ -108,25 +106,25 @@ module Reactor
       def create(content, attr, url, title = nil, target = nil)
         request = XmlRequest.prepare do |xml|
           xml.create_tag!(base_name) do
-            xml.tag!('attributeName', attr.to_s)
-            xml.tag!('sourceContent', content.to_s)
-            xml.tag!('destinationUrl', url.to_s)
+            xml.tag!("attributeName", attr.to_s)
+            xml.tag!("sourceContent", content.to_s)
+            xml.tag!("destinationUrl", url.to_s)
           end
         end
         response = request.execute!
 
-        id = response.xpath('//id/text()')
+        id = response.xpath("//id/text()")
         get(id)
 
         if !title.nil? || !target.nil?
           request = XmlRequest.prepare do |xml|
-            xml.where_key_tag!(base_name, 'id', id)
+            xml.where_key_tag!(base_name, "id", id)
             xml.set_tag!(base_name) do
-              xml.value_tag!('title', title) if title
-              xml.value_tag!('target', target) if target
+              xml.value_tag!("title", title) if title
+              xml.value_tag!("target", target) if target
             end
           end
-          response = request.execute!
+          request.execute!
         end
 
         self

data/lib/reactor/cm/live_group.rb

@@ -1,14 +1,10 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/group'
+require "reactor/cm/group"
 
 module Reactor
-
   module Cm
-
     # The LiveGroup class respects the user management configured in the content manager and
     # handles all live groups. See @Group for further details.
     class LiveGroup < Group
-      
       protected
 
       # Overwritten method from +Group+.
@@ -17,11 +13,8 @@ module Reactor
       end
 
       def self.base_name
-        'secondaryGroupProxy'
+        "secondaryGroupProxy"
       end
-
     end
-    
   end
-  
 end

data/lib/reactor/cm/log_entry.rb

@@ -5,37 +5,37 @@ module Reactor
         def where(conditions = {})
           request = XmlRequest.prepare do |xml|
             where_part(xml, conditions)
-            xml.tag!('logEntry-get') do
-              xml.tag!('logTime')
-              xml.tag!('logText')
-              xml.tag!('logType')
-              xml.tag!('objectId')
-              xml.tag!('receiver')
-              xml.tag!('userLogin')
+            xml.tag!("logEntry-get") do
+              xml.tag!("logTime")
+              xml.tag!("logText")
+              xml.tag!("logType")
+              xml.tag!("objectId")
+              xml.tag!("receiver")
+              xml.tag!("userLogin")
             end
           end
           response = request.execute!
-          
+
           result = []
-          log_entries = response.xpath('//logEntry')
-          log_entries = [log_entries] unless log_entries.kind_of?(Array)
+          log_entries = response.xpath("//logEntry")
+          log_entries = [log_entries] unless log_entries.is_a?(Array)
           log_entries.each do |log_entry_node|
             dict = {}
             log_entry_node.each_element do |value_node|
-              if value_node.name == 'logTime'
-                dict[value_node.name] = value_node.elements['isoDateTime'].text.to_s
-              else
-                dict[value_node.name] = value_node.text.to_s
-              end
+              dict[value_node.name] = if value_node.name == "logTime"
+                                        value_node.elements["isoDateTime"].text.to_s
+                                      else
+                                        value_node.text.to_s
+                                      end
             end
 
             result << dict
           end
 
-          return result
+          result
         rescue Reactor::Cm::XmlRequestError => e
-          if e.message =~ /#{Regexp.escape('[060001] Es wurde kein Eintrag gefunden.')}/
-            return []
+          if /#{Regexp.escape('[060001] Es wurde kein Eintrag gefunden.')}/.match?(e.message)
+            []
           else
             raise e
           end
@@ -44,15 +44,16 @@ module Reactor
         def delete(conditions)
           request = XmlRequest.prepare do |xml|
             where_part(xml, conditions)
-            xml.tag!('logEntry-delete')
+            xml.tag!("logEntry-delete")
           end
           response = request.execute!
-          result = response.xpath('//deleteLogEntriesCount').map {|x| x.text.to_s }.first
+          response.xpath("//deleteLogEntriesCount").map { |x| x.text.to_s }.first
         end
 
         protected
+
         def where_part(xml, conditions)
-          xml.tag!('logEntry-where') do
+          xml.tag!("logEntry-where") do
             conditions.each do |key, value|
               xml.tag!(key.to_s, value.to_s)
             end

data/lib/reactor/cm/missing_credentials.rb

@@ -1,8 +1,9 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Cm
     class MissingCredentials < StandardError
-      def initialize ; super("CM access credentials are missing. Check your configuration or supplied credentials.") ; end
+      def initialize
+        super("CM access credentials are missing. Check your configuration or supplied credentials.")
+      end
     end
   end
 end

data/lib/reactor/cm/multi_xml_request.rb

@@ -1,13 +1,11 @@
-# -*- encoding : utf-8 -*-
-require 'net/http'
-require 'reactor/cm/xml_response'
-require 'reactor/cm/xml_multi_request_error'
-require 'reactor/cm/xml_markup'
-require 'nokogiri'
+require "net/http"
+require "reactor/cm/xml_response"
+require "reactor/cm/xml_multi_request_error"
+require "reactor/cm/xml_markup"
+require "nokogiri"
 
 module Reactor
   module Cm
-
     class MultiXmlRequest
       def self.timeout
         Reactor::Cm::XmlRequest.timeout
@@ -18,59 +16,56 @@ module Reactor
       end
 
       def self.execute
-        access = Configuration::xml_access
+        access = Configuration.xml_access
         sanity_check(access)
         xml = XmlMarkup.new
-        xml2 = nil
-        ret = nil
         xml.instruct!
         req = nil
-        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
-          req = self.new(xml).tap do |instance|
+          req = new(xml).tap do |instance|
             yield instance
           end
         end
         req.execute!(ret)
       end
 
-      def mandatory(&block)
+      def mandatory
         req_id = self.class.generate_id
         @mandatory << req_id
-        @builder.tag!('cm-request', 'request-id' => req_id, 'preclusive' => 'true') do |xml2|
+        @builder.tag!("cm-request", "request-id" => req_id, "preclusive" => "true") do |xml2|
           yield xml2
         end
       end
 
-      def optional(&block)
+      def optional
         req_id = self.class.generate_id
         @optional << req_id
-        @builder.tag!('cm-request', 'request-id' => req_id, 'preclusive' => 'false') do |xml2|
+        @builder.tag!("cm-request", "request-id" => req_id, "preclusive" => "false") do |xml2|
           yield xml2
         end
       end
 
       def execute!(xml)
-        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')
+          req = Net::HTTP::Post.new("/xml")
           req.body = payload
           http.request(req)
         end
 
-        result = MultiXmlResponse.new(res.body, @mandatory, @optional)
+        MultiXmlResponse.new(res.body, @mandatory, @optional)
       end
 
       class << self
-
         def generate_id
-          rand(10000)
+          rand(10_000)
         end
 
         protected
@@ -90,7 +85,9 @@ module Reactor
 
       class MultiXmlResponse
         def initialize(xml, mandatory, optional)
-          @xml, @mandatory, @optional = xml, mandatory, optional
+          @xml = xml
+          @mandatory = mandatory
+          @optional = optional
           @n = Nokogiri::XML.parse(@xml)
         end