infopark_reactor 1.24.1 → 1.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 120a29c7221d27d52ce6a0127253d0cc032f8001
-  data.tar.gz: c2b26618039f56626b28cf2e7f16d8e47c5c8f40
+  metadata.gz: 0239fbc0807b9a31e6fa80298930ca37465af29d
+  data.tar.gz: 73f6561b9a114871fce30a050ca677e828e6ecf4
 SHA512:
-  metadata.gz: 8bb9bc6c05ec5ce8fc6e244aec7f5f2819b6c1a40a7ab5e7736c2ab667592db494f334fa7c795d578a060fff278d9c8ec41d63f38dcf08e2ee5a650125d106f2
-  data.tar.gz: 63a1870ce4031fd9f04806282f2e470213fcc35ace6702fc0b13cf3bca490df016c58d095934a03d68c8cfd89fcc6652aa52af7fcc659d58c7819bbcf4709f55
+  metadata.gz: f7bf7b6f924abb2bba8b8d6dd916641c407d99cd6644812005689a1e78cf288871a67e7393db59623e50a6cbc66faa6ecf9e5befa9b4009a628d901a7e230c4b
+  data.tar.gz: 4760a747861ac8d05d4b315cfddf3a3820a76213146eb11b08208ab03b98e120c5438abd3738b94337a65a2693d6c22a190f0569b1c9f4c6996a6fc728c3f8b0

data/lib/reactor/cm/editorial_group.rb

@@ -15,6 +15,10 @@ module Reactor
 
       # Overwritten method from +Group+.
       def base_name
+        self.class.base_name
+      end
+
+      def self.base_name
         'groupProxy'
       end
 

data/lib/reactor/cm/group.rb

@@ -3,7 +3,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/string'
+require 'reactor/tools/response_handler/xml_attribute'
+require 'reactor/tools/where_query'
 
 require 'reactor/cm/permissions'
 
@@ -19,6 +20,7 @@ module Reactor
     class Group
 
       include XmlAttributes
+      extend WhereQuery
 
       class << self
 
@@ -34,25 +36,8 @@ module Reactor
         end
 
         # Returns all known group names as an array of strings.
-        def all(match = '')
-          object = new
-
-          base_name = object.send(:base_name)
-
-          request = XmlRequest.prepare do |xml|
-            xml.where_key_tag!(base_name, 'groupText', match)
-            xml.get_key_tag!(base_name, 'name')
-          end
-
-          begin
-            response = request.execute!
-            groups = ResponseHandler::String.new.get(response, "//#{base_name}/name/text()")
-
-            groups.is_a?(Array) ? groups : [groups]
-          rescue XmlRequestError
-            []
-          end
-
+        def all(match = nil)
+          self.where("groupText", match)
         end
 
         # See @get.
@@ -173,6 +158,10 @@ module Reactor
       # account. Use +EditorialGroup+ to work on editorial groups and +LiveGroup+ to work on live
       # groups.
       def base_name
+        self.class.base_name
+      end
+
+      def self.base_name
         'group'
       end
 

data/lib/reactor/cm/live_group.rb

@@ -13,6 +13,10 @@ module Reactor
 
       # Overwritten method from +Group+.
       def base_name
+        self.class.base_name
+      end
+
+      def self.base_name
         'secondaryGroupProxy'
       end
 

data/lib/reactor/cm/user.rb

@@ -3,6 +3,7 @@ require 'reactor/cm/object_base'
 require 'reactor/configuration'
 require 'reactor/cm/language'
 require 'reactor/tools/xml_attributes'
+require 'reactor/tools/where_query'
 
 require 'reactor/cm/permissions'
 
@@ -64,21 +65,32 @@ module Reactor
       end
 
       include XmlAttributes
+      extend WhereQuery
 
-      attribute :name
+      attribute :login
       attribute :groups, :type => :list
       attribute :global_permissions, :name => :globalPermissions, :type => :list
       attribute :email
+      attribute :default_group, :name => :defaultGroup
+      attribute :real_name, :name => :realName
 
       primary_key 'login'
 
-      def initialize(name)
-        @name = name
+      def initialize(name = nil)
+        @login = name
+      end
+
+      def name
+        self.login
+      end
+
+      def self.all(match = nil)
+        self.where("userText", match)
       end
 
       def has_password?(password)
         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, self.login)
           xml.get_tag!(base_name) do |xml3|
             xml3.tag!('hasPassword', :password => password)
           end
@@ -89,7 +101,7 @@ module Reactor
 
       def is_root?
         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, self.login)
           xml.get_key_tag!(base_name, 'isSuperUser')
         end
 
@@ -99,14 +111,14 @@ module Reactor
       end
 
       def language
-        Reactor::Cm::Language.get(self.name)
+        Reactor::Cm::Language.get(self.login)
       end
 
       def global_permissions
         xml_attribute = self.class.xml_attribute(:global_permissions)
 
         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, self.login)
           xml.get_key_tag!(base_name, xml_attribute.name)
         end
 
@@ -119,7 +131,7 @@ module Reactor
         xml_attribute = self.class.xml_attribute(:groups)
 
         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, self.login)
           xml.get_key_tag!(base_name, xml_attribute.name)
         end
 
@@ -132,7 +144,7 @@ module Reactor
         xml_attribute = self.class.xml_attribute(:email)
 
         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, self.login)
           xml.get_key_tag!(base_name, xml_attribute.name)
         end
 
@@ -143,6 +155,11 @@ module Reactor
 
       protected
       def base_name
+        self.class.base_name
+        
+      end
+
+      def self.base_name
         'userProxy'
       end
 

data/lib/reactor/cm/xml_response.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
 require 'reactor/tools/response_handler/xml_attribute'
+require 'reactor/tools/xpath_extractor'
 require 'rexml/document'
 
 module Reactor
@@ -15,13 +16,11 @@ module Reactor
         @xml_str = xml
         @xml = REXML::Document.new(xml)
         @handler = Reactor::ResponseHandler::XmlAttribute.new
+        @xpath = Reactor::XPathExtractor.new(@xml)
       end
 
       def xpath(expr)
-        arr = REXML::XPath.match(@xml, expr)
-
-        return arr.first if arr.length == 1
-        return arr
+        @xpath.match(expr)
       end
 
       def ok?

data/lib/reactor/tools/response_handler/xml_attribute.rb

@@ -1,14 +1,16 @@
 # -*- encoding : utf-8 -*-
-require 'reactor/tools/response_handler/base'
-
+require 'reactor/tools/xpath_extractor'
 module Reactor
 
   module ResponseHandler
     
-    class XmlAttribute < Base
+    class XmlAttribute
+      attr_accessor :response
+      attr_accessor :context
       
       def get(response, attribute)
-        super(response, attribute)
+        @response = response
+        @context = context
 
         name = attribute.name
         type = attribute.type
@@ -18,11 +20,19 @@ module Reactor
         self.send(method_name, name)
       end
 
+      def multiple(elem, attributes)
+        values = {}
+        attributes.each do |attribute|
+          values[attribute.name] = self.get(elem, attribute)
+        end
+        values
+      end
+
       private
 
       # Extracts a string value with the given +name+ and returns a string.
       def extract_string(name)
-        result = self.response.xpath("//#{name}/text()")
+        result = self.xpath(".//#{name}/text()")
         if result.kind_of?(Array)
           return result.first
         else
@@ -32,7 +42,7 @@ module Reactor
 
       # Extracts a list value with the given +name+ and returns an array of strings.
       def extract_list(name)
-        result = self.response.xpath("//#{name}/listitem/text()")
+        result = self.xpath(".//#{name}/listitem/text()")
         result = result.kind_of?(Array) ? result : [result]
 
         result.map(&:to_s)
@@ -41,7 +51,7 @@ module Reactor
       # This shit will break with the slightest change of the CM.
       def extract_signaturelist(name)
         signatures = []
-        self.response.xpath("//#{name}/").each do |potential_signature|
+        self.xpath(".//#{name}/").each do |potential_signature|
           if (potential_signature.name.to_s == "listitem")
             attribute = potential_signature.children.first.text.to_s
             group = potential_signature.children.last.text.to_s
@@ -51,6 +61,20 @@ module Reactor
         signatures
       end
 
+      protected
+      def node
+        # TODO: clean up this bullshit
+        if self.response.kind_of?(Reactor::Cm::XmlResponse)
+          self.response.xml
+        else
+          self.response
+        end
+      end
+
+      def xpath(expr)
+        Reactor::XPathExtractor.new(self.node).match(expr)
+      end
+
     end
     
   end

data/lib/reactor/tools/where_query.rb

@@ -0,0 +1,36 @@
+module Reactor
+  module WhereQuery
+    def where(key, value)
+      request = Cm::XmlRequest.prepare do |xml|
+        xml.where_tag!(self.base_name) do
+          xml.tag!(key) do
+            if value
+              xml.text!(value)
+            end
+          end
+        end
+
+        xml.get_tag!(self.base_name) do
+          self.attributes.each do |_, xml_attribute|
+            xml.tag!(xml_attribute.name)
+          end
+        end
+      end
+
+      response = request.execute!
+      result = response.xpath("//#{self.base_name}")
+      result = [result] unless result.kind_of?(Array)
+      result.map do |elem|
+        values = {}
+        values = self.response_handler.multiple(elem, self.attributes.values)
+        instance  = self.new
+        values.each do |name, value|
+          instance.instance_variable_set(:"@#{name}", value)
+        end
+        instance
+      end
+    rescue Cm::XmlRequestError
+      []
+    end
+  end
+end

data/lib/reactor/tools/xpath_extractor.rb

@@ -0,0 +1,14 @@
+module Reactor
+  class XPathExtractor
+    def initialize(node)
+      @node = node
+    end
+
+    def match(expr)
+      arr = REXML::XPath.match(@node, expr)
+
+      return arr.first if arr.length == 1
+      return arr
+    end
+  end
+end

data/lib/reactor/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Reactor
-  VERSION = "1.24.1"
+  VERSION = "1.25.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_reactor
 version: !ruby/object:Gem::Version
-  version: 1.24.1
+  version: 1.25.0
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -183,15 +183,15 @@ files:
 - lib/reactor/sudo.rb
 - lib/reactor/support/link_matcher.rb
 - lib/reactor/tools/migrator.rb
-- lib/reactor/tools/response_handler/base.rb
-- lib/reactor/tools/response_handler/string.rb
 - lib/reactor/tools/response_handler/xml_attribute.rb
 - lib/reactor/tools/smart_xml_logger.rb
 - lib/reactor/tools/sower.rb
 - lib/reactor/tools/uploader.rb
 - lib/reactor/tools/versioner.rb
+- lib/reactor/tools/where_query.rb
 - lib/reactor/tools/workflow_generator.rb
 - lib/reactor/tools/xml_attributes.rb
+- lib/reactor/tools/xpath_extractor.rb
 - lib/reactor/validations.rb
 - lib/reactor/version.rb
 - lib/reactor/workflow.rb

data/lib/reactor/tools/response_handler/base.rb

@@ -1,23 +0,0 @@
-# -*- encoding : utf-8 -*-
-module Reactor
-
-  module ResponseHandler
-    
-    # Common base class to handle a xml response. Provides helper methods to extract the content 
-    # from a xml response.
-    class Base
-
-      attr_accessor :response
-      attr_accessor :context
-
-      # Common strategy method for each sub class.
-      def get(response, context)
-        @response = response
-        @context = context
-      end
-      
-    end
-
-  end
-
-end

data/lib/reactor/tools/response_handler/string.rb

@@ -1,20 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/tools/response_handler/base'
-
-module Reactor
-
-  module ResponseHandler
-    
-    class String < Base
-      
-      def get(response, string)
-        super(response, string)
-
-        self.response.xpath(string)
-      end
-
-    end
-    
-  end
-
-end